From c636a9e0dbfeffa25878dbf2402b7c923c051ef6 Mon Sep 17 00:00:00 2001 From: Yair <39923744+yaira2@users.noreply.github.com> Date: Thu, 5 Dec 2024 19:44:42 -0500 Subject: [PATCH 1/2] Init --- .github/scripts/Configure-AppxManifest.ps1 | 41 ++- ...cd-preview.yml => cd-sideload-preview.yml} | 6 +- .../{cd-stable.yml => cd-sideload-stable.yml} | 6 +- .github/workflows/cd-store-preview.yml | 107 ++++++ .../{cd-store.yml => cd-store-stable.yml} | 6 +- Files.sln | 322 +----------------- .../Files.App.BackgroundTasks.csproj | 2 +- .../Files.App.Controls.csproj | 2 +- .../Files.App.CsWin32.csproj | 2 +- src/Files.App.Server/Files.App.Server.csproj | 2 +- .../Files.App.Storage.csproj | 2 +- src/Files.App/App.xaml.cs | 5 +- src/Files.App/Data/Enums/AppEnvironment.cs | 17 +- src/Files.App/Files.App.csproj | 2 +- .../Helpers/Application/AppLifecycleHelper.cs | 40 ++- .../Settings/GeneralSettingsService.cs | 2 +- src/Files.App/Utils/Git/GitHelpers.cs | 6 +- src/Files.App/Utils/Taskbar/SystemTrayIcon.cs | 23 +- src/Files.App/Views/SplashScreenPage.xaml.cs | 3 +- .../Files.Core.SourceGenerator.csproj | 1 + .../Files.Core.Storage.csproj | 2 +- src/Files.Shared/Files.Shared.csproj | 2 +- .../Files.App.UITests.csproj | 2 +- .../Files.InteractionTests.csproj | 2 +- 24 files changed, 214 insertions(+), 391 deletions(-) rename .github/workflows/{cd-preview.yml => cd-sideload-preview.yml} (98%) rename .github/workflows/{cd-stable.yml => cd-sideload-stable.yml} (98%) create mode 100644 .github/workflows/cd-store-preview.yml rename .github/workflows/{cd-store.yml => cd-store-stable.yml} (97%) diff --git a/.github/scripts/Configure-AppxManifest.ps1 b/.github/scripts/Configure-AppxManifest.ps1 index 3d07f781f615..f3c24742716f 100644 --- a/.github/scripts/Configure-AppxManifest.ps1 +++ b/.github/scripts/Configure-AppxManifest.ps1 @@ -2,7 +2,7 @@ # Licensed under the MIT License. See the LICENSE. param( - [string]$Branch = "", + [string]$Branch = "", # This has to correspond with one of the AppEnvironment enum values [string]$PackageManifestPath = "", [string]$Publisher = "", [string]$WorkingDir = "", @@ -27,7 +27,7 @@ $ea = $xmlDoc.SelectSingleNode("/pkg:Package/pkg:Applications/pkg:Application/pk # Update the publisher $xmlDoc.Package.Identity.Publisher = $Publisher -if ($Branch -eq "Preview") +if ($Branch -eq "SideloadPreview") { # Set identities $xmlDoc.Package.Identity.Name="FilesPreview" @@ -54,7 +54,34 @@ if ($Branch -eq "Preview") Set-Content $_ -NoNewline ` } } -elseif ($Branch -eq "Stable") +elseif ($Branch -eq "StorePreview") +{ + # Set identities + $xmlDoc.Package.Identity.Name="49306atecsolution.FilesPreview" + $xmlDoc.Package.Properties.DisplayName="Files - Preview" + $xmlDoc.Package.Applications.Application.VisualElements.DisplayName="Files - Preview" + $xmlDoc.Package.Applications.Application.VisualElements.DefaultTile.ShortName="49306atecsolution.FilesPreview" + + # Remove capability that is only used for the sideload package + $nsmgr = New-Object System.Xml.XmlNamespaceManager($xmlDoc.NameTable) + $nsmgr.AddNamespace("pkg", "http://schemas.microsoft.com/appx/manifest/foundation/windows10") + $nsmgr.AddNamespace("rescap", "http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities") + $pm = $xmlDoc.SelectSingleNode("/pkg:Package/pkg:Capabilities/rescap:Capability[@Name='packageManagement']", $nsmgr) + $xmlDoc.Package.Capabilities.RemoveChild($pm) + + # Update app protocol and execution alias + $ap.SetAttribute("Name", "files-preview"); + $ea.SetAttribute("Alias", "files-preview.exe"); + + $xmlDoc.Save($PackageManifestPath) + + Get-ChildItem $WorkingDir -Include *.csproj, *.appxmanifest, *.wapproj, *.xaml -recurse | ForEach-Object -Process ` + { ` + (Get-Content $_ -Raw | ForEach-Object -Process { $_ -replace "Assets\\AppTiles\\Dev", "Assets\AppTiles\Preview" }) | ` + Set-Content $_ -NoNewline ` + } +} +elseif ($Branch -eq "SideloadStable") { # Set identities $xmlDoc.Package.Identity.Name="Files" @@ -81,7 +108,7 @@ elseif ($Branch -eq "Stable") Set-Content $_ -NoNewline ` } } -elseif ($Branch -eq "Store") +elseif ($Branch -eq "StoreStable") { # Set identities $xmlDoc.Package.Identity.Name="49306atecsolution.FilesUWP" @@ -113,6 +140,12 @@ elseif ($Branch -eq "Store") } } +Get-ChildItem $WorkingDir -Include *.cs -recurse | ForEach-Object -Process ` +{ ` + (Get-Content $_ -Raw | ForEach-Object -Process { $_ -replace "cd_app_env_placeholder", $Branch }) | ` + Set-Content $_ -NoNewline ` +} + Get-ChildItem $WorkingDir -Include *.cs -recurse | ForEach-Object -Process ` { ` (Get-Content $_ -Raw | ForEach-Object -Process { $_ -replace "bingmapskey.secret", "$SecretBingMapsKey" }) | ` diff --git a/.github/workflows/cd-preview.yml b/.github/workflows/cd-sideload-preview.yml similarity index 98% rename from .github/workflows/cd-preview.yml rename to .github/workflows/cd-sideload-preview.yml index 961941c197f8..bc350f4c2860 100644 --- a/.github/workflows/cd-preview.yml +++ b/.github/workflows/cd-sideload-preview.yml @@ -11,7 +11,7 @@ # 4. Sign the package # 5. Publish the package to Azure -name: Files CD (Preview) +name: Files CD (Sideload Preview) on: workflow_dispatch: @@ -23,7 +23,7 @@ jobs: strategy: fail-fast: false matrix: - configuration: [Preview] + configuration: [Release] platform: [x64] env: SOLUTION_NAME: 'Files.sln' @@ -55,7 +55,7 @@ jobs: shell: pwsh run: | . './.github/scripts/Configure-AppxManifest.ps1' ` - -Branch "$env:CONFIGURATION" ` + -Branch "SideloadPreview" ` -PackageManifestPath "$env:PACKAGE_MANIFEST_PATH" ` -Publisher "$env:SIDELOAD_PUBLISHER_SECRET" ` -WorkingDir "$env:WORKING_DIR" ` diff --git a/.github/workflows/cd-stable.yml b/.github/workflows/cd-sideload-stable.yml similarity index 98% rename from .github/workflows/cd-stable.yml rename to .github/workflows/cd-sideload-stable.yml index be39a2707299..bc72efca20ce 100644 --- a/.github/workflows/cd-stable.yml +++ b/.github/workflows/cd-sideload-stable.yml @@ -11,7 +11,7 @@ # 4. Sign the package # 5. Publish the package to Azure -name: Files CD (Stable) +name: Files CD (Sideload Stable) on: workflow_dispatch: @@ -23,7 +23,7 @@ jobs: strategy: fail-fast: false matrix: - configuration: [Stable] + configuration: [Release] platform: [x64] env: SOLUTION_NAME: 'Files.sln' @@ -55,7 +55,7 @@ jobs: shell: pwsh run: | . './.github/scripts/Configure-AppxManifest.ps1' ` - -Branch "$env:CONFIGURATION" ` + -Branch "SideloadStable" ` -PackageManifestPath "$env:PACKAGE_MANIFEST_PATH" ` -Publisher "$env:SIDELOAD_PUBLISHER_SECRET" ` -WorkingDir "$env:WORKING_DIR" ` diff --git a/.github/workflows/cd-store-preview.yml b/.github/workflows/cd-store-preview.yml new file mode 100644 index 000000000000..c3ec28e01326 --- /dev/null +++ b/.github/workflows/cd-store-preview.yml @@ -0,0 +1,107 @@ +# Copyright (c) 2024 Files Community +# Licensed under the MIT License. See the LICENSE. + +# Abstract: +# Deploys Files Preview (Store). +# +# Workflow: +# 1. Configure manifest, logo and secrets +# 2. Restore, build and package Files +# 3. Generate a msixupload file +# 4. Publish the msixupload to GitHub Actions + +name: Files CD (Store Preview) + +on: + workflow_dispatch: + +jobs: + build: + runs-on: windows-latest + environment: Deployments + strategy: + fail-fast: false + matrix: + configuration: [Release] + platform: [x64] + env: + SOLUTION_NAME: 'Files.sln' + CONFIGURATION: '${{ matrix.configuration }}' + PLATFORM: '${{ matrix.platform }}' + APPX_BUNDLE_PLATFORMS: 'x64|arm64' + WORKING_DIR: '${{ github.workspace }}' # D:\a\Files\Files\ + ARTIFACTS_STAGING_DIR: '${{ github.workspace }}\artifacts' + APPX_PACKAGE_DIR: '${{ github.workspace }}\artifacts\AppxPackages' + PACKAGE_PROJECT_DIR: '${{ github.workspace }}\src\Files.App (Package)' + PACKAGE_PROJECT_PATH: '${{ github.workspace }}\src\Files.App (Package)\Files.Package.wapproj' + PACKAGE_MANIFEST_PATH: '${{ github.workspace }}\src\Files.App (Package)\Package.appxmanifest' + + steps: + - name: Checkout the repository + uses: actions/checkout@v4 + - name: Setup MSBuild + uses: microsoft/setup-msbuild@v2 + - name: Setup NuGet + uses: NuGet/setup-nuget@v2 + - name: Setup .NET 8 + uses: actions/setup-dotnet@v4 + with: + global-json-file: global.json + + - name: Configure the package manifest, logo, and secrets + shell: pwsh + run: | + . './.github/scripts/Configure-AppxManifest.ps1' ` + -Branch "StorePreview" ` + -PackageManifestPath "$env:PACKAGE_MANIFEST_PATH" ` + -Publisher "$env:STORE_PUBLISHER_SECRET" ` + -WorkingDir "$env:WORKING_DIR" ` + -SecretBingMapsKey "$env:SECRET_BINGMAPS_KEY" ` + -SecretSentry "$env:SECRET_SENTRY" ` + -SecretGitHubOAuthClientId "$env:SECRET_GITHUB_OAUTH_CLIENT_ID" + env: + STORE_PUBLISHER_SECRET: ${{ secrets.STORE_PUBLISHER_SECRET }} + SECRET_BINGMAPS_KEY: ${{ secrets.BING_MAPS_SECRET }} + SECRET_SENTRY: ${{ secrets.SENTRY_SECRET }} + SECRET_GITHUB_OAUTH_CLIENT_ID: ${{ secrets.GH_OAUTH_CLIENT_ID }} + + - name: Use Windows SDK Preview + shell: cmd + run: | + for /f %%a in ('dir /b /a:d %localappdata%\Microsoft\VisualStudio\17*') do echo UsePreviews=True>%localappdata%\Microsoft\VisualStudio\%%a\sdk.txt + + - name: Restore NuGet + shell: pwsh + run: 'nuget restore $env:SOLUTION_NAME' + + - name: Restore Files + shell: pwsh + run: | + msbuild $env:SOLUTION_NAME ` + -t:Restore ` + -p:Platform=$env:PLATFORM ` + -p:Configuration=$env:CONFIGURATION ` + -p:PublishReadyToRun=true + + - name: Build & package Files + shell: pwsh + run: | + msbuild "$env:PACKAGE_PROJECT_PATH" ` + -t:Build ` + -t:_GenerateAppxPackage ` + -p:Platform=$env:PLATFORM ` + -p:Configuration=$env:CONFIGURATION ` + -p:AppxBundlePlatforms=$env:APPX_BUNDLE_PLATFORMS ` + -p:AppxPackageDir="$env:APPX_PACKAGE_DIR" ` + -p:AppxBundle=Always ` + -p:UapAppxPackageBuildMode=StoreUpload + + - name: Remove empty files from the packages + shell: bash + run: find $ARTIFACTS_STAGING_DIR -empty -delete + + - name: Upload the packages to GitHub Actions + uses: actions/upload-artifact@v4 + with: + name: 'Appx Packages (${{ env.CONFIGURATION }}, ${{ env.PLATFORM }})' + path: ${{ env.ARTIFACTS_STAGING_DIR }} diff --git a/.github/workflows/cd-store.yml b/.github/workflows/cd-store-stable.yml similarity index 97% rename from .github/workflows/cd-store.yml rename to .github/workflows/cd-store-stable.yml index 86dafb0b2720..44b2088411d0 100644 --- a/.github/workflows/cd-store.yml +++ b/.github/workflows/cd-store-stable.yml @@ -10,7 +10,7 @@ # 3. Generate a msixupload file # 4. Publish the msixupload to GitHub Actions -name: Files CD (Store) +name: Files CD (Store Stable) on: workflow_dispatch: @@ -22,7 +22,7 @@ jobs: strategy: fail-fast: false matrix: - configuration: [Store] + configuration: [Release] platform: [x64] env: SOLUTION_NAME: 'Files.sln' @@ -52,7 +52,7 @@ jobs: shell: pwsh run: | . './.github/scripts/Configure-AppxManifest.ps1' ` - -Branch "$env:CONFIGURATION" ` + -Branch "StoreStable" ` -PackageManifestPath "$env:PACKAGE_MANIFEST_PATH" ` -Publisher "$env:STORE_PUBLISHER_SECRET" ` -WorkingDir "$env:WORKING_DIR" ` diff --git a/Files.sln b/Files.sln index 87aeb70599c3..002cf7910f3b 100644 --- a/Files.sln +++ b/Files.sln @@ -49,25 +49,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Files.App.UITests", "tests\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Files.App.Controls", "src\Files.App.Controls\Files.App.Controls.csproj", "{83FF8729-CC76-43E2-976F-47F0A187FC7E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Files.App.CsWin32", "src\Files.App.CsWin32\Files.App.CsWin32.csproj", "{4803E2CB-3E27-447D-94FC-45B5F96E4F7A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Files.App.CsWin32", "src\Files.App.CsWin32\Files.App.CsWin32.csproj", "{4803E2CB-3E27-447D-94FC-45B5F96E4F7A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|arm64 = Debug|arm64 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 - Preview|arm64 = Preview|arm64 - Preview|x64 = Preview|x64 - Preview|x86 = Preview|x86 Release|arm64 = Release|arm64 Release|x64 = Release|x64 Release|x86 = Release|x86 - Stable|arm64 = Stable|arm64 - Stable|x64 = Stable|x64 - Stable|x86 = Stable|x86 - Store|arm64 = Store|arm64 - Store|x64 = Store|x64 - Store|x86 = Store|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {94F77692-D47C-48D8-A1A7-645192EF38A4}.Debug|arm64.ActiveCfg = Debug|arm64 @@ -76,210 +67,84 @@ Global {94F77692-D47C-48D8-A1A7-645192EF38A4}.Debug|x64.Build.0 = Debug|x64 {94F77692-D47C-48D8-A1A7-645192EF38A4}.Debug|x86.ActiveCfg = Debug|x86 {94F77692-D47C-48D8-A1A7-645192EF38A4}.Debug|x86.Build.0 = Debug|x86 - {94F77692-D47C-48D8-A1A7-645192EF38A4}.Preview|arm64.ActiveCfg = Preview|arm64 - {94F77692-D47C-48D8-A1A7-645192EF38A4}.Preview|arm64.Build.0 = Preview|arm64 - {94F77692-D47C-48D8-A1A7-645192EF38A4}.Preview|x64.ActiveCfg = Preview|x64 - {94F77692-D47C-48D8-A1A7-645192EF38A4}.Preview|x64.Build.0 = Preview|x64 - {94F77692-D47C-48D8-A1A7-645192EF38A4}.Preview|x86.ActiveCfg = Preview|x86 - {94F77692-D47C-48D8-A1A7-645192EF38A4}.Preview|x86.Build.0 = Preview|x86 {94F77692-D47C-48D8-A1A7-645192EF38A4}.Release|arm64.ActiveCfg = Release|arm64 {94F77692-D47C-48D8-A1A7-645192EF38A4}.Release|arm64.Build.0 = Release|arm64 {94F77692-D47C-48D8-A1A7-645192EF38A4}.Release|x64.ActiveCfg = Release|x64 {94F77692-D47C-48D8-A1A7-645192EF38A4}.Release|x64.Build.0 = Release|x64 {94F77692-D47C-48D8-A1A7-645192EF38A4}.Release|x86.ActiveCfg = Release|x86 {94F77692-D47C-48D8-A1A7-645192EF38A4}.Release|x86.Build.0 = Release|x86 - {94F77692-D47C-48D8-A1A7-645192EF38A4}.Stable|arm64.ActiveCfg = Stable|arm64 - {94F77692-D47C-48D8-A1A7-645192EF38A4}.Stable|arm64.Build.0 = Stable|arm64 - {94F77692-D47C-48D8-A1A7-645192EF38A4}.Stable|x64.ActiveCfg = Stable|x64 - {94F77692-D47C-48D8-A1A7-645192EF38A4}.Stable|x64.Build.0 = Stable|x64 - {94F77692-D47C-48D8-A1A7-645192EF38A4}.Stable|x86.ActiveCfg = Stable|x86 - {94F77692-D47C-48D8-A1A7-645192EF38A4}.Stable|x86.Build.0 = Stable|x86 - {94F77692-D47C-48D8-A1A7-645192EF38A4}.Store|arm64.ActiveCfg = Store|arm64 - {94F77692-D47C-48D8-A1A7-645192EF38A4}.Store|arm64.Build.0 = Store|arm64 - {94F77692-D47C-48D8-A1A7-645192EF38A4}.Store|x64.ActiveCfg = Store|x64 - {94F77692-D47C-48D8-A1A7-645192EF38A4}.Store|x64.Build.0 = Store|x64 - {94F77692-D47C-48D8-A1A7-645192EF38A4}.Store|x86.ActiveCfg = Store|x86 - {94F77692-D47C-48D8-A1A7-645192EF38A4}.Store|x86.Build.0 = Store|x86 {B8051E11-5BF2-49F7-A7C8-E3820DBB8209}.Debug|arm64.ActiveCfg = Debug|arm64 {B8051E11-5BF2-49F7-A7C8-E3820DBB8209}.Debug|arm64.Build.0 = Debug|arm64 {B8051E11-5BF2-49F7-A7C8-E3820DBB8209}.Debug|x64.ActiveCfg = Debug|x64 {B8051E11-5BF2-49F7-A7C8-E3820DBB8209}.Debug|x64.Build.0 = Debug|x64 {B8051E11-5BF2-49F7-A7C8-E3820DBB8209}.Debug|x86.ActiveCfg = Debug|x86 {B8051E11-5BF2-49F7-A7C8-E3820DBB8209}.Debug|x86.Build.0 = Debug|x86 - {B8051E11-5BF2-49F7-A7C8-E3820DBB8209}.Preview|arm64.ActiveCfg = Preview|arm64 - {B8051E11-5BF2-49F7-A7C8-E3820DBB8209}.Preview|arm64.Build.0 = Preview|arm64 - {B8051E11-5BF2-49F7-A7C8-E3820DBB8209}.Preview|x64.ActiveCfg = Preview|x64 - {B8051E11-5BF2-49F7-A7C8-E3820DBB8209}.Preview|x64.Build.0 = Preview|x64 - {B8051E11-5BF2-49F7-A7C8-E3820DBB8209}.Preview|x86.ActiveCfg = Preview|x86 - {B8051E11-5BF2-49F7-A7C8-E3820DBB8209}.Preview|x86.Build.0 = Preview|x86 {B8051E11-5BF2-49F7-A7C8-E3820DBB8209}.Release|arm64.ActiveCfg = Release|arm64 {B8051E11-5BF2-49F7-A7C8-E3820DBB8209}.Release|arm64.Build.0 = Release|arm64 {B8051E11-5BF2-49F7-A7C8-E3820DBB8209}.Release|x64.ActiveCfg = Release|x64 {B8051E11-5BF2-49F7-A7C8-E3820DBB8209}.Release|x64.Build.0 = Release|x64 {B8051E11-5BF2-49F7-A7C8-E3820DBB8209}.Release|x86.ActiveCfg = Release|x86 {B8051E11-5BF2-49F7-A7C8-E3820DBB8209}.Release|x86.Build.0 = Release|x86 - {B8051E11-5BF2-49F7-A7C8-E3820DBB8209}.Stable|arm64.ActiveCfg = Stable|arm64 - {B8051E11-5BF2-49F7-A7C8-E3820DBB8209}.Stable|arm64.Build.0 = Stable|arm64 - {B8051E11-5BF2-49F7-A7C8-E3820DBB8209}.Stable|x64.ActiveCfg = Stable|x64 - {B8051E11-5BF2-49F7-A7C8-E3820DBB8209}.Stable|x64.Build.0 = Stable|x64 - {B8051E11-5BF2-49F7-A7C8-E3820DBB8209}.Stable|x86.ActiveCfg = Stable|x86 - {B8051E11-5BF2-49F7-A7C8-E3820DBB8209}.Stable|x86.Build.0 = Stable|x86 - {B8051E11-5BF2-49F7-A7C8-E3820DBB8209}.Store|arm64.ActiveCfg = Store|arm64 - {B8051E11-5BF2-49F7-A7C8-E3820DBB8209}.Store|arm64.Build.0 = Store|arm64 - {B8051E11-5BF2-49F7-A7C8-E3820DBB8209}.Store|x64.ActiveCfg = Store|x64 - {B8051E11-5BF2-49F7-A7C8-E3820DBB8209}.Store|x64.Build.0 = Store|x64 - {B8051E11-5BF2-49F7-A7C8-E3820DBB8209}.Store|x86.ActiveCfg = Store|x86 - {B8051E11-5BF2-49F7-A7C8-E3820DBB8209}.Store|x86.Build.0 = Store|x86 {53371D77-7AC1-4975-9A2A-5E0EB0B37CE3}.Debug|arm64.ActiveCfg = Debug|arm64 {53371D77-7AC1-4975-9A2A-5E0EB0B37CE3}.Debug|arm64.Build.0 = Debug|arm64 {53371D77-7AC1-4975-9A2A-5E0EB0B37CE3}.Debug|x64.ActiveCfg = Debug|x64 {53371D77-7AC1-4975-9A2A-5E0EB0B37CE3}.Debug|x64.Build.0 = Debug|x64 {53371D77-7AC1-4975-9A2A-5E0EB0B37CE3}.Debug|x86.ActiveCfg = Debug|x86 {53371D77-7AC1-4975-9A2A-5E0EB0B37CE3}.Debug|x86.Build.0 = Debug|x86 - {53371D77-7AC1-4975-9A2A-5E0EB0B37CE3}.Preview|arm64.ActiveCfg = Preview|arm64 - {53371D77-7AC1-4975-9A2A-5E0EB0B37CE3}.Preview|arm64.Build.0 = Preview|arm64 - {53371D77-7AC1-4975-9A2A-5E0EB0B37CE3}.Preview|x64.ActiveCfg = Preview|x64 - {53371D77-7AC1-4975-9A2A-5E0EB0B37CE3}.Preview|x64.Build.0 = Preview|x64 - {53371D77-7AC1-4975-9A2A-5E0EB0B37CE3}.Preview|x86.ActiveCfg = Preview|x86 - {53371D77-7AC1-4975-9A2A-5E0EB0B37CE3}.Preview|x86.Build.0 = Preview|x86 {53371D77-7AC1-4975-9A2A-5E0EB0B37CE3}.Release|arm64.ActiveCfg = Release|arm64 {53371D77-7AC1-4975-9A2A-5E0EB0B37CE3}.Release|arm64.Build.0 = Release|arm64 {53371D77-7AC1-4975-9A2A-5E0EB0B37CE3}.Release|x64.ActiveCfg = Release|x64 {53371D77-7AC1-4975-9A2A-5E0EB0B37CE3}.Release|x64.Build.0 = Release|x64 {53371D77-7AC1-4975-9A2A-5E0EB0B37CE3}.Release|x86.ActiveCfg = Release|x86 {53371D77-7AC1-4975-9A2A-5E0EB0B37CE3}.Release|x86.Build.0 = Release|x86 - {53371D77-7AC1-4975-9A2A-5E0EB0B37CE3}.Stable|arm64.ActiveCfg = Stable|arm64 - {53371D77-7AC1-4975-9A2A-5E0EB0B37CE3}.Stable|arm64.Build.0 = Stable|arm64 - {53371D77-7AC1-4975-9A2A-5E0EB0B37CE3}.Stable|x64.ActiveCfg = Stable|x64 - {53371D77-7AC1-4975-9A2A-5E0EB0B37CE3}.Stable|x64.Build.0 = Stable|x64 - {53371D77-7AC1-4975-9A2A-5E0EB0B37CE3}.Stable|x86.ActiveCfg = Stable|x86 - {53371D77-7AC1-4975-9A2A-5E0EB0B37CE3}.Stable|x86.Build.0 = Stable|x86 - {53371D77-7AC1-4975-9A2A-5E0EB0B37CE3}.Store|arm64.ActiveCfg = Store|arm64 - {53371D77-7AC1-4975-9A2A-5E0EB0B37CE3}.Store|arm64.Build.0 = Store|arm64 - {53371D77-7AC1-4975-9A2A-5E0EB0B37CE3}.Store|x64.ActiveCfg = Store|x64 - {53371D77-7AC1-4975-9A2A-5E0EB0B37CE3}.Store|x64.Build.0 = Store|x64 - {53371D77-7AC1-4975-9A2A-5E0EB0B37CE3}.Store|x86.ActiveCfg = Store|x86 - {53371D77-7AC1-4975-9A2A-5E0EB0B37CE3}.Store|x86.Build.0 = Store|x86 {BB1DA0B0-4E5B-4336-961E-DF389482C094}.Debug|arm64.ActiveCfg = Debug|arm64 {BB1DA0B0-4E5B-4336-961E-DF389482C094}.Debug|arm64.Build.0 = Debug|arm64 {BB1DA0B0-4E5B-4336-961E-DF389482C094}.Debug|x64.ActiveCfg = Debug|x64 {BB1DA0B0-4E5B-4336-961E-DF389482C094}.Debug|x64.Build.0 = Debug|x64 {BB1DA0B0-4E5B-4336-961E-DF389482C094}.Debug|x86.ActiveCfg = Debug|x86 {BB1DA0B0-4E5B-4336-961E-DF389482C094}.Debug|x86.Build.0 = Debug|x86 - {BB1DA0B0-4E5B-4336-961E-DF389482C094}.Preview|arm64.ActiveCfg = Preview|arm64 - {BB1DA0B0-4E5B-4336-961E-DF389482C094}.Preview|arm64.Build.0 = Preview|arm64 - {BB1DA0B0-4E5B-4336-961E-DF389482C094}.Preview|x64.ActiveCfg = Preview|x64 - {BB1DA0B0-4E5B-4336-961E-DF389482C094}.Preview|x64.Build.0 = Preview|x64 - {BB1DA0B0-4E5B-4336-961E-DF389482C094}.Preview|x86.ActiveCfg = Preview|x86 - {BB1DA0B0-4E5B-4336-961E-DF389482C094}.Preview|x86.Build.0 = Preview|x86 {BB1DA0B0-4E5B-4336-961E-DF389482C094}.Release|arm64.ActiveCfg = Release|arm64 {BB1DA0B0-4E5B-4336-961E-DF389482C094}.Release|arm64.Build.0 = Release|arm64 {BB1DA0B0-4E5B-4336-961E-DF389482C094}.Release|x64.ActiveCfg = Release|x64 {BB1DA0B0-4E5B-4336-961E-DF389482C094}.Release|x64.Build.0 = Release|x64 {BB1DA0B0-4E5B-4336-961E-DF389482C094}.Release|x86.ActiveCfg = Release|x86 {BB1DA0B0-4E5B-4336-961E-DF389482C094}.Release|x86.Build.0 = Release|x86 - {BB1DA0B0-4E5B-4336-961E-DF389482C094}.Stable|arm64.ActiveCfg = Stable|arm64 - {BB1DA0B0-4E5B-4336-961E-DF389482C094}.Stable|arm64.Build.0 = Stable|arm64 - {BB1DA0B0-4E5B-4336-961E-DF389482C094}.Stable|x64.ActiveCfg = Stable|x64 - {BB1DA0B0-4E5B-4336-961E-DF389482C094}.Stable|x64.Build.0 = Stable|x64 - {BB1DA0B0-4E5B-4336-961E-DF389482C094}.Stable|x86.ActiveCfg = Stable|x86 - {BB1DA0B0-4E5B-4336-961E-DF389482C094}.Stable|x86.Build.0 = Stable|x86 - {BB1DA0B0-4E5B-4336-961E-DF389482C094}.Store|arm64.ActiveCfg = Store|arm64 - {BB1DA0B0-4E5B-4336-961E-DF389482C094}.Store|arm64.Build.0 = Store|arm64 - {BB1DA0B0-4E5B-4336-961E-DF389482C094}.Store|x64.ActiveCfg = Store|x64 - {BB1DA0B0-4E5B-4336-961E-DF389482C094}.Store|x64.Build.0 = Store|x64 - {BB1DA0B0-4E5B-4336-961E-DF389482C094}.Store|x86.ActiveCfg = Store|x86 - {BB1DA0B0-4E5B-4336-961E-DF389482C094}.Store|x86.Build.0 = Store|x86 {4ED01D20-8529-4DEF-8C1B-4E31031AE7E0}.Debug|arm64.ActiveCfg = Debug|arm64 {4ED01D20-8529-4DEF-8C1B-4E31031AE7E0}.Debug|arm64.Build.0 = Debug|arm64 {4ED01D20-8529-4DEF-8C1B-4E31031AE7E0}.Debug|x64.ActiveCfg = Debug|x64 {4ED01D20-8529-4DEF-8C1B-4E31031AE7E0}.Debug|x64.Build.0 = Debug|x64 {4ED01D20-8529-4DEF-8C1B-4E31031AE7E0}.Debug|x86.ActiveCfg = Debug|x86 {4ED01D20-8529-4DEF-8C1B-4E31031AE7E0}.Debug|x86.Build.0 = Debug|x86 - {4ED01D20-8529-4DEF-8C1B-4E31031AE7E0}.Preview|arm64.ActiveCfg = Preview|arm64 - {4ED01D20-8529-4DEF-8C1B-4E31031AE7E0}.Preview|arm64.Build.0 = Preview|arm64 - {4ED01D20-8529-4DEF-8C1B-4E31031AE7E0}.Preview|x64.ActiveCfg = Preview|x64 - {4ED01D20-8529-4DEF-8C1B-4E31031AE7E0}.Preview|x64.Build.0 = Preview|x64 - {4ED01D20-8529-4DEF-8C1B-4E31031AE7E0}.Preview|x86.ActiveCfg = Preview|x86 - {4ED01D20-8529-4DEF-8C1B-4E31031AE7E0}.Preview|x86.Build.0 = Preview|x86 {4ED01D20-8529-4DEF-8C1B-4E31031AE7E0}.Release|arm64.ActiveCfg = Release|arm64 {4ED01D20-8529-4DEF-8C1B-4E31031AE7E0}.Release|arm64.Build.0 = Release|arm64 {4ED01D20-8529-4DEF-8C1B-4E31031AE7E0}.Release|x64.ActiveCfg = Release|x64 {4ED01D20-8529-4DEF-8C1B-4E31031AE7E0}.Release|x64.Build.0 = Release|x64 {4ED01D20-8529-4DEF-8C1B-4E31031AE7E0}.Release|x86.ActiveCfg = Release|x86 {4ED01D20-8529-4DEF-8C1B-4E31031AE7E0}.Release|x86.Build.0 = Release|x86 - {4ED01D20-8529-4DEF-8C1B-4E31031AE7E0}.Stable|arm64.ActiveCfg = Stable|arm64 - {4ED01D20-8529-4DEF-8C1B-4E31031AE7E0}.Stable|arm64.Build.0 = Stable|arm64 - {4ED01D20-8529-4DEF-8C1B-4E31031AE7E0}.Stable|x64.ActiveCfg = Stable|x64 - {4ED01D20-8529-4DEF-8C1B-4E31031AE7E0}.Stable|x64.Build.0 = Stable|x64 - {4ED01D20-8529-4DEF-8C1B-4E31031AE7E0}.Stable|x86.ActiveCfg = Stable|x86 - {4ED01D20-8529-4DEF-8C1B-4E31031AE7E0}.Stable|x86.Build.0 = Stable|x86 - {4ED01D20-8529-4DEF-8C1B-4E31031AE7E0}.Store|arm64.ActiveCfg = Store|arm64 - {4ED01D20-8529-4DEF-8C1B-4E31031AE7E0}.Store|arm64.Build.0 = Store|arm64 - {4ED01D20-8529-4DEF-8C1B-4E31031AE7E0}.Store|x64.ActiveCfg = Store|x64 - {4ED01D20-8529-4DEF-8C1B-4E31031AE7E0}.Store|x64.Build.0 = Store|x64 - {4ED01D20-8529-4DEF-8C1B-4E31031AE7E0}.Store|x86.ActiveCfg = Store|x86 - {4ED01D20-8529-4DEF-8C1B-4E31031AE7E0}.Store|x86.Build.0 = Store|x86 {A2FF3F3B-8EBC-4108-B99D-1476B7876656}.Debug|arm64.ActiveCfg = Debug|arm64 {A2FF3F3B-8EBC-4108-B99D-1476B7876656}.Debug|arm64.Build.0 = Debug|arm64 {A2FF3F3B-8EBC-4108-B99D-1476B7876656}.Debug|x64.ActiveCfg = Debug|x64 {A2FF3F3B-8EBC-4108-B99D-1476B7876656}.Debug|x64.Build.0 = Debug|x64 {A2FF3F3B-8EBC-4108-B99D-1476B7876656}.Debug|x86.ActiveCfg = Debug|Win32 {A2FF3F3B-8EBC-4108-B99D-1476B7876656}.Debug|x86.Build.0 = Debug|Win32 - {A2FF3F3B-8EBC-4108-B99D-1476B7876656}.Preview|arm64.ActiveCfg = Preview|arm64 - {A2FF3F3B-8EBC-4108-B99D-1476B7876656}.Preview|arm64.Build.0 = Preview|arm64 - {A2FF3F3B-8EBC-4108-B99D-1476B7876656}.Preview|x64.ActiveCfg = Preview|x64 - {A2FF3F3B-8EBC-4108-B99D-1476B7876656}.Preview|x64.Build.0 = Preview|x64 - {A2FF3F3B-8EBC-4108-B99D-1476B7876656}.Preview|x86.ActiveCfg = Preview|Win32 - {A2FF3F3B-8EBC-4108-B99D-1476B7876656}.Preview|x86.Build.0 = Preview|Win32 {A2FF3F3B-8EBC-4108-B99D-1476B7876656}.Release|arm64.ActiveCfg = Release|arm64 {A2FF3F3B-8EBC-4108-B99D-1476B7876656}.Release|arm64.Build.0 = Release|arm64 {A2FF3F3B-8EBC-4108-B99D-1476B7876656}.Release|x64.ActiveCfg = Release|x64 {A2FF3F3B-8EBC-4108-B99D-1476B7876656}.Release|x64.Build.0 = Release|x64 {A2FF3F3B-8EBC-4108-B99D-1476B7876656}.Release|x86.ActiveCfg = Release|Win32 {A2FF3F3B-8EBC-4108-B99D-1476B7876656}.Release|x86.Build.0 = Release|Win32 - {A2FF3F3B-8EBC-4108-B99D-1476B7876656}.Stable|arm64.ActiveCfg = Stable|arm64 - {A2FF3F3B-8EBC-4108-B99D-1476B7876656}.Stable|arm64.Build.0 = Stable|arm64 - {A2FF3F3B-8EBC-4108-B99D-1476B7876656}.Stable|x64.ActiveCfg = Stable|x64 - {A2FF3F3B-8EBC-4108-B99D-1476B7876656}.Stable|x64.Build.0 = Stable|x64 - {A2FF3F3B-8EBC-4108-B99D-1476B7876656}.Stable|x86.ActiveCfg = Stable|Win32 - {A2FF3F3B-8EBC-4108-B99D-1476B7876656}.Stable|x86.Build.0 = Stable|Win32 - {A2FF3F3B-8EBC-4108-B99D-1476B7876656}.Store|arm64.ActiveCfg = Store|arm64 - {A2FF3F3B-8EBC-4108-B99D-1476B7876656}.Store|arm64.Build.0 = Store|arm64 - {A2FF3F3B-8EBC-4108-B99D-1476B7876656}.Store|x64.ActiveCfg = Store|x64 - {A2FF3F3B-8EBC-4108-B99D-1476B7876656}.Store|x64.Build.0 = Store|x64 - {A2FF3F3B-8EBC-4108-B99D-1476B7876656}.Store|x86.ActiveCfg = Store|Win32 - {A2FF3F3B-8EBC-4108-B99D-1476B7876656}.Store|x86.Build.0 = Store|Win32 {25FD5045-6D4C-4DD0-B3AC-613AB59CBB07}.Debug|arm64.ActiveCfg = Debug|arm64 {25FD5045-6D4C-4DD0-B3AC-613AB59CBB07}.Debug|arm64.Build.0 = Debug|arm64 {25FD5045-6D4C-4DD0-B3AC-613AB59CBB07}.Debug|x64.ActiveCfg = Debug|x64 {25FD5045-6D4C-4DD0-B3AC-613AB59CBB07}.Debug|x64.Build.0 = Debug|x64 {25FD5045-6D4C-4DD0-B3AC-613AB59CBB07}.Debug|x86.ActiveCfg = Debug|Win32 {25FD5045-6D4C-4DD0-B3AC-613AB59CBB07}.Debug|x86.Build.0 = Debug|Win32 - {25FD5045-6D4C-4DD0-B3AC-613AB59CBB07}.Preview|arm64.ActiveCfg = Preview|arm64 - {25FD5045-6D4C-4DD0-B3AC-613AB59CBB07}.Preview|arm64.Build.0 = Preview|arm64 - {25FD5045-6D4C-4DD0-B3AC-613AB59CBB07}.Preview|x64.ActiveCfg = Preview|x64 - {25FD5045-6D4C-4DD0-B3AC-613AB59CBB07}.Preview|x64.Build.0 = Preview|x64 - {25FD5045-6D4C-4DD0-B3AC-613AB59CBB07}.Preview|x86.ActiveCfg = Preview|Win32 - {25FD5045-6D4C-4DD0-B3AC-613AB59CBB07}.Preview|x86.Build.0 = Preview|Win32 {25FD5045-6D4C-4DD0-B3AC-613AB59CBB07}.Release|arm64.ActiveCfg = Release|arm64 {25FD5045-6D4C-4DD0-B3AC-613AB59CBB07}.Release|arm64.Build.0 = Release|arm64 {25FD5045-6D4C-4DD0-B3AC-613AB59CBB07}.Release|x64.ActiveCfg = Release|x64 {25FD5045-6D4C-4DD0-B3AC-613AB59CBB07}.Release|x64.Build.0 = Release|x64 {25FD5045-6D4C-4DD0-B3AC-613AB59CBB07}.Release|x86.ActiveCfg = Release|Win32 {25FD5045-6D4C-4DD0-B3AC-613AB59CBB07}.Release|x86.Build.0 = Release|Win32 - {25FD5045-6D4C-4DD0-B3AC-613AB59CBB07}.Stable|arm64.ActiveCfg = Stable|arm64 - {25FD5045-6D4C-4DD0-B3AC-613AB59CBB07}.Stable|arm64.Build.0 = Stable|arm64 - {25FD5045-6D4C-4DD0-B3AC-613AB59CBB07}.Stable|x64.ActiveCfg = Stable|x64 - {25FD5045-6D4C-4DD0-B3AC-613AB59CBB07}.Stable|x64.Build.0 = Stable|x64 - {25FD5045-6D4C-4DD0-B3AC-613AB59CBB07}.Stable|x86.ActiveCfg = Stable|Win32 - {25FD5045-6D4C-4DD0-B3AC-613AB59CBB07}.Stable|x86.Build.0 = Stable|Win32 - {25FD5045-6D4C-4DD0-B3AC-613AB59CBB07}.Store|arm64.ActiveCfg = Store|arm64 - {25FD5045-6D4C-4DD0-B3AC-613AB59CBB07}.Store|arm64.Build.0 = Store|arm64 - {25FD5045-6D4C-4DD0-B3AC-613AB59CBB07}.Store|x64.ActiveCfg = Store|x64 - {25FD5045-6D4C-4DD0-B3AC-613AB59CBB07}.Store|x64.Build.0 = Store|x64 - {25FD5045-6D4C-4DD0-B3AC-613AB59CBB07}.Store|x86.ActiveCfg = Store|Win32 - {25FD5045-6D4C-4DD0-B3AC-613AB59CBB07}.Store|x86.Build.0 = Store|Win32 {6F431D82-A5FF-4833-B5E4-702E1E523126}.Debug|arm64.ActiveCfg = Debug|arm64 {6F431D82-A5FF-4833-B5E4-702E1E523126}.Debug|arm64.Build.0 = Debug|arm64 {6F431D82-A5FF-4833-B5E4-702E1E523126}.Debug|arm64.Deploy.0 = Debug|arm64 @@ -289,12 +154,6 @@ Global {6F431D82-A5FF-4833-B5E4-702E1E523126}.Debug|x86.ActiveCfg = Debug|x86 {6F431D82-A5FF-4833-B5E4-702E1E523126}.Debug|x86.Build.0 = Debug|x86 {6F431D82-A5FF-4833-B5E4-702E1E523126}.Debug|x86.Deploy.0 = Debug|x86 - {6F431D82-A5FF-4833-B5E4-702E1E523126}.Preview|arm64.ActiveCfg = Preview|arm64 - {6F431D82-A5FF-4833-B5E4-702E1E523126}.Preview|arm64.Build.0 = Preview|arm64 - {6F431D82-A5FF-4833-B5E4-702E1E523126}.Preview|x64.ActiveCfg = Preview|x64 - {6F431D82-A5FF-4833-B5E4-702E1E523126}.Preview|x64.Build.0 = Preview|x64 - {6F431D82-A5FF-4833-B5E4-702E1E523126}.Preview|x86.ActiveCfg = Preview|x86 - {6F431D82-A5FF-4833-B5E4-702E1E523126}.Preview|x86.Build.0 = Preview|x86 {6F431D82-A5FF-4833-B5E4-702E1E523126}.Release|arm64.ActiveCfg = Release|arm64 {6F431D82-A5FF-4833-B5E4-702E1E523126}.Release|arm64.Build.0 = Release|arm64 {6F431D82-A5FF-4833-B5E4-702E1E523126}.Release|arm64.Deploy.0 = Release|arm64 @@ -304,18 +163,6 @@ Global {6F431D82-A5FF-4833-B5E4-702E1E523126}.Release|x86.ActiveCfg = Release|x86 {6F431D82-A5FF-4833-B5E4-702E1E523126}.Release|x86.Build.0 = Release|x86 {6F431D82-A5FF-4833-B5E4-702E1E523126}.Release|x86.Deploy.0 = Release|x86 - {6F431D82-A5FF-4833-B5E4-702E1E523126}.Stable|arm64.ActiveCfg = Stable|arm64 - {6F431D82-A5FF-4833-B5E4-702E1E523126}.Stable|arm64.Build.0 = Stable|arm64 - {6F431D82-A5FF-4833-B5E4-702E1E523126}.Stable|x64.ActiveCfg = Stable|x64 - {6F431D82-A5FF-4833-B5E4-702E1E523126}.Stable|x64.Build.0 = Stable|x64 - {6F431D82-A5FF-4833-B5E4-702E1E523126}.Stable|x86.ActiveCfg = Stable|x86 - {6F431D82-A5FF-4833-B5E4-702E1E523126}.Stable|x86.Build.0 = Stable|x86 - {6F431D82-A5FF-4833-B5E4-702E1E523126}.Store|arm64.ActiveCfg = Store|arm64 - {6F431D82-A5FF-4833-B5E4-702E1E523126}.Store|arm64.Build.0 = Store|arm64 - {6F431D82-A5FF-4833-B5E4-702E1E523126}.Store|x64.ActiveCfg = Store|x64 - {6F431D82-A5FF-4833-B5E4-702E1E523126}.Store|x64.Build.0 = Store|x64 - {6F431D82-A5FF-4833-B5E4-702E1E523126}.Store|x86.ActiveCfg = Store|x86 - {6F431D82-A5FF-4833-B5E4-702E1E523126}.Store|x86.Build.0 = Store|x86 {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Debug|arm64.ActiveCfg = Debug|arm64 {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Debug|arm64.Build.0 = Debug|arm64 {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Debug|arm64.Deploy.0 = Debug|arm64 @@ -325,15 +172,6 @@ Global {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Debug|x86.ActiveCfg = Debug|x86 {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Debug|x86.Build.0 = Debug|x86 {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Debug|x86.Deploy.0 = Debug|x86 - {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Preview|arm64.ActiveCfg = Preview|arm64 - {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Preview|arm64.Build.0 = Preview|arm64 - {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Preview|arm64.Deploy.0 = Preview|arm64 - {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Preview|x64.ActiveCfg = Preview|x64 - {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Preview|x64.Build.0 = Preview|x64 - {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Preview|x64.Deploy.0 = Preview|x64 - {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Preview|x86.ActiveCfg = Preview|x86 - {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Preview|x86.Build.0 = Preview|x86 - {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Preview|x86.Deploy.0 = Preview|x86 {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Release|arm64.ActiveCfg = Release|arm64 {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Release|arm64.Build.0 = Release|arm64 {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Release|arm64.Deploy.0 = Release|arm64 @@ -343,54 +181,18 @@ Global {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Release|x86.ActiveCfg = Release|x86 {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Release|x86.Build.0 = Release|x86 {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Release|x86.Deploy.0 = Release|x86 - {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Stable|arm64.ActiveCfg = Stable|arm64 - {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Stable|arm64.Build.0 = Stable|arm64 - {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Stable|arm64.Deploy.0 = Stable|arm64 - {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Stable|x64.ActiveCfg = Stable|x64 - {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Stable|x64.Build.0 = Stable|x64 - {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Stable|x64.Deploy.0 = Stable|x64 - {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Stable|x86.ActiveCfg = Stable|x86 - {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Stable|x86.Build.0 = Stable|x86 - {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Stable|x86.Deploy.0 = Stable|x86 - {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Store|arm64.ActiveCfg = Store|arm64 - {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Store|arm64.Build.0 = Store|arm64 - {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Store|arm64.Deploy.0 = Store|arm64 - {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Store|x64.ActiveCfg = Store|x64 - {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Store|x64.Build.0 = Store|x64 - {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Store|x64.Deploy.0 = Store|x64 - {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Store|x86.ActiveCfg = Store|x86 - {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Store|x86.Build.0 = Store|x86 - {8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Store|x86.Deploy.0 = Store|x86 {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Debug|arm64.ActiveCfg = Debug|Any CPU {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Debug|arm64.Build.0 = Debug|Any CPU {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Debug|x64.ActiveCfg = Debug|Any CPU {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Debug|x64.Build.0 = Debug|Any CPU {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Debug|x86.ActiveCfg = Debug|Any CPU {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Debug|x86.Build.0 = Debug|Any CPU - {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Preview|arm64.ActiveCfg = Preview|Any CPU - {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Preview|arm64.Build.0 = Preview|Any CPU - {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Preview|x64.ActiveCfg = Preview|Any CPU - {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Preview|x64.Build.0 = Preview|Any CPU - {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Preview|x86.ActiveCfg = Preview|Any CPU - {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Preview|x86.Build.0 = Preview|Any CPU {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Release|arm64.ActiveCfg = Release|Any CPU {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Release|arm64.Build.0 = Release|Any CPU {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Release|x64.ActiveCfg = Release|Any CPU {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Release|x64.Build.0 = Release|Any CPU {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Release|x86.ActiveCfg = Release|Any CPU {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Release|x86.Build.0 = Release|Any CPU - {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Stable|arm64.ActiveCfg = Stable|Any CPU - {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Stable|arm64.Build.0 = Stable|Any CPU - {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Stable|x64.ActiveCfg = Stable|Any CPU - {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Stable|x64.Build.0 = Stable|Any CPU - {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Stable|x86.ActiveCfg = Stable|Any CPU - {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Stable|x86.Build.0 = Stable|Any CPU - {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Store|arm64.ActiveCfg = Store|Any CPU - {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Store|arm64.Build.0 = Store|Any CPU - {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Store|x64.ActiveCfg = Store|Any CPU - {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Store|x64.Build.0 = Store|Any CPU - {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Store|x86.ActiveCfg = Store|Any CPU - {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Store|x86.Build.0 = Store|Any CPU {1EE996D6-885E-4403-A461-26C7A4E14D26}.Debug|arm64.ActiveCfg = Debug|arm64 {1EE996D6-885E-4403-A461-26C7A4E14D26}.Debug|arm64.Build.0 = Debug|arm64 {1EE996D6-885E-4403-A461-26C7A4E14D26}.Debug|arm64.Deploy.0 = Debug|arm64 @@ -400,12 +202,6 @@ Global {1EE996D6-885E-4403-A461-26C7A4E14D26}.Debug|x86.ActiveCfg = Debug|x86 {1EE996D6-885E-4403-A461-26C7A4E14D26}.Debug|x86.Build.0 = Debug|x86 {1EE996D6-885E-4403-A461-26C7A4E14D26}.Debug|x86.Deploy.0 = Debug|x86 - {1EE996D6-885E-4403-A461-26C7A4E14D26}.Preview|arm64.ActiveCfg = Preview|arm64 - {1EE996D6-885E-4403-A461-26C7A4E14D26}.Preview|arm64.Build.0 = Preview|arm64 - {1EE996D6-885E-4403-A461-26C7A4E14D26}.Preview|x64.ActiveCfg = Preview|x64 - {1EE996D6-885E-4403-A461-26C7A4E14D26}.Preview|x64.Build.0 = Preview|x64 - {1EE996D6-885E-4403-A461-26C7A4E14D26}.Preview|x86.ActiveCfg = Preview|x86 - {1EE996D6-885E-4403-A461-26C7A4E14D26}.Preview|x86.Build.0 = Preview|x86 {1EE996D6-885E-4403-A461-26C7A4E14D26}.Release|arm64.ActiveCfg = Release|arm64 {1EE996D6-885E-4403-A461-26C7A4E14D26}.Release|arm64.Build.0 = Release|arm64 {1EE996D6-885E-4403-A461-26C7A4E14D26}.Release|arm64.Deploy.0 = Release|arm64 @@ -415,98 +211,38 @@ Global {1EE996D6-885E-4403-A461-26C7A4E14D26}.Release|x86.ActiveCfg = Release|x86 {1EE996D6-885E-4403-A461-26C7A4E14D26}.Release|x86.Build.0 = Release|x86 {1EE996D6-885E-4403-A461-26C7A4E14D26}.Release|x86.Deploy.0 = Release|x86 - {1EE996D6-885E-4403-A461-26C7A4E14D26}.Stable|arm64.ActiveCfg = Stable|arm64 - {1EE996D6-885E-4403-A461-26C7A4E14D26}.Stable|arm64.Build.0 = Stable|arm64 - {1EE996D6-885E-4403-A461-26C7A4E14D26}.Stable|x64.ActiveCfg = Stable|x64 - {1EE996D6-885E-4403-A461-26C7A4E14D26}.Stable|x64.Build.0 = Stable|x64 - {1EE996D6-885E-4403-A461-26C7A4E14D26}.Stable|x86.ActiveCfg = Stable|x86 - {1EE996D6-885E-4403-A461-26C7A4E14D26}.Stable|x86.Build.0 = Stable|x86 - {1EE996D6-885E-4403-A461-26C7A4E14D26}.Store|arm64.ActiveCfg = Store|arm64 - {1EE996D6-885E-4403-A461-26C7A4E14D26}.Store|arm64.Build.0 = Store|arm64 - {1EE996D6-885E-4403-A461-26C7A4E14D26}.Store|x64.ActiveCfg = Store|x64 - {1EE996D6-885E-4403-A461-26C7A4E14D26}.Store|x64.Build.0 = Store|x64 - {1EE996D6-885E-4403-A461-26C7A4E14D26}.Store|x86.ActiveCfg = Store|x86 - {1EE996D6-885E-4403-A461-26C7A4E14D26}.Store|x86.Build.0 = Store|x86 {EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6}.Debug|arm64.ActiveCfg = Debug|arm64 {EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6}.Debug|arm64.Build.0 = Debug|arm64 {EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6}.Debug|x64.ActiveCfg = Debug|x64 {EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6}.Debug|x64.Build.0 = Debug|x64 {EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6}.Debug|x86.ActiveCfg = Debug|Win32 {EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6}.Debug|x86.Build.0 = Debug|Win32 - {EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6}.Preview|arm64.ActiveCfg = Preview|arm64 - {EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6}.Preview|arm64.Build.0 = Preview|arm64 - {EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6}.Preview|x64.ActiveCfg = Preview|x64 - {EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6}.Preview|x64.Build.0 = Preview|x64 - {EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6}.Preview|x86.ActiveCfg = Preview|Win32 - {EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6}.Preview|x86.Build.0 = Preview|Win32 {EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6}.Release|arm64.ActiveCfg = Release|arm64 {EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6}.Release|arm64.Build.0 = Release|arm64 {EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6}.Release|x64.ActiveCfg = Release|x64 {EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6}.Release|x64.Build.0 = Release|x64 {EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6}.Release|x86.ActiveCfg = Release|Win32 {EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6}.Release|x86.Build.0 = Release|Win32 - {EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6}.Stable|arm64.ActiveCfg = Stable|arm64 - {EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6}.Stable|arm64.Build.0 = Stable|arm64 - {EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6}.Stable|x64.ActiveCfg = Stable|x64 - {EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6}.Stable|x64.Build.0 = Stable|x64 - {EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6}.Stable|x86.ActiveCfg = Stable|Win32 - {EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6}.Stable|x86.Build.0 = Stable|Win32 - {EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6}.Store|arm64.ActiveCfg = Store|arm64 - {EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6}.Store|arm64.Build.0 = Store|arm64 - {EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6}.Store|x64.ActiveCfg = Store|x64 - {EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6}.Store|x64.Build.0 = Store|x64 - {EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6}.Store|x86.ActiveCfg = Store|Win32 - {EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6}.Store|x86.Build.0 = Store|Win32 {7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Debug|arm64.ActiveCfg = Debug|Win32 {7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Debug|arm64.Build.0 = Debug|Win32 {7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Debug|x64.ActiveCfg = Debug|Win32 {7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Debug|x64.Build.0 = Debug|Win32 {7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Debug|x86.ActiveCfg = Debug|Win32 - {7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Preview|arm64.ActiveCfg = Preview|Win32 - {7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Preview|arm64.Build.0 = Preview|Win32 - {7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Preview|x64.ActiveCfg = Preview|Win32 - {7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Preview|x64.Build.0 = Preview|Win32 - {7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Preview|x86.ActiveCfg = Preview|Win32 {7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Release|arm64.ActiveCfg = Release|Win32 {7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Release|arm64.Build.0 = Release|Win32 {7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Release|x64.ActiveCfg = Release|Win32 {7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Release|x64.Build.0 = Release|Win32 {7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Release|x86.ActiveCfg = Release|Win32 - {7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Stable|arm64.ActiveCfg = Stable|Win32 - {7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Stable|arm64.Build.0 = Stable|Win32 - {7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Stable|x64.ActiveCfg = Stable|Win32 - {7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Stable|x64.Build.0 = Stable|Win32 - {7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Stable|x86.ActiveCfg = Stable|Win32 - {7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Store|arm64.ActiveCfg = Store|Win32 - {7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Store|arm64.Build.0 = Store|Win32 - {7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Store|x64.ActiveCfg = Store|Win32 - {7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Store|x64.Build.0 = Store|Win32 - {7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Store|x86.ActiveCfg = Store|Win32 {B3FE3F3B-CECC-4918-B72B-5488C3774125}.Debug|arm64.ActiveCfg = Debug|Win32 {B3FE3F3B-CECC-4918-B72B-5488C3774125}.Debug|arm64.Build.0 = Debug|Win32 {B3FE3F3B-CECC-4918-B72B-5488C3774125}.Debug|x64.ActiveCfg = Debug|Win32 {B3FE3F3B-CECC-4918-B72B-5488C3774125}.Debug|x64.Build.0 = Debug|Win32 {B3FE3F3B-CECC-4918-B72B-5488C3774125}.Debug|x86.ActiveCfg = Debug|Win32 - {B3FE3F3B-CECC-4918-B72B-5488C3774125}.Preview|arm64.ActiveCfg = Preview|Win32 - {B3FE3F3B-CECC-4918-B72B-5488C3774125}.Preview|arm64.Build.0 = Preview|Win32 - {B3FE3F3B-CECC-4918-B72B-5488C3774125}.Preview|x64.ActiveCfg = Preview|Win32 - {B3FE3F3B-CECC-4918-B72B-5488C3774125}.Preview|x64.Build.0 = Preview|Win32 - {B3FE3F3B-CECC-4918-B72B-5488C3774125}.Preview|x86.ActiveCfg = Preview|Win32 {B3FE3F3B-CECC-4918-B72B-5488C3774125}.Release|arm64.ActiveCfg = Release|Win32 {B3FE3F3B-CECC-4918-B72B-5488C3774125}.Release|arm64.Build.0 = Release|Win32 {B3FE3F3B-CECC-4918-B72B-5488C3774125}.Release|x64.ActiveCfg = Release|Win32 {B3FE3F3B-CECC-4918-B72B-5488C3774125}.Release|x64.Build.0 = Release|Win32 {B3FE3F3B-CECC-4918-B72B-5488C3774125}.Release|x86.ActiveCfg = Release|Win32 - {B3FE3F3B-CECC-4918-B72B-5488C3774125}.Stable|arm64.ActiveCfg = Stable|Win32 - {B3FE3F3B-CECC-4918-B72B-5488C3774125}.Stable|arm64.Build.0 = Stable|Win32 - {B3FE3F3B-CECC-4918-B72B-5488C3774125}.Stable|x64.ActiveCfg = Stable|Win32 - {B3FE3F3B-CECC-4918-B72B-5488C3774125}.Stable|x64.Build.0 = Stable|Win32 - {B3FE3F3B-CECC-4918-B72B-5488C3774125}.Stable|x86.ActiveCfg = Stable|Win32 - {B3FE3F3B-CECC-4918-B72B-5488C3774125}.Store|arm64.ActiveCfg = Store|Win32 - {B3FE3F3B-CECC-4918-B72B-5488C3774125}.Store|arm64.Build.0 = Store|Win32 - {B3FE3F3B-CECC-4918-B72B-5488C3774125}.Store|x64.ActiveCfg = Store|Win32 - {B3FE3F3B-CECC-4918-B72B-5488C3774125}.Store|x64.Build.0 = Store|Win32 - {B3FE3F3B-CECC-4918-B72B-5488C3774125}.Store|x86.ActiveCfg = Store|Win32 {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Debug|arm64.ActiveCfg = Debug|arm64 {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Debug|arm64.Build.0 = Debug|arm64 {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Debug|arm64.Deploy.0 = Debug|arm64 @@ -516,15 +252,6 @@ Global {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Debug|x86.ActiveCfg = Debug|x86 {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Debug|x86.Build.0 = Debug|x86 {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Debug|x86.Deploy.0 = Debug|x86 - {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Preview|arm64.ActiveCfg = Preview|arm64 - {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Preview|arm64.Build.0 = Preview|arm64 - {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Preview|arm64.Deploy.0 = Preview|arm64 - {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Preview|x64.ActiveCfg = Preview|x64 - {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Preview|x64.Build.0 = Preview|x64 - {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Preview|x64.Deploy.0 = Preview|x64 - {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Preview|x86.ActiveCfg = Preview|x86 - {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Preview|x86.Build.0 = Preview|x86 - {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Preview|x86.Deploy.0 = Preview|x86 {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Release|arm64.ActiveCfg = Release|arm64 {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Release|arm64.Build.0 = Release|arm64 {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Release|arm64.Deploy.0 = Release|arm64 @@ -534,70 +261,25 @@ Global {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Release|x86.ActiveCfg = Release|x86 {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Release|x86.Build.0 = Release|x86 {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Release|x86.Deploy.0 = Release|x86 - {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Stable|arm64.ActiveCfg = Stable|arm64 - {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Stable|arm64.Build.0 = Stable|arm64 - {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Stable|arm64.Deploy.0 = Stable|arm64 - {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Stable|x64.ActiveCfg = Stable|x64 - {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Stable|x64.Build.0 = Stable|x64 - {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Stable|x64.Deploy.0 = Stable|x64 - {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Stable|x86.ActiveCfg = Stable|x86 - {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Stable|x86.Build.0 = Stable|x86 - {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Stable|x86.Deploy.0 = Stable|x86 - {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Store|arm64.ActiveCfg = Store|arm64 - {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Store|arm64.Build.0 = Store|arm64 - {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Store|arm64.Deploy.0 = Store|arm64 - {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Store|x64.ActiveCfg = Store|x64 - {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Store|x64.Build.0 = Store|x64 - {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Store|x64.Deploy.0 = Store|x64 - {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Store|x86.ActiveCfg = Store|x86 - {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Store|x86.Build.0 = Store|x86 - {6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B}.Store|x86.Deploy.0 = Store|x86 {83FF8729-CC76-43E2-976F-47F0A187FC7E}.Debug|arm64.ActiveCfg = Debug|arm64 {83FF8729-CC76-43E2-976F-47F0A187FC7E}.Debug|x64.ActiveCfg = Debug|x64 {83FF8729-CC76-43E2-976F-47F0A187FC7E}.Debug|x64.Build.0 = Debug|x64 {83FF8729-CC76-43E2-976F-47F0A187FC7E}.Debug|x86.ActiveCfg = Debug|x86 - {83FF8729-CC76-43E2-976F-47F0A187FC7E}.Preview|arm64.ActiveCfg = Preview|arm64 - {83FF8729-CC76-43E2-976F-47F0A187FC7E}.Preview|x64.ActiveCfg = Preview|x64 - {83FF8729-CC76-43E2-976F-47F0A187FC7E}.Preview|x86.ActiveCfg = Preview|x86 {83FF8729-CC76-43E2-976F-47F0A187FC7E}.Release|arm64.ActiveCfg = Release|arm64 {83FF8729-CC76-43E2-976F-47F0A187FC7E}.Release|x64.ActiveCfg = Release|x64 {83FF8729-CC76-43E2-976F-47F0A187FC7E}.Release|x86.ActiveCfg = Release|x86 - {83FF8729-CC76-43E2-976F-47F0A187FC7E}.Stable|arm64.ActiveCfg = Stable|arm64 - {83FF8729-CC76-43E2-976F-47F0A187FC7E}.Stable|x64.ActiveCfg = Stable|x64 - {83FF8729-CC76-43E2-976F-47F0A187FC7E}.Stable|x86.ActiveCfg = Stable|x86 - {83FF8729-CC76-43E2-976F-47F0A187FC7E}.Store|arm64.ActiveCfg = Store|arm64 - {83FF8729-CC76-43E2-976F-47F0A187FC7E}.Store|x64.ActiveCfg = Store|x64 - {83FF8729-CC76-43E2-976F-47F0A187FC7E}.Store|x86.ActiveCfg = Store|x86 {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Debug|arm64.ActiveCfg = Debug|arm64 {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Debug|arm64.Build.0 = Debug|arm64 {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Debug|x64.ActiveCfg = Debug|x64 {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Debug|x64.Build.0 = Debug|x64 {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Debug|x86.ActiveCfg = Debug|x86 {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Debug|x86.Build.0 = Debug|x86 - {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Preview|arm64.ActiveCfg = Preview|arm64 - {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Preview|arm64.Build.0 = Preview|arm64 - {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Preview|x64.ActiveCfg = Preview|x64 - {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Preview|x64.Build.0 = Preview|x64 - {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Preview|x86.ActiveCfg = Preview|x86 - {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Preview|x86.Build.0 = Preview|x86 {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Release|arm64.ActiveCfg = Release|arm64 {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Release|arm64.Build.0 = Release|arm64 {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Release|x64.ActiveCfg = Release|x64 {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Release|x64.Build.0 = Release|x64 {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Release|x86.ActiveCfg = Release|x86 {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Release|x86.Build.0 = Release|x86 - {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Stable|arm64.ActiveCfg = Stable|arm64 - {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Stable|arm64.Build.0 = Stable|arm64 - {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Stable|x64.ActiveCfg = Stable|x64 - {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Stable|x64.Build.0 = Stable|x64 - {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Stable|x86.ActiveCfg = Stable|x86 - {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Stable|x86.Build.0 = Stable|x86 - {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Store|arm64.ActiveCfg = Store|arm64 - {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Store|arm64.Build.0 = Store|arm64 - {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Store|x64.ActiveCfg = Store|x64 - {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Store|x64.Build.0 = Store|x64 - {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Store|x86.ActiveCfg = Store|x86 - {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Store|x86.Build.0 = Store|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -626,4 +308,4 @@ Global GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {0E62043C-A7A1-4982-9EC9-4CDB2939B776} EndGlobalSection -EndGlobal \ No newline at end of file +EndGlobal diff --git a/src/Files.App.BackgroundTasks/Files.App.BackgroundTasks.csproj b/src/Files.App.BackgroundTasks/Files.App.BackgroundTasks.csproj index 297b1bc9976c..2a93a525da97 100644 --- a/src/Files.App.BackgroundTasks/Files.App.BackgroundTasks.csproj +++ b/src/Files.App.BackgroundTasks/Files.App.BackgroundTasks.csproj @@ -6,7 +6,7 @@ en-US 10.0.19041.0 true - Debug;Release;Stable;Preview;Store + Debug;Release x86;x64;ARM64 win-x86;win-x64;win-arm64 diff --git a/src/Files.App.Controls/Files.App.Controls.csproj b/src/Files.App.Controls/Files.App.Controls.csproj index 7a694150ca97..7c3c22659c8f 100644 --- a/src/Files.App.Controls/Files.App.Controls.csproj +++ b/src/Files.App.Controls/Files.App.Controls.csproj @@ -7,7 +7,7 @@ true 10.0.19041.0 enable - Debug;Release;Stable;Preview;Store + Debug;Release x86;x64;arm64 win-x86;win-x64;win-arm64 TRACE;DEBUG;NETFX_CORE diff --git a/src/Files.App.CsWin32/Files.App.CsWin32.csproj b/src/Files.App.CsWin32/Files.App.CsWin32.csproj index 096cca9f7150..34572e1301db 100644 --- a/src/Files.App.CsWin32/Files.App.CsWin32.csproj +++ b/src/Files.App.CsWin32/Files.App.CsWin32.csproj @@ -6,7 +6,7 @@ 10.0.19041.0 enable true - Debug;Release;Stable;Preview;Store + Debug;Release x86;x64;arm64 win-x86;win-x64;win-arm64 TRACE;DEBUG;NETFX_CORE diff --git a/src/Files.App.Server/Files.App.Server.csproj b/src/Files.App.Server/Files.App.Server.csproj index 5b11120b04f9..df55a9b75a03 100644 --- a/src/Files.App.Server/Files.App.Server.csproj +++ b/src/Files.App.Server/Files.App.Server.csproj @@ -9,7 +9,7 @@ 10.0.19041.0 enable enable - Debug;Release;Stable;Preview;Store + Debug;Release x86;x64;arm64 true win-x86;win-x64;win-arm64 diff --git a/src/Files.App.Storage/Files.App.Storage.csproj b/src/Files.App.Storage/Files.App.Storage.csproj index c08d08cbe3f0..ad42c0d94470 100644 --- a/src/Files.App.Storage/Files.App.Storage.csproj +++ b/src/Files.App.Storage/Files.App.Storage.csproj @@ -6,7 +6,7 @@ 10.0.19041.0 enable true - Debug;Release;Stable;Preview;Store + Debug;Release x86;x64;arm64 win-x86;win-x64;win-arm64 diff --git a/src/Files.App/App.xaml.cs b/src/Files.App/App.xaml.cs index 4d305570a86d..8e77a1fd51d4 100644 --- a/src/Files.App/App.xaml.cs +++ b/src/Files.App/App.xaml.cs @@ -89,10 +89,9 @@ async Task ActivateAsync() var host = AppLifecycleHelper.ConfigureHost(); Ioc.Default.ConfigureServices(host.Services); -#if STORE || STABLE || PREVIEW // Configure Sentry - AppLifecycleHelper.ConfigureSentry(); -#endif + if (AppLifecycleHelper.AppEnvironment is not AppEnvironment.Dev) + AppLifecycleHelper.ConfigureSentry(); var userSettingsService = Ioc.Default.GetRequiredService(); var isLeaveAppRunning = userSettingsService.GeneralSettingsService.LeaveAppRunning; diff --git a/src/Files.App/Data/Enums/AppEnvironment.cs b/src/Files.App/Data/Enums/AppEnvironment.cs index 8ee11c048271..8ce0c8ef73a2 100644 --- a/src/Files.App/Data/Enums/AppEnvironment.cs +++ b/src/Files.App/Data/Enums/AppEnvironment.cs @@ -17,18 +17,23 @@ public enum AppEnvironment Dev, /// - /// Application distribution type is Stable. + /// Application distribution type is Sideload Stable. /// - Stable, + SideloadStable, /// - /// Application distribution type is Store. + /// Application distribution type is Store Stable. /// - Store, + StoreStable, /// - /// Application distribution type is Preview. + /// Application distribution type is Sideload Preview. /// - Preview + SideloadPreview, + + /// + /// Application distribution type is Store Preview. + /// + StorePreview } } diff --git a/src/Files.App/Files.App.csproj b/src/Files.App/Files.App.csproj index bcfb46253783..ec71b184ab04 100644 --- a/src/Files.App/Files.App.csproj +++ b/src/Files.App/Files.App.csproj @@ -24,7 +24,7 @@ true true true - Debug;Release;Stable;Preview;Store + Debug;Release Files.App.Server;Microsoft.UI.Content.ContentExternalOutputLink;Microsoft.UI.Content.IContentExternalOutputLink bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\ False diff --git a/src/Files.App/Helpers/Application/AppLifecycleHelper.cs b/src/Files.App/Helpers/Application/AppLifecycleHelper.cs index 0711dc21dcb5..10cfdaf9fa15 100644 --- a/src/Files.App/Helpers/Application/AppLifecycleHelper.cs +++ b/src/Files.App/Helpers/Application/AppLifecycleHelper.cs @@ -29,16 +29,11 @@ public static class AppLifecycleHelper /// /// Gets the value that provides application environment or branch name. /// - public static AppEnvironment AppEnvironment { get; } = -#if STORE - AppEnvironment.Store; -#elif PREVIEW - AppEnvironment.Preview; -#elif STABLE - AppEnvironment.Stable; -#else - AppEnvironment.Dev; -#endif + public static AppEnvironment AppEnvironment => + Enum.TryParse("cd_app_env_placeholder", true, out AppEnvironment appEnvironment) + ? appEnvironment + : AppEnvironment.Dev; + /// /// Gets application package version. @@ -53,7 +48,7 @@ public static class AppLifecycleHelper SystemIO.Path.Combine(Package.Current.InstalledLocation.Path, AppEnvironment switch { AppEnvironment.Dev => Constants.AssetPaths.DevLogo, - AppEnvironment.Preview => Constants.AssetPaths.PreviewLogo, + AppEnvironment.SideloadPreview or AppEnvironment.StorePreview => Constants.AssetPaths.PreviewLogo, _ => Constants.AssetPaths.StableLogo }); @@ -122,7 +117,7 @@ public static void ConfigureSentry() options.Release = $"{SystemInformation.Instance.ApplicationVersion.Major}.{SystemInformation.Instance.ApplicationVersion.Minor}.{SystemInformation.Instance.ApplicationVersion.Build}"; options.TracesSampleRate = 0.80; options.ProfilesSampleRate = 0.40; - options.Environment = AppEnvironment == AppEnvironment.Preview ? "preview" : "production"; + options.Environment = AppEnvironment == AppEnvironment.StorePreview || AppEnvironment == AppEnvironment.SideloadPreview ? "preview" : "production"; options.ExperimentalMetrics = new ExperimentalMetricsOptions { EnableCodeLocations = true @@ -137,7 +132,7 @@ public static void ConfigureSentry() /// public static IHost ConfigureHost() { - return Host.CreateDefaultBuilder() + var builder = Host.CreateDefaultBuilder() .UseEnvironment(AppLifecycleHelper.AppEnvironment.ToString()) .ConfigureLogging(builder => builder .ClearProviders() @@ -186,13 +181,6 @@ public static IHost ConfigureHost() .AddSingleton() .AddSingleton() .AddSingleton() -#if STABLE || PREVIEW - .AddSingleton() -#elif STORE - .AddSingleton() -#else - .AddSingleton() -#endif .AddSingleton() .AddSingleton() .AddSingleton() @@ -227,7 +215,17 @@ public static IHost ConfigureHost() .AddSingleton() .AddSingleton() .AddSingleton() - ).Build(); + ); + + // Conditional DI + if (AppEnvironment is AppEnvironment.SideloadPreview or AppEnvironment.SideloadStable) + builder.ConfigureServices(s => s.AddSingleton()); + else if (AppEnvironment is AppEnvironment.StorePreview or AppEnvironment.StoreStable) + builder.ConfigureServices(s => s.AddSingleton()); + else + builder.ConfigureServices(s => s.AddSingleton()); + + return builder.Build(); } /// diff --git a/src/Files.App/Services/Settings/GeneralSettingsService.cs b/src/Files.App/Services/Settings/GeneralSettingsService.cs index 7641b1ec4fdd..0c0ea3cf9a6d 100644 --- a/src/Files.App/Services/Settings/GeneralSettingsService.cs +++ b/src/Files.App/Services/Settings/GeneralSettingsService.cs @@ -295,7 +295,7 @@ public bool ShowCreateShortcut public bool LeaveAppRunning { -#if STORE || STABLE || PREVIEW +#if RELEASE get => Get(true); #else get => Get(false); diff --git a/src/Files.App/Utils/Git/GitHelpers.cs b/src/Files.App/Utils/Git/GitHelpers.cs index 6ce6083f8cee..6f5931f0eff1 100644 --- a/src/Files.App/Utils/Git/GitHelpers.cs +++ b/src/Files.App/Utils/Git/GitHelpers.cs @@ -34,9 +34,9 @@ internal static class GitHelpers private static readonly PullOptions _pullOptions = new(); - private static readonly string _clientId = AppLifecycleHelper.AppEnvironment is AppEnvironment.Store or AppEnvironment.Stable or AppEnvironment.Preview - ? CLIENT_ID_SECRET - : string.Empty; + private static readonly string _clientId = AppLifecycleHelper.AppEnvironment is AppEnvironment.Dev + ? string.Empty + : CLIENT_ID_SECRET; private static readonly SemaphoreSlim GitOperationSemaphore = new SemaphoreSlim(1, 1); diff --git a/src/Files.App/Utils/Taskbar/SystemTrayIcon.cs b/src/Files.App/Utils/Taskbar/SystemTrayIcon.cs index 4187600b6d5c..d57f96aee077 100644 --- a/src/Files.App/Utils/Taskbar/SystemTrayIcon.cs +++ b/src/Files.App/Utils/Taskbar/SystemTrayIcon.cs @@ -27,19 +27,16 @@ public sealed class SystemTrayIcon : IDisposable // Fields - private readonly static Guid _trayIconGuid = new( -#if DEBUG - "684F2832-AC2B-4630-98C2-73D6AEBD4001" -#elif PREVIEW - "684F2832-AC2B-4630-98C2-73D6AEBD4002" -#elif STABLE - "684F2832-AC2B-4630-98C2-73D6AEBD4003" -#elif STORE - "684F2832-AC2B-4630-98C2-73D6AEBD4004" -#else - "684F2832-AC2B-4630-98C2-73D6AEBD4005" -#endif - ); + private readonly static Guid _trayIconGuid = AppLifecycleHelper.AppEnvironment switch + { + AppEnvironment.Dev => new Guid("684F2832-AC2B-4630-98C2-73D6AEBD4001"), + AppEnvironment.SideloadPreview => new Guid("684F2832-AC2B-4630-98C2-73D6AEBD4002"), + AppEnvironment.StorePreview => new Guid("684F2832-AC2B-4630-98C2-73D6AEBD4003"), + AppEnvironment.SideloadStable => new Guid("684F2832-AC2B-4630-98C2-73D6AEBD4004"), + AppEnvironment.StoreStable => new Guid("684F2832-AC2B-4630-98C2-73D6AEBD4005"), + _ => new Guid("684F2832-AC2B-4630-98C2-73D6AEBD4001") + }; + private readonly SystemTrayIconWindow _IconWindow; diff --git a/src/Files.App/Views/SplashScreenPage.xaml.cs b/src/Files.App/Views/SplashScreenPage.xaml.cs index 59bcc208872b..bc671a94ed09 100644 --- a/src/Files.App/Views/SplashScreenPage.xaml.cs +++ b/src/Files.App/Views/SplashScreenPage.xaml.cs @@ -15,7 +15,8 @@ public sealed partial class SplashScreenPage : Page AppLifecycleHelper.AppEnvironment switch { AppEnvironment.Dev => "Dev", - AppEnvironment.Preview => "Preview", + AppEnvironment.StorePreview => "Preview", + AppEnvironment.SideloadPreview => "Preview", _ => string.Empty, }; diff --git a/src/Files.Core.SourceGenerator/Files.Core.SourceGenerator.csproj b/src/Files.Core.SourceGenerator/Files.Core.SourceGenerator.csproj index 0c39e9086e94..d9518c3cff04 100644 --- a/src/Files.Core.SourceGenerator/Files.Core.SourceGenerator.csproj +++ b/src/Files.Core.SourceGenerator/Files.Core.SourceGenerator.csproj @@ -8,6 +8,7 @@ false AnyCPU true + Debug;Release diff --git a/src/Files.Core.Storage/Files.Core.Storage.csproj b/src/Files.Core.Storage/Files.Core.Storage.csproj index 95dec887659d..556f97282a08 100644 --- a/src/Files.Core.Storage/Files.Core.Storage.csproj +++ b/src/Files.Core.Storage/Files.Core.Storage.csproj @@ -5,7 +5,7 @@ net8.0 enable true - Debug;Release;Stable;Preview;Store + Debug;Release x86;x64;arm64 win-x86;win-x64;win-arm64 diff --git a/src/Files.Shared/Files.Shared.csproj b/src/Files.Shared/Files.Shared.csproj index d3611aa761f7..03f10cb0feef 100644 --- a/src/Files.Shared/Files.Shared.csproj +++ b/src/Files.Shared/Files.Shared.csproj @@ -5,7 +5,7 @@ net8.0 enable true - Debug;Release;Stable;Preview;Store + Debug;Release x86;x64;arm64 win-x86;win-x64;win-arm64 diff --git a/tests/Files.App.UITests/Files.App.UITests.csproj b/tests/Files.App.UITests/Files.App.UITests.csproj index bca84db84288..5b76102b61e0 100644 --- a/tests/Files.App.UITests/Files.App.UITests.csproj +++ b/tests/Files.App.UITests/Files.App.UITests.csproj @@ -10,7 +10,7 @@ true app.manifest enable - Debug;Release;Stable;Preview;Store + Debug;Release x86;x64;arm64 win-x86;win-x64;win-arm64 TRACE;DEBUG;NETFX_CORE diff --git a/tests/Files.InteractionTests/Files.InteractionTests.csproj b/tests/Files.InteractionTests/Files.InteractionTests.csproj index 8db0fac809c2..7914402b2817 100644 --- a/tests/Files.InteractionTests/Files.InteractionTests.csproj +++ b/tests/Files.InteractionTests/Files.InteractionTests.csproj @@ -4,7 +4,7 @@ net8.0 false - Debug;Release;Stable;Preview;Store + Debug;Release x86;x64;arm64 win-x86;win-x64;win-arm64 From c65b5e5103a00b089be6a557ffca95a2696999a2 Mon Sep 17 00:00:00 2001 From: Yair <39923744+yaira2@users.noreply.github.com> Date: Thu, 5 Dec 2024 22:44:09 -0500 Subject: [PATCH 2/2] Update SplashScreenPage.xaml.cs --- src/Files.App/Views/SplashScreenPage.xaml.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Files.App/Views/SplashScreenPage.xaml.cs b/src/Files.App/Views/SplashScreenPage.xaml.cs index bc671a94ed09..eecf4c8ecb32 100644 --- a/src/Files.App/Views/SplashScreenPage.xaml.cs +++ b/src/Files.App/Views/SplashScreenPage.xaml.cs @@ -15,8 +15,7 @@ public sealed partial class SplashScreenPage : Page AppLifecycleHelper.AppEnvironment switch { AppEnvironment.Dev => "Dev", - AppEnvironment.StorePreview => "Preview", - AppEnvironment.SideloadPreview => "Preview", + AppEnvironment.SideloadPreview or AppEnvironment.StorePreview => "Preview", _ => string.Empty, };