diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 2817fea9..5a513e11 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"uno.check": {
- "version": "1.20.2",
+ "version": "1.27.1",
"commands": [
"uno-check"
]
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index c8987eb9..6935449f 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,8 +1,5 @@
-# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.208.0/containers/dotnet/.devcontainer/base.Dockerfile
-
-# [Choice] .NET version: 6.0, 5.0, 3.1, 6.0-bullseye, 5.0-bullseye, 3.1-bullseye, 6.0-focal, 5.0-focal, 3.1-focal
-ARG VARIANT="6.0-bullseye-slim"
-FROM mcr.microsoft.com/vscode/devcontainers/dotnet:0-${VARIANT}
+# See https://github.com/devcontainers/images/tree/main/src/dotnet for image choices
+FROM mcr.microsoft.com/vscode/devcontainers/dotnet:9.0
# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
ARG NODE_VERSION="none"
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 1ff6856c..f616c78f 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -7,7 +7,7 @@
"args": {
// Update 'VARIANT' to pick a .NET Core version: 3.1, 5.0, 6.0
// Append -bullseye or -focal to pin to an OS version.
- "VARIANT": "8.0",
+ "VARIANT": "9.0",
// Options
"NODE_VERSION": "lts/*"
}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5b7feb9f..d70be516 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ on:
workflow_dispatch:
env:
- DOTNET_VERSION: ${{ '8.0.x' }}
+ DOTNET_VERSION: ${{ '9.0.x' }}
DOTNET_INSTALL_DIR: dotnet-install
DOTNET_ROOT: dotnet-install
ENABLE_DIAGNOSTICS: false
diff --git a/Build-Toolkit-Components.ps1 b/Build-Toolkit-Components.ps1
index 2a99ef67..c461bddd 100644
--- a/Build-Toolkit-Components.ps1
+++ b/Build-Toolkit-Components.ps1
@@ -104,6 +104,20 @@ if ($null -eq $ExcludeMultiTargets)
$ExcludeMultiTargets = @()
}
+# Both uwp and wasdk share a targetframework. Both cannot be enabled at once.
+# If both are supplied, remove one based on WinUIMajorVersion.
+if ($MultiTargets.Contains('uwp') -and $MultiTargets.Contains('wasdk'))
+{
+ if ($WinUIMajorVersion -eq 2)
+ {
+ $ExcludeMultiTargets = $ExcludeMultiTargets + 'wasdk'
+ }
+ else
+ {
+ $ExcludeMultiTargets = $ExcludeMultiTargets + 'uwp'
+ }
+}
+
$MultiTargets = $MultiTargets | Where-Object { $_ -notin $ExcludeMultiTargets }
if ($Components -eq @('all')) {
diff --git a/Build-Toolkit-Gallery.ps1 b/Build-Toolkit-Gallery.ps1
index b6fc3668..ec09ae91 100644
--- a/Build-Toolkit-Gallery.ps1
+++ b/Build-Toolkit-Gallery.ps1
@@ -87,6 +87,20 @@ if ($null -eq $ExcludeMultiTargets)
$ExcludeMultiTargets = @()
}
+# Both uwp and wasdk share a targetframework. Both cannot be enabled at once.
+# If both are supplied, remove one based on WinUIMajorVersion.
+if ($MultiTargets.Contains('uwp') -and $MultiTargets.Contains('wasdk'))
+{
+ if ($WinUIMajorVersion -eq 2)
+ {
+ $ExcludeMultiTargets = $ExcludeMultiTargets + 'wasdk'
+ }
+ else
+ {
+ $ExcludeMultiTargets = $ExcludeMultiTargets + 'uwp'
+ }
+}
+
if ($MultiTargets -eq 'all') {
$MultiTargets = @('wasm', 'uwp', 'wasdk', 'wpf', 'linuxgtk', 'macos', 'ios', 'android', 'netstandard')
}
diff --git a/CommunityToolkit.Tooling.SampleGen.Tests/CommunityToolkit.Tooling.SampleGen.Tests.csproj b/CommunityToolkit.Tooling.SampleGen.Tests/CommunityToolkit.Tooling.SampleGen.Tests.csproj
index a04a5fa1..3dc69337 100644
--- a/CommunityToolkit.Tooling.SampleGen.Tests/CommunityToolkit.Tooling.SampleGen.Tests.csproj
+++ b/CommunityToolkit.Tooling.SampleGen.Tests/CommunityToolkit.Tooling.SampleGen.Tests.csproj
@@ -9,10 +9,10 @@
-
+
-
-
+
+
diff --git a/CommunityToolkit.Tooling.TestGen.Tests/CommunityToolkit.Tooling.TestGen.Tests.csproj b/CommunityToolkit.Tooling.TestGen.Tests/CommunityToolkit.Tooling.TestGen.Tests.csproj
index 42048be6..8c87f398 100644
--- a/CommunityToolkit.Tooling.TestGen.Tests/CommunityToolkit.Tooling.TestGen.Tests.csproj
+++ b/CommunityToolkit.Tooling.TestGen.Tests/CommunityToolkit.Tooling.TestGen.Tests.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/GenerateAllSolution.ps1 b/GenerateAllSolution.ps1
index 1ef1efac..f1daf804 100644
--- a/GenerateAllSolution.ps1
+++ b/GenerateAllSolution.ps1
@@ -62,6 +62,20 @@ if ($null -eq $ExcludeMultiTargets)
$ExcludeMultiTargets = @()
}
+# Both uwp and wasdk share a targetframework. Both cannot be enabled at once.
+# If both are supplied, remove one based on WinUIMajorVersion.
+if ($MultiTargets.Contains('uwp') -and $MultiTargets.Contains('wasdk'))
+{
+ if ($WinUIMajorVersion -eq 2)
+ {
+ $ExcludeMultiTargets = $ExcludeMultiTargets + 'wasdk'
+ }
+ else
+ {
+ $ExcludeMultiTargets = $ExcludeMultiTargets + 'uwp'
+ }
+}
+
$MultiTargets = $MultiTargets | Where-Object { $_ -notin $ExcludeMultiTargets }
# Generate required props for "All" solution.
diff --git a/MultiTarget/AvailableTargetFrameworks.props b/MultiTarget/AvailableTargetFrameworks.props
index 1ec9c768..6da40358 100644
--- a/MultiTarget/AvailableTargetFrameworks.props
+++ b/MultiTarget/AvailableTargetFrameworks.props
@@ -1,23 +1,23 @@
uap10.0.17763;net8.0-windows10.0.26100.0;
- net8.0-windows10.0.19041.0;net7.0-windows10.0.19041.0;net6.0-windows10.0.19041.0;
+ net9.0-windows10.0.19041.0;net8.0-windows10.0.19041.0;net7.0-windows10.0.19041.0;net6.0-windows10.0.19041.0;
- net8.0
- net8.0
- net8.0
+ net9.0;
+ net9.0;
+ net9.0;
- net8.0-android34.0
- net8.0-maccatalyst
- net8.0-ios
+ net9.0-android;
+ net9.0-maccatalyst;
+ net9.0-ios;
- net8.0
- net8.0
- net8.0
+ net9.0;
+ net9.0;
+ net9.0;
netstandard2.0
- net8.0
+ net9.0;
\ No newline at end of file
diff --git a/MultiTarget/DefinedConstants.props b/MultiTarget/DefinedConstants.props
index 41e955b7..b5c8c2c9 100644
--- a/MultiTarget/DefinedConstants.props
+++ b/MultiTarget/DefinedConstants.props
@@ -15,6 +15,7 @@
$(DefineConstants);HAS_UNO_SKIA;__SKIA__;WINDOWS_WPF;
$(DefineConstants);HAS_UNO_SKIA;__SKIA__;__GTK__;
+ $(DefineConstants);NET9_0_OR_GREATER
$(DefineConstants);NET8_0_OR_GREATER
$(DefineConstants);NET7_0_OR_GREATER
$(DefineConstants);NET6_0_OR_GREATER
diff --git a/MultiTarget/EnabledTargetFrameworks.props b/MultiTarget/EnabledTargetFrameworks.props
index efff04a4..32d81400 100644
--- a/MultiTarget/EnabledTargetFrameworks.props
+++ b/MultiTarget/EnabledTargetFrameworks.props
@@ -1,20 +1,20 @@
uap10.0.17763;net8.0-windows10.0.26100.0;
+ net9.0-windows10.0.19041.0;net8.0-windows10.0.19041.0;net7.0-windows10.0.19041.0;net6.0-windows10.0.19041.0;
-
- net8.0
- net8.0
- net8.0
+ net9.0;
+ net9.0;
+ net9.0;
- net8.0
- net8.0
- net8.0
+ net9.0;
+ net9.0;
+ net9.0;
diff --git a/MultiTarget/MultiTargetIdentifiers.props b/MultiTarget/MultiTargetIdentifiers.props
index 559bdb34..3444d5ad 100644
--- a/MultiTarget/MultiTargetIdentifiers.props
+++ b/MultiTarget/MultiTargetIdentifiers.props
@@ -29,25 +29,25 @@
true
true
- true
- true
+ true
+ true
true
- true
- true
+ true
+ true
true
- true
- true
+ true
+ true
true
true
true
- true
- true
- true
- true
+ true
+ true
+ true
+ true
true
diff --git a/MultiTarget/PackageReferences/Uno.props b/MultiTarget/PackageReferences/Uno.props
index ab7ec0f3..cd6712c1 100644
--- a/MultiTarget/PackageReferences/Uno.props
+++ b/MultiTarget/PackageReferences/Uno.props
@@ -1,13 +1,13 @@
- 5.2.132
+ 5.5.66
-
+
diff --git a/MultiTarget/PackageReferences/WinAppSdk.props b/MultiTarget/PackageReferences/WinAppSdk.props
index b557de75..867078b6 100644
--- a/MultiTarget/PackageReferences/WinAppSdk.props
+++ b/MultiTarget/PackageReferences/WinAppSdk.props
@@ -2,6 +2,6 @@
-
+
diff --git a/MultiTarget/WinUI.Extra.props b/MultiTarget/WinUI.Extra.props
index a5a0f839..a21be28e 100644
--- a/MultiTarget/WinUI.Extra.props
+++ b/MultiTarget/WinUI.Extra.props
@@ -23,6 +23,7 @@
+
diff --git a/ProjectHeads/AllComponents/Wasm/CommunityToolkit.App.Wasm.csproj b/ProjectHeads/AllComponents/Wasm/CommunityToolkit.App.Wasm.csproj
index 1d3a7526..cb846c4d 100644
--- a/ProjectHeads/AllComponents/Wasm/CommunityToolkit.App.Wasm.csproj
+++ b/ProjectHeads/AllComponents/Wasm/CommunityToolkit.App.Wasm.csproj
@@ -1,4 +1,4 @@
-
+
true
diff --git a/ProjectHeads/App.Head.Uno.UI.Dependencies.props b/ProjectHeads/App.Head.Uno.UI.Dependencies.props
index 960a1391..d3c8a7ff 100644
--- a/ProjectHeads/App.Head.Uno.UI.Dependencies.props
+++ b/ProjectHeads/App.Head.Uno.UI.Dependencies.props
@@ -3,7 +3,7 @@
-
+
diff --git a/ProjectHeads/App.Head.Uno.WinUI.Dependencies.props b/ProjectHeads/App.Head.Uno.WinUI.Dependencies.props
index 0d911d78..ed26f4fd 100644
--- a/ProjectHeads/App.Head.Uno.WinUI.Dependencies.props
+++ b/ProjectHeads/App.Head.Uno.WinUI.Dependencies.props
@@ -3,6 +3,6 @@
-
+
diff --git a/ProjectHeads/App.Head.Uwp.Dependencies.props b/ProjectHeads/App.Head.Uwp.Dependencies.props
index 42070aa6..0e355f4f 100644
--- a/ProjectHeads/App.Head.Uwp.Dependencies.props
+++ b/ProjectHeads/App.Head.Uwp.Dependencies.props
@@ -2,8 +2,8 @@
-
+
-
+
diff --git a/ProjectHeads/App.Head.Wasm.props b/ProjectHeads/App.Head.Wasm.props
index 86a98d39..f3ad1930 100644
--- a/ProjectHeads/App.Head.Wasm.props
+++ b/ProjectHeads/App.Head.Wasm.props
@@ -1,7 +1,7 @@
Exe
- $(WasmHeadTargetFramework)
+ $(WasmHeadTargetFramework.Split(';')[0])
@@ -59,13 +59,14 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/ProjectHeads/App.Head.props b/ProjectHeads/App.Head.props
index e391661d..f6aae2ba 100644
--- a/ProjectHeads/App.Head.props
+++ b/ProjectHeads/App.Head.props
@@ -8,13 +8,13 @@
-
+
-
-
+
+
diff --git a/ProjectHeads/SingleComponent/Wasm/ProjectTemplate.Wasm.csproj b/ProjectHeads/SingleComponent/Wasm/ProjectTemplate.Wasm.csproj
index e0b6be0c..25f62528 100644
--- a/ProjectHeads/SingleComponent/Wasm/ProjectTemplate.Wasm.csproj
+++ b/ProjectHeads/SingleComponent/Wasm/ProjectTemplate.Wasm.csproj
@@ -1,4 +1,4 @@
-
+
true
diff --git a/ProjectHeads/Tests.Head.WinAppSdk.props b/ProjectHeads/Tests.Head.WinAppSdk.props
index 7260103d..2e306263 100644
--- a/ProjectHeads/Tests.Head.WinAppSdk.props
+++ b/ProjectHeads/Tests.Head.WinAppSdk.props
@@ -6,7 +6,7 @@
-
+
build
diff --git a/ProjectHeads/Tests.Head.props b/ProjectHeads/Tests.Head.props
index 0dff7352..354c480b 100644
--- a/ProjectHeads/Tests.Head.props
+++ b/ProjectHeads/Tests.Head.props
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/ToolkitComponent.SampleProject.props b/ToolkitComponent.SampleProject.props
index cb598e4a..8b461c8c 100644
--- a/ToolkitComponent.SampleProject.props
+++ b/ToolkitComponent.SampleProject.props
@@ -11,7 +11,7 @@
-
+
diff --git a/global.json b/global.json
index 91187a7c..d413698a 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"sdk": {
- "version": "8.0.403",
+ "version": "9.0.100",
"rollForward": "latestFeature"
},
"msbuild-sdks":