Merge pull request #476 from unoplatform/dev/nr/removfxref

fix: Removing framework reference requirement
unoplatform · Feb 23, 2023 · e718c4e · e718c4e
2 parents 26035c9 + 5712fd4
commit e718c4e
Show file tree

Hide file tree

Showing 13 changed files with 46 additions and 84 deletions.
diff --git a/samples/Directory.Packages.props b/samples/Directory.Packages.props
@@ -11,34 +11,34 @@
     <PackageVersion Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.11" />
     <PackageVersion Include="Microsoft.UI.Xaml" Version="2.6.0" />
     <PackageVersion Include="Microsoft.Windows.Compatibility" Version="5.0.1" />
-    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22000.197" />
+    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
     <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.1.0" />
     <PackageVersion Include="SkiaSharp.Skottie" Version="2.88.2" />
     <PackageVersion Include="SkiaSharp.Views" Version="2.80.2" />
     <PackageVersion Include="SkiaSharp.Views.Uno" Version="2.88.2" />
     <PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.2" />
     <PackageVersion Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
     <PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
-    <PackageVersion Include="Uno.Cupertino" Version="2.4.1" />
-    <PackageVersion Include="Uno.Cupertino.WinUI" Version="2.4.1" />
+    <PackageVersion Include="Uno.Cupertino" Version="2.5.0-dev.37" />
+    <PackageVersion Include="Uno.Cupertino.WinUI" Version="2.5.0-dev.37" />
     <PackageVersion Include="Uno.Extensions.Logging.OSLog" Version="1.3.0" />
     <PackageVersion Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.4.0" />
-    <PackageVersion Include="Uno.Material" Version="2.5.0-dev.15" />
-    <PackageVersion Include="Uno.Material.WinUI" Version="2.5.0-dev.15" />
-    <PackageVersion Include="Uno.UI" Version="4.6.41" />
+    <PackageVersion Include="Uno.Material" Version="2.5.0-dev.37" />
+    <PackageVersion Include="Uno.Material.WinUI" Version="2.5.0-dev.37" />
+    <PackageVersion Include="Uno.UI" Version="4.7.37" />
     <PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.9" />
-    <PackageVersion Include="Uno.UI.RemoteControl" Version="4.6.41" />
-    <PackageVersion Include="Uno.UI.Skia.Gtk" Version="4.6.41" />
-    <PackageVersion Include="Uno.UI.Skia.Tizen" Version="4.6.41" />
-    <PackageVersion Include="Uno.UI.Skia.Wpf" Version="4.6.41" />
-    <PackageVersion Include="Uno.UI.WebAssembly" Version="4.6.41" />
+    <PackageVersion Include="Uno.UI.RemoteControl" Version="4.7.37" />
+    <PackageVersion Include="Uno.UI.Skia.Gtk" Version="4.7.37" />
+    <PackageVersion Include="Uno.UI.Skia.Tizen" Version="4.7.37" />
+    <PackageVersion Include="Uno.UI.Skia.Wpf" Version="4.7.37" />
+    <PackageVersion Include="Uno.UI.WebAssembly" Version="4.7.37" />
     <PackageVersion Include="Uno.UniversalImageLoader" Version="1.9.35" />
     <PackageVersion Include="Uno.Wasm.Bootstrap" Version="7.0.3" />
     <PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="7.0.3" />
-    <PackageVersion Include="Uno.WinUI" Version="4.6.41" />
-    <PackageVersion Include="Uno.WinUI.RemoteControl" Version="4.6.41" />
-    <PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="4.6.41" />
-    <PackageVersion Include="Uno.WinUI.WebAssembly" Version="4.6.41" />
+    <PackageVersion Include="Uno.WinUI" Version="4.7.37" />
+    <PackageVersion Include="Uno.WinUI.RemoteControl" Version="4.7.37" />
+    <PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="4.7.37" />
+    <PackageVersion Include="Uno.WinUI.WebAssembly" Version="4.7.37" />
     <PackageVersion Include="Xamarin.Android.Support.CustomTabs" Version="28.0.0.3" />
     <PackageVersion Include="Xamarin.AndroidX.AppCompat.AppCompatResources" Version="1.2.0.5" />
     <PackageVersion Include="Xamarin.AndroidX.Browser" Version="1.4.0.2" />

diff --git a/...no.Toolkit.WinUI.Samples.Windows.Desktop/Uno.Toolkit.WinUI.Samples.Windows.Desktop.csproj b/...no.Toolkit.WinUI.Samples.Windows.Desktop/Uno.Toolkit.WinUI.Samples.Windows.Desktop.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
-		<TargetFramework>net5.0-windows10.0.18362</TargetFramework>
+		<TargetFramework>net6.0-windows10.0.18362</TargetFramework>
 		<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
 		<RootNamespace>Uno.Toolkit.WinUI.Samples</RootNamespace>
 		<ApplicationManifest>app.manifest</ApplicationManifest>
@@ -16,6 +16,7 @@
 		<Manifest Include="$(ApplicationManifest)" />
 
 		<PackageReference Include="Microsoft.WindowsAppSDK" />
+		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" />
 		<PackageReference Include="Uno.Core.Extensions.Compatibility" />
 		<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" />
@@ -29,20 +30,5 @@
 	  <ProjectReference Include="..\..\..\src\Uno.Toolkit.UI\Uno.Toolkit.WinUI.csproj" />
 	</ItemGroup>
 
-	<ItemGroup>
-	<!--
-	If you encounter this error message:
-    error NETSDK1148: A referenced assembly was compiled using a newer version of Microsoft.Windows.SDK.NET.dll.
-	Please update to a newer .NET SDK in order to reference this assembly.
-
-	This means that the two packages below must be aligned with the "build" version number of
-	the "Microsoft.Windows.SDK.BuildTools" package above, and the "revision" version number
-	must be the highest found in https://www.nuget.org/packages/Microsoft.Windows.SDK.NET.Ref.
-	-->
-
-		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.22000.25" />
-		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.22000.25" />
-   </ItemGroup>
-
 	<Import Project="..\..\Uno.Toolkit.Samples\Uno.Toolkit.Samples.Shared\Uno.Toolkit.Samples.Shared.projitems" Label="Shared" />
 </Project>
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -3,18 +3,19 @@
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
     <PackageVersion Include="Microsoft.UI.Xaml" Version="2.6.0" />
     <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.1.0" />
+    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" /> 
     <PackageVersion Include="Uno.Core.Extensions.Collections" Version="4.0.1" />
     <PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
     <PackageVersion Include="Uno.Core.Extensions.Logging" Version="4.0.1" />
-    <PackageVersion Include="Uno.Cupertino" Version="2.4.1" />
-    <PackageVersion Include="Uno.Cupertino.WinUI" Version="2.4.1" />
+    <PackageVersion Include="Uno.Cupertino" Version="2.5.0-dev.37" />
+    <PackageVersion Include="Uno.Cupertino.WinUI" Version="2.5.0-dev.37" />
     <PackageVersion Include="Uno.Extensions.Markup.Generators" Version="1.0.0-dev.166" />
     <PackageVersion Include="Uno.SourceGenerationTasks" Version="4.2.0" />
     <PackageVersion Include="Uno.WinUI.Markup" Version="4.6.0-dev.16" />
-    <PackageVersion Include="Uno.Material" Version="2.5.0-dev.15" />
-    <PackageVersion Include="Uno.Material.WinUI" Version="2.5.0-dev.15" />
-    <PackageVersion Include="Uno.UI" Version="4.6.41" />
-    <PackageVersion Include="Uno.WinUI" Version="4.6.41" />
+    <PackageVersion Include="Uno.Material" Version="2.5.0-dev.37" />
+    <PackageVersion Include="Uno.Material.WinUI" Version="2.5.0-dev.37" />
+    <PackageVersion Include="Uno.UI" Version="4.7.37" />
+    <PackageVersion Include="Uno.WinUI" Version="4.7.37" />
     <PackageVersion Include="Uno.XamlMerge.Task" Version="1.1.0-dev.12" />
     <PackageVersion Include="FluentAssertions" Version="5.10.3" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
@@ -31,4 +32,4 @@
     <PackageVersion Include="Microsoft.Net.Compilers.Toolset" Version="4.5.0-2.final" />
     <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0-preview1.22518.1" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/Uno.Toolkit.RuntimeTests/Tests/LeakTest.cs b/src/Uno.Toolkit.RuntimeTests/Tests/LeakTest.cs
@@ -1,4 +1,4 @@
-#if !WINDOWS_UWP && !NET5_0_WINDOWS10_0_18362
+#if !WINDOWS_UWP && !NET6_0_WINDOWS10_0_18362
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;

diff --git a/src/Uno.Toolkit.RuntimeTests/Uno.Toolkit.RuntimeTests.props b/src/Uno.Toolkit.RuntimeTests/Uno.Toolkit.RuntimeTests.props
@@ -14,36 +14,23 @@
 		<TargetFrameworks Condition="'$(UnoTargetFrameworkOverride)'=='' OR $(UnoTargetFrameworkOverride.Contains('MonoAndroid12.0'))">$(TargetFrameworks);MonoAndroid12.0</TargetFrameworks>
 		<!-- condition: in addition to the above condition, we ALSO check if the right FrameworkLineage is given and that we are building on window machine -->
 		<TargetFrameworks Condition="'$(FrameworkLineage)' == 'UWP' AND $([MSBuild]::IsOSPlatform('windows')) AND ('$(UnoTargetFrameworkOverride)'=='' OR $(UnoTargetFrameworkOverride.Contains('uap10.0.18362')))">$(TargetFrameworks);uap10.0.18362</TargetFrameworks>
-		<TargetFrameworks Condition="'$(FrameworkLineage)' == 'WINUI' AND $([MSBuild]::IsOSPlatform('windows')) AND ('$(UnoTargetFrameworkOverride)'=='' OR $(UnoTargetFrameworkOverride.Contains('net5.0-windows10.0.18362')))">$(TargetFrameworks);net5.0-windows10.0.18362</TargetFrameworks>
+		<TargetFrameworks Condition="'$(FrameworkLineage)' == 'WINUI' AND $([MSBuild]::IsOSPlatform('windows')) AND ('$(UnoTargetFrameworkOverride)'=='' OR $(UnoTargetFrameworkOverride.Contains('net6.0-windows10.0.18362')))">$(TargetFrameworks);net6.0-windows10.0.18362</TargetFrameworks>
 
 		<AssemblyName>Uno.Toolkit.RuntimeTests</AssemblyName>
 		<RootNamespace>Uno.Toolkit.RuntimeTests</RootNamespace>
 		<IsPackable>false</IsPackable>
 
 		<DefineConstants Condition="'$(FrameworkLineage)' == 'UWP'">$(DefineConstants);IS_UWP</DefineConstants>
 		<DefineConstants Condition="'$(FrameworkLineage)' == 'WinUI'">$(DefineConstants);IS_WINUI</DefineConstants>
-		<DefineConstants Condition="'$(TargetFramework)'=='net5.0-windows10.0.18362'">$(DefineConstants);WINDOWS_WINUI</DefineConstants>
+		<DefineConstants Condition="'$(TargetFramework)'=='net6.0-windows10.0.18362'">$(DefineConstants);WINDOWS_WINUI</DefineConstants>
 	</PropertyGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)'=='net5.0-windows10.0.18362'">
-		<!--
-			If you encounter this error message:
-			error NETSDK1148: A referenced assembly was compiled using a newer version of Microsoft.Windows.SDK.NET.dll.
-			Please update to a newer .NET SDK in order to reference this assembly.
-
-			This means that the two packages below must be aligned with the "build" version number of
-			the "Microsoft.Windows.SDK.BuildTools" package above, and the "revision" version number
-			must be the highest found in https://www.nuget.org/packages/Microsoft.Windows.SDK.NET.Ref.
-		-->
-
-		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.22000.25" />
-		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.22000.25" />
-	</ItemGroup>
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.UI.Xaml" Condition="'$(TargetFramework)'=='uap10.0.18362'" />
-		<PackageReference Include="Microsoft.WindowsAppSDK" Condition="'$(TargetFramework)'=='net5.0-windows10.0.18362'" />
-
+		<PackageReference Include="Microsoft.WindowsAppSDK" Condition="'$(TargetFramework)'=='net6.0-windows10.0.18362'" />
+		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Condition="'$(TargetFramework)'=='net6.0-windows10.0.18362'" />
+
 		<PackageReference Include="Uno.UI" Condition="'$(FrameworkLineage)' == 'UWP'" />
 		<PackageReference Include="Uno.WinUI" Condition="'$(FrameworkLineage)' == 'WinUI'" />
 		<PackageReference Include="Uno.UI.RuntimeTests.Engine" />

diff --git a/src/Uno.Toolkit.UI/Helpers/LinkerAttributes.cs b/src/Uno.Toolkit.UI/Helpers/LinkerAttributes.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-#if !NET6_0_IOS && !NET6_0_MACCATALYST && !NET6_0_MACOS && !NET6_0_ANDROID && !NET5_0_WINDOWS10_0_18362
+#if !NET6_0_IOS && !NET6_0_MACCATALYST && !NET6_0_MACOS && !NET6_0_ANDROID && !NET6_0_WINDOWS10_0_18362
 namespace System.Diagnostics.CodeAnalysis
 {
 	/// <summary>

diff --git a/src/Uno.Toolkit.UI/Uno.Toolkit.WinUI.csproj b/src/Uno.Toolkit.UI/Uno.Toolkit.WinUI.csproj
@@ -7,7 +7,7 @@
 		<TargetFrameworks Condition="'$(UnoTargetFrameworkOverride)'!=''">$(UnoTargetFrameworkOverride)</TargetFrameworks>
 		<TargetFrameworks Condition="'$(UnoTargetFrameworkOverride)'==''">netstandard2.0;xamarinios10;xamarinmac20;MonoAndroid12.0</TargetFrameworks>
 		<TargetFrameworks Condition="'$(UnoTargetFrameworkOverride)'=='' and '$(DisableNet6MobileTargets)'==''">$(TargetFrameworks);net6.0-ios;net6.0-macos;net6.0-android;net6.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="'$(UnoTargetFrameworkOverride)'=='' and '$(OS)'=='Windows_NT'">$(TargetFrameworks);net5.0-windows10.0.18362</TargetFrameworks>
+		<TargetFrameworks Condition="'$(UnoTargetFrameworkOverride)'=='' and '$(OS)'=='Windows_NT'">$(TargetFrameworks);net6.0-windows10.0.18362</TargetFrameworks>
 		<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
 		<GenerateLibraryLayout>true</GenerateLibraryLayout>
 		<DefineConstants>$(DefineConstants);IS_WINUI</DefineConstants>
@@ -31,8 +31,7 @@
 
 	<ItemGroup Condition="$(_IsWinUI)">
 		<PackageReference Include="Microsoft.WindowsAppSDK" />
-		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.22000.25" />
-		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.22000.25" />
+		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/crosstargeting_override.props.sample b/src/crosstargeting_override.props.sample
@@ -20,7 +20,7 @@
 			Available build targets
 
 				uap10.0.18362 (Windows)
-				net5.0-windows10.0.18362 (WinAppSDK Windows)
+				net6.0-windows10.0.18362 (WinAppSDK Windows)
 				xamarinios10 (iOS)
 				MonoAndroid12.0 (Android 12.0)
 				netstandard2.0 (WebAssembly, Skia)

diff --git a/src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.WinUI.Cupertino.csproj b/src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.WinUI.Cupertino.csproj
@@ -8,7 +8,7 @@
 		<TargetFrameworks Condition="'$(UnoTargetFrameworkOverride)'!=''">$(UnoTargetFrameworkOverride)</TargetFrameworks>
 		<TargetFrameworks Condition="'$(UnoTargetFrameworkOverride)'==''">netstandard2.0;xamarinios10;xamarinmac20;MonoAndroid12.0</TargetFrameworks>
 		<TargetFrameworks Condition="'$(UnoTargetFrameworkOverride)'=='' and '$(DisableNet6MobileTargets)'==''">$(TargetFrameworks);net6.0-ios;net6.0-macos;net6.0-android;net6.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="'$(UnoTargetFrameworkOverride)'=='' and '$(OS)'=='Windows_NT'">$(TargetFrameworks);net5.0-windows10.0.18362</TargetFrameworks>
+		<TargetFrameworks Condition="'$(UnoTargetFrameworkOverride)'=='' and '$(OS)'=='Windows_NT'">$(TargetFrameworks);net6.0-windows10.0.18362</TargetFrameworks>
 		<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
 		<GenerateLibraryLayout>true</GenerateLibraryLayout>
 		<DefineConstants>$(DefineConstants);IS_WINUI</DefineConstants>
@@ -30,10 +30,10 @@
 		</EmbeddedResource>
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)'=='net5.0-windows10.0.18362'">
+	<ItemGroup Condition="'$(TargetFramework)'=='net6.0-windows10.0.18362'">
 		<PackageReference Include="Microsoft.WindowsAppSDK" />
-		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.22000.25" />
-		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.22000.25" />
+		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
+
 		<Page Remove="Generated\*.xaml" />
 	</ItemGroup>
 

diff --git a/src/library/Uno.Toolkit.Material/Uno.Toolkit.WinUI.Material.csproj b/src/library/Uno.Toolkit.Material/Uno.Toolkit.WinUI.Material.csproj
@@ -8,7 +8,7 @@
 		<TargetFrameworks Condition="'$(UnoTargetFrameworkOverride)'!=''">$(UnoTargetFrameworkOverride)</TargetFrameworks>
 		<TargetFrameworks Condition="'$(UnoTargetFrameworkOverride)'==''">netstandard2.0;xamarinios10;xamarinmac20;MonoAndroid12.0</TargetFrameworks>
 		<TargetFrameworks Condition="'$(UnoTargetFrameworkOverride)'=='' and '$(DisableNet6MobileTargets)'==''">$(TargetFrameworks);net6.0-ios;net6.0-macos;net6.0-android;net6.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="'$(UnoTargetFrameworkOverride)'=='' and '$(OS)'=='Windows_NT'">$(TargetFrameworks);net5.0-windows10.0.18362</TargetFrameworks>
+		<TargetFrameworks Condition="'$(UnoTargetFrameworkOverride)'=='' and '$(OS)'=='Windows_NT'">$(TargetFrameworks);net6.0-windows10.0.18362</TargetFrameworks>
 		<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
 		<GenerateLibraryLayout>true</GenerateLibraryLayout>
 		<DefineConstants>$(DefineConstants);IS_WINUI</DefineConstants>
@@ -30,11 +30,10 @@
 		</EmbeddedResource>
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)'=='net5.0-windows10.0.18362'">
-
+	<ItemGroup Condition="'$(TargetFramework)'=='net6.0-windows10.0.18362'">
 		<PackageReference Include="Microsoft.WindowsAppSDK" />
-		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.22000.25" />
-		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.22000.25" />
+		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
+
 		<Page Remove="Generated\*.xaml" />
 
 	</ItemGroup>

diff --git a/src/library/Uno.Toolkit.WinUI.Markup/Uno.Toolkit.WinUI.Markup.csproj b/src/library/Uno.Toolkit.WinUI.Markup/Uno.Toolkit.WinUI.Markup.csproj
@@ -7,7 +7,7 @@
 	<PropertyGroup>
 		<TargetFrameworks Condition="'$(TargetFrameworkOverride)'!=''">$(TargetFrameworkOverride)</TargetFrameworks>
 		<TargetFrameworks Condition="'$(TargetFrameworkOverride)'==''">netstandard2.0</TargetFrameworks>
-		<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(DisableNet6MobileTargets)'!='true'">$(TargetFrameworks);net5.0-windows10.0.18362;net6.0-ios;net6.0-macos;net6.0-android;net6.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(DisableNet6MobileTargets)'!='true'">$(TargetFrameworks);net6.0-windows10.0.18362;net6.0-ios;net6.0-macos;net6.0-android;net6.0-maccatalyst</TargetFrameworks>
 		<AllowedOutputExtensionsInPackageBuildOutputFolder>.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
 		<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
 		<GenerateLibraryLayout>true</GenerateLibraryLayout>
@@ -20,11 +20,6 @@
 		<PackageReference Include="Uno.WinUI.Markup" />
 	</ItemGroup>
 
-	<ItemGroup Condition="$(_IsWinUI)">
-		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.22000.25" />
-		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.22000.25" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<ProjectReference Include="..\..\Uno.Toolkit.UI\Uno.Toolkit.WinUI.csproj" />
 	</ItemGroup>

diff --git a/src/library/Uno.Toolkit.WinUI.Material.Markup/Uno.Toolkit.WinUI.Material.Markup.csproj b/src/library/Uno.Toolkit.WinUI.Material.Markup/Uno.Toolkit.WinUI.Material.Markup.csproj
@@ -7,19 +7,14 @@
 	<PropertyGroup>
 		<TargetFrameworks Condition="'$(TargetFrameworkOverride)'!=''">$(TargetFrameworkOverride)</TargetFrameworks>
 		<TargetFrameworks Condition="'$(TargetFrameworkOverride)'==''">netstandard2.0</TargetFrameworks>
-		<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(DisableNet6MobileTargets)'!='true'">$(TargetFrameworks);net5.0-windows10.0.18362;net6.0-ios;net6.0-macos;net6.0-android;net6.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(DisableNet6MobileTargets)'!='true'">$(TargetFrameworks);net6.0-windows10.0.18362;net6.0-ios;net6.0-macos;net6.0-android;net6.0-maccatalyst</TargetFrameworks>
 		<AllowedOutputExtensionsInPackageBuildOutputFolder>.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
 		<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
 		<GenerateLibraryLayout>true</GenerateLibraryLayout>
 		<DefineConstants>WINUI</DefineConstants>
 		<UseWinUI>true</UseWinUI>
 	</PropertyGroup>
 
-	<ItemGroup Condition="$(_IsWinUI)">
-		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.22000.25" />
-		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.22000.25" />
-	</ItemGroup>
-
 	<ItemGroup>
 	  <ProjectReference Include="..\Uno.Toolkit.Material\Uno.Toolkit.WinUI.Material.csproj" />
 	  <ProjectReference Include="..\Uno.Toolkit.WinUI.Markup\Uno.Toolkit.WinUI.Markup.csproj" />

diff --git a/src/winappsdk-workaround.targets b/src/winappsdk-workaround.targets
@@ -2,7 +2,7 @@
 	<!--
 		Workaround to avoid including Uno.Toolkit.UI XBFs in the PRI file:
 			> C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\Microsoft.Common.CurrentVersion.targets(5097,5):
-			> error MSB3030: Could not copy the file "D:\a\1\s\src\Uno.Toolkit.UI\obj\Uno.Toolkit.WinUI\Release\net5.0-windows10.0.18362\Controls\AutoLayout\AutoLayout.xbf" because it was not found.
+			> error MSB3030: Could not copy the file "D:\a\1\s\src\Uno.Toolkit.UI\obj\Uno.Toolkit.WinUI\Release\net6.0-windows10.0.18362\Controls\AutoLayout\AutoLayout.xbf" because it was not found.
 			> [D:\a\1\s\src\Uno.Toolkit.RuntimeTests\Uno.Toolkit.RuntimeTests.WinUI.csproj]
 		Just <Import /> this file into the winui project appearing in the `[]` bracket.
 	-->