From b004df30105a30335f646dc96e1b1c1e6b45104e Mon Sep 17 00:00:00 2001 From: hmishra Date: Fri, 13 Oct 2023 22:51:17 +0530 Subject: [PATCH 1/2] Update TFM from .NET 8 to .NET 9 --- Directory.Build.props | 4 ++-- eng/WpfArcadeSdk/tools/SdkReferences.targets | 6 +++--- .../PresentationBuildTasks/PresentationBuildTasks.csproj | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 21c80043ee2..3b3c53502e5 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,8 +2,8 @@ wpf true - net8.0 - 8.0 + net9.0 + 9.0 diff --git a/eng/WpfArcadeSdk/tools/SdkReferences.targets b/eng/WpfArcadeSdk/tools/SdkReferences.targets index 66a6849356c..81f70261a06 100644 --- a/eng/WpfArcadeSdk/tools/SdkReferences.targets +++ b/eng/WpfArcadeSdk/tools/SdkReferences.targets @@ -202,10 +202,10 @@ Condition="Exists('$(PkgMicrosoft_Private_Winforms)\ref\$(TargetFramework)\%(MicrosoftPrivateWinFormsReference.Identity).dll')"> Microsoft.Private.Winforms - + And $(TargetFramework) == 'net9.0' + And Exists('$(PkgMicrosoft_Private_Winforms)\ref\net8.0\%(MicrosoftPrivateWinFormsReference.Identity).dll')"> Microsoft.Private.Winforms diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj index 1058257e356..362484504c8 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj @@ -1,6 +1,6 @@  - net472;net8.0 + net472;net9.0 false true @@ -60,7 +60,7 @@ - + From da643a302ca1c0a12ba4bfe1a2577ae604e7cb0f Mon Sep 17 00:00:00 2001 From: hmishra Date: Fri, 13 Oct 2023 23:09:29 +0530 Subject: [PATCH 2/2] Updating global.json --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 79633c5fcc5..335107281c7 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "9.0.100-alpha.1.23464.17", + "dotnet": "9.0.100-alpha.1.23511.2", "runtimes": { "dotnet": [ "2.1.7", @@ -16,7 +16,7 @@ "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23504.4" }, "sdk": { - "version": "9.0.100-alpha.1.23464.17" + "version": "9.0.100-alpha.1.23511.2" }, "native-tools": { "strawberry-perl": "5.38.0.1",