Skip to content

Commit 266e21f

Browse files
d2dyno1d2dyno1
committed
Merge branch 'main' into d2dyno/shelf_drop
2 parents 33dc46e + 6cee330 commit 266e21f

File tree

712 files changed

+21834
-8871
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

712 files changed

+21834
-8871
lines changed

‎.github/workflows/cd-sideload-preview.yml‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
configuration: [Release]
2727
platform: [x64]
2828
env:
29-
SOLUTION_NAME: 'Files.sln'
29+
SOLUTION_NAME: 'Files.slnx'
3030
CONFIGURATION: '${{ matrix.configuration }}'
3131
PLATFORM: '${{ matrix.platform }}'
3232
APPX_BUNDLE_PLATFORMS: 'x64|arm64'
@@ -47,7 +47,7 @@ jobs:
4747
uses: microsoft/setup-msbuild@v2
4848
- name: Setup NuGet
4949
uses: NuGet/setup-nuget@v2
50-
- name: Setup .NET 8
50+
- name: Setup .NET
5151
uses: actions/setup-dotnet@v4
5252
with:
5353
global-json-file: global.json
@@ -74,25 +74,31 @@ jobs:
7474
run: |
7575
for /f %%a in ('dir /b /a:d %localappdata%\Microsoft\VisualStudio\17*') do echo UsePreviews=True>%localappdata%\Microsoft\VisualStudio\%%a\sdk.txt
7676
77-
- name: Restore NuGet
78-
shell: pwsh
79-
run: 'nuget restore $env:SOLUTION_NAME'
80-
8177
- name: Restore Files
8278
shell: pwsh
8379
run: |
8480
msbuild $env:SOLUTION_NAME `
8581
-t:Restore `
8682
-p:Platform=$env:PLATFORM `
8783
-p:Configuration=$env:CONFIGURATION `
88-
-p:PublishReadyToRun=true
84+
-p:PublishReadyToRun=true `
85+
-v:quiet
86+
87+
- name: Restore NuGet Packages for Launcher Project
88+
shell: pwsh
89+
run: |
90+
nuget restore "$env:LAUNCHER_PROJECT_PATH" `
91+
-SolutionDirectory "$env:WORKING_DIR" `
92+
-Verbosity detailed
8993
9094
- name: Build launcher project
9195
shell: pwsh
9296
run: |
9397
msbuild "$env:LAUNCHER_PROJECT_PATH" `
98+
-t:Build `
9499
-p:Platform=$env:PLATFORM `
95-
-p:Configuration=$env:CONFIGURATION
100+
-p:Configuration=$env:CONFIGURATION `
101+
-v:quiet
96102
97103
- name: Build & package Files
98104
shell: pwsh
@@ -107,7 +113,8 @@ jobs:
107113
-p:AppxBundle=Always `
108114
-p:UapAppxPackageBuildMode=Sideload `
109115
-p:GenerateAppInstallerFile=True `
110-
-p:AppInstallerUri=$env:APP_INSTALLER_SIDELOAD_URL
116+
-p:AppInstallerUri=$env:APP_INSTALLER_SIDELOAD_URL `
117+
-v:quiet
111118
112119
- name: Remove empty files from the packages
113120
shell: bash

‎.github/workflows/cd-sideload-stable.yml‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
configuration: [Release]
2727
platform: [x64]
2828
env:
29-
SOLUTION_NAME: 'Files.sln'
29+
SOLUTION_NAME: 'Files.slnx'
3030
CONFIGURATION: '${{ matrix.configuration }}'
3131
PLATFORM: '${{ matrix.platform }}'
3232
APPX_BUNDLE_PLATFORMS: 'x64|arm64'
@@ -47,7 +47,7 @@ jobs:
4747
uses: microsoft/setup-msbuild@v2
4848
- name: Setup NuGet
4949
uses: NuGet/setup-nuget@v2
50-
- name: Setup .NET 8
50+
- name: Setup .NET
5151
uses: actions/setup-dotnet@v4
5252
with:
5353
global-json-file: global.json
@@ -74,25 +74,31 @@ jobs:
7474
run: |
7575
for /f %%a in ('dir /b /a:d %localappdata%\Microsoft\VisualStudio\17*') do echo UsePreviews=True>%localappdata%\Microsoft\VisualStudio\%%a\sdk.txt
7676
77-
- name: Restore NuGet
78-
shell: pwsh
79-
run: 'nuget restore $env:SOLUTION_NAME'
80-
8177
- name: Restore Files
8278
shell: pwsh
8379
run: |
8480
msbuild $env:SOLUTION_NAME `
8581
-t:Restore `
8682
-p:Platform=$env:PLATFORM `
8783
-p:Configuration=$env:CONFIGURATION `
88-
-p:PublishReadyToRun=true
84+
-p:PublishReadyToRun=true `
85+
-v:quiet
86+
87+
- name: Restore NuGet Packages for Launcher Project
88+
shell: pwsh
89+
run: |
90+
nuget restore "$env:LAUNCHER_PROJECT_PATH" `
91+
-SolutionDirectory "$env:WORKING_DIR" `
92+
-Verbosity detailed
8993
9094
- name: Build launcher project
9195
shell: pwsh
9296
run: |
9397
msbuild "$env:LAUNCHER_PROJECT_PATH" `
98+
-t:Build `
9499
-p:Platform=$env:PLATFORM `
95-
-p:Configuration=$env:CONFIGURATION
100+
-p:Configuration=$env:CONFIGURATION `
101+
-v:quiet
96102
97103
- name: Build & package Files
98104
shell: pwsh
@@ -107,7 +113,8 @@ jobs:
107113
-p:AppxBundle=Always `
108114
-p:UapAppxPackageBuildMode=Sideload `
109115
-p:GenerateAppInstallerFile=True `
110-
-p:AppInstallerUri=$env:APP_INSTALLER_SIDELOAD_URL
116+
-p:AppInstallerUri=$env:APP_INSTALLER_SIDELOAD_URL `
117+
-v:quiet
111118
112119
- name: Remove empty files from the packages
113120
shell: bash

‎.github/workflows/cd-store-preview.yml‎

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
configuration: [Release]
2626
platform: [x64]
2727
env:
28-
SOLUTION_NAME: 'Files.sln'
28+
SOLUTION_NAME: 'Files.slnx'
2929
CONFIGURATION: '${{ matrix.configuration }}'
3030
PLATFORM: '${{ matrix.platform }}'
3131
APPX_BUNDLE_PLATFORMS: 'x64|arm64'
@@ -44,7 +44,7 @@ jobs:
4444
uses: microsoft/setup-msbuild@v2
4545
- name: Setup NuGet
4646
uses: NuGet/setup-nuget@v2
47-
- name: Setup .NET 8
47+
- name: Setup .NET
4848
uses: actions/setup-dotnet@v4
4949
with:
5050
global-json-file: global.json
@@ -70,26 +70,32 @@ jobs:
7070
shell: cmd
7171
run: |
7272
for /f %%a in ('dir /b /a:d %localappdata%\Microsoft\VisualStudio\17*') do echo UsePreviews=True>%localappdata%\Microsoft\VisualStudio\%%a\sdk.txt
73-
74-
- name: Restore NuGet
75-
shell: pwsh
76-
run: 'nuget restore $env:SOLUTION_NAME'
77-
73+
7874
- name: Restore Files
7975
shell: pwsh
8076
run: |
8177
msbuild $env:SOLUTION_NAME `
8278
-t:Restore `
8379
-p:Platform=$env:PLATFORM `
8480
-p:Configuration=$env:CONFIGURATION `
85-
-p:PublishReadyToRun=true
81+
-p:PublishReadyToRun=true `
82+
-v:quiet
8683
84+
- name: Restore NuGet Packages for Launcher Project
85+
shell: pwsh
86+
run: |
87+
nuget restore "$env:LAUNCHER_PROJECT_PATH" `
88+
-SolutionDirectory "$env:WORKING_DIR" `
89+
-Verbosity detailed
90+
8791
- name: Build launcher project
8892
shell: pwsh
8993
run: |
9094
msbuild "$env:LAUNCHER_PROJECT_PATH" `
95+
-t:Build `
9196
-p:Platform=$env:PLATFORM `
92-
-p:Configuration=$env:CONFIGURATION
97+
-p:Configuration=$env:CONFIGURATION `
98+
-v:quiet
9399
94100
- name: Build & package Files
95101
shell: pwsh
@@ -102,14 +108,26 @@ jobs:
102108
-p:AppxBundlePlatforms=$env:APPX_BUNDLE_PLATFORMS `
103109
-p:AppxPackageDir="$env:APPX_PACKAGE_DIR" `
104110
-p:AppxBundle=Always `
105-
-p:UapAppxPackageBuildMode=StoreUpload
111+
-p:UapAppxPackageBuildMode=StoreUpload `
112+
-v:quiet
106113
107114
- name: Remove empty files from the packages
108115
shell: bash
109116
run: find $ARTIFACTS_STAGING_DIR -empty -delete
110-
117+
111118
- name: Upload the packages to GitHub Actions
112119
uses: actions/upload-artifact@v4
113120
with:
114121
name: 'Appx Packages (${{ env.CONFIGURATION }}, ${{ env.PLATFORM }})'
115122
path: ${{ env.ARTIFACTS_STAGING_DIR }}
123+
124+
- name: Publish the packages to Microsoft Store
125+
uses: isaacrlevin/[email protected]
126+
with:
127+
app-id: '9NSQD9PKV3SS'
128+
tenant-id: ${{ secrets.STORE_TENANT_ID }}
129+
client-id: ${{ secrets.STORE_CLIENT_ID }}
130+
client-secret: ${{ secrets.STORE_CLIENT_SECRET }}
131+
package-path: '${{ env.APPX_PACKAGE_DIR }}'
132+
skip-polling: false
133+
packages-keep: 5

‎.github/workflows/cd-store-stable.yml‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
configuration: [Release]
2626
platform: [x64]
2727
env:
28-
SOLUTION_NAME: 'Files.sln'
28+
SOLUTION_NAME: 'Files.slnx'
2929
CONFIGURATION: '${{ matrix.configuration }}'
3030
PLATFORM: '${{ matrix.platform }}'
3131
APPX_BUNDLE_PLATFORMS: 'x64|arm64'
@@ -44,7 +44,7 @@ jobs:
4444
uses: microsoft/setup-msbuild@v2
4545
- name: Setup NuGet
4646
uses: NuGet/setup-nuget@v2
47-
- name: Setup .NET 8
47+
- name: Setup .NET
4848
uses: actions/setup-dotnet@v4
4949
with:
5050
global-json-file: global.json
@@ -71,25 +71,31 @@ jobs:
7171
run: |
7272
for /f %%a in ('dir /b /a:d %localappdata%\Microsoft\VisualStudio\17*') do echo UsePreviews=True>%localappdata%\Microsoft\VisualStudio\%%a\sdk.txt
7373
74-
- name: Restore NuGet
75-
shell: pwsh
76-
run: 'nuget restore $env:SOLUTION_NAME'
77-
7874
- name: Restore Files
7975
shell: pwsh
8076
run: |
8177
msbuild $env:SOLUTION_NAME `
8278
-t:Restore `
8379
-p:Platform=$env:PLATFORM `
8480
-p:Configuration=$env:CONFIGURATION `
85-
-p:PublishReadyToRun=true
81+
-p:PublishReadyToRun=true `
82+
-v:quiet
83+
84+
- name: Restore NuGet Packages for Launcher Project
85+
shell: pwsh
86+
run: |
87+
nuget restore "$env:LAUNCHER_PROJECT_PATH" `
88+
-SolutionDirectory "$env:WORKING_DIR" `
89+
-Verbosity detailed
8690
8791
- name: Build launcher project
8892
shell: pwsh
8993
run: |
9094
msbuild "$env:LAUNCHER_PROJECT_PATH" `
95+
-t:Build `
9196
-p:Platform=$env:PLATFORM `
92-
-p:Configuration=$env:CONFIGURATION
97+
-p:Configuration=$env:CONFIGURATION `
98+
-v:quiet
9399
94100
- name: Build & package Files
95101
shell: pwsh
@@ -102,7 +108,8 @@ jobs:
102108
-p:AppxBundlePlatforms=$env:APPX_BUNDLE_PLATFORMS `
103109
-p:AppxPackageDir="$env:APPX_PACKAGE_DIR" `
104110
-p:AppxBundle=Always `
105-
-p:UapAppxPackageBuildMode=StoreUpload
111+
-p:UapAppxPackageBuildMode=StoreUpload `
112+
-v:quiet
106113
107114
- name: Remove empty files from the packages
108115
shell: bash

‎.github/workflows/ci.yml‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ run-name: ${{ github.event_name == 'pull_request' && 'Files PR Validation' || 'F
2929

3030
env:
3131
WORKING_DIR: ${{ github.workspace }} # Default: 'D:\a\Files\Files'
32-
SOLUTION_PATH: '${{ github.workspace }}\Files.sln'
32+
SOLUTION_PATH: '${{ github.workspace }}\Files.slnx'
3333
PACKAGE_PROJECT_DIR: '${{ github.workspace }}\src\Files.App (Package)'
3434
PACKAGE_PROJECT_PATH: '${{ github.workspace }}\src\Files.App (Package)\Files.Package.wapproj'
3535
AUTOMATED_TESTS_ARCHITECTURE: 'x64'
@@ -57,7 +57,7 @@ jobs:
5757
uses: actions/checkout@v4
5858
with:
5959
fetch-depth: 2
60-
- name: Setup .NET 8
60+
- name: Setup .NET
6161
uses: actions/setup-dotnet@v4
6262

6363
- name: Install XamlStyler.Console
@@ -103,34 +103,31 @@ jobs:
103103
uses: microsoft/setup-msbuild@v2
104104
- name: Setup NuGet
105105
uses: NuGet/setup-nuget@v2
106-
- name: Setup .NET 8
106+
- name: Setup .NET
107107
uses: actions/setup-dotnet@v4
108108
with:
109109
global-json-file: global.json
110110

111-
- name: Restore NuGet
112-
shell: pwsh
113-
run: 'nuget restore $env:SOLUTION_PATH'
114-
115111
- name: Restore Files
116112
shell: pwsh
117113
run: |
118114
msbuild $env:SOLUTION_PATH `
119115
-t:Restore `
120116
-p:Platform=$env:ARCHITECTURE `
121117
-p:Configuration=$env:CONFIGURATION `
122-
-p:PublishReadyToRun=true
118+
-p:PublishReadyToRun=true `
119+
-v:quiet
123120
124121
- if: env.CONFIGURATION != env.AUTOMATED_TESTS_CONFIGURATION || env.ARCHITECTURE != env.AUTOMATED_TESTS_ARCHITECTURE
125122
name: Build Files
126123
run: |
127124
msbuild `
128125
$env:PACKAGE_PROJECT_PATH `
129126
-t:Build `
130-
-clp:ErrorsOnly `
131127
-p:Configuration=$env:CONFIGURATION `
132128
-p:Platform=$env:ARCHITECTURE `
133-
-p:AppxBundle=Never
129+
-p:AppxBundle=Never `
130+
-v:quiet
134131
135132
- if: env.CONFIGURATION == env.AUTOMATED_TESTS_CONFIGURATION && env.ARCHITECTURE == env.AUTOMATED_TESTS_ARCHITECTURE
136133
name: Create self signed cert as a pfx file
@@ -143,7 +140,6 @@ jobs:
143140
$env:PACKAGE_PROJECT_PATH `
144141
-t:Build `
145142
-t:_GenerateAppxPackage `
146-
-clp:ErrorsOnly `
147143
-p:Configuration=$env:CONFIGURATION `
148144
-p:Platform=$env:ARCHITECTURE `
149145
-p:AppxBundlePlatforms=$env:AUTOMATED_TESTS_ARCHITECTURE `
@@ -153,16 +149,17 @@ jobs:
153149
-p:AppxPackageSigningEnabled=true `
154150
-p:PackageCertificateKeyFile=$env:APPX_SELFSIGNED_CERT_PATH `
155151
-p:PackageCertificatePassword="" `
156-
-p:PackageCertificateThumbprint=""
152+
-p:PackageCertificateThumbprint="" `
153+
-v:quiet
157154
158155
- if: env.ARCHITECTURE == env.AUTOMATED_TESTS_ARCHITECTURE && env.CONFIGURATION == env.AUTOMATED_TESTS_CONFIGURATION
159156
name: Build interaction tests
160157
run: |
161158
msbuild $env:AUTOMATED_TESTS_PROJECT_PATH `
162159
-t:Build `
163-
-clp:ErrorsOnly `
164160
-p:Configuration=$env:CONFIGURATION `
165-
-p:Platform=$env:AUTOMATED_TESTS_ARCHITECTURE
161+
-p:Platform=$env:AUTOMATED_TESTS_ARCHITECTURE `
162+
-v:quiet
166163
167164
- if: env.ARCHITECTURE == env.AUTOMATED_TESTS_ARCHITECTURE && env.CONFIGURATION == env.AUTOMATED_TESTS_CONFIGURATION
168165
name: Copy tests bin to the artifacts dir
@@ -204,7 +201,7 @@ jobs:
204201

205202
- name: Checkout the repository
206203
uses: actions/checkout@v4
207-
- name: Setup .NET 8
204+
- name: Setup .NET
208205
uses: actions/setup-dotnet@v4
209206
with:
210207
global-json-file: global.json

‎.github/workflows/format-xaml.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- uses: actions/checkout@v4
4444
if: env.CAN_RUN == 1
4545

46-
- name: Setup .NET 8
46+
- name: Setup .NET
4747
uses: actions/setup-dotnet@v4
4848

4949
- name: Set git identity

0 commit comments

Comments
 (0)