diff --git a/Directory.Build.props b/Directory.Build.props index 21c80043e..3b3c53502 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 66a684935..81f70261a 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/global.json b/global.json index 79633c5fc..335107281 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", diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj index 1058257e3..362484504 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 @@ - +