Skip to content

Commit 85fa924

Browse files
ViktorHoferViktorHofer
authored
Merge pull request #90880 from dotnet/net90tfm
Upgrade our TFM to net9.0
2 parents f0463a9 + 5f952f1 commit 85fa924

File tree

164 files changed

+4739
-4014
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

164 files changed

+4739
-4014
lines changed

‎Directory.Build.props

+8-6
Original file line numberDiff line numberDiff line change
@@ -80,24 +80,25 @@
8080

8181
<!-- The TFMs to build and test against. -->
8282
<PropertyGroup>
83-
<NetCoreAppCurrentVersion>8.0</NetCoreAppCurrentVersion>
83+
<NetCoreAppCurrentVersion>9.0</NetCoreAppCurrentVersion>
8484
<NetCoreAppCurrentIdentifier>.NETCoreApp</NetCoreAppCurrentIdentifier>
8585
<NetCoreAppCurrentTargetFrameworkMoniker>$(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppCurrentVersion)</NetCoreAppCurrentTargetFrameworkMoniker>
8686
<MicrosoftNetCoreAppFrameworkName>Microsoft.NETCore.App</MicrosoftNetCoreAppFrameworkName>
8787
<NetCoreAppCurrentBrandName>.NET $(NetCoreAppCurrentVersion)</NetCoreAppCurrentBrandName>
8888
<NetCoreAppCurrent>net$(NetCoreAppCurrentVersion)</NetCoreAppCurrent>
8989

9090
<!-- The previous supported .NET version. -->
91-
<NetCoreAppPreviousVersion>7.0</NetCoreAppPreviousVersion>
91+
<NetCoreAppPreviousVersion>8.0</NetCoreAppPreviousVersion>
9292
<NetCoreAppPrevious>net$(NetCoreAppPreviousVersion)</NetCoreAppPrevious>
9393
<NetCoreAppPrevious Condition="'$(DotNetBuildFromSource)' == 'true'">$(NetCoreAppCurrent)</NetCoreAppPrevious>
9494

9595
<!-- The minimum supported .NET version. -->
96-
<NetCoreAppMinimum>net6.0</NetCoreAppMinimum>
96+
<NetCoreAppMinimum>net8.0</NetCoreAppMinimum>
9797
<NetCoreAppMinimum Condition="'$(DotNetBuildFromSource)' == 'true'">$(NetCoreAppCurrent)</NetCoreAppMinimum>
9898

9999
<!-- when this is updated, make sure to keep $(_TargetFrameworkForNETCoreTasks)
100-
in src/mono/wasm/build/WasmApp.LocalBuild.props in sync -->
100+
in src/mono/wasm/build/WasmApp.LocalBuild.props
101+
and in src/mono/msbuild/apple/build/AppleBuild.LocalBuild.props in sync -->
101102
<NetCoreAppToolCurrentVersion>8.0</NetCoreAppToolCurrentVersion>
102103
<NetCoreAppToolCurrent>net$(NetCoreAppToolCurrentVersion)</NetCoreAppToolCurrent>
103104
<NetCoreAppCurrentToolTargetFrameworkMoniker>$(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppToolCurrentVersion)</NetCoreAppCurrentToolTargetFrameworkMoniker>
@@ -114,8 +115,8 @@
114115
<NetFrameworkCurrent Condition="'$(DotNetBuildFromSource)' == 'true'" />
115116

116117
<!-- Important: Set this to the GA version (or a close approximation) during servicing and adjust the TFM property below. -->
117-
<ApiCompatNetCoreAppBaselineVersion>7.0.0</ApiCompatNetCoreAppBaselineVersion>
118-
<ApiCompatNetCoreAppBaselineTFM>net7.0</ApiCompatNetCoreAppBaselineTFM>
118+
<ApiCompatNetCoreAppBaselineVersion>8.0.0-rc.1.23415.6</ApiCompatNetCoreAppBaselineVersion>
119+
<ApiCompatNetCoreAppBaselineTFM>net8.0</ApiCompatNetCoreAppBaselineTFM>
119120

120121
<TargetFrameworkForNETFrameworkTasks>$(NetFrameworkToolCurrent)</TargetFrameworkForNETFrameworkTasks>
121122
<!-- Don't build for NETFramework during source-build. -->
@@ -429,6 +430,7 @@
429430
<PublishWindowsPdb>false</PublishWindowsPdb>
430431
</PropertyGroup>
431432

433+
432434
<!-- All reference assemblies should have a ReferenceAssemblyAttribute and the 0x70 flag which prevents them from loading. -->
433435
<ItemGroup Condition="'$(IsReferenceAssemblyProject)' == 'true'">
434436
<AssemblyAttribute Include="System.Runtime.CompilerServices.ReferenceAssemblyAttribute" />

‎eng/Analyzers.targets

+7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
<Project>
2+
<PropertyGroup Condition="'$(UsingMicrosoftNoTargetsSdk)' == 'true' or
3+
'$(UsingMicrosoftDotNetSharedFrameworkSdk)' == 'true' or
4+
'$(MSBuildProjectExtension)' == '.pkgproj' or
5+
'$(UsingMicrosoftTraversalSdk)' == 'true'">
6+
<!-- Explicitly disable running analyzers to avoid trying to discover the correct ILLink tool pack for a project that has no sources. -->
7+
<RunAnalyzers>false</RunAnalyzers>
8+
</PropertyGroup>
29
<PropertyGroup>
310
<!-- Disable analyzers in sourcebuild -->
411
<RunAnalyzers Condition="'$(DotNetBuildFromSource)' == 'true'">false</RunAnalyzers>

‎eng/Versions.props

+2-3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<MinorVersion>0</MinorVersion>
88
<PatchVersion>0</PatchVersion>
99
<SdkBandVersion>9.0.100</SdkBandVersion>
10+
<PackageVersionNet8>8.0.0-rc.1.23414.4</PackageVersionNet8>
1011
<PackageVersionNet7>7.0.8</PackageVersionNet7>
1112
<PackageVersionNet6>6.0.$([MSBuild]::Add($([System.Version]::Parse('$(PackageVersionNet7)').Build),11))</PackageVersionNet6>
1213
<PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
@@ -15,15 +16,13 @@
1516
<SdkBandVersionForWorkload_FromRuntimeVersions>$(SdkBandVersion)$(WorkloadVersionSuffix)</SdkBandVersionForWorkload_FromRuntimeVersions>
1617
<!-- Set assembly version to align with major and minor version,
1718
as for the patches and revisions should be manually updated per assembly if it is serviced. -->
18-
<!-- Temporarily hard-code to 8.0.0.0. We can't version forward the Assembly Version without updating the TFM in dotnet/runtime. -->
19-
<AssemblyVersion>8.0.0.0</AssemblyVersion>
19+
<AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
2020
<!-- Enable to remove prerelease label. -->
2121
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
2222
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
2323
<!-- Opt-in/out repo features -->
2424
<UsingToolIbcOptimization>false</UsingToolIbcOptimization>
2525
<UsingToolXliff>false</UsingToolXliff>
26-
<LastReleasedStableAssemblyVersion>$(AssemblyVersion)</LastReleasedStableAssemblyVersion>
2726
<!-- Use SDK compilers in full source-build. -->
2827
<UsingToolMicrosoftNetCompilers Condition="'$(DotNetBuildFromSourceFlavor)' != 'Product'">true</UsingToolMicrosoftNetCompilers>
2928
</PropertyGroup>

‎eng/build.ps1

+2-2
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ function Get-Help() {
7878
Write-Host "Libraries settings:"
7979
Write-Host " -allconfigurations Build packages for all build configurations."
8080
Write-Host " -coverage Collect code coverage when testing."
81-
Write-Host " -framework (-f) Build framework: net8.0 or net48."
82-
Write-Host " [Default: net8.0]"
81+
Write-Host " -framework (-f) Build framework: net9.0 or net48."
82+
Write-Host " [Default: net9.0]"
8383
Write-Host " -testnobuild Skip building tests when invoking -test."
8484
Write-Host " -testscope Scope tests, allowed values: innerloop, outerloop, all."
8585
Write-Host ""

‎eng/build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ usage()
6767
echo "Libraries settings:"
6868
echo " --allconfigurations Build packages for all build configurations."
6969
echo " --coverage Collect code coverage when testing."
70-
echo " --framework (-f) Build framework: net8.0 or net48."
71-
echo " [Default: net8.0]"
70+
echo " --framework (-f) Build framework: net9.0 or net48."
71+
echo " [Default: net9.0]"
7272
echo " --testnobuild Skip building tests when invoking -test."
7373
echo " --testscope Test scope, allowed values: innerloop, outerloop, all."
7474
echo ""

‎eng/pipelines/libraries/base-job.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ parameters:
44
archType: ''
55
osSubgroup: ''
66
crossBuild: false
7-
framework: 'net8.0'
7+
framework: 'net9.0'
88
isOfficialAllConfigurations: false
99
isSourceBuild: false
1010
liveRuntimeBuildConfig: ''

‎eng/pipelines/libraries/build-job.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ parameters:
55
archType: ''
66
targetRid: ''
77
crossBuild: false
8-
framework: 'net8.0'
8+
framework: 'net9.0'
99
isOfficialBuild: false
1010
isOfficialAllConfigurations: false
1111
runtimeVariant: ''

‎eng/pipelines/libraries/run-test-job.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ parameters:
44
osSubgroup: ''
55
archType: ''
66
targetRid: ''
7-
framework: 'net8.0'
7+
framework: 'net9.0'
88
isOfficialBuild: false
99
liveRuntimeBuildConfig: ''
1010
runtimeFlavor: 'coreclr'

‎eng/targetingpacks.targets

+12-4
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,13 @@
7272
Condition="'@(KnownAppHostPack)' == '' or !@(KnownAppHostPack->AnyHaveMetadataValue('TargetFramework', '$(NetCoreAppCurrent)'))" />
7373
</ItemGroup>
7474

75+
<!-- Add known packs from the downlevel TFM until we are building with an SDK that supports the new TFM all-up. -->
76+
<ItemGroup Condition="'$(NetCoreAppToolCurrent)' != '$(NetCoreAppCurrent)'">
77+
<KnownILLinkPack Include="@(KnownILLinkPack->WithMetadataValue('Identity', 'Microsoft.NET.ILLink.Tasks')->WithMetadataValue('TargetFramework', '$(NetCoreAppToolCurrent)'))">
78+
<TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
79+
</KnownILLinkPack>
80+
</ItemGroup>
81+
7582
<!-- Simple name references will be resolved from the targeting pack folders and should never be copied to the output. -->
7683
<ItemGroup>
7784
<Reference Update="@(Reference)">
@@ -92,7 +99,7 @@
9299
</PropertyGroup>
93100
</Target>
94101

95-
<!--
102+
<!--
96103
SDK tries to download runtime packs when RuntimeIdentifier is set, remove them from PackageDownload item.
97104
TODO: Remove this target when an 8.0.100 SDK is consumed that respects EnableRuntimePackDownload.
98105
-->
@@ -106,12 +113,13 @@
106113
Condition="'$(UsePackageDownload)' != 'true' and $([System.String]::Copy('%(Identity)').StartsWith('$(LocalFrameworkOverrideName).Runtime'))" />
107114
<PackageDownload Remove="@(PackageDownload)"
108115
Condition="'$(UsePackageDownload)' == 'true' and $([System.String]::Copy('%(Identity)').EndsWith('Microsoft.DotNet.ILCompiler'))" />
116+
<!-- Always remove the PackageReference items as some of the packages are only via PackageReference -->
109117
<PackageReference Remove="@(PackageReference)"
110-
Condition="'$(UsePackageDownload)' != 'true' and $([System.String]::Copy('%(Identity)').EndsWith('Microsoft.DotNet.ILCompiler'))" />
118+
Condition="$([System.String]::Copy('%(Identity)').EndsWith('Microsoft.DotNet.ILCompiler'))" />
111119
</ItemGroup>
112120
</Target>
113121

114-
<!--
122+
<!--
115123
TODO: Remove this target when an 8.0.100 SDK is consumed that respects EnableAppHostPackDownload.
116124
-->
117125
<Target Name="RemoveAppHostPackFromDownloadItem"
@@ -131,7 +139,7 @@
131139
AfterTargets="ResolveFrameworkReferences">
132140
<Error Text="The shared framework must be built before the local targeting pack can be consumed."
133141
Condition="!Exists('$(MicrosoftNetCoreAppRefPackDir)data\FrameworkList.xml')" />
134-
142+
135143
<ItemGroup>
136144
<ResolvedTargetingPack Path="$(MicrosoftNetCoreAppRefPackDir.TrimEnd('/\'))"
137145
NuGetPackageVersion="$(ProductVersion)"

‎global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"sdk": {
3-
"version": "8.0.100-preview.7.23376.3",
3+
"version": "8.0.100-rc.1.23415.11",
44
"allowPrerelease": true,
55
"rollForward": "major"
66
},
77
"tools": {
8-
"dotnet": "8.0.100-preview.7.23376.3"
8+
"dotnet": "8.0.100-rc.1.23415.11"
99
},
1010
"msbuild-sdks": {
1111
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23428.2",

‎src/coreclr/System.Private.CoreLib/CompatibilitySuppressions.xml

+1-14
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,32 @@
11
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
23
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
34
<Suppression>
45
<DiagnosticId>CP0015</DiagnosticId>
56
<Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,``0):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
6-
<Left>ref/net8.0/System.Private.CoreLib.dll</Left>
7-
<Right>lib/net8.0/System.Private.CoreLib.dll</Right>
87
</Suppression>
98
<Suppression>
109
<DiagnosticId>CP0015</DiagnosticId>
1110
<Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,System.Diagnostics.Tracing.EventSourceOptions@,``0@):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
12-
<Left>ref/net8.0/System.Private.CoreLib.dll</Left>
13-
<Right>lib/net8.0/System.Private.CoreLib.dll</Right>
1411
</Suppression>
1512
<Suppression>
1613
<DiagnosticId>CP0015</DiagnosticId>
1714
<Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,System.Diagnostics.Tracing.EventSourceOptions@,System.Guid@,System.Guid@,``0@):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
18-
<Left>ref/net8.0/System.Private.CoreLib.dll</Left>
19-
<Right>lib/net8.0/System.Private.CoreLib.dll</Right>
2015
</Suppression>
2116
<Suppression>
2217
<DiagnosticId>CP0015</DiagnosticId>
2318
<Target>M:System.Diagnostics.Tracing.EventSource.WriteEvent(System.Int32,System.Object[]):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
24-
<Left>ref/net8.0/System.Private.CoreLib.dll</Left>
25-
<Right>lib/net8.0/System.Private.CoreLib.dll</Right>
2619
</Suppression>
2720
<Suppression>
2821
<DiagnosticId>CP0015</DiagnosticId>
2922
<Target>M:System.Diagnostics.Tracing.EventSource.WriteEventCore(System.Int32,System.Int32,System.Diagnostics.Tracing.EventSource.EventData*):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
30-
<Left>ref/net8.0/System.Private.CoreLib.dll</Left>
31-
<Right>lib/net8.0/System.Private.CoreLib.dll</Right>
3223
</Suppression>
3324
<Suppression>
3425
<DiagnosticId>CP0015</DiagnosticId>
3526
<Target>M:System.Diagnostics.Tracing.EventSource.WriteEventWithRelatedActivityId(System.Int32,System.Guid,System.Object[]):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
36-
<Left>ref/net8.0/System.Private.CoreLib.dll</Left>
37-
<Right>lib/net8.0/System.Private.CoreLib.dll</Right>
3827
</Suppression>
3928
<Suppression>
4029
<DiagnosticId>CP0015</DiagnosticId>
4130
<Target>M:System.Diagnostics.Tracing.EventSource.WriteEventWithRelatedActivityIdCore(System.Int32,System.Guid*,System.Int32,System.Diagnostics.Tracing.EventSource.EventData*):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
42-
<Left>ref/net8.0/System.Private.CoreLib.dll</Left>
43-
<Right>lib/net8.0/System.Private.CoreLib.dll</Right>
4431
</Suppression>
4532
</Suppressions>

‎src/coreclr/nativeaot/System.Private.CoreLib/src/CompatibilitySuppressions.xml

-14
Original file line numberDiff line numberDiff line change
@@ -959,43 +959,29 @@
959959
<Suppression>
960960
<DiagnosticId>CP0015</DiagnosticId>
961961
<Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,``0):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
962-
<Left>ref/net8.0/System.Private.CoreLib.dll</Left>
963-
<Right>lib/net8.0/System.Private.CoreLib.dll</Right>
964962
</Suppression>
965963
<Suppression>
966964
<DiagnosticId>CP0015</DiagnosticId>
967965
<Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,System.Diagnostics.Tracing.EventSourceOptions@,``0@):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
968-
<Left>ref/net8.0/System.Private.CoreLib.dll</Left>
969-
<Right>lib/net8.0/System.Private.CoreLib.dll</Right>
970966
</Suppression>
971967
<Suppression>
972968
<DiagnosticId>CP0015</DiagnosticId>
973969
<Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,System.Diagnostics.Tracing.EventSourceOptions@,System.Guid@,System.Guid@,``0@):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
974-
<Left>ref/net8.0/System.Private.CoreLib.dll</Left>
975-
<Right>lib/net8.0/System.Private.CoreLib.dll</Right>
976970
</Suppression>
977971
<Suppression>
978972
<DiagnosticId>CP0015</DiagnosticId>
979973
<Target>M:System.Diagnostics.Tracing.EventSource.WriteEvent(System.Int32,System.Object[]):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
980-
<Left>ref/net8.0/System.Private.CoreLib.dll</Left>
981-
<Right>lib/net8.0/System.Private.CoreLib.dll</Right>
982974
</Suppression>
983975
<Suppression>
984976
<DiagnosticId>CP0015</DiagnosticId>
985977
<Target>M:System.Diagnostics.Tracing.EventSource.WriteEventCore(System.Int32,System.Int32,System.Diagnostics.Tracing.EventSource.EventData*):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
986-
<Left>ref/net8.0/System.Private.CoreLib.dll</Left>
987-
<Right>lib/net8.0/System.Private.CoreLib.dll</Right>
988978
</Suppression>
989979
<Suppression>
990980
<DiagnosticId>CP0015</DiagnosticId>
991981
<Target>M:System.Diagnostics.Tracing.EventSource.WriteEventWithRelatedActivityId(System.Int32,System.Guid,System.Object[]):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
992-
<Left>ref/net8.0/System.Private.CoreLib.dll</Left>
993-
<Right>lib/net8.0/System.Private.CoreLib.dll</Right>
994982
</Suppression>
995983
<Suppression>
996984
<DiagnosticId>CP0015</DiagnosticId>
997985
<Target>M:System.Diagnostics.Tracing.EventSource.WriteEventWithRelatedActivityIdCore(System.Int32,System.Guid*,System.Int32,System.Diagnostics.Tracing.EventSource.EventData*):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
998-
<Left>ref/net8.0/System.Private.CoreLib.dll</Left>
999-
<Right>lib/net8.0/System.Private.CoreLib.dll</Right>
1000986
</Suppression>
1001987
</Suppressions>

‎src/coreclr/tools/Common/TypeSystem/Ecma/SymbolReader/UnmanagedPdbSymbolReader.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ protected override object CreateObject(IntPtr externalComObject, CreateObjectFla
6868
Debug.Assert(flags == CreateObjectFlags.UniqueInstance);
6969

7070
var iid = ICLRMetaHost.IID;
71-
if (Marshal.QueryInterface(externalComObject, ref iid, out IntPtr hostPtr) != 0)
71+
if (Marshal.QueryInterface(externalComObject, in iid, out IntPtr hostPtr) != 0)
7272
{
7373
throw new ArgumentException("Expected ICLRMetaHost COM interface");
7474
}
@@ -284,7 +284,7 @@ private CoCreateWrapperCache() { }
284284
Debug.Assert(flags == CreateObjectFlags.UniqueInstance);
285285

286286
var iid = new Guid("AA544D42-28CB-11d3-BD22-0000F80849BD");
287-
if (Marshal.QueryInterface(externalComObject, ref iid, out IntPtr ppv) != 0)
287+
if (Marshal.QueryInterface(externalComObject, in iid, out IntPtr ppv) != 0)
288288
{
289289
return null;
290290
}

‎src/coreclr/tools/aot/Directory.Build.props

-6
This file was deleted.

‎src/coreclr/tools/aot/Directory.Build.targets

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<Project>
2+
<Import Project="../Directory.Build.targets" />
3+
<PropertyGroup>
4+
<IsTrimmable Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">true</IsTrimmable>
5+
</PropertyGroup>
6+
</Project>

‎src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj

+5
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@
1616
<Platforms>AnyCPU;x64</Platforms>
1717
<PlatformTarget>AnyCPU</PlatformTarget>
1818
<RunAnalyzers>false</RunAnalyzers>
19+
<!--
20+
The SDK warns if a project targets a framework that doesn't support trimming and IsTrimmable is true.
21+
We set IsTrimmable higher up in the Directory.Build.props files, so we reset it to false here.
22+
-->
23+
<IsTrimmable>false</IsTrimmable>
1924
</PropertyGroup>
2025

2126
<ItemGroup>

‎src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
<CoreCLRCrossTargetFiles Condition="'%(FileName)%(Extension)' == 'mscordbi.dll' and '$(TargetsWindows)' == 'true'">
115115
<TargetPath>tools/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture)</TargetPath>
116116
</CoreCLRCrossTargetFiles>
117-
<CoreCLROptimizationFiles Include="$(CoreCLRArtifactsPath)StandardOptimizationData.mibc"
117+
<CoreCLROptimizationFiles Include="$(CoreCLRArtifactsPath)StandardOptimizationData.mibc"
118118
Condition="Exists('$(CoreCLRArtifactsPath)StandardOptimizationData.mibc')">
119119
<TargetPath>tools</TargetPath>
120120
</CoreCLROptimizationFiles>

‎src/installer/tests/Assets/TestUtils/TestProjects.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
-->
66

77
<PropertyGroup>
8-
<NetCoreAppCurrent>net8.0</NetCoreAppCurrent>
8+
<NetCoreAppCurrent>net9.0</NetCoreAppCurrent>
99
<!-- Turn off end of life target framework checks as we intentionally build older .NETCoreApp configurations. -->
1010
<CheckEolTargetFramework>false</CheckEolTargetFramework>
1111
<!--

0 commit comments

Comments
 (0)