Updated references of Windows Store to be Microsoft Store

DLSS Swapper.sln

@@ -7,20 +7,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DLSS Swapper", "src\DLSS Sw
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug_WindowsStore|x64 = Debug_WindowsStore|x64
+		Debug_MicrosoftStore|x64 = Debug_MicrosoftStore|x64
 		Debug|x64 = Debug|x64
-		Release_WindowsStore|x64 = Release_WindowsStore|x64
+		Release_MicrosoftStore|x64 = Release_MicrosoftStore|x64
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{63586228-FDDE-4E35-9138-7FF35ED61EC1}.Debug_WindowsStore|x64.ActiveCfg = Debug_WindowsStore|x64
-		{63586228-FDDE-4E35-9138-7FF35ED61EC1}.Debug_WindowsStore|x64.Build.0 = Debug_WindowsStore|x64
-		{63586228-FDDE-4E35-9138-7FF35ED61EC1}.Debug_WindowsStore|x64.Deploy.0 = Debug_WindowsStore|x64
+		{63586228-FDDE-4E35-9138-7FF35ED61EC1}.Debug_MicrosoftStore|x64.ActiveCfg = Debug_MicrosoftStore|x64
+		{63586228-FDDE-4E35-9138-7FF35ED61EC1}.Debug_MicrosoftStore|x64.Build.0 = Debug_MicrosoftStore|x64
+		{63586228-FDDE-4E35-9138-7FF35ED61EC1}.Debug_MicrosoftStore|x64.Deploy.0 = Debug_MicrosoftStore|x64
 		{63586228-FDDE-4E35-9138-7FF35ED61EC1}.Debug|x64.ActiveCfg = Debug|x64
 		{63586228-FDDE-4E35-9138-7FF35ED61EC1}.Debug|x64.Build.0 = Debug|x64
-		{63586228-FDDE-4E35-9138-7FF35ED61EC1}.Release_WindowsStore|x64.ActiveCfg = Release_WindowsStore|x64
-		{63586228-FDDE-4E35-9138-7FF35ED61EC1}.Release_WindowsStore|x64.Build.0 = Release_WindowsStore|x64
-		{63586228-FDDE-4E35-9138-7FF35ED61EC1}.Release_WindowsStore|x64.Deploy.0 = Release_WindowsStore|x64
+		{63586228-FDDE-4E35-9138-7FF35ED61EC1}.Release_MicrosoftStore|x64.ActiveCfg = Release_MicrosoftStore|x64
+		{63586228-FDDE-4E35-9138-7FF35ED61EC1}.Release_MicrosoftStore|x64.Build.0 = Release_MicrosoftStore|x64
+		{63586228-FDDE-4E35-9138-7FF35ED61EC1}.Release_MicrosoftStore|x64.Deploy.0 = Release_MicrosoftStore|x64
 		{63586228-FDDE-4E35-9138-7FF35ED61EC1}.Release|x64.ActiveCfg = Release|x64
 		{63586228-FDDE-4E35-9138-7FF35ED61EC1}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection

README.md

@@ -1,7 +1,7 @@
 # DLSS Swapper
 
-<!-- Removed this until Windows Store build is restored.
-<a href="https://www.microsoft.com/store/apps/9NNL4H1PTJBL" target="_blank"><img src="https://beeradmoore.github.io/dlss-swapper/images/windows_store_badge.png" alt="Windows Store install link" width="300" /></a>
+<!-- Removed this until Microsoft Store build is restored.
+<a href="https://www.microsoft.com/store/apps/9NNL4H1PTJBL" target="_blank"><img src="https://beeradmoore.github.io/dlss-swapper/images/microsoft_store_badge.png" alt="Microsoft Store install link" width="300" /></a>
 -->
 
 DLSS Swapper is a tool that allows you to conveniently download, manage, and swap DLSS dlls allowing you to upgrade or downgrade DLSS version in a game without the game needing an update.
@@ -29,7 +29,7 @@ Please come and share your DLSS exprience over in [r/DLSS_Swapper](https://www.r
 
 ## How do I get it?
 > **Note:**
-> DLSS Swapper is currently unavailable on the Windows Store. It will hopefully be restored soon. If you'd like to know more please see this [comment](https://github.com/beeradmoore/dlss-swapper/issues/96#issuecomment-1320977249).
+> DLSS Swapper is currently unavailable on the Microsoft Store. It will hopefully be restored soon. If you'd like to know more please see this [comment](https://github.com/beeradmoore/dlss-swapper/issues/96#issuecomment-1320977249).
 
 ~~Install from the [Microsoft Store](https://www.microsoft.com/store/apps/9NNL4H1PTJBL)~~, or look at our [manual install instructions](https://beeradmoore.github.io/dlss-swapper/install/).
 

docs/index.md

@@ -1,5 +1,5 @@
 
-<!-- <a href="https://www.microsoft.com/store/apps/9NNL4H1PTJBL" target="_blank"><img src="https://beeradmoore.github.io/dlss-swapper/images/windows_store_badge.png" alt="Windows Store install link" width="300" /></a> -->
+<!-- <a href="https://www.microsoft.com/store/apps/9NNL4H1PTJBL" target="_blank"><img src="https://beeradmoore.github.io/dlss-swapper/images/microsoft_store_badge.png" alt="Microsoft Store install link" width="300" /></a> -->
 
 
 DLSS Swapper is a tool that allows you to conveniently download, manage, and swap DLSS dlls allowing you to upgrade or downgrade DLSS version in a game without the game needing an update.
@@ -27,7 +27,7 @@ Please come and share your DLSS exprience over in [r/DLSS_Swapper](https://www.r
 
 ## How do I get it?
 > **Note:**
-> DLSS Swapper is currently unavailable on the Windows Store. It will hopefully be restored soon. If you'd like to know more please see this [comment](https://github.com/beeradmoore/dlss-swapper/issues/96#issuecomment-1320977249).
+> DLSS Swapper is currently unavailable on the Microsoft Store. It will hopefully be restored soon. If you'd like to know more please see this [comment](https://github.com/beeradmoore/dlss-swapper/issues/96#issuecomment-1320977249).
 
 ~~Install from the [https://www.microsoft.com/store/apps/9NNL4H1PTJBL](Microsoft Store)~~, or look at our [manual install instructions](https://beeradmoore.github.io/dlss-swapper/install/).
 

docs/install/index.md

@@ -1,14 +1,14 @@
 ## Recommended Install Instructions
 
 > **Note:**
-> DLSS Swapper is currently unavailable on the Windows Store. It will hopefully be restored soon. If you'd like to know more please see this [comment](https://github.com/beeradmoore/dlss-swapper/issues/96#issuecomment-1320977249).
+> DLSS Swapper is currently unavailable on the Microsoft Store. It will hopefully be restored soon. If you'd like to know more please see this [comment](https://github.com/beeradmoore/dlss-swapper/issues/96#issuecomment-1320977249).
 
 
 
-~~DLSS Swapper is now on the Windows Store!~~ You can install builds directly from GitHub using the manual method below, however they will not automatically update when a new version is available (although you will still be notified in app about updates).
+~~DLSS Swapper is now on the Microsoft Store!~~ You can install builds directly from GitHub using the manual method below, however they will not automatically update when a new version is available (although you will still be notified in app about updates).
 
 <!--
-<a href="https://www.microsoft.com/store/apps/9NNL4H1PTJBL" target="_blank"><img src="https://beeradmoore.github.io/dlss-swapper/images/windows_store_badge.png" alt="Windows Store install link" width="300" /></a>-->
+<a href="https://www.microsoft.com/store/apps/9NNL4H1PTJBL" target="_blank"><img src="https://beeradmoore.github.io/dlss-swapper/images/microsoft_store_badge.png" alt="Microsoft Store install link" width="300" /></a>-->
 
 ## Manual Install Instructions
 To install a GitHub build of DLSS Swapper you will need to trust our signing certificate and download installer from Github, or build the application from source.
@@ -56,6 +56,6 @@ If your installer says `Untrusted App` please review and re-attempt the steps fr
 If you have any problems installing please try install each of the `dependency-xxx.msix` files on the associated with that release. Then check if someone has already reported a similar problem in the [issues section](https://github.com/beeradmoore/dlss-swapper/issues) on our Github repository. If that doesn't solve your problem please create a new issue so we can try get you up and running.
 
 ### Updating
-~~If you installed via the Windows Store DLSS Swapper should update automatically.~~
+~~If you installed via the Microsoft Store DLSS Swapper should update automatically.~~
 
-If you installed via GitHub you will be notified about a new update on launch. You can also manually check for updates in settings. Unlike the Windows Store version, DLSS Swapper from GitHub will not update automatically. If you are ever unsure you can always check the [releases section](https://github.com/beeradmoore/dlss-swapper/releases) in our Github repository.
+If you installed via GitHub you will be notified about a new update on launch. You can also manually check for updates in settings. Unlike the Microsoft Store version, DLSS Swapper from GitHub will not update automatically. If you are ever unsure you can always check the [releases section](https://github.com/beeradmoore/dlss-swapper/releases) in our Github repository.

docs/privacy-policy/index.md

@@ -4,4 +4,4 @@
 
 DLSS Swapper does not collect any information on users, their system, their games or their DLSS versions from the DLSS Swapper application.
 
-Windows Store collects information such as install date, daily active users, etc. None of this information (as far as I am aware) is personally identifiable information. Opting out of Windows Store metrics is out of scope of this project, but if you wish to do so you should contact Microsoft Support. 
+Microsoft Store collects information such as install date, daily active users, etc. None of this information (as far as I am aware) is personally identifiable information. Opting out of Microsoft Store metrics is out of scope of this project, but if you wish to do so you should contact Microsoft Support. 

docs/uninstall/index.md

@@ -11,7 +11,7 @@
 
 
 ## Additional instructions if you installed via GitHub
-When you originally installed DLSS Swapper from GitHub you also need to install a developer certificate. If you are migrating to the [Windows Store version](https://www.microsoft.com/store/apps/9NNL4H1PTJBL) or are just cleaning this app out you should remove this. If you have only ever installed via the Windows Store this does not apply to you.
+When you originally installed DLSS Swapper from GitHub you also need to install a developer certificate. If you are migrating to the [Microsoft Store version](https://www.microsoft.com/store/apps/9NNL4H1PTJBL) or are just cleaning this app out you should remove this. If you have only ever installed via the Microsoft Store this does not apply to you.
 
 1. Open `Manage user certificates`
 

package/PrePackager/Program.cs

@@ -6,7 +6,7 @@
 using System.Text.Json;
 
 // Keep going up directories until we are in the package directory, then go up one more. From there we want to use src/StoredData.
-// This is where we store data for DLSS Swapper for the Windows Store.
+// This is where we store data for DLSS Swapper for the Microsoft Store.
 var storedDataPath = String.Empty;
 var currentSearchPath = Directory.GetCurrentDirectory() ?? String.Empty;
 do

package/build_MicrosoftStore.cmd

@@ -25,7 +25,7 @@ echo ################################
 echo.
 
 dotnet publish "..\src\DLSS Swapper.csproj" ^
-    -c Release_WindowsStore ^
+    -c Release_MicrosoftStore ^
     -r win10-x64 ^
     --self-contained false ^
     -p:Platform=x64 ^
@@ -46,10 +46,10 @@ echo.
 REM Build mapping file.
 (
     echo [Files]
-    echo "..\src\bin\publish\microsoft_store\DLSS Swapper_%app_version%_x64_Release_WindowsStore_Test\DLSS Swapper_%app_version%_x64_Release_WindowsStore.msix" "DLSS_Swapper_%app_version%_x64_Release_WindowsStore.msix"
+    echo "..\src\bin\publish\microsoft_store\DLSS Swapper_%app_version%_x64_Release_MicrosoftStore_Test\DLSS Swapper_%app_version%_x64_Release_MicrosoftStore.msix" "DLSS_Swapper_%app_version%_x64_Release_MicrosoftStore.msix"
 ) > ..\src\bin\publish\microsoft_store\mapping_file || goto :error
 
-SET msix_bundle_file="..\src\bin\publish\microsoft_store\DLSS Swapper-%app_version%-WindowsStore.msixbundle"
+SET msix_bundle_file="..\src\bin\publish\microsoft_store\DLSS Swapper-%app_version%-MicrosoftStore.msixbundle"
 
 REM Delete the bundle file if it already exists.
 DEL %msix_bundle_file% > NUL 2>&1

src/App.xaml.cs

@@ -37,10 +37,10 @@ public partial class App : Application
         public static App CurrentApp => (App)Application.Current;
 
 
-#if WINDOWS_STORE
-        public const bool IsWindowsStoreBuild = true;
+#if MICROSOFT_STORE
+        public const bool IsMicrosoftStoreBuild = true;
 #else
-        public const bool IsWindowsStoreBuild = false;
+        public const bool IsMicrosoftStoreBuild = false;
 #endif
 
         internal DLSSRecords DLSSRecords { get; } = new DLSSRecords();
@@ -86,7 +86,7 @@ protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs ar
 
         internal void LoadLocalRecordFromDLSSRecord(DLSSRecord dlssRecord, bool isImportedRecord = false)
         {
-#if WINDOWS_STORE
+#if MICROSOFT_STORE
             var dllsPath = Path.Combine(AppContext.BaseDirectory, "StoredData", "dlss_zip");
             if (isImportedRecord)
             {
@@ -221,7 +221,7 @@ internal void RelaunchAsAdministrator()
 
         public Version GetVersion()
         {
-#if WINDOWS_STORE
+#if MICROSOFT_STORE
             var packageVersion = Windows.ApplicationModel.Package.Current.Id.Version;
             return new Version(packageVersion.Major, packageVersion.Minor, packageVersion.Build, packageVersion.Revision);
 #else

src/Converters/LibraryDeleteButtonVisbilityConverter.cs

@@ -25,7 +25,7 @@ public object Convert(object value, Type targetType, object parameter, string la
                     return Visibility.Visible;
                 }
 
-                if (localRecord.IsDownloaded == true && App.IsWindowsStoreBuild == false)
+                if (localRecord.IsDownloaded == true && App.IsMicrosoftStoreBuild == false)
                 {
                     return Visibility.Visible;
                 }

src/DLSS Swapper.csproj

@@ -12,7 +12,7 @@
     <EnableMsixTooling>true</EnableMsixTooling>
     <!--<WindowsPackageType>None</WindowsPackageType>-->
     <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
-    <Configurations>Debug;Release;Debug_WindowsStore;Release_WindowsStore</Configurations>
+    <Configurations>Debug;Release;Debug_MicrosoftStore;Release_MicrosoftStore</Configurations>
     <PackageIcon>Asssets\icon_256.png</PackageIcon>
     <ApplicationIcon>Assets\icon.ico</ApplicationIcon>
     <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
@@ -26,39 +26,39 @@
     <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)'=='Release' Or '$(Configuration)'=='Release_WindowsStore'">
+  <PropertyGroup Condition="'$(Configuration)'=='Release' Or '$(Configuration)'=='Release_MicrosoftStore'">
     <Optimize>True</Optimize>
   </PropertyGroup>
 
-  <!-- If we are building for Windows Store set the WINDOWS_STORE defined constant -->
-  <PropertyGroup Condition="'$(Configuration)'=='Debug_WindowsStore' Or '$(Configuration)'=='Release_WindowsStore'">
-    <DefineConstants>WINDOWS_STORE</DefineConstants>
+  <!-- If we are building for Microsoft Store set the MICROSOFT_STORE defined constant -->
+  <PropertyGroup Condition="'$(Configuration)'=='Debug_MicrosoftStore' Or '$(Configuration)'=='Release_MicrosoftStore'">
+    <DefineConstants>MICROSOFT_STORE</DefineConstants>
     <WindowsPackageType>MSIX</WindowsPackageType>
   </PropertyGroup>
 
-    <!-- If we are not building for Windows Store still set the WindowsPackageType to none -->
+    <!-- If we are not building for Microsoft Store still set the WindowsPackageType to none -->
     <PropertyGroup Condition="'$(Configuration)'=='Debug' Or '$(Configuration)'=='Release'">
       <WindowsPackageType>None</WindowsPackageType>
     </PropertyGroup>
 
 
-    <!-- If we are building for the Windows Store copy the packaged launchSettings.json -->
-  <Target Name="PreBuildPackaged" BeforeTargets="PreBuildEvent" Condition="'$(DefineConstants.Contains(`WINDOWS_STORE`))' == 'true'">
+    <!-- If we are building for the Microsoft Store copy the packaged launchSettings.json -->
+  <Target Name="PreBuildPackaged" BeforeTargets="PreBuildEvent" Condition="'$(DefineConstants.Contains(`MICROSOFT_STORE`))' == 'true'">
     <Exec Command="copy &quot;$(ProjectDir)Properties\launchSettings.Packaged.json&quot; &quot;$(ProjectDir)Properties\launchSettings.json&quot; /Y" />
   </Target>
 
-  <!-- If we are not building for the Windows Store copy the unpackaged launchSettings.json -->
-  <Target Name="PreBuildUnpackged" BeforeTargets="PreBuildEvent" Condition="'$(DefineConstants.Contains(`WINDOWS_STORE`))' == 'false'">
+  <!-- If we are not building for the Microsoft Store copy the unpackaged launchSettings.json -->
+  <Target Name="PreBuildUnpackged" BeforeTargets="PreBuildEvent" Condition="'$(DefineConstants.Contains(`MICROSOFT_STORE`))' == 'false'">
     <Exec Command="copy &quot;$(ProjectDir)Properties\launchSettings.Unpackaged.json&quot; &quot;$(ProjectDir)Properties\launchSettings.json&quot; /Y" />
   </Target>
 
-  <ItemGroup Condition="'$(DefineConstants.Contains(`WINDOWS_STORE`))' == 'true'">
+  <ItemGroup Condition="'$(DefineConstants.Contains(`MICROSOFT_STORE`))' == 'true'">
       <None Update="StoredData\**">
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       </None>
   </ItemGroup>
 
-  <ItemGroup Condition="'$(DefineConstants.Contains(`WINDOWS_STORE`))' == 'false'">
+  <ItemGroup Condition="'$(DefineConstants.Contains(`MICROSOFT_STORE`))' == 'false'">
       <None Remove="StoredData\dlss_zip\**" />
       <None Remove="StoredData\dlss_zip\**" />
       <None Update="StoredData\static_json\**">

src/Data/DLSSRecord.cs

@@ -147,8 +147,8 @@ internal void CancelDownload()
 
         internal async Task<(bool Success, string Message, bool Cancelled)> DownloadAsync(Action<int> ProgressCallback = null)
         {
-#if WINDOWS_STORE
-            return (false, "Windows Store builds can not download DLSS updates.", false);
+#if MICROSOFT_STORE
+            return (false, "Microsoft Store builds can not download DLSS updates.", false);
 #else
             var dispatcherQueue = Microsoft.UI.Dispatching.DispatcherQueue.GetForCurrentThread();
 

src/Data/GitHub/GitHubUpdater.cs

@@ -13,7 +13,7 @@
 namespace DLSS_Swapper.Data.GitHub
 {
     /// <summary>
-    /// Helper class to be notified of updates in non-Windows Store builds of the app (which is Debug and Release builds)
+    /// Helper class to be notified of updates in non-Microsoft Store builds of the app (which is Debug and Release builds)
     /// </summary>
     internal class GitHubUpdater
     {
@@ -49,7 +49,7 @@ internal async Task<GitHubRelease> GetReleaseFromTag(string tag)
             }
         }
 
-#if !WINDOWS_STORE
+#if !MICROSOFT_STORE
         /// <summary>
         /// Queries GitHub and returns a GitHubRelease only if a newer version was detected, otherwise null
         /// </summary>

src/Data/LocalRecord.cs

@@ -160,7 +160,7 @@ void NotifyPropertyChanged([CallerMemberName] String propertyName = "")
 
         internal bool Delete()
         {
-#if WINDOWS_STORE
+#if MICROSOFT_STORE
             if (IsImported)
             {
                 try

src/MainWindow.xaml.cs

@@ -193,7 +193,7 @@ async void MainNavigationView_Loaded(object sender, RoutedEventArgs e)
             }
             */
 
-#if !WINDOWS_STORE
+#if !MICROSOFT_STORE
             var gitHubUpdater = new Data.GitHub.GitHubUpdater();
 
             // If this is a GitHub build check if there is a new version.
@@ -269,7 +269,7 @@ If this keeps happening please file an report in our issue tracker on Github.
             }
             */
 
-#if !WINDOWS_STORE
+#if !MICROSOFT_STORE
             await newUpdateTask;
             if (newUpdateTask.Result != null)
             {
@@ -322,7 +322,7 @@ internal void FilterDLSSRecords()
         /// <returns>True if we expect there are now valid DLSS records loaded into memory.</returns>
         async Task<bool> LoadDLSSRecordsAsync()
         {
-#if !WINDOWS_STORE
+#if !MICROSOFT_STORE
             // Only auto check for updates once every 12 hours.
             var timeSinceLastUpdate = DateTimeOffset.Now - Settings.Instance.LastRecordsRefresh;
             if (timeSinceLastUpdate.TotalHours > 12)
@@ -344,7 +344,7 @@ async Task<bool> LoadDLSSRecordsAsync()
                 // If items could not be loaded then we should attempt to upload dlss_records from the dlss-archive.
                 if (items == null)
                 {
-#if WINDOWS_STORE
+#if MICROSOFT_STORE
                     return false;
 #else
                     return await UpdateDLSSRecordsAsync();
@@ -387,7 +387,7 @@ internal void UpdateImportedDLSSRecordsList(List<DLSSRecord> localDlssRecords)
             App.CurrentApp.ImportedDLSSRecords.AddRange(localDlssRecords);
         }
 
-#if !WINDOWS_STORE
+#if !MICROSOFT_STORE
         /// <summary>
         /// Attempts to load dlss_records.json from dlss-archive.
         /// </summary>