- update C# and .NET versions in NuGet readme's

VincentH-Net · VincentH-Net · commit d276a6ec3688 · 2025-04-25T16:07:36.000+02:00
- use Uno.Sdk for Uno Extensions based NuGets
- adjust versions in TFMs to valid values
- update ThemeResourceGenerator to .NET 8
- fix for generated code namespace missing from Thickness helpers invocations in non-core NuGets
- set codegen project langversion to C# 13
- improve Regenerate.ps1 to handle cleanup of any 3rd party source generator
diff --git a/global.json b/global.json
@@ -1,4 +1,7 @@
 ﻿{
+  "msbuild-sdks": {
+    "Uno.Sdk": "5.6.54"
+  },
   "sdk": {
     "version": "9.0.200",
     "rollForward": "latestPatch"
diff --git a/src/CSharpMarkup.WinUI.LiveChartsCore.SkiaSharpView/Readme.md b/src/CSharpMarkup.WinUI.LiveChartsCore.SkiaSharpView/Readme.md
@@ -6,7 +6,7 @@ Enjoy a Flutter-like UI development experience with .NET Hot Reload and the best
 
 No XAML / HTML / JavaScript / CSS required
 
-This release targets WinUI 3 (Windows App SDK) and Uno Platform - including browser webassembly - with C# 11 and .NET 7.
+This release targets WinUI 3 (Windows App SDK) and Uno Platform - including browser webassembly - with C# 13 and .NET 8.
 
 [Docs](https://github.com/VincentH-Net/CSharpForMarkup#readme)
 
diff --git a/src/CSharpMarkup.WinUI.Uno.Extensions.Navigation.Toolkit/CSharpMarkup.WinUI.Uno.Extensions.Navigation.Toolkit.csproj b/src/CSharpMarkup.WinUI.Uno.Extensions.Navigation.Toolkit/CSharpMarkup.WinUI.Uno.Extensions.Navigation.Toolkit.csproj
@@ -1,11 +1,16 @@
-﻿<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
+﻿<Project Sdk="Uno.Sdk">
 	<PropertyGroup>
 		<Configurations>Debug;Release;Generate</Configurations>
 		<IsUno>true</IsUno>
 
 		<!-- Workaround for PRI resource build errors and dotnet build support, from https://github.com/dotnet/maui/issues/5886#issuecomment-1123106200 -->
 		<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
 		<GenerateLibraryLayout>true</GenerateLibraryLayout>
+
+		<!-- Because we are using Uno.Sdk -->
+		<EnableDefaultPageItems>false</EnableDefaultPageItems>
+		<UnoSingleProject>true</UnoSingleProject>
+		<OutputType>Library</OutputType>
 	</PropertyGroup>
 
 	<PropertyGroup>
diff --git a/src/CSharpMarkup.WinUI.Uno.Extensions.Navigation.Toolkit/Readme.md b/src/CSharpMarkup.WinUI.Uno.Extensions.Navigation.Toolkit/Readme.md
@@ -6,7 +6,7 @@ Enjoy a Flutter-like UI development experience with .NET Hot Reload and the best
 
 No XAML / HTML / JavaScript / CSS required
 
-This release targets WinUI 3 (Windows App SDK) and Uno Platform - including browser webassembly - with C# 11 and .NET 7.
+This release targets WinUI 3 (Windows App SDK) and Uno Platform - including browser webassembly - with C# 13 and .NET 8.
 
 [Docs](https://github.com/VincentH-Net/CSharpForMarkup#readme)
 
diff --git a/src/CSharpMarkup.WinUI.Uno.Extensions.Navigation.Toolkit/global.json b/src/CSharpMarkup.WinUI.Uno.Extensions.Navigation.Toolkit/global.json
@@ -1,4 +1,7 @@
 ﻿{
+  "msbuild-sdks": {
+    "Uno.Sdk": "5.6.54"
+  },
   "sdk": {
     "version": "9.0.200",
     "rollForward": "latestPatch"
diff --git a/src/CSharpMarkup.WinUI.Uno.Extensions.Navigation/CSharpMarkup.WinUI.Uno.Extensions.Navigation.csproj b/src/CSharpMarkup.WinUI.Uno.Extensions.Navigation/CSharpMarkup.WinUI.Uno.Extensions.Navigation.csproj
@@ -1,11 +1,16 @@
-﻿<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
+﻿<Project Sdk="Uno.Sdk">
 	<PropertyGroup>
 		<Configurations>Debug;Release;Generate</Configurations>
 		<IsUno>true</IsUno>
 
 		<!-- Workaround for PRI resource build errors and dotnet build support, from https://github.com/dotnet/maui/issues/5886#issuecomment-1123106200 -->
 		<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
 		<GenerateLibraryLayout>true</GenerateLibraryLayout>
+
+		<!-- Because we are using Uno.Sdk -->
+		<EnableDefaultPageItems>false</EnableDefaultPageItems>
+		<UnoSingleProject>true</UnoSingleProject>
+		<OutputType>Library</OutputType>
 	</PropertyGroup>
 
 	<PropertyGroup>
diff --git a/src/CSharpMarkup.WinUI.Uno.Extensions.Navigation/Readme.md b/src/CSharpMarkup.WinUI.Uno.Extensions.Navigation/Readme.md
@@ -6,7 +6,7 @@ Enjoy a Flutter-like UI development experience with .NET Hot Reload and the best
 
 No XAML / HTML / JavaScript / CSS required
 
-This release targets WinUI 3 (Windows App SDK) and Uno Platform - including browser webassembly - with C# 11 and .NET 7.
+This release targets WinUI 3 (Windows App SDK) and Uno Platform - including browser webassembly - with C# 13 and .NET 8.
 
 [Docs](https://github.com/VincentH-Net/CSharpForMarkup#readme)
 
diff --git a/src/CSharpMarkup.WinUI.Uno.Extensions.Navigation/global.json b/src/CSharpMarkup.WinUI.Uno.Extensions.Navigation/global.json
@@ -1,4 +1,7 @@
 ﻿{
+  "msbuild-sdks": {
+    "Uno.Sdk": "5.6.54"
+  },
   "sdk": {
     "version": "9.0.200",
     "rollForward": "latestPatch"
diff --git a/src/CSharpMarkup.WinUI.Uno.Extensions.Reactive/CSharpMarkup.WinUI.Uno.Extensions.Reactive.csproj b/src/CSharpMarkup.WinUI.Uno.Extensions.Reactive/CSharpMarkup.WinUI.Uno.Extensions.Reactive.csproj
@@ -1,11 +1,16 @@
-﻿<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
+﻿<Project Sdk="Uno.Sdk">
 	<PropertyGroup>
 		<Configurations>Debug;Release;Generate</Configurations>
 		<IsUno>true</IsUno>
 
 		<!-- Workaround for PRI resource build errors and dotnet build support, from https://github.com/dotnet/maui/issues/5886#issuecomment-1123106200 -->
 		<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
 		<GenerateLibraryLayout>true</GenerateLibraryLayout>
+
+		<!-- Because we are using Uno.Sdk -->
+		<EnableDefaultPageItems>false</EnableDefaultPageItems>
+		<UnoSingleProject>true</UnoSingleProject>
+		<OutputType>Library</OutputType>
 	</PropertyGroup>
 
 	<PropertyGroup>
diff --git a/src/CSharpMarkup.WinUI.Uno.Extensions.Reactive/Readme.md b/src/CSharpMarkup.WinUI.Uno.Extensions.Reactive/Readme.md
@@ -6,7 +6,7 @@ Enjoy a Flutter-like UI development experience with .NET Hot Reload and the best
 
 No XAML / HTML / JavaScript / CSS required
 
-This release targets WinUI 3 (Windows App SDK) and Uno Platform - including browser webassembly - with C# 11 and .NET 7.
+This release targets WinUI 3 (Windows App SDK) and Uno Platform - including browser webassembly - with C# 13 and .NET 8.
 
 [Docs](https://github.com/VincentH-Net/CSharpForMarkup#readme)
 
diff --git a/src/CSharpMarkup.WinUI.Uno.Extensions.Reactive/global.json b/src/CSharpMarkup.WinUI.Uno.Extensions.Reactive/global.json
@@ -1,4 +1,7 @@
 ﻿{
+  "msbuild-sdks": {
+    "Uno.Sdk": "5.6.54"
+  },
   "sdk": {
     "version": "9.0.200",
     "rollForward": "latestPatch"
diff --git a/src/CSharpMarkup.WinUI.Uno.Toolkit/CSharpMarkup.WinUI.Uno.Toolkit.csproj b/src/CSharpMarkup.WinUI.Uno.Toolkit/CSharpMarkup.WinUI.Uno.Toolkit.csproj
@@ -44,7 +44,7 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0-windows10.0.19041.0;net8.0;net8.0-android34.0;net8.0-ios17.2;net8.0-maccatalyst17.2;net8.0-macos14.2</TargetFrameworks>
+		<TargetFrameworks>net8.0-windows10.0.19041.0;net8.0;net8.0-android34.0;net8.0-ios18.0;net8.0-maccatalyst18.0;net8.0-macos15.0</TargetFrameworks>
 		<RootNamespace>CSharpMarkup.WinUI.Uno.Toolkit</RootNamespace>
 	</PropertyGroup>
 
diff --git a/src/CSharpMarkup.WinUI.Uno.Toolkit/Readme.md b/src/CSharpMarkup.WinUI.Uno.Toolkit/Readme.md
@@ -6,7 +6,7 @@ Enjoy a Flutter-like UI development experience with .NET Hot Reload and the best
 
 No XAML / HTML / JavaScript / CSS required
 
-This release targets WinUI 3 (Windows App SDK) and Uno Platform - including browser webassembly - with C# 11 and .NET 7.
+This release targets WinUI 3 (Windows App SDK) and Uno Platform - including browser webassembly - with C# 13 and .NET 8.
 
 [Docs](https://github.com/VincentH-Net/CSharpForMarkup#readme)
 
diff --git a/src/CSharpMarkup.WinUI/CSharpMarkup.WinUI.csproj b/src/CSharpMarkup.WinUI/CSharpMarkup.WinUI.csproj
@@ -42,7 +42,7 @@
 		<RootNamespace>CSharpMarkup.WinUI</RootNamespace>
 		<TargetFrameworks>$(CSharpMarkupWinUITargetFrameworks)</TargetFrameworks>
 	</PropertyGroup>
-	
+
 	<PropertyGroup Condition="$(IsUno)==false">
 		<UseWinUI>true</UseWinUI>
 
diff --git a/src/CSharpMarkup.WinUI/Readme.md b/src/CSharpMarkup.WinUI/Readme.md
@@ -4,7 +4,7 @@
 
 No XAML / HTML / JavaScript / CSS required
 
-This release targets WinUI 3 (Windows App SDK) and Uno Platform - including browser webassembly - with C# 11 and .NET 7.
+This release targets WinUI 3 (Windows App SDK) and Uno Platform - including browser webassembly - with C# 13 and .NET 9 or 8.
 When only targeting Windows, C# Markup 2 has no dependency on Uno - just the Windows App SDK.
 
 [Docs](https://github.com/VincentH-Net/CSharpForMarkup#readme)
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -14,9 +14,9 @@
 		<IsWinAppSdk>false</IsWinAppSdk>
 		<IsWasm>false</IsWasm>
 
-		<CSharpMarkupWinUINet8TargetFrameworks>net8.0-windows10.0.19041.0;net8.0;net8.0-android30.0;net8.0-ios17.0;net8.0-maccatalyst17.0;net8.0-macos14.0</CSharpMarkupWinUINet8TargetFrameworks>
-		<CSharpMarkupWinUINet9TargetFrameworks>net9.0;net9.0-android30.0;net9.0-ios18.0;net9.0-maccatalyst18.0;net9.0-macos15.0</CSharpMarkupWinUINet9TargetFrameworks>
-		<CSharpMarkupWinUIExtensionsTargetFrameworks>net8.0-windows10.0.19041.0;net8.0;net8.0-android34.0;net8-browserwasm1.0;net8-desktop1.0;net8.0-ios17.2;net8.0-maccatalyst17.2</CSharpMarkupWinUIExtensionsTargetFrameworks>
+		<CSharpMarkupWinUINet8TargetFrameworks>net8.0-windows10.0.19041.0;net8.0;net8.0-android34.0;net8.0-ios17.0;net8.0-maccatalyst17.0;net8.0-macos14.0</CSharpMarkupWinUINet8TargetFrameworks>
+		<CSharpMarkupWinUINet9TargetFrameworks>net9.0;net9.0-android35.0;net9.0-ios18.0;net9.0-maccatalyst18.0;net9.0-macos15.0</CSharpMarkupWinUINet9TargetFrameworks>
+		<CSharpMarkupWinUIExtensionsTargetFrameworks>net8.0-windows10.0.19041.0;net8.0;net8.0-android34.0;net8-browserwasm1.0;net8-desktop1.0;net8.0-ios18.0;net8.0-maccatalyst18.0</CSharpMarkupWinUIExtensionsTargetFrameworks>
 	</PropertyGroup>
 
 	<Choose>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,7 @@`
`1`	`1`	`{`
	`2`	`+ "msbuild-sdks": {`
	`3`	`+ "Uno.Sdk": "5.6.54"`
	`4`	`+ },`
`2`	`5`	`"sdk": {`
`3`	`6`	`"version": "9.0.200",`
`4`	`7`	`"rollForward": "latestPatch"`