Skip to content

Code Quality: Upgrade dependencies #16741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 43 commits into from
Feb 9, 2025
Merged

Code Quality: Upgrade dependencies #16741

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
8bd1ff9
Migrate to slnx
hez2010 Jan 27, 2025
8c7cf03
wasdk 1.6 and dependency upgrade
hez2010 Jan 27, 2025
5b01b0e
Drop 8
hez2010 Jan 27, 2025
d22f48c
Include workflows in slnx
hez2010 Jan 27, 2025
599689f
Check for slnx
hez2010 Jan 27, 2025
15606d6
Update workflows
hez2010 Jan 27, 2025
cd94ec7
Bump sdk version
hez2010 Jan 27, 2025
a04e988
Ignore Files.App.Launcher.exe
hez2010 Jan 27, 2025
8f09144
Fix cursor
hez2010 Jan 27, 2025
e0ba626
Bring back the old GridSplitter
hez2010 Jan 27, 2025
6b9b149
Remove IsAutoHideTaskbarEnabled workaround
hez2010 Jan 27, 2025
e178e66
Reference CsWinRT in Files.App.Controls to generate AOT code
hez2010 Jan 27, 2025
2be67f0
Nit
hez2010 Jan 27, 2025
f9e4c38
Make TotalLaunchCount readonly
hez2010 Jan 27, 2025
34971a8
Skip nuget restore
hez2010 Jan 27, 2025
083967f
Oops
hez2010 Jan 27, 2025
15c5a95
Temporarily bring back sln for CI
hez2010 Jan 27, 2025
250097a
Revert LibGit2Sharp to 0.30.0, remove redundant trimming roots
hez2010 Jan 27, 2025
747dc7e
Use a private CsWinRT build that has GC hole fixes
hez2010 Jan 27, 2025
663d4c8
Fixed xaml formatting
yaira2 Jan 27, 2025
376b47b
Revert "Use a private CsWinRT build that has GC hole fixes"
hez2010 Jan 27, 2025
fd4cdfb
Remove Files.App.Launcher.exe.sha256 from .gitignore
hez2010 Feb 2, 2025
fc598d7
Update nuget.config
hez2010 Feb 7, 2025
c8dfde4
License header and formatting
hez2010 Feb 7, 2025
070f1c5
Correct Files license header
hez2010 Feb 7, 2025
db95359
More styling fixes
hez2010 Feb 7, 2025
5b57e0a
Remove unused properties
hez2010 Feb 7, 2025
6b08e4b
Move some methods to AppLifecycleHelper
hez2010 Feb 7, 2025
346a710
Apply necessary partial to WinRT classes
hez2010 Feb 8, 2025
26d331d
Remove unused configurations
hez2010 Feb 8, 2025
8a6ad32
Merge remote-tracking branch 'origin/main' into wasdk1.6
hez2010 Feb 8, 2025
0075cd3
Revert nuget.config changes
hez2010 Feb 8, 2025
ecbcc8f
Avoid being too verbose
hez2010 Feb 8, 2025
ae1e24e
Revert "Revert nuget.config changes"
hez2010 Feb 8, 2025
aa6d4ff
Fix build
hez2010 Feb 8, 2025
3bbf244
Bump dependencies
hez2010 Feb 8, 2025
16a6aa1
Create package source mapping
hez2010 Feb 8, 2025
306cf96
Line ending
hez2010 Feb 8, 2025
5390298
Fix build failures due to CsWin32 bump
hez2010 Feb 8, 2025
c836c1d
Bye bye Microsoft.Xaml.Interactions.Core
hez2010 Feb 8, 2025
dbdd39b
Update Files.App.Launcher.exe.sha256
yaira2 Feb 9, 2025
f807a46
Update Files.App.Launcher.exe.sha256
yaira2 Feb 9, 2025
d75ea80
Formatted XAML files
files-community-bot[bot] Feb 9, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/cd-sideload-preview.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
configuration: [Release]
platform: [x64]
env:
SOLUTION_NAME: 'Files.sln'
SOLUTION_NAME: 'Files.slnx'
CONFIGURATION: '${{ matrix.configuration }}'
PLATFORM: '${{ matrix.platform }}'
APPX_BUNDLE_PLATFORMS: 'x64|arm64'
Expand All @@ -47,7 +47,7 @@ jobs:
uses: microsoft/setup-msbuild@v2
- name: Setup NuGet
uses: NuGet/setup-nuget@v2
- name: Setup .NET 8
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
global-json-file: global.json
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cd-sideload-stable.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
configuration: [Release]
platform: [x64]
env:
SOLUTION_NAME: 'Files.sln'
SOLUTION_NAME: 'Files.slnx'
CONFIGURATION: '${{ matrix.configuration }}'
PLATFORM: '${{ matrix.platform }}'
APPX_BUNDLE_PLATFORMS: 'x64|arm64'
Expand All @@ -47,7 +47,7 @@ jobs:
uses: microsoft/setup-msbuild@v2
- name: Setup NuGet
uses: NuGet/setup-nuget@v2
- name: Setup .NET 8
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
global-json-file: global.json
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cd-store-preview.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
configuration: [Release]
platform: [x64]
env:
SOLUTION_NAME: 'Files.sln'
SOLUTION_NAME: 'Files.slnx'
CONFIGURATION: '${{ matrix.configuration }}'
PLATFORM: '${{ matrix.platform }}'
APPX_BUNDLE_PLATFORMS: 'x64|arm64'
Expand All @@ -44,7 +44,7 @@ jobs:
uses: microsoft/setup-msbuild@v2
- name: Setup NuGet
uses: NuGet/setup-nuget@v2
- name: Setup .NET 8
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
global-json-file: global.json
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cd-store-stable.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
configuration: [Release]
platform: [x64]
env:
SOLUTION_NAME: 'Files.sln'
SOLUTION_NAME: 'Files.slnx'
CONFIGURATION: '${{ matrix.configuration }}'
PLATFORM: '${{ matrix.platform }}'
APPX_BUNDLE_PLATFORMS: 'x64|arm64'
Expand All @@ -44,7 +44,7 @@ jobs:
uses: microsoft/setup-msbuild@v2
- name: Setup NuGet
uses: NuGet/setup-nuget@v2
- name: Setup .NET 8
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
global-json-file: global.json
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ run-name: ${{ github.event_name == 'pull_request' && 'Files PR Validation' || 'F

env:
WORKING_DIR: ${{ github.workspace }} # Default: 'D:\a\Files\Files'
SOLUTION_PATH: '${{ github.workspace }}\Files.sln'
SOLUTION_PATH: '${{ github.workspace }}\Files.slnx'
PACKAGE_PROJECT_DIR: '${{ github.workspace }}\src\Files.App (Package)'
PACKAGE_PROJECT_PATH: '${{ github.workspace }}\src\Files.App (Package)\Files.Package.wapproj'
AUTOMATED_TESTS_ARCHITECTURE: 'x64'
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 2
- name: Setup .NET 8
- name: Setup .NET
uses: actions/setup-dotnet@v4

- name: Install XamlStyler.Console
Expand Down Expand Up @@ -103,7 +103,7 @@ jobs:
uses: microsoft/setup-msbuild@v2
- name: Setup NuGet
uses: NuGet/setup-nuget@v2
- name: Setup .NET 8
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
global-json-file: global.json
Expand Down Expand Up @@ -204,7 +204,7 @@ jobs:

- name: Checkout the repository
uses: actions/checkout@v4
- name: Setup .NET 8
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
global-json-file: global.json
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/format-xaml.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- uses: actions/checkout@v4
if: env.CAN_RUN == 1

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

- name: Set git identity
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
Files.App.OpenDialog*.dll
Files.App.SaveDialog*.dll
Files.App.Launcher.exe
Files.App.Launcher.exe.sha256

# User-specific files
*.rsuser
Expand Down
9 changes: 9 additions & 0 deletions Directory.Build.props
View file
Open in desktop
Copy link
Contributor

@Lamparter Lamparter Feb 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if you created a WindowsTargetFramework MSBuild switch so you don't need to specify $(TargetFrameworkVersion)-windows$(TargetWindowsVersion) in every project file?
e.g.:

<!-- Directory.Build.props -->
<WindowsTargetFramework>$(TargetFrameworkVersion)-windows$(TargetWindowsVersion)</WindowsTargetFramework>

and then in the project file:

<!-- Files.*.csproj, Target: Windows -->
<TargetFramework>$(WindowsTargetFramework)</TargetFramework>

Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<!-- Copyright (c) Files Community. Licensed under the MIT License. -->
<Project>
<PropertyGroup>
<TargetFrameworkVersion>net9.0</TargetFrameworkVersion>
<TargetWindowsVersion>10.0.22621.0</TargetWindowsVersion>
<MinimalWindowsVersion>10.0.19041.0</MinimalWindowsVersion>
<WindowsSdkPackageVersion>10.0.22621.57</WindowsSdkPackageVersion>
Copy link
Contributor

@Lamparter Lamparter Feb 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<WindowsSdkPackageVersion>10.0.22621.57</WindowsSdkPackageVersion>
<WindowsSdkPackageVersion>10.0.22621.57</WindowsSdkPackageVersion>
<DefineConstants>$(DefineConstants);$(Platform)</DefineConstants>

</PropertyGroup>
</Project>
56 changes: 56 additions & 0 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<!-- Copyright (c) Files Community. Licensed under the MIT License. -->
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="ByteSize" Version="2.1.2" />
<PackageVersion Include="ColorCode.WinUI" Version="2.0.15" />
<PackageVersion Include="CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock" Version="0.1.250103-build.1988" />
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
<PackageVersion Include="CommunityToolkit.WinUI.Behaviors" Version="8.2.241112-preview1" />
<PackageVersion Include="CommunityToolkit.WinUI.Controls.ColorPicker" Version="8.2.241112-preview1" />
<PackageVersion Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.2.241112-preview1" />
<PackageVersion Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.2.241112-preview1" />
<PackageVersion Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.2.241112-preview1" />
<PackageVersion Include="CommunityToolkit.WinUI.Converters" Version="8.2.241112-preview1" />
<PackageVersion Include="CommunityToolkit.WinUI.Extensions" Version="8.2.241112-preview1" />
<PackageVersion Include="CommunityToolkit.WinUI.Helpers" Version="8.2.241112-preview1" />
<PackageVersion Include="CommunityToolkit.WinUI.Triggers" Version="8.2.241112-preview1" />
<PackageVersion Include="DiscUtils.Udf" Version="0.16.13" />
<PackageVersion Include="FluentFTP" Version="52.0.0" />
<PackageVersion Include="LibGit2Sharp" Version="0.31.0" />
<PackageVersion Include="MessageFormat" Version="7.1.2" />
<PackageVersion Include="Microsoft.Data.Sqlite.Core" Version="9.0.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.1" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.1" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.1" />
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
<PackageVersion Include="Sentry" Version="5.0.1" />
<PackageVersion Include="SevenZipSharp" Version="1.0.2" />
<PackageVersion Include="SQLitePCLRaw.bundle_green" Version="2.1.10" />
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.6.250108002" />
<PackageVersion Include="Microsoft.Graphics.Win2D" Version="1.3.1" />
<PackageVersion Include="TagLibSharp" Version="2.3.0" />
<PackageVersion Include="Tulpep.ActiveDirectoryObjectPicker" Version="3.0.11" />
<PackageVersion Include="WinUIEx" Version="2.5.1" />
<PackageVersion Include="Vanara.Windows.Extensions" Version="4.0.4" />
<PackageVersion Include="Vanara.Windows.Shell" Version="4.0.4" />
<PackageVersion Include="Microsoft.Management.Infrastructure" Version="3.0.0" />
<PackageVersion Include="Microsoft.Management.Infrastructure.Runtime.Win" Version="3.0.0" />
<PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.162" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.12.0" />
<PackageVersion Include="PolySharp" Version="1.15.0" />
<PackageVersion Include="System.Text.Json" Version="9.0.1" />
<PackageVersion Include="System.IO.Hashing" Version="9.0.1" />
<PackageVersion Include="System.Threading.Tasks.Dataflow" Version="9.0.1" />
<PackageVersion Include="Appium.WebDriver" Version="4.4.5" />
<PackageVersion Include="Axe.Windows" Version="2.4.2" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageVersion Include="MSTest.TestAdapter" Version="3.7.2" />
<PackageVersion Include="MSTest.TestFramework" Version="3.7.2" />
</ItemGroup>
</Project>
Loading
Loading