Merge pull request #938 from unoplatform/dev/nr/wintfmbump

feat: Updating to Windows tfm 10.0.26100
unoplatform · Sep 17, 2024 · 32e04d9 · 32e04d9
2 parents a959e93 + 926462b
commit 32e04d9
Show file tree

Hide file tree

Showing 9 changed files with 138 additions and 138 deletions.
diff --git a/.github/actions/sdk-update/action.yml b/.github/actions/sdk-update/action.yml
@@ -13,7 +13,7 @@ runs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '8.0.300'
+        dotnet-version: '8.0.400'
 
     - name: Setup GitVersion
       uses: gittools/actions/gitversion/setup@v1.1.1

diff --git a/build/.azure-pipelines.yml b/build/.azure-pipelines.yml
@@ -20,7 +20,7 @@ variables:
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   IsCanaryBranch: $[startsWith(variables['Build.SourceBranch'], 'refs/heads/canaries/')]
   ValidationUnoCheckVersion: '1.25.1'
-  ValidationDotNetVersion: '8.0.304'
+  ValidationDotNetVersion: '8.0.400'
 
   # https://github.com/unoplatform/Uno.Wasm.Bootstrap/pull/887 remove when upgarding to .NET 9
   # compatible version of the bootstrapper

diff --git a/build/templates/dotnet-install-windows.yml b/build/templates/dotnet-install-windows.yml
@@ -1,5 +1,5 @@
 parameters:
-  DotNetVersion: '8.0.100'
+  DotNetVersion: '8.0.400'
 
 steps:
 

diff --git a/build/templates/package-validation.yml b/build/templates/package-validation.yml
@@ -19,7 +19,7 @@ steps:
     $dotnetVersion = $env:TargetDotNetVersion
     if ($templateArgs -match 'net9.0')
     {
-        $dotnetVersion = '9.0.100-preview.2.24157.14'
+        $dotnetVersion = '9.0.100-rc.1.24452.12'
     }
 
     echo "##vso[task.setvariable variable=DotNetVersion]$dotnetVersion"

diff --git a/src/Uno.Templates/content/unoapp/.run/MyExtensionsApp.1.run.xml b/src/Uno.Templates/content/unoapp/.run/MyExtensionsApp.1.run.xml
@@ -51,7 +51,7 @@
   <!--#if (useWinAppSdk)-->
   <configuration default="false" name="MyExtensionsApp.1 (WinAppSDK Unpackaged)" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
     <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/MyExtensionsApp.1/MyExtensionsApp.1.csproj" />
-    <option name="LAUNCH_PROFILE_TFM" value="$baseTargetFramework$-windows10.0.19041.0" />
+    <option name="LAUNCH_PROFILE_TFM" value="$baseTargetFramework$-windows10.0.26100.0" />
     <option name="LAUNCH_PROFILE_NAME" value="MyExtensionsApp.1 (WinAppSDK Unpackaged)" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />

diff --git a/src/Uno.Templates/content/unoapp/.template.config/template.json b/src/Uno.Templates/content/unoapp/.template.config/template.json
diff --git a/...lates/content/unoapp/MyExtensionsApp.1.MauiControls/MyExtensionsApp.1.MauiControls.csproj b/...lates/content/unoapp/MyExtensionsApp.1.MauiControls/MyExtensionsApp.1.MauiControls.csproj
@@ -8,7 +8,7 @@
 
     <!--#endif-->
     <!--#if (useWinAppSdk)-->
-    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) or '$(EnableWindowsTargeting)' == 'true'">$baseTargetFramework$-windows10.0.19041</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) or '$(EnableWindowsTargeting)' == 'true'">$baseTargetFramework$-windows10.0.26100</TargetFrameworks>
     <!--#endif-->
     <TargetFrameworks>
       $baseTargetFramework$;

diff --git a/src/Uno.Templates/content/unolib/CrossTargetedLibrary.csproj b/src/Uno.Templates/content/unolib/CrossTargetedLibrary.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Uno.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$baseTargetFramework$;$baseTargetFramework$-ios;$baseTargetFramework$-maccatalyst;$baseTargetFramework$-android;$baseTargetFramework$-windows10.0.19041;$baseTargetFramework$-browserwasm;$baseTargetFramework$-desktop</TargetFrameworks>
+    <TargetFrameworks>$baseTargetFramework$;$baseTargetFramework$-ios;$baseTargetFramework$-maccatalyst;$baseTargetFramework$-android;$baseTargetFramework$-windows10.0.26100;$baseTargetFramework$-browserwasm;$baseTargetFramework$-desktop</TargetFrameworks>
     <UnoSingleProject>true</UnoSingleProject>
     <OutputType>Library</OutputType>
     <!-- Ensures the .xr.xml files are generated in a proper layout folder -->

diff --git a/tools/TemplateTfmSwitchGenerator/Program.cs b/tools/TemplateTfmSwitchGenerator/Program.cs
@@ -9,7 +9,7 @@
     new Platform("platforms == android", "platforms != android", "android"),
     new Platform("platforms == ios", "platforms != ios", "ios"),
     new Platform("platforms == maccatalyst", "platforms != maccatalyst", "maccatalyst"),
-    new Platform("platforms == windows", "platforms != windows", "windows10.0.19041"),
+    new Platform("platforms == windows", "platforms != windows", "windows10.0.26100"),
     new Platform("platforms == wasm", "platforms != wasm", "browserwasm"),
     new Platform("platforms == desktop", "platforms != desktop", "desktop"),
     new Platform("useUnitTests == true", "useUnitTests == false", null)