Update TFM from .NET 8 to .NET 9 (#8301)
* Update TFM from .NET 8 to .NET 9 * Updating global.json
This commit is contained in:
Родитель
6634719e22
Коммит
69985c9074
|
@ -2,8 +2,8 @@
|
|||
<PropertyGroup>
|
||||
<RepositoryName>wpf</RepositoryName>
|
||||
<WindowsDesktopARM64Support>true</WindowsDesktopARM64Support>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFrameworkVersion>8.0</TargetFrameworkVersion>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<TargetFrameworkVersion>9.0</TargetFrameworkVersion>
|
||||
</PropertyGroup>
|
||||
<!-- Normalize $(TestWpfArcadeSdkPath) by appending a '\' to it if one is missing -->
|
||||
<PropertyGroup Condition="'$(TestWpfArcadeSdkPath)'!=''">
|
||||
|
|
|
@ -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')">
|
||||
<NuGetPackageId>Microsoft.Private.Winforms</NuGetPackageId>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
@ -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>
|
||||
|
|
Загрузка…
Ссылка в новой задаче