Code Quality: Remove embedded Package.appinstaller (#14908)

files-community · Mar 5, 2024 · 511daff · 511daff
1 parent bda0057
commit 511daff
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 16 deletions.
diff --git a/.github/workflows/deploy-preview.yml b/.github/workflows/deploy-preview.yml
@@ -131,6 +131,14 @@ jobs:
  shell: bash
  run: find $ARTIFACTS_STAGING_DIR -empty -delete
 
+ - name: Update appinstaller schema
+ run: |
+ $newSchema = "http://schemas.microsoft.com/appx/appinstaller/2018"
+ $localFilePath = "${{ env.APPX_PACKAGE_DIR }}/Files.Package.appinstaller"
+ $fileContent = Get-Content $localFilePath
+ $fileContent = $fileContent.Replace("http://schemas.microsoft.com/appx/appinstaller/2017/2", $newSchema)
+ $fileContent | Set-Content $localFilePath
+
  - name: Sign files with Azure Code Signing
  uses: azure/[email protected]
  with:
@@ -163,7 +171,7 @@ jobs:
  - name: logout
  run: |
  az logout
- 
+
  - name: Upload the packages to GitHub Actions
  uses: actions/upload-artifact@v3
  with:

diff --git a/.github/workflows/deploy-stable.yml b/.github/workflows/deploy-stable.yml
@@ -131,6 +131,14 @@ jobs:
  shell: bash
  run: find $ARTIFACTS_STAGING_DIR -empty -delete
 
+ - name: Update appinstaller schema
+ run: |
+ $newSchema = "http://schemas.microsoft.com/appx/appinstaller/2018"
+ $localFilePath = "${{ env.APPX_PACKAGE_DIR }}/Files.Package.appinstaller"
+ $fileContent = Get-Content $localFilePath
+ $fileContent = $fileContent.Replace("http://schemas.microsoft.com/appx/appinstaller/2017/2", $newSchema)
+ $fileContent | Set-Content $localFilePath
+
  - name: Sign files with Azure Code Signing
  uses: azure/[email protected]
  with:

diff --git a/src/Files.App (Package)/Files.Package.wapproj b/src/Files.App (Package)/Files.Package.wapproj
@@ -16,6 +16,7 @@
  <AppxBundleAutoResourcePackageQualifiers>Scale|DXFeatureLevel</AppxBundleAutoResourcePackageQualifiers>
  <AppxDefaultResourceQualifiers>Language=en-US;af;ar;bg;ca;cs-CZ;da;da-DK;de-DE;el;en-GB;es-ES;es-419;fa-IR;fi-FI;fil-PH;fr-FR;he-IL;hi-IN;hu-HU;id-ID;it-IT;ja-JP;ka;ko-KR;lt;lv-LV;nb-NO;nl-NL;or-IN;pl-PL;pt-BR;pt-PT;ro-RO;ru-RU;sk-SK;sv-SE;ta;th-TH;tr-TR;uk-UA;vi;zh-Hans;zh-Hant</AppxDefaultResourceQualifiers>
  <UapAppxPackageBuildMode>StoreUpload</UapAppxPackageBuildMode>
+ <HoursBetweenUpdateChecks>255</HoursBetweenUpdateChecks>
  <EntryPointProjectUniqueName>..\Files.App\Files.App.csproj</EntryPointProjectUniqueName>
  <AppxBundle>Always</AppxBundle>
  </PropertyGroup>
@@ -94,7 +95,6 @@
  <SubType>Designer</SubType>
  </AppxManifest>
  <Content Include="Assets\AppTiles\Dev\**" />
- <Content Include="Package.appinstaller" />
  </ItemGroup>
  <ItemGroup>
  <ProjectReference Include="..\Files.App.Server\Files.App.Server.csproj">

diff --git a/src/Files.App (Package)/Package.appinstaller b/src/Files.App (Package)/Package.appinstaller