Code Quality: Upgrade dependencies #16741

hez2010 · 2025-01-27T13:50:05Z

Upgrade to .NET 9
Upgrade to WASDK 1.6
Upgrade to CommunityToolkit.WinUI 8.2
Upgrade to CsWinRT 2.2
Migrate to slnx (while still keeping sln for CI now)
Use centralized nuget package version management
Use new Microsoft.UI.Content metadata

Known issues:

TotalLaunchCount will be reset as we implement a different approach for counting this
slnx won't work in CI until .NET SDK 9.0.200 is out
Scroll via middle click
Mouse cursors

Resolved / Related Issues

Supersedes #16156
Supersedes #16557
Closes #14826
Closes #16705

Steps used to test these changes

Stability is a top priority for Files and all changes are required to go through testing before being merged into the repo. Please include a list of steps that you used to test this PR.

Opened Files ...
...

src/Files.App/Data/Items/WindowEx.cs

src/Files.App/Views/MainPage.xaml.cs

src/Files.App/Views/Layouts/GridLayoutPage.xaml

src/Files.App/UserControls/AddressToolbar.xaml

.gitignore

hez2010 · 2025-01-27T16:31:22Z

I temporarily brought back the sln for CI.

hez2010 · 2025-01-27T16:48:23Z

CI is passing

Lamparter · 2025-01-27T17:20:40Z

This PR also supersedes #16557 and closes #14826

Lamparter · 2025-01-27T17:21:48Z

By the way, the work you put into this is amazing and the fact that it works is jaw-dropping 😮

yaira2 · 2025-01-27T21:31:05Z

src/Files.App/App.xaml.cs

+
+		static App()
+		{
+			using var infoKey = Registry.CurrentUser.CreateSubKey(AppInformationKey);


Is this the virtual registry? Also, it would be preferable to create a helper class.

Yeah it's virtual registry.

Is there any reason not to use our existing settings service?

Information.* APIs are no longer available in WCT 8.x. Registry ensures the thread safety IMO, so if multiple Files instances launch simultaneously, there won't be any read-write conflicts.
But yeah it can be anything. I implemented this just because it's convenient.

so if multiple Files instances launch simultaneously, there won't be any read-write conflicts.

This is good enough reason to use the registry, however, we should put it in a separate helper for code quality.

This reverts commit 747dc7e.

files-community-bot · 2025-01-27T23:33:31Z

⛔ No XAML files changed.

Lamparter

It's looking amazing! ❤️

Lamparter · 2025-02-02T16:40:03Z

nuget.config

 <configuration>
    <packageSources>
        <add key="Project Packages" value="src/Files.App/Assets/Libraries/" />
+        <add key="Lab-Windows" value="https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-Labs/nuget/v3/index.json" />
    </packageSources>
 </configuration>


Suggested change

<configuration>

<packageSources>

<add key="Project Packages" value="src/Files.App/Assets/Libraries/" />

<add key="Lab-Windows" value="https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-Labs/nuget/v3/index.json" />

</packageSources>

</configuration>

<configuration>

<packageSources>

<clear />

<add key="NuGet Gallery" value="https://api.nuget.org/v3/index.json" />

<add key="Project Packages" value="src/Files.App/Assets/Libraries/" />

<add key="Toolkit Labs" value="https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-Labs/nuget/v3/index.json" />

</packageSources>

</configuration>

This could potentially fix issues on some computers where the user has a custom NuGet setup.

Also rename to Toolkit Labs to be consistent with what Microsoft calls it

Lamparter · 2025-02-02T16:41:07Z

src/Files.App.Controls/AdaptiveGridView/AdaptiveGridView.Properties.cs

+	/// The number and the width of items are calculated based on the
+	/// screen resolution in order to fully leverage the available screen space. The property ItemsHeight define
+	/// the items fixed height and the property DesiredWidth sets the minimum width for the elements to add a
+	/// new column.</remarks>


Suggested change

/// new column.</remarks>

/// new column.

/// </remarks>

Lamparter · 2025-02-02T16:42:37Z

src/Files.App.Controls/AdaptiveGridView/AdaptiveGridView.Properties.cs

This and many other files are missing the license header.

@yaira2 there's a built in functionality to Visual Studio that automatically appends any header of your choice to each new file.
I can set this up in another PR if you would like.

It might be a good idea to retain the .NET Foundation license header

Lamparter · 2025-02-02T16:44:40Z

src/Files.App.Controls/BladeView/BladeItem.Properties.cs

+using System.Threading.Tasks;
+
+namespace Files.App.Controls
+{    /// <summary>


Suggested change

{ /// <summary>

{

/// <summary>

Lamparter · 2025-02-02T16:50:05Z

src/Files.App.Controls/GridSplitter/GridSplitter.Options.cs

+			var gridSplitter = (GridSplitter)d;
+
+			gridSplitter._hoverWrapper?.UpdateHoverElement(gridSplitter.CursorBehavior ==
+														   SplitterCursorBehavior.ChangeOnSplitterHover


Suggested change

SplitterCursorBehavior.ChangeOnSplitterHover

SplitterCursorBehavior.ChangeOnSplitterHover

Lamparter · 2025-02-02T16:50:26Z

src/Files.App.Controls/GridSplitter/GridSplitter.Options.cs

+			var gridSplitter = (GridSplitter)d;
+
+			gridSplitter._hoverWrapper?.UpdateHoverElement(gridSplitter.CursorBehavior ==
+														   SplitterCursorBehavior.ChangeOnSplitterHover


Suggested change

SplitterCursorBehavior.ChangeOnSplitterHover

SplitterCursorBehavior.ChangeOnSplitterHover

Lamparter · 2025-02-02T16:53:09Z

src/Files.App/ViewModels/UserControls/Previews/ShellPreviewViewModel.cs

+// Copyright (c) 2024 Files Community
+// Licensed under the MIT License. See the LICENSE.


Suggested change

// Copyright (c) 2024 Files Community

// Licensed under the MIT License. See the LICENSE.

// Copyright (c) Files Community

// Licensed under the MIT License.

Lamparter · 2025-02-02T16:53:22Z

src/Files.App/ViewModels/UserControls/Previews/ShellPreviewViewModel.cs

@@ -19,12 +19,14 @@
 using WinRT;
 using static Vanara.PInvoke.ShlwApi;
 using static Vanara.PInvoke.User32;
+using System.Runtime.InteropServices.Marshalling;
+


Suggested change

Lamparter · 2025-02-02T16:56:36Z

Directory.Build.props

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

 <WindowsTargetFramework>$(TargetFrameworkVersion)-windows$(TargetWindowsVersion)</WindowsTargetFramework>

and then in the project file:

 <TargetFramework>$(WindowsTargetFramework)</TargetFramework>

Lamparter · 2025-02-02T17:13:51Z

Directory.Build.props

+    <TargetFrameworkVersion>net9.0</TargetFrameworkVersion>
+    <TargetWindowsVersion>10.0.22621.0</TargetWindowsVersion>
+    <MinimalWindowsVersion>10.0.19041.0</MinimalWindowsVersion>
+    <WindowsSdkPackageVersion>10.0.22621.57</WindowsSdkPackageVersion>


Suggested change

<WindowsSdkPackageVersion>10.0.22621.57</WindowsSdkPackageVersion>

<WindowsSdkPackageVersion>10.0.22621.57</WindowsSdkPackageVersion>

<DefineConstants>$(DefineConstants);$(Platform)</DefineConstants>

0x5bfa · 2025-02-02T23:55:12Z

I won't request changes for tiny quality and sanitization issues as long as it works (and looks perfect already) in this PR given lots of work have been put and it still WIP.

Lamparter · 2025-02-03T07:32:53Z

Wait, this PR is WIP?

hez2010 added 9 commits January 27, 2025 18:13

Migrate to slnx

8bd1ff9

wasdk 1.6 and dependency upgrade

8c7cf03

Drop 8

5b01b0e

Include workflows in slnx

d22f48c

Check for slnx

599689f

Update workflows

15606d6

Bump sdk version

cd94ec7

Ignore Files.App.Launcher.exe

a04e988

Fix cursor

8f09144

yaira2 reviewed Jan 27, 2025

View reviewed changes

src/Files.App/Data/Items/WindowEx.cs Outdated Show resolved Hide resolved

yaira2 reviewed Jan 27, 2025

View reviewed changes

src/Files.App/Views/MainPage.xaml.cs Outdated Show resolved Hide resolved

yaira2 reviewed Jan 27, 2025

View reviewed changes

src/Files.App/Views/Layouts/GridLayoutPage.xaml Show resolved Hide resolved

yaira2 reviewed Jan 27, 2025

View reviewed changes

src/Files.App/UserControls/AddressToolbar.xaml Show resolved Hide resolved

yaira2 reviewed Jan 27, 2025

View reviewed changes

.gitignore Outdated Show resolved Hide resolved

hez2010 added 3 commits January 28, 2025 00:58

Bring back the old GridSplitter

e0ba626

Remove IsAutoHideTaskbarEnabled workaround

6b9b149

Reference CsWinRT in Files.App.Controls to generate AOT code

e178e66

yaira2 changed the title ~~Upgrade dependencies~~ Code Quality: Upgrade dependencies Jan 27, 2025

hez2010 added 5 commits January 28, 2025 01:21

Nit

2be67f0

Make TotalLaunchCount readonly

f9e4c38

Skip nuget restore

34971a8

Oops

083967f

Temporarily bring back sln for CI

15c5a95

hez2010 added 2 commits January 28, 2025 02:37

Revert LibGit2Sharp to 0.30.0, remove redundant trimming roots

250097a

Use a private CsWinRT build that has GC hole fixes

747dc7e

yaira2 reviewed Jan 27, 2025

View reviewed changes

Fixed xaml formatting

663d4c8

yaira2 added the needs - code review label Jan 27, 2025

Revert "Use a private CsWinRT build that has GC hole fixes"

376b47b

This reverts commit 747dc7e.

Remove Files.App.Launcher.exe.sha256 from .gitignore

fd4cdfb

Lamparter suggested changes Feb 2, 2025

View reviewed changes

Lamparter reviewed Feb 2, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Code Quality: Upgrade dependencies #16741

Code Quality: Upgrade dependencies #16741

hez2010 commented Jan 27, 2025 •

edited by yaira2

Loading

hez2010 commented Jan 27, 2025

hez2010 commented Jan 27, 2025

Lamparter commented Jan 27, 2025

Lamparter commented Jan 27, 2025

yaira2 Jan 27, 2025

hez2010 Jan 27, 2025

yaira2 Jan 27, 2025

hez2010 Jan 28, 2025 •

edited

Loading

yaira2 Jan 28, 2025

files-community-bot bot commented Jan 27, 2025

Lamparter left a comment

Lamparter Feb 2, 2025

Lamparter Feb 2, 2025

Lamparter Feb 2, 2025

Lamparter Feb 2, 2025

Lamparter Feb 2, 2025

Lamparter Feb 2, 2025

Lamparter Feb 2, 2025

Lamparter Feb 2, 2025

Lamparter Feb 2, 2025

Lamparter Feb 2, 2025

Lamparter Feb 2, 2025

Lamparter Feb 2, 2025

0x5bfa commented Feb 2, 2025 •

edited

Loading

Lamparter commented Feb 3, 2025

	SplitterCursorBehavior.ChangeOnSplitterHover
	SplitterCursorBehavior.ChangeOnSplitterHover

		// Copyright (c) 2024 Files Community
		// Licensed under the MIT License. See the LICENSE.

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

Code Quality: Upgrade dependencies #16741

Are you sure you want to change the base?

Code Quality: Upgrade dependencies #16741

Conversation

hez2010 commented Jan 27, 2025 • edited by yaira2 Loading

hez2010 commented Jan 27, 2025

hez2010 commented Jan 27, 2025

Lamparter commented Jan 27, 2025

Lamparter commented Jan 27, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hez2010 Jan 28, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

files-community-bot bot commented Jan 27, 2025

Lamparter left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

0x5bfa commented Feb 2, 2025 • edited Loading

Lamparter commented Feb 3, 2025

hez2010 commented Jan 27, 2025 •

edited by yaira2

Loading

hez2010 Jan 28, 2025 •

edited

Loading

0x5bfa commented Feb 2, 2025 •

edited

Loading