Skip to content

Commit d6fa520

Browse files
duffharcgis-maps-sdk-bot
authored andcommitted
Update script to hide tabs in store released WPF viewer (#1396)
1 parent c6201c9 commit d6fa520

File tree

4 files changed

+11
-3
lines changed

4 files changed

+11
-3
lines changed

src/Samples.Shared/Managers/ApiKeyManager.cs

+2
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ public static partial class ApiKeyManager
3737

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

40+
internal static bool DisableApiKeyUI {get; private set;}
41+
4042
// Name for file on windows systems. / Name for key in .NET MAUI SecureStorage.
4143
private const string _apiKeyFileName = "agolResource";
4244

src/WPF/WPF.Viewer/SettingsWindow.xaml.cs

+7-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
using ArcGIS.Helpers;
1111
using ArcGIS.Samples.Managers;
12+
using ArcGIS.Samples.Shared.Managers;
1213
using ArcGIS.Samples.Shared.Models;
1314
using ArcGIS.WPF.Viewer;
1415
using Esri.ArcGISRuntime;
@@ -68,10 +69,14 @@ public SettingsWindow()
6869

6970
SetUpTelemetryTab();
7071

71-
#if STORE_RELEASE
72+
#if RELEASE
7273
ScreenshotTab.Visibility = Visibility.Collapsed;
73-
APIKeyTab.Visibility = Visibility.Collapsed;
7474
#endif
75+
76+
if (ApiKeyManager.DisableApiKeyUI)
77+
{
78+
APIKeyTab.Visibility = Visibility.Collapsed;
79+
}
7580
}
7681

7782
private void SetUpTelemetryTab()

tools/GenerateApps.msbuild

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<XmlPoke Condition="'$(PUBLISHER)'!=''" XmlInputPath="$(MSBuildThisFileDirectory)..\src\WPF\WPF.StorePackage\Package.appxmanifest"
4444
Value="$(PUBLISHER)" Query="/dn:Package/dn:Identity/@Publisher" Namespaces="$(AppManifestNamespace)"/>
4545

46-
<MSBuild Projects="@(WPFProject)" Targets="Build" Properties="Configuration=$(Configuration);TargetFramework=$(_NetWindowsTarget);Platform=x64;DefineConstants=STORE_RELEASE" />
46+
<MSBuild Projects="@(WPFProject)" Targets="Build" Properties="Configuration=$(Configuration);TargetFramework=$(_NetWindowsTarget);Platform=x64" />
4747
<MSBuild Projects="@(WPFWAPProject)" Targets="Restore" Properties="Configuration=$(Configuration);ArcGISMapsSDKVersion=$(ArcGISMapsSDKVersion)" />
4848
<MSBuild Projects="@(WPFWAPProject)" Targets="Build" Properties="Configuration=$(Configuration);Platform=x64;PackageCertificateKeyFile=$(PFXSignatureFile);PackageCertificatePassword=$(PFXSignaturePassword);PackageCertificateThumbprint=$(PackageCertificateThumbprint)" />
4949
<ZipDirectory SourceDirectory="$(MSBuildThisFileDirectory)..\src\WPF\WPF.Viewer\bin\x64\Release\$(_NetWindowsTarget)" DestinationFile="$(MSBuildThisFileDirectory)..\output\WPF_$(_NetWindowsTarget)_$(Configuration)_x64.zip" Overwrite="true" />

tools/cibuild.cmd

+1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ IF "%ARCGIS_API_KEY%" NEQ "" (
4747
ECHO public static partial class ApiKeyManager ^{ >>%keyFile%
4848
ECHO static ApiKeyManager^(^) ^{ >>%keyFile%
4949
ECHO Esri.ArcGISRuntime.ArcGISRuntimeEnvironment.ApiKey = _key = "%ARCGIS_API_KEY%"; >>%keyFile%
50+
ECHO DisableApiKeyUI = true; >>%keyFile%
5051
ECHO ^}^}^} >>%keyFile%
5152
)
5253

0 commit comments

Comments
 (0)