Skip to content

Update TFM from .NET 8 to .NET 9 #8301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 13, 2023
Merged

Update TFM from .NET 8 to .NET 9 #8301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b004df3
Update TFM from .NET 8 to .NET 9
harshit7962 Oct 13, 2023
da643a3
Updating global.json
harshit7962 Oct 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<PropertyGroup>
<RepositoryName>wpf</RepositoryName>
<WindowsDesktopARM64Support>true</WindowsDesktopARM64Support>
<TargetFramework>net8.0</TargetFramework>
<TargetFrameworkVersion>8.0</TargetFrameworkVersion>
<TargetFramework>net9.0</TargetFramework>
Copy link
Member

@dreddy-work dreddy-work Oct 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@singhashish-wpf, why can't you use NetCurrent and NetPrevious variables defined by arcade?

Copy link
Member

@ViktorHofer ViktorHofer Oct 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Those properties aren't really used by many repositories yet. Consider filing an issue to track the work to switch to these properties.

<TargetFrameworkVersion>9.0</TargetFrameworkVersion>
</PropertyGroup>
<!-- Normalize $(TestWpfArcadeSdkPath) by appending a '\' to it if one is missing -->
<PropertyGroup Condition="'$(TestWpfArcadeSdkPath)'!=''">
Expand Down
6 changes: 3 additions & 3 deletions eng/WpfArcadeSdk/tools/SdkReferences.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,10 +202,10 @@
Condition="Exists('$(PkgMicrosoft_Private_Winforms)\ref\$(TargetFramework)\%(MicrosoftPrivateWinFormsReference.Identity).dll')">
<NuGetPackageId>Microsoft.Private.Winforms</NuGetPackageId>
</Reference>
<Reference Include="$(PkgMicrosoft_Private_Winforms)\ref\net7.0\%(MicrosoftPrivateWinFormsReference.Identity).dll"
<Reference Include="$(PkgMicrosoft_Private_Winforms)\ref\net8.0\%(MicrosoftPrivateWinFormsReference.Identity).dll"
Condition="!Exists('$(PkgMicrosoft_Private_Winforms)\ref\$(TargetFramework)\%(MicrosoftPrivateWinFormsReference.Identity).dll')
And $(TargetFramework) == 'net8.0'
And Exists('$(PkgMicrosoft_Private_Winforms)\ref\net7.0\%(MicrosoftPrivateWinFormsReference.Identity).dll')">
And $(TargetFramework) == 'net9.0'
And Exists('$(PkgMicrosoft_Private_Winforms)\ref\net8.0\%(MicrosoftPrivateWinFormsReference.Identity).dll')">
Copy link
Member

@ViktorHofer ViktorHofer Oct 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this the TFM folder in the Microsoft.Private.Winforms package net8.0 instead of net9.0?

<NuGetPackageId>Microsoft.Private.Winforms</NuGetPackageId>
</Reference>
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;net8.0</TargetFrameworks>
<TargetFrameworks>net472;net9.0</TargetFrameworks>
<EnableDefaultItems>false</EnableDefaultItems>
<EnablePInvokeAnalyzer>true</EnablePInvokeAnalyzer>

Expand Down Expand Up @@ -60,7 +60,7 @@
<PackagingAssemblyContent Include="System.Reflection.MetadataLoadContext.dll" />
<PackagingAssemblyContent Include="System.Runtime.CompilerServices.Unsafe.dll" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
<ItemGroup Condition="'$(TargetFramework)'=='net9.0'">
<PackagingAssemblyContent Include="PresentationBuildTasks.dll" />
<PackagingAssemblyContent Include="System.Reflection.MetadataLoadContext.dll" />
</ItemGroup>
Expand Down