Update .NET version to 9.0 and related dependencies

CommunityToolkit · Dec 4, 2024 · ce173c4 · ce173c4
1 parent 8ce50b7
commit ce173c4
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 10 deletions.
diff --git 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, etc
-ARG VARIANT="8.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
@@ -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": "6.0",
+			"VARIANT": "9.0",
 			// Options
 			"NODE_VERSION": "lts/*"
 		}

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ on:
   merge_group:
 
 env:
-  DOTNET_VERSION: ${{ '8.0.201' }}
+  DOTNET_VERSION: ${{ '9.0.x' }}
   ENABLE_DIAGNOSTICS: false
   #COREHOST_TRACE: 1
   MSBUILD_VERBOSITY: normal

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -1,7 +1,7 @@
 <Project>
 
   <ItemGroup Condition="'$(Configuration)' == 'Release'">
-    <PackageReference Include="NuGet.Build.Tasks.Pack" Version="6.7.0" PrivateAssets="all" Pack="false" />
+    <PackageReference Include="NuGet.Build.Tasks.Pack" Version="6.12.1" PrivateAssets="all" Pack="false" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
 

diff --git a/components/Notifications/src/CommunityToolkit.Notifications.csproj b/components/Notifications/src/CommunityToolkit.Notifications.csproj
@@ -14,6 +14,8 @@
     <PackageId>$(PackageIdPrefix).$(ToolkitComponentName)</PackageId>
     <Nullable>disable</Nullable>
     <HasWinUI>false</HasWinUI>
+
+    <UwpTargetFramework Condition="'$(UwpTargetFramework)' == ''">uap10.0.17763;net8.0-windows10.0.17763.0;</UwpTargetFramework>
   </PropertyGroup>
 
   <!-- Sets this up as a toolkit component's source project -->

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.403",
+    "version": "9.0.101",
     "rollForward": "latestFeature"
   },
   "msbuild-sdks": 

diff --git a/tooling b/tooling
+1 −1		.config/dotnet-tools.json
+2 −5		.devcontainer/Dockerfile
+1 −1		.devcontainer/devcontainer.json
+1 −1		.github/workflows/build.yml
+3 −2		.github/workflows/config/Directory.Build.props
+14 −0		Build-Toolkit-Components.ps1
+14 −0		Build-Toolkit-Gallery.ps1
+6 −7		CommunityToolkit.App.Shared/Pages/GettingStartedPage.xaml
+4 −5		CommunityToolkit.App.Shared/Renderers/ToolkitDocumentationRenderer.xaml
+3 −3		CommunityToolkit.Tooling.SampleGen.Tests/CommunityToolkit.Tooling.SampleGen.Tests.csproj
+1 −1		CommunityToolkit.Tooling.TestGen.Tests/CommunityToolkit.Tooling.TestGen.Tests.csproj
+15 −1		GenerateAllSolution.ps1
+11 −11		MultiTarget/AvailableTargetFrameworks.props
+1 −0		MultiTarget/DefinedConstants.props
+7 −7		MultiTarget/EnabledTargetFrameworks.props
+10 −11		MultiTarget/MultiTargetIdentifiers.props
+1 −1		MultiTarget/NoWarn.props
+2 −2		MultiTarget/PackageReferences/Uno.props
+5 −3		MultiTarget/PackageReferences/Uwp.props
+3 −2		MultiTarget/PackageReferences/WinAppSdk.props
+2 −1		MultiTarget/WinUI.Extra.props
+1 −1		ProjectHeads/AllComponents/Wasm/CommunityToolkit.App.Wasm.csproj
+1 −1		ProjectHeads/App.Head.Uno.UI.Dependencies.props
+1 −1		ProjectHeads/App.Head.Uno.WinUI.Dependencies.props
+3 −3		ProjectHeads/App.Head.Uwp.Dependencies.props
+9 −8		ProjectHeads/App.Head.Wasm.props
+1 −1		ProjectHeads/App.Head.WinAppSdk.Dependencies.props
+3 −3		ProjectHeads/App.Head.props
+103 −19		ProjectHeads/GenerateSingleSampleHeads.ps1
+0 −0		ProjectHeads/SingleComponent/Tests.Wasdk/Package.appxmanifest
+0 −0		ProjectHeads/SingleComponent/Tests.Wasdk/ProjectTemplate.Tests.Wasdk.csproj
+0 −0		ProjectHeads/SingleComponent/Tests.Wasdk/Properties/launchSettings.json
+0 −0		ProjectHeads/SingleComponent/Tests.Wasdk/app.manifest
+0 −0		ProjectHeads/SingleComponent/Wasdk/Package.appxmanifest
+0 −0		ProjectHeads/SingleComponent/Wasdk/ProjectTemplate.Wasdk.csproj
+0 −0		ProjectHeads/SingleComponent/Wasdk/Properties/launchSettings.json
+0 −0		ProjectHeads/SingleComponent/Wasdk/app.manifest
+1 −1		ProjectHeads/SingleComponent/Wasm/ProjectTemplate.Wasm.csproj
+1 −1		ProjectHeads/Tests.Head.WinAppSdk.props
+2 −2		ProjectHeads/Tests.Head.props
+1 −1		ToolkitComponent.SampleProject.props
+1 −1		global.json