Merge branch 'files-community:main' into editorconfig

Author: Lamparter

.github/PRIVACY.md

@@ -1,31 +1,3 @@
 # Privacy Policy
 
-###### Effective date: June 2, 2024
-
-This Privacy Policy ("Policy") for Files ("we", "us", or "our") describes how and why we collect, store, use, and disclose information about users ("you", "your") when you use our services ("Services"), and our desktop application (the "Application", "Files"). By using our Services, you acknowledge and consent to the practices described in this Policy.
-
-## Table of Contents
-
-1. Information We Collect
-2. How We Use Your Information
-3. Changes to This Privacy Policy
-
-## Information We Collect
-
-**Diagnostic Information.** Our Application collects non-personably identifiable diagnostic data such as fault analysis and performance logs. This information may include technical details about your device, such as its make, model, operating system, and Application version. In addition, Files may store log files containing diagnostic information on the user's device. These files are not shared with us by default.
-
-**Usage Information.** We collect non-identifiable information about your use of our Services, including but not limited to interactions within the Application, enabled user preferences (Application settings), and usage patterns. Our Application uses Sentry for error reporting, please review the Sentry Privacy Policy here: https://sentry.io/privacy/.
-
-Furthermore, we use certain Microsoft services such as Microsoft Partner Center to collect usage data, to learn more about how data is collected, used, and disclosed by Microsoft and its subsidiaries, please review the Microsoft Privacy Policy Statement available here: https://privacy.microsoft.com/privacystatement
-
-Please note that any information we collect is non-identifiable and does not include any personal data. We do not share collected information with any third parties.
-
-## How We Use Collected Information
-
-**Mitigate Reliability Issues.** We may use the aggregated information to diagnose and address any unexpected issues that may arise during the use of our Application. This may include analyzing diagnostic data, such as fault analysis and performance logs, to identify the root cause of the issue and develop a solution to resolve it.
-
-**Identify Usage Trends.** We may use the information to identify and analyze usage trends for our Services and Application. This may include analyzing aggregated usage data to understand how users interact with our Services and to measure their utilization intensity. We may use this analysis to improve the functionality, usability, and performance of our Services and to inform future development decisions.
-
-## Changes to This Privacy Policy
-
-We may modify, update, or amend this Privacy Policy from time to time to reflect changes made to our Application. When we change this Policy in a material manner, we will inform you of such changes by updating the 'Effective date' notice. It is your responsibility to review this Privacy Policy periodically to stay informed of any updates. Your continued use of the Services after any modifications to this Policy constitutes your acceptance of such changes.
+The privacy policy has been moved to here https://files.community/privacy

.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 = "",
@@ -11,16 +11,68 @@ param(
     [string]$SecretGitHubOAuthClientId = ""
 )
 
+# Load Package.appxmanifest
 [xml]$xmlDoc = Get-Content $PackageManifestPath
+
+# Add namespaces
+$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")
+$nsmgr.AddNamespace("uap", "http://schemas.microsoft.com/appx/manifest/uap/windows10")
+$nsmgr.AddNamespace("uap5", "http://schemas.microsoft.com/appx/manifest/uap/windows10/5")
+$ap = $xmlDoc.SelectSingleNode("/pkg:Package/pkg:Applications/pkg:Application/pkg:Extensions/uap:Extension[@Category='windows.protocol']/uap:Protocol", $nsmgr)
+$aea = $xmlDoc.SelectSingleNode("/pkg:Package/pkg:Applications/pkg:Application/pkg:Extensions/uap5:Extension[@Category='windows.appExecutionAlias']/uap5:AppExecutionAlias", $nsmgr)
+$ea = $xmlDoc.SelectSingleNode("/pkg:Package/pkg:Applications/pkg:Application/pkg:Extensions/uap5:Extension[@Category='windows.appExecutionAlias']/uap5:AppExecutionAlias/uap5:ExecutionAlias", $nsmgr)
+
+# Update the publisher
 $xmlDoc.Package.Identity.Publisher = $Publisher
 
-if ($Branch -eq "Preview")
+if ($Branch -eq "SideloadPreview")
 {
     # Set identities
     $xmlDoc.Package.Identity.Name="FilesPreview"
     $xmlDoc.Package.Properties.DisplayName="Files - Preview"
     $xmlDoc.Package.Applications.Application.VisualElements.DisplayName="Files - Preview"
     $xmlDoc.Package.Applications.Application.VisualElements.DefaultTile.ShortName="Files - Preview"
+
+    # Update app protocol and execution alias
+    $ap.SetAttribute("Name", "files-preview");
+    $ea.SetAttribute("Alias", "files-preview.exe");
+
+    # Save modified Package.appxmanifest
+    $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 `
+    }
+
+    Get-ChildItem $WorkingDir -Include *.cs, *.cpp -recurse | ForEach-Object -Process `
+    { `
+        (Get-Content $_ -Raw | ForEach-Object -Process { $_ -replace "files-dev", "files-preview" }) | `
+        Set-Content $_ -NoNewline `
+    }
+}
+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 `
@@ -29,42 +81,69 @@ if ($Branch -eq "Preview")
         Set-Content $_ -NoNewline `
     }
 }
-elseif ($Branch -eq "Stable")
+elseif ($Branch -eq "SideloadStable")
 {
     # Set identities
     $xmlDoc.Package.Identity.Name="Files"
     $xmlDoc.Package.Properties.DisplayName="Files"
     $xmlDoc.Package.Applications.Application.VisualElements.DisplayName="Files"
     $xmlDoc.Package.Applications.Application.VisualElements.DefaultTile.ShortName="Files"
+
+    # Update app protocol and execution alias
+    $ap.SetAttribute("Name", "files-stable");
+    $ea.SetAttribute("Alias", "files-stable.exe");
+    
+    # Save modified Package.appxmanifest
     $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\Release" }) | `
         Set-Content $_ -NoNewline `
     }
+
+    Get-ChildItem $WorkingDir -Include *.cs, *.cpp -recurse | ForEach-Object -Process `
+    { `
+        (Get-Content $_ -Raw | ForEach-Object -Process { $_ -replace "files-dev", "files-stable" }) | `
+        Set-Content $_ -NoNewline `
+    }
 }
-elseif ($Branch -eq "Store")
+elseif ($Branch -eq "StoreStable")
 {
     # Set identities
     $xmlDoc.Package.Identity.Name="49306atecsolution.FilesUWP"
     $xmlDoc.Package.Properties.DisplayName="Files App"
     $xmlDoc.Package.Applications.Application.VisualElements.DisplayName="Files"
     $xmlDoc.Package.Applications.Application.VisualElements.DefaultTile.ShortName="Files"
 
-    # Remove an capability that is used for the sideload
-    $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")
+    # Remove capability that is only used for the sideload package
     $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");
+    $aea.RemoveChild($aea.FirstChild); # Avoid duplication
+
+    # Save modified Package.appxmanifest
     $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\Release" }) | `
         Set-Content $_ -NoNewline `
     }
+
+    Get-ChildItem $WorkingDir -Include *.cs, *.cpp -recurse | ForEach-Object -Process `
+    { `
+        (Get-Content $_ -Raw | ForEach-Object -Process { $_ -replace "files-dev", "files" }) | `
+        Set-Content $_ -NoNewline `
+    }
+}
+
+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 `

.github/workflows/cd-preview.yml renamed to .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" `

.github/workflows/cd-stable.yml renamed to .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" `

.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 }}

.github/workflows/cd-store.yml renamed to .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" `

.github/workflows/ci.yml

@@ -243,6 +243,11 @@ jobs:
             $env:AUTOMATED_TESTS_ASSEMBLY_DIR\**\Files.InteractionTests.dll `
             --logger "trx;LogFileName=$env:AUTOMATED_TESTS_ASSEMBLY_DIR\testResults.trx"
 
+    - if: github.event_name == 'pull_request'
+      uses: geekyeggo/delete-artifact@v5
+      with:
+          name: '*'
+
     # - name: Generate markdown from the tests result
     #   shell: pwsh
     #   run: |