Update UWP settings for .NET 9 GA

microsoft · Nov 25, 2024 · 29abbe2 · 29abbe2
1 parent 7f8f4e4
commit 29abbe2
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -27,7 +27,7 @@
   <PropertyGroup>
     <NetFrameworkMinimum>net462</NetFrameworkMinimum>
     <UwpMinimum>uap10.0.16299</UwpMinimum>
-    <UwpNet9Minimum>net8.0-windows10.0.26100.0</UwpNet9Minimum>
+    <UwpNet9Minimum>net9.0-windows10.0.17763.0</UwpNet9Minimum>
     <WinUiMinimum>net6.0-windows10.0.18362.0</WinUiMinimum>
     <NetCurrent>net8.0</NetCurrent>
 

diff --git a/src/TestFramework/TestFramework.Extensions/MSTest.TestFramework.nuspec b/src/TestFramework/TestFramework.Extensions/MSTest.TestFramework.nuspec
@@ -69,8 +69,10 @@
     <file src="net8.0\**\Microsoft.VisualStudio.TestPlatform.TestFramework.resources.dll" target="lib\net8.0\" />
     <file src="net8.0\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll" target="build\net8.0\" />
     <file src="net8.0\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="build\net8.0\" />
-    <file src="net8.0-windows10.0.26100.0\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll" target="build\net8.0\uwp\" />
-    <file src="net8.0-windows10.0.26100.0\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="build\net8.0\uwp\" />
+
+    <!-- net9.0 -->
+    <file src="net9.0-windows10.0.17763.0\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll" target="build\net9.0\uwp\" />
+    <file src="net9.0-windows10.0.17763.0\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="build\net9.0\uwp\" />
 
     <!-- Source code -->
     <file src="$srcroot$\**\*.cs" target="src" />

diff --git a/...windows10.0.26100.0/PublicAPI.Shipped.txt → ...windows10.0.17763.0/PublicAPI.Shipped.txt b/...windows10.0.26100.0/PublicAPI.Shipped.txt → ...windows10.0.17763.0/PublicAPI.Shipped.txt
diff --git a/...ndows10.0.26100.0/PublicAPI.Unshipped.txt → ...ndows10.0.17763.0/PublicAPI.Unshipped.txt b/...ndows10.0.26100.0/PublicAPI.Unshipped.txt → ...ndows10.0.17763.0/PublicAPI.Unshipped.txt
diff --git a/src/TestFramework/TestFramework.Extensions/TestFramework.Extensions.csproj b/src/TestFramework/TestFramework.Extensions/TestFramework.Extensions.csproj
@@ -28,7 +28,7 @@
       - .NET 6.0
       - .NET 6.0 Windows.18362+
       - UWP 10.0.16299
-      - UWP 10.0.26100 with .NET 9
+      - UWP 10.0.17763 with .NET 9
     </PackageDescription>
   </PropertyGroup>
 
@@ -52,6 +52,10 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(TargetFramework)' == '$(UwpNet9Minimum)' ">
     <DefineConstants>$(DefineConstants);WINDOWS_UWP</DefineConstants>
+    <TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <SupportedOSPlatformVersion>10.0.17763.0</SupportedOSPlatformVersion>
+    <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/TestFramework/TestFramework.Extensions/build/winui/MSTest.TestFramework.targets b/src/TestFramework/TestFramework.Extensions/build/winui/MSTest.TestFramework.targets
@@ -4,7 +4,7 @@
     <_TestFrameworkExtensionsRoot>$(MSBuildThisFileDirectory)../net6.0/winui/</_TestFrameworkExtensionsRoot>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(UseUwpTools)' == 'true' ">
-    <_TestFrameworkExtensionsRoot>$(MSBuildThisFileDirectory)../net8.0/uwp/</_TestFrameworkExtensionsRoot>
+    <_TestFrameworkExtensionsRoot>$(MSBuildThisFileDirectory)../net9.0/uwp/</_TestFrameworkExtensionsRoot>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(UseWinUI)' != 'true' ">
     <_TestFrameworkExtensionsRoot>$(MSBuildThisFileDirectory)</_TestFrameworkExtensionsRoot>