Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/cd-sideload-preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,21 +33,21 @@ jobs:
WORKING_DIR: '${{ github.workspace }}' # D:\a\Files\Files\
ARTIFACTS_STAGING_DIR: '${{ github.workspace }}\artifacts'
APPX_PACKAGE_DIR: '${{ github.workspace }}\artifacts\AppxPackages\'
APP_PROJECT_PATH: 'src\Files.App\Files.App.csproj'
APP_PROJECT_PATH: 'src\Files.App\Files.App.csproj'
PACKAGE_MANIFEST_PATH: 'src\Files.App\Package.appxmanifest'
LAUNCHER_PROJECT_PATH: 'src\Files.App.Launcher\Files.App.Launcher.vcxproj'
TEST_PROJECT_PATH: 'tests\Files.InteractionTests\Files.InteractionTests.csproj'
APP_INSTALLER_SIDELOAD_URL: 'https://cdn.files.community/files/preview/'

steps:
- name: Checkout the repository
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Setup MSBuild
uses: microsoft/setup-msbuild@v2
uses: microsoft/setup-msbuild@v3
- name: Setup NuGet
uses: NuGet/setup-nuget@v2
uses: NuGet/setup-nuget@v3
- name: Setup .NET
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v5
with:
global-json-file: global.json

Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
-v:quiet

- name: Sign launcher EXE with Azure Trusted Signing
uses: azure/trusted-signing-action@v0.4.0
uses: Azure/artifact-signing-action@v1
with:
azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
Expand Down Expand Up @@ -142,7 +142,7 @@ jobs:
run: find $ARTIFACTS_STAGING_DIR -empty -delete

- name: Sign Files with Azure Trusted Signing
uses: azure/trusted-signing-action@v0.4.0
uses: Azure/artifact-signing-action@v1
with:
azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
Expand All @@ -169,7 +169,7 @@ jobs:
destination-dir: ./files/preview

- name: Upload the packages to GitHub Actions
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: 'Appx Packages (${{ env.CONFIGURATION }}, ${{ env.PLATFORM }})'
path: ${{ env.ARTIFACTS_STAGING_DIR }}
22 changes: 11 additions & 11 deletions .github/workflows/cd-sideload-stable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,21 +33,21 @@ jobs:
WORKING_DIR: '${{ github.workspace }}' # D:\a\Files\Files\
ARTIFACTS_STAGING_DIR: '${{ github.workspace }}\artifacts'
APPX_PACKAGE_DIR: '${{ github.workspace }}\artifacts\AppxPackages\'
APP_PROJECT_PATH: 'src\Files.App\Files.App.csproj'
APP_PROJECT_PATH: 'src\Files.App\Files.App.csproj'
PACKAGE_MANIFEST_PATH: 'src\Files.App\Package.appxmanifest'
LAUNCHER_PROJECT_PATH: 'src\Files.App.Launcher\Files.App.Launcher.vcxproj'
TEST_PROJECT_PATH: 'tests\Files.InteractionTests\Files.InteractionTests.csproj'
APP_INSTALLER_SIDELOAD_URL: 'https://cdn.files.community/files/stable/'

steps:
- name: Checkout the repository
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Setup MSBuild
uses: microsoft/setup-msbuild@v2
uses: microsoft/setup-msbuild@v3
- name: Setup NuGet
uses: NuGet/setup-nuget@v2
uses: NuGet/setup-nuget@v3
- name: Setup .NET
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v5
with:
global-json-file: global.json

Expand All @@ -67,7 +67,7 @@ jobs:
SECRET_BINGMAPS_KEY: ${{ secrets.BING_MAPS_SECRET }}
SECRET_SENTRY: ${{ secrets.SENTRY_SECRET }}
SECRET_GITHUB_OAUTH_CLIENT_ID: ${{ secrets.GH_OAUTH_CLIENT_ID }}

- name: Restore Files
shell: pwsh
run: |
Expand All @@ -84,7 +84,7 @@ jobs:
nuget restore "$env:LAUNCHER_PROJECT_PATH" `
-SolutionDirectory "$env:WORKING_DIR" `
-Verbosity detailed

- name: Build launcher project
shell: pwsh
run: |
Expand All @@ -95,7 +95,7 @@ jobs:
-v:quiet

- name: Sign launcher EXE with Azure Trusted Signing
uses: azure/trusted-signing-action@v0.4.0
uses: Azure/artifact-signing-action@v1
with:
azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
Expand Down Expand Up @@ -142,7 +142,7 @@ jobs:
run: find $ARTIFACTS_STAGING_DIR -empty -delete

- name: Sign Files with Azure Trusted Signing
uses: azure/trusted-signing-action@v0.4.0
uses: Azure/artifact-signing-action@v1
with:
azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
Expand All @@ -167,9 +167,9 @@ jobs:
r2-bucket: ${{ secrets.R2_BUCKET }}
source-dir: ${{ env.APPX_PACKAGE_DIR }}
destination-dir: ./files/stable

- name: Upload the packages to GitHub Actions
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: 'Appx Packages (${{ env.CONFIGURATION }}, ${{ env.PLATFORM }})'
path: ${{ env.ARTIFACTS_STAGING_DIR }}
20 changes: 10 additions & 10 deletions .github/workflows/cd-store-preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,19 @@ jobs:
WORKING_DIR: '${{ github.workspace }}' # D:\a\Files\Files\
ARTIFACTS_STAGING_DIR: '${{ github.workspace }}\artifacts'
APPX_PACKAGE_DIR: '${{ github.workspace }}\artifacts\AppxPackages\'
APP_PROJECT_PATH: '${{ github.workspace }}\src\Files.App\Files.App.csproj'
APP_PROJECT_PATH: '${{ github.workspace }}\src\Files.App\Files.App.csproj'
PACKAGE_MANIFEST_PATH: '${{ github.workspace }}\src\Files.App\Package.appxmanifest'
LAUNCHER_PROJECT_PATH: 'src\Files.App.Launcher\Files.App.Launcher.vcxproj'

steps:
- name: Checkout the repository
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Setup MSBuild
uses: microsoft/setup-msbuild@v2
uses: microsoft/setup-msbuild@v3
- name: Setup NuGet
uses: NuGet/setup-nuget@v2
uses: NuGet/setup-nuget@v3
- name: Setup .NET
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v5
with:
global-json-file: global.json

Expand All @@ -64,7 +64,7 @@ jobs:
SECRET_BINGMAPS_KEY: ${{ secrets.BING_MAPS_SECRET }}
SECRET_SENTRY: ${{ secrets.SENTRY_SECRET }}
SECRET_GITHUB_OAUTH_CLIENT_ID: ${{ secrets.GH_OAUTH_CLIENT_ID }}

- name: Restore Files
shell: pwsh
run: |
Expand All @@ -81,7 +81,7 @@ jobs:
nuget restore "$env:LAUNCHER_PROJECT_PATH" `
-SolutionDirectory "$env:WORKING_DIR" `
-Verbosity detailed

- name: Build launcher project
shell: pwsh
run: |
Expand All @@ -92,7 +92,7 @@ jobs:
-v:quiet

- name: Sign launcher EXE with Azure Trusted Signing
uses: azure/trusted-signing-action@v0.4.0
uses: Azure/artifact-signing-action@v1
with:
azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
Expand Down Expand Up @@ -135,9 +135,9 @@ jobs:
- 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
uses: actions/upload-artifact@v7
with:
name: 'Appx Packages (${{ env.CONFIGURATION }}, ${{ env.PLATFORM }})'
path: ${{ env.ARTIFACTS_STAGING_DIR }}
14 changes: 7 additions & 7 deletions .github/workflows/cd-store-stable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,19 @@ jobs:
WORKING_DIR: '${{ github.workspace }}' # D:\a\Files\Files\
ARTIFACTS_STAGING_DIR: '${{ github.workspace }}\artifacts'
APPX_PACKAGE_DIR: '${{ github.workspace }}\artifacts\AppxPackages\'
APP_PROJECT_PATH: '${{ github.workspace }}\src\Files.App\Files.App.csproj'
APP_PROJECT_PATH: '${{ github.workspace }}\src\Files.App\Files.App.csproj'
PACKAGE_MANIFEST_PATH: '${{ github.workspace }}\src\Files.App\Package.appxmanifest'
LAUNCHER_PROJECT_PATH: 'src\Files.App.Launcher\Files.App.Launcher.vcxproj'

steps:
- name: Checkout the repository
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Setup MSBuild
uses: microsoft/setup-msbuild@v2
uses: microsoft/setup-msbuild@v3
- name: Setup NuGet
uses: NuGet/setup-nuget@v2
uses: NuGet/setup-nuget@v3
- name: Setup .NET
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v5
with:
global-json-file: global.json

Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
-v:quiet

- name: Sign launcher EXE with Azure Trusted Signing
uses: azure/trusted-signing-action@v0.4.0
uses: Azure/artifact-signing-action@v1
with:
azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
Expand Down Expand Up @@ -137,7 +137,7 @@ jobs:
run: find $ARTIFACTS_STAGING_DIR -empty -delete

- name: Upload the packages to GitHub Actions
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: 'Appx Packages (${{ env.CONFIGURATION }}, ${{ env.PLATFORM }})'
path: ${{ env.ARTIFACTS_STAGING_DIR }}
28 changes: 14 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ env:
AUTOMATED_TESTS_PROJECT_DIR: '${{ github.workspace }}\tests\Files.InteractionTests'
AUTOMATED_TESTS_PROJECT_PATH: '${{ github.workspace }}\tests\Files.InteractionTests\Files.InteractionTests.csproj'
AUTOMATED_TESTS_ASSEMBLY_DIR: '${{ github.workspace }}\artifacts\TestsAssembly'
ARTIFACTS_STAGING_DIR: '${{ github.workspace }}\artifacts'
ARTIFACTS_STAGING_DIR: '${{ github.workspace }}\artifacts'
APPX_PACKAGE_DIR: '${{ github.workspace }}\artifacts\AppxPackages\'
APPX_SELFSIGNED_CERT_PATH: '${{ github.workspace }}\.github\workflows\FilesApp_SelfSigned.pfx'
WINAPPDRIVER_EXE86_PATH: 'C:\Program Files (x86)\Windows Application Driver\WinAppDriver.exe'
Expand All @@ -53,11 +53,11 @@ jobs:
steps:

- name: Checkout the repository
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
fetch-depth: 2
- name: Setup .NET
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v5

- name: Install XamlStyler.Console
run: 'dotnet tool install --global XamlStyler.Console'
Expand All @@ -75,7 +75,7 @@ jobs:
}
}
continue-on-error: true

- name: Fail if necessary
if: steps.check-step.outcome == 'failure'
run: exit 1
Expand All @@ -97,13 +97,13 @@ jobs:
steps:

- name: Checkout the repository
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Setup MSBuild
uses: microsoft/setup-msbuild@v2
uses: microsoft/setup-msbuild@v3
- name: Setup NuGet
uses: NuGet/setup-nuget@v2
uses: NuGet/setup-nuget@v3
- name: Setup .NET
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v5
with:
global-json-file: global.json

Expand All @@ -117,7 +117,7 @@ jobs:
-p:PublishReadyToRun=true `
-v:quiet

- if: env.CONFIGURATION != env.AUTOMATED_TESTS_CONFIGURATION || env.ARCHITECTURE != env.AUTOMATED_TESTS_ARCHITECTURE
- if: env.CONFIGURATION != env.AUTOMATED_TESTS_CONFIGURATION || env.ARCHITECTURE != env.AUTOMATED_TESTS_ARCHITECTURE
name: Build Files
run: |
msbuild `
Expand Down Expand Up @@ -173,7 +173,7 @@ jobs:

- if: env.ARCHITECTURE == env.AUTOMATED_TESTS_ARCHITECTURE && env.CONFIGURATION == env.AUTOMATED_TESTS_CONFIGURATION
name: Upload the packages to the Artifacts
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: 'Appx Packages (${{ env.CONFIGURATION }}, ${{ env.ARCHITECTURE }})'
path: ${{ env.ARTIFACTS_STAGING_DIR }}
Expand Down Expand Up @@ -202,14 +202,14 @@ jobs:
run: exit 1

- name: Checkout the repository
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Setup .NET
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v5
with:
global-json-file: global.json

- name: Download the packages from the Artifacts
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: 'Appx Packages (${{ env.CONFIGURATION }}, ${{ env.AUTOMATED_TESTS_ARCHITECTURE }})'
path: ${{ env.ARTIFACTS_STAGING_DIR }}
Expand Down Expand Up @@ -267,7 +267,7 @@ jobs:
- if: github.event_name == 'pull_request'
uses: geekyeggo/delete-artifact@v5
with:
name: '*'
name: '*'

# - name: Generate markdown from the tests result
# shell: pwsh
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/format-xaml.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ jobs:
if: github.event.issue.pull_request && github.event.comment.body == '/format'
runs-on: windows-2025-vs2026
environment: Pull Requests
permissions:
permissions:
contents: write

steps:
- name: Generate GitHub Apps token
id: generate
uses: actions/create-github-app-token@v1
uses: actions/create-github-app-token@v3
with:
app-id: ${{ secrets.BOT_APP_ID }}
private-key: ${{ secrets.BOT_PRIVATE_KEY }}
Expand All @@ -23,7 +23,7 @@ jobs:
run: |
# this is required for early termination in case any conditions aren't satisfied
# https://github.com/actions/runner/issues/662
"CAN_RUN=1" | Out-File -FilePath $env:GITHUB_ENV -Append
- name: Login to gh cli
Expand All @@ -37,14 +37,14 @@ jobs:
gh pr comment ${{ github.event.issue.number }} -b "🔒 This PR cannot be committed to. Ensure that Allow edits from maintainers is enabled."
"CAN_RUN=0" | Out-File -FilePath $env:GITHUB_ENV -Append
}
# all steps after this one must have the env.CAN_RUN == 1 condition
- uses: actions/checkout@v4
- uses: actions/checkout@v6
if: env.CAN_RUN == 1

- name: Setup .NET
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v5

- name: Set git identity
if: env.CAN_RUN == 1
Expand Down Expand Up @@ -73,11 +73,11 @@ jobs:
gh pr comment ${{ github.event.issue.number }} -b "⛔ No XAML files found to format."
"CAN_RUN=0" | Out-File -FilePath $env:GITHUB_ENV -Append
}
- name: Install XamlStyler.Console
if: env.CAN_RUN == 1
run: dotnet tool install --global XamlStyler.Console

- name: Format XAML files
if: env.CAN_RUN == 1
run: |
Expand Down Expand Up @@ -122,7 +122,7 @@ jobs:
}
}
}' -F owner=$owner -F name=$name -F number=$number --jq '{Branch: .data.repository.pullRequest.headRef.name, Url: .data.repository.pullRequest.headRepository.url}' | ConvertFrom-Json
$url = [UriBuilder]($data.Url)
$url.UserName = 'x-access-token'
$url.Password = '${{ steps.generate.outputs.token }}'
Expand Down
Loading