Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update script to hide tabs in store released WPF viewer #1396

Merged
merged 3 commits into from
Feb 23, 2024
Merged

Update script to hide tabs in store released WPF viewer #1396

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f39be6
Hide tabs in store released viewer
duffh Feb 1, 2024
40ed1cc
Update cibuild.cmd
duffh Feb 2, 2024
1fd6167
implement PR feedback
duffh Feb 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/Samples.Shared/Managers/ApiKeyManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ public static partial class ApiKeyManager

public static bool KeyDisabled { get { return _keyDisabled; } }

internal static bool DisableApiKeyUI {get; private set;}

// Name for file on windows systems. / Name for key in .NET MAUI SecureStorage.
private const string _apiKeyFileName = "agolResource";

Expand Down
8 changes: 6 additions & 2 deletions src/WPF/WPF.Viewer/SettingsWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

using ArcGIS.Helpers;
using ArcGIS.Samples.Managers;
using ArcGIS.Samples.Shared.Managers;
using ArcGIS.Samples.Shared.Models;
using ArcGIS.WPF.Viewer;
using Esri.ArcGISRuntime;
Expand Down Expand Up @@ -68,9 +69,12 @@ public SettingsWindow()

SetUpTelemetryTab();

#if STORE_RELEASE
#if RELEASE
ScreenshotTab.Visibility = Visibility.Collapsed;
APIKeyTab.Visibility = Visibility.Collapsed;
if(ApiKeyManager.DisableApiKeyUI)
{
APIKeyTab.Visibility = Visibility.Collapsed;
}
#endif
}

Expand Down
2 changes: 1 addition & 1 deletion tools/GenerateApps.msbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<XmlPoke Condition="'$(PUBLISHER)'!=''" XmlInputPath="$(MSBuildThisFileDirectory)..\src\WPF\WPF.StorePackage\Package.appxmanifest"
Value="$(PUBLISHER)" Query="/dn:Package/dn:Identity/@Publisher" Namespaces="$(AppManifestNamespace)"/>

<MSBuild Projects="@(WPFProject)" Targets="Build" Properties="Configuration=$(Configuration);TargetFramework=$(_NetWindowsTarget);Platform=x64;DefineConstants=STORE_RELEASE" />
<MSBuild Projects="@(WPFProject)" Targets="Build" Properties="Configuration=$(Configuration);TargetFramework=$(_NetWindowsTarget);Platform=x64" />
<MSBuild Projects="@(WPFWAPProject)" Targets="Restore" Properties="Configuration=$(Configuration);ArcGISMapsSDKVersion=$(ArcGISMapsSDKVersion)" />
<MSBuild Projects="@(WPFWAPProject)" Targets="Build" Properties="Configuration=$(Configuration);Platform=x64;PackageCertificateKeyFile=$(PFXSignatureFile);PackageCertificatePassword=$(PFXSignaturePassword);PackageCertificateThumbprint=$(PackageCertificateThumbprint)" />
<ZipDirectory SourceDirectory="$(MSBuildThisFileDirectory)..\src\WPF\WPF.Viewer\bin\x64\Release\$(_NetWindowsTarget)" DestinationFile="$(MSBuildThisFileDirectory)..\output\WPF_$(_NetWindowsTarget)_$(Configuration)_x64.zip" Overwrite="true" />
Expand Down
5 changes: 5 additions & 0 deletions tools/cibuild.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ IF "%RELEASE_VERSION%" == "" (
SET RELEASE_VERSION=200.3.0
)

IF "%BUILD_NUM%" == "" (
SET BUILD_NUM=0
)

REM Configure NuGet
dotnet new nugetconfig --force -o ../
IF "%NUGET_REPO%" NEQ "" IF EXIST "%NUGET_REPO%" (
Expand Down Expand Up @@ -47,6 +51,7 @@ IF "%ARCGIS_API_KEY%" NEQ "" (
ECHO public static partial class ApiKeyManager ^{ >>%keyFile%
ECHO static ApiKeyManager^(^) ^{ >>%keyFile%
ECHO Esri.ArcGISRuntime.ArcGISRuntimeEnvironment.ApiKey = _key = "%ARCGIS_API_KEY%"; >>%keyFile%
ECHO DisableApiKeyUI = true; >>%keyFile%
ECHO ^}^}^} >>%keyFile%
)

Expand Down