Upgrade our TFM to net9.0#90880

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
ViktorHofer merged 21 commits into from
Aug 31, 2023
Merged

Upgrade our TFM to net9.0 #90880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
02bcb36
Update TFM to net9.0
fanyang-mono Aug 23, 2023
2fd5797
Fix ApiCompat failures.
jkoritzinsky Aug 23, 2023
608fe0c
Create a separate workload for net9 vs net8. Let's see if this fixes …
jkoritzinsky Aug 23, 2023
5516dae
Remove netcoreappX.X, net6.0, net7.0 and net8.0 conditions and clean-up
ViktorHofer Aug 25, 2023
152c332
Merge branch 'main' into net90tfm
ViktorHofer Aug 25, 2023
49a4843
Fix build
ViktorHofer Aug 25, 2023
a49cdb8
Make projects target the right set of TFMs and order
ViktorHofer Aug 25, 2023
f32781e
Update assembly version
ViktorHofer Aug 25, 2023
f92050d
Remove dead property
ViktorHofer Aug 25, 2023
b7b8bb3
revert all wasm changes
radical Aug 25, 2023
fcceee9
[wasm] WBT: Override runtime pack with the locally built one
radical Aug 28, 2023
afdca7b
Merge branch 'main' into net90tfm
radical Aug 29, 2023
1f5a55b
[wasm] Move the override targets to a separate file, and use for wasi…
radical Aug 30, 2023
fcc6935
overwrite when copying
radical Aug 30, 2023
ecadc3b
add missing file
radical Aug 30, 2023
718d654
Update WebAssembly.Pack version also
radical Aug 30, 2023
bef19e5
fix tests
radical Aug 30, 2023
e070989
Disable non-wasm build tests
radical Aug 30, 2023
41d7eb9
Override runtime pack for multithread
radical Aug 30, 2023
cd5f671
[wasm] more fixes for wbt
radical Aug 31, 2023
5f952f1
[wasm] override packs only when using workloads
radical Aug 31, 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
14 changes: 8 additions & 6 deletions Directory.Build.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,24 +80,25 @@

<!-- The TFMs to build and test against. -->
<PropertyGroup>
<NetCoreAppCurrentVersion>8.0</NetCoreAppCurrentVersion>
<NetCoreAppCurrentVersion>9.0</NetCoreAppCurrentVersion>
<NetCoreAppCurrentIdentifier>.NETCoreApp</NetCoreAppCurrentIdentifier>
<NetCoreAppCurrentTargetFrameworkMoniker>$(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppCurrentVersion)</NetCoreAppCurrentTargetFrameworkMoniker>
<MicrosoftNetCoreAppFrameworkName>Microsoft.NETCore.App</MicrosoftNetCoreAppFrameworkName>
<NetCoreAppCurrentBrandName>.NET $(NetCoreAppCurrentVersion)</NetCoreAppCurrentBrandName>
<NetCoreAppCurrent>net$(NetCoreAppCurrentVersion)</NetCoreAppCurrent>

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

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

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

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

<TargetFrameworkForNETFrameworkTasks>$(NetFrameworkToolCurrent)</TargetFrameworkForNETFrameworkTasks>
<!-- Don't build for NETFramework during source-build. -->
Expand DownExpand Up@@ -429,6 +430,7 @@
<PublishWindowsPdb>false</PublishWindowsPdb>
</PropertyGroup>


<!-- All reference assemblies should have a ReferenceAssemblyAttribute and the 0x70 flag which prevents them from loading. -->
<ItemGroup Condition="'$(IsReferenceAssemblyProject)' == 'true'">
<AssemblyAttribute Include="System.Runtime.CompilerServices.ReferenceAssemblyAttribute" />
Expand Down
7 changes: 7 additions & 0 deletions eng/Analyzers.targets
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
<Project>
<PropertyGroup Condition="'$(UsingMicrosoftNoTargetsSdk)' == 'true' or
'$(UsingMicrosoftDotNetSharedFrameworkSdk)' == 'true' or
'$(MSBuildProjectExtension)' == '.pkgproj' or
'$(UsingMicrosoftTraversalSdk)' == 'true'">
<!-- Explicitly disable running analyzers to avoid trying to discover the correct ILLink tool pack for a project that has no sources. -->
<RunAnalyzers>false</RunAnalyzers>
</PropertyGroup>
<PropertyGroup>
<!-- Disable analyzers in sourcebuild -->
<RunAnalyzers Condition="'$(DotNetBuildFromSource)' == 'true'">false</RunAnalyzers>
Expand Down
5 changes: 2 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
<MinorVersion>0</MinorVersion>
<PatchVersion>0</PatchVersion>
<SdkBandVersion>9.0.100</SdkBandVersion>
<PackageVersionNet8>8.0.0-rc.1.23414.4</PackageVersionNet8>
<PackageVersionNet7>7.0.8</PackageVersionNet7>
<PackageVersionNet6>6.0.$([MSBuild]::Add($([System.Version]::Parse('$(PackageVersionNet7)').Build),11))</PackageVersionNet6>
<PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
Expand All@@ -15,15 +16,13 @@
<SdkBandVersionForWorkload_FromRuntimeVersions>$(SdkBandVersion)$(WorkloadVersionSuffix)</SdkBandVersionForWorkload_FromRuntimeVersions>
<!-- Set assembly version to align with major and minor version,
as for the patches and revisions should be manually updated per assembly if it is serviced. -->
<!-- Temporarily hard-code to 8.0.0.0. We can't version forward the Assembly Version without updating the TFM in dotnet/runtime. -->
<AssemblyVersion>8.0.0.0</AssemblyVersion>
<AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
<!-- Enable to remove prerelease label. -->
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
<!-- Opt-in/out repo features -->
<UsingToolIbcOptimization>false</UsingToolIbcOptimization>
<UsingToolXliff>false</UsingToolXliff>
<LastReleasedStableAssemblyVersion>$(AssemblyVersion)</LastReleasedStableAssemblyVersion>
<!-- Use SDK compilers in full source-build. -->
<UsingToolMicrosoftNetCompilers Condition="'$(DotNetBuildFromSourceFlavor)' != 'Product'">true</UsingToolMicrosoftNetCompilers>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions eng/build.ps1
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,8 +78,8 @@ function Get-Help() {
Write-Host "Libraries settings:"
Write-Host " -allconfigurations Build packages for all build configurations."
Write-Host " -coverage Collect code coverage when testing."
Write-Host " -framework (-f) Build framework: net8.0 or net48."
Write-Host " [Default: net8.0]"
Write-Host " -framework (-f) Build framework: net9.0 or net48."
Write-Host " [Default: net9.0]"
Write-Host " -testnobuild Skip building tests when invoking -test."
Write-Host " -testscope Scope tests, allowed values: innerloop, outerloop, all."
Write-Host ""
Expand Down
4 changes: 2 additions & 2 deletions eng/build.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,8 +67,8 @@ usage()
echo "Libraries settings:"
echo " --allconfigurations Build packages for all build configurations."
echo " --coverage Collect code coverage when testing."
echo " --framework (-f) Build framework: net8.0 or net48."
echo " [Default: net8.0]"
echo " --framework (-f) Build framework: net9.0 or net48."
echo " [Default: net9.0]"
echo " --testnobuild Skip building tests when invoking -test."
echo " --testscope Test scope, allowed values: innerloop, outerloop, all."
echo ""
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/libraries/base-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ parameters:
archType: ''
osSubgroup: ''
crossBuild: false
framework: 'net8.0'
framework: 'net9.0'
isOfficialAllConfigurations: false
isSourceBuild: false
liveRuntimeBuildConfig: ''
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/libraries/build-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ parameters:
archType: ''
targetRid: ''
crossBuild: false
framework: 'net8.0'
framework: 'net9.0'
isOfficialBuild: false
isOfficialAllConfigurations: false
runtimeVariant: ''
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/libraries/run-test-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ parameters:
osSubgroup: ''
archType: ''
targetRid: ''
framework: 'net8.0'
framework: 'net9.0'
isOfficialBuild: false
liveRuntimeBuildConfig: ''
runtimeFlavor: 'coreclr'
Expand Down
16 changes: 12 additions & 4 deletions eng/targetingpacks.targets
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,13 @@
Condition="'@(KnownAppHostPack)' == '' or !@(KnownAppHostPack->AnyHaveMetadataValue('TargetFramework', '$(NetCoreAppCurrent)'))" />
</ItemGroup>

<!-- Add known packs from the downlevel TFM until we are building with an SDK that supports the new TFM all-up. -->
<ItemGroup Condition="'$(NetCoreAppToolCurrent)' != '$(NetCoreAppCurrent)'">
<KnownILLinkPack Include="@(KnownILLinkPack->WithMetadataValue('Identity', 'Microsoft.NET.ILLink.Tasks')->WithMetadataValue('TargetFramework', '$(NetCoreAppToolCurrent)'))">
<TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
</KnownILLinkPack>
</ItemGroup>

<!-- Simple name references will be resolved from the targeting pack folders and should never be copied to the output. -->
<ItemGroup>
<Reference Update="@(Reference)">
Expand All@@ -92,7 +99,7 @@
</PropertyGroup>
</Target>

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

<!--
<!--
TODO: Remove this target when an 8.0.100 SDK is consumed that respects EnableAppHostPackDownload.
-->
<Target Name="RemoveAppHostPackFromDownloadItem"
Expand All@@ -131,7 +139,7 @@
AfterTargets="ResolveFrameworkReferences">
<Error Text="The shared framework must be built before the local targeting pack can be consumed."
Condition="!Exists('$(MicrosoftNetCoreAppRefPackDir)data\FrameworkList.xml')" />

<ItemGroup>
<ResolvedTargetingPack Path="$(MicrosoftNetCoreAppRefPackDir.TrimEnd('/\'))"
NuGetPackageVersion="$(ProductVersion)"
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
{
"sdk": {
"version": "8.0.100-preview.7.23376.3",
"version": "8.0.100-rc.1.23415.11",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "8.0.100-preview.7.23376.3"
"dotnet": "8.0.100-rc.1.23415.11"
Comment thread
ViktorHofer marked this conversation as resolved.
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23428.2",
Expand Down
15 changes: 1 addition & 14 deletions src/coreclr/System.Private.CoreLib/CompatibilitySuppressions.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Suppression>
<DiagnosticId>CP0015</DiagnosticId>
<Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,``0):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
<Left>ref/net8.0/System.Private.CoreLib.dll</Left>
<Right>lib/net8.0/System.Private.CoreLib.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0015</DiagnosticId>
<Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,System.Diagnostics.Tracing.EventSourceOptions@,``0@):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
<Left>ref/net8.0/System.Private.CoreLib.dll</Left>
<Right>lib/net8.0/System.Private.CoreLib.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0015</DiagnosticId>
<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>
<Left>ref/net8.0/System.Private.CoreLib.dll</Left>
<Right>lib/net8.0/System.Private.CoreLib.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0015</DiagnosticId>
<Target>M:System.Diagnostics.Tracing.EventSource.WriteEvent(System.Int32,System.Object[]):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
<Left>ref/net8.0/System.Private.CoreLib.dll</Left>
<Right>lib/net8.0/System.Private.CoreLib.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0015</DiagnosticId>
<Target>M:System.Diagnostics.Tracing.EventSource.WriteEventCore(System.Int32,System.Int32,System.Diagnostics.Tracing.EventSource.EventData*):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
<Left>ref/net8.0/System.Private.CoreLib.dll</Left>
<Right>lib/net8.0/System.Private.CoreLib.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0015</DiagnosticId>
<Target>M:System.Diagnostics.Tracing.EventSource.WriteEventWithRelatedActivityId(System.Int32,System.Guid,System.Object[]):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
<Left>ref/net8.0/System.Private.CoreLib.dll</Left>
<Right>lib/net8.0/System.Private.CoreLib.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0015</DiagnosticId>
<Target>M:System.Diagnostics.Tracing.EventSource.WriteEventWithRelatedActivityIdCore(System.Int32,System.Guid*,System.Int32,System.Diagnostics.Tracing.EventSource.EventData*):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
<Left>ref/net8.0/System.Private.CoreLib.dll</Left>
<Right>lib/net8.0/System.Private.CoreLib.dll</Right>
</Suppression>
</Suppressions>
14 changes: 0 additions & 14 deletions src/coreclr/nativeaot/System.Private.CoreLib/src/CompatibilitySuppressions.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -959,43 +959,29 @@
<Suppression>
<DiagnosticId>CP0015</DiagnosticId>
<Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,``0):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
<Left>ref/net8.0/System.Private.CoreLib.dll</Left>
<Right>lib/net8.0/System.Private.CoreLib.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0015</DiagnosticId>
<Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,System.Diagnostics.Tracing.EventSourceOptions@,``0@):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
<Left>ref/net8.0/System.Private.CoreLib.dll</Left>
<Right>lib/net8.0/System.Private.CoreLib.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0015</DiagnosticId>
<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>
<Left>ref/net8.0/System.Private.CoreLib.dll</Left>
<Right>lib/net8.0/System.Private.CoreLib.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0015</DiagnosticId>
<Target>M:System.Diagnostics.Tracing.EventSource.WriteEvent(System.Int32,System.Object[]):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
<Left>ref/net8.0/System.Private.CoreLib.dll</Left>
<Right>lib/net8.0/System.Private.CoreLib.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0015</DiagnosticId>
<Target>M:System.Diagnostics.Tracing.EventSource.WriteEventCore(System.Int32,System.Int32,System.Diagnostics.Tracing.EventSource.EventData*):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
<Left>ref/net8.0/System.Private.CoreLib.dll</Left>
<Right>lib/net8.0/System.Private.CoreLib.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0015</DiagnosticId>
<Target>M:System.Diagnostics.Tracing.EventSource.WriteEventWithRelatedActivityId(System.Int32,System.Guid,System.Object[]):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
<Left>ref/net8.0/System.Private.CoreLib.dll</Left>
<Right>lib/net8.0/System.Private.CoreLib.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0015</DiagnosticId>
<Target>M:System.Diagnostics.Tracing.EventSource.WriteEventWithRelatedActivityIdCore(System.Int32,System.Guid*,System.Int32,System.Diagnostics.Tracing.EventSource.EventData*):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
<Left>ref/net8.0/System.Private.CoreLib.dll</Left>
<Right>lib/net8.0/System.Private.CoreLib.dll</Right>
</Suppression>
</Suppressions>
4 changes: 2 additions & 2 deletions src/coreclr/tools/Common/TypeSystem/Ecma/SymbolReader/UnmanagedPdbSymbolReader.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,7 @@ protected override object CreateObject(IntPtr externalComObject, CreateObjectFla
Debug.Assert(flags == CreateObjectFlags.UniqueInstance);

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

var iid = new Guid("AA544D42-28CB-11d3-BD22-0000F80849BD");
if (Marshal.QueryInterface(externalComObject, ref iid, out IntPtr ppv) != 0)
if (Marshal.QueryInterface(externalComObject, in iid, out IntPtr ppv) != 0)
{
return null;
}
Expand Down
6 changes: 0 additions & 6 deletions src/coreclr/tools/aot/Directory.Build.props
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions src/coreclr/tools/aot/Directory.Build.targets
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
<Project>
<Import Project="../Directory.Build.targets" />
<PropertyGroup>
<IsTrimmable Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">true</IsTrimmable>
</PropertyGroup>
</Project>
5 changes: 5 additions & 0 deletions ...oreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,11 @@
<Platforms>AnyCPU;x64</Platforms>
<PlatformTarget>AnyCPU</PlatformTarget>
<RunAnalyzers>false</RunAnalyzers>
<!--
The SDK warns if a project targets a framework that doesn't support trimming and IsTrimmable is true.
We set IsTrimmable higher up in the Directory.Build.props files, so we reset it to false here.
-->
<IsTrimmable>false</IsTrimmable>
Comment on lines +19 to +23

@ViktorHoferViktorHoferAug 24, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Are you sure this is still necessary? From what I can see, the IsTrimmable=true property is now only set for .NETCoreApp under tools/aot.

</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,7 +114,7 @@
<CoreCLRCrossTargetFiles Condition="'%(FileName)%(Extension)' == 'mscordbi.dll' and '$(TargetsWindows)' == 'true'">
<TargetPath>tools/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture)</TargetPath>
</CoreCLRCrossTargetFiles>
<CoreCLROptimizationFiles Include="$(CoreCLRArtifactsPath)StandardOptimizationData.mibc"
<CoreCLROptimizationFiles Include="$(CoreCLRArtifactsPath)StandardOptimizationData.mibc"
Condition="Exists('$(CoreCLRArtifactsPath)StandardOptimizationData.mibc')">
<TargetPath>tools</TargetPath>
</CoreCLROptimizationFiles>
Expand Down
2 changes: 1 addition & 1 deletion src/installer/tests/Assets/TestUtils/TestProjects.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
-->

<PropertyGroup>
<NetCoreAppCurrent>net8.0</NetCoreAppCurrent>
<NetCoreAppCurrent>net9.0</NetCoreAppCurrent>

@marek-safarmarek-safarSep 1, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why not to use NetCoreAppCurrentVersion?

@ViktorHoferViktorHoferSep 1, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

These projects don't import the repo infrastructure.

<!-- Turn off end of life target framework checks as we intentionally build older .NETCoreApp configurations. -->
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<!--
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Upgrade our TFM to net9.0#90880

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

ViktorHofer
merged 21 commits into

from

Aug 31, 2023
 Merged


Upgrade our TFM to net9.0
#90880
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


21 commits


Select commit
Hold shift + click to select a range
02bcb36

Update TFM to net9.0


fanyang-mono Aug 23, 2023
2fd5797

Fix ApiCompat failures.


jkoritzinsky Aug 23, 2023
608fe0c

Create a separate workload for net9 vs net8. Let's see if this fixes …


jkoritzinsky Aug 23, 2023
5516dae

Remove netcoreappX.X, net6.0, net7.0 and net8.0 conditions and clean-up


ViktorHofer Aug 25, 2023
152c332

Merge branch 'main' into net90tfm


ViktorHofer Aug 25, 2023
49a4843

Fix build


ViktorHofer Aug 25, 2023
a49cdb8

Make projects target the right set of TFMs and order


ViktorHofer Aug 25, 2023
f32781e

Update assembly version


ViktorHofer Aug 25, 2023
f92050d

Remove dead property


ViktorHofer Aug 25, 2023
b7b8bb3

revert all wasm changes


radical Aug 25, 2023
fcceee9

[wasm] WBT: Override runtime pack with the locally built one


radical Aug 28, 2023
afdca7b

Merge branch 'main' into net90tfm


radical Aug 29, 2023
1f5a55b

[wasm] Move the override targets to a separate file, and use for wasi…


radical Aug 30, 2023
fcc6935

overwrite when copying


radical Aug 30, 2023
ecadc3b

add missing file


radical Aug 30, 2023
718d654

Update WebAssembly.Pack version also


radical Aug 30, 2023
bef19e5

fix tests


radical Aug 30, 2023
e070989

Disable non-wasm build tests


radical Aug 30, 2023
41d7eb9

Override runtime pack for multithread


radical Aug 30, 2023
cd5f671

[wasm] more fixes for wbt


radical Aug 31, 2023
5f952f1

[wasm] override packs only when using workloads


radical Aug 31, 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


14 changes: 8 additions & 6 deletions
Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,24 +80,25 @@

 <!-- The TFMs to build and test against. -->
 <PropertyGroup>
 <NetCoreAppCurrentVersion>8.0</NetCoreAppCurrentVersion>
 <NetCoreAppCurrentVersion>9.0</NetCoreAppCurrentVersion>
 <NetCoreAppCurrentIdentifier>.NETCoreApp</NetCoreAppCurrentIdentifier>
 <NetCoreAppCurrentTargetFrameworkMoniker>$(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppCurrentVersion)</NetCoreAppCurrentTargetFrameworkMoniker>
 <MicrosoftNetCoreAppFrameworkName>Microsoft.NETCore.App</MicrosoftNetCoreAppFrameworkName>
 <NetCoreAppCurrentBrandName>.NET $(NetCoreAppCurrentVersion)</NetCoreAppCurrentBrandName>
 <NetCoreAppCurrent>net$(NetCoreAppCurrentVersion)</NetCoreAppCurrent>

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

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

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

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

 <TargetFrameworkForNETFrameworkTasks>$(NetFrameworkToolCurrent)</TargetFrameworkForNETFrameworkTasks>
 <!-- Don't build for NETFramework during source-build. -->
Expand DownExpand Up@@ -429,6 +430,7 @@
 <PublishWindowsPdb>false</PublishWindowsPdb>
 </PropertyGroup>


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

7 changes: 7 additions & 0 deletions
eng/Analyzers.targets

View file


Open in desktop

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

5 changes: 2 additions & 3 deletions
eng/Versions.props

View file


Open in desktop

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

4 changes: 2 additions & 2 deletions
eng/build.ps1

View file


Open in desktop

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

4 changes: 2 additions & 2 deletions
eng/build.sh

View file


Open in desktop

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

2 changes: 1 addition & 1 deletion
eng/pipelines/libraries/base-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ parameters:
 archType: ''
 osSubgroup: ''
 crossBuild: false
 framework: 'net8.0'
 framework: 'net9.0'
 isOfficialAllConfigurations: false
 isSourceBuild: false
 liveRuntimeBuildConfig: ''
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/libraries/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ parameters:
 archType: ''
 targetRid: ''
 crossBuild: false
 framework: 'net8.0'
 framework: 'net9.0'
 isOfficialBuild: false
 isOfficialAllConfigurations: false
 runtimeVariant: ''
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/libraries/run-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ parameters:
 osSubgroup: ''
 archType: ''
 targetRid: ''
 framework: 'net8.0'
 framework: 'net9.0'
 isOfficialBuild: false
 liveRuntimeBuildConfig: ''
 runtimeFlavor: 'coreclr'
Expand Down

16 changes: 12 additions & 4 deletions
eng/targetingpacks.targets

View file


Open in desktop

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

 <!-- Add known packs from the downlevel TFM until we are building with an SDK that supports the new TFM all-up. -->
 <ItemGroup Condition="'$(NetCoreAppToolCurrent)' != '$(NetCoreAppCurrent)'">
 <KnownILLinkPack Include="@(KnownILLinkPack->WithMetadataValue('Identity', 'Microsoft.NET.ILLink.Tasks')->WithMetadataValue('TargetFramework', '$(NetCoreAppToolCurrent)'))">
 <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
 </KnownILLinkPack>
 </ItemGroup>

 <!-- Simple name references will be resolved from the targeting pack folders and should never be copied to the output. -->
 <ItemGroup>
 <Reference Update="@(Reference)">
Expand All@@ -92,7 +99,7 @@
 </PropertyGroup>
 </Target>

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

 <!--
 <!--
 TODO: Remove this target when an 8.0.100 SDK is consumed that respects EnableAppHostPackDownload.
 -->
 <Target Name="RemoveAppHostPackFromDownloadItem"
Expand All@@ -131,7 +139,7 @@
 AfterTargets="ResolveFrameworkReferences">
 <Error Text="The shared framework must be built before the local targeting pack can be consumed."
 Condition="!Exists('$(MicrosoftNetCoreAppRefPackDir)data\FrameworkList.xml')" />

 <ItemGroup>
 <ResolvedTargetingPack Path="$(MicrosoftNetCoreAppRefPackDir.TrimEnd('/\'))"
 NuGetPackageVersion="$(ProductVersion)"
Expand Down

4 changes: 2 additions & 2 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
{
 "sdk": {
 "version": "8.0.100-preview.7.23376.3",
 "version": "8.0.100-rc.1.23415.11",
 "allowPrerelease": true,
 "rollForward": "major"
 },
 "tools": {
 "dotnet": "8.0.100-preview.7.23376.3"
 "dotnet": "8.0.100-rc.1.23415.11"
Comment thread
ViktorHofer marked this conversation as resolved.

 },
 "msbuild-sdks": {
 "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23428.2",
Expand Down

15 changes: 1 addition & 14 deletions
src/coreclr/System.Private.CoreLib/CompatibilitySuppressions.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,45 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,``0):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,System.Diagnostics.Tracing.EventSourceOptions@,``0@):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <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>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEvent(System.Int32,System.Object[]):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventCore(System.Int32,System.Int32,System.Diagnostics.Tracing.EventSource.EventData*):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventWithRelatedActivityId(System.Int32,System.Guid,System.Object[]):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventWithRelatedActivityIdCore(System.Int32,System.Guid*,System.Int32,System.Diagnostics.Tracing.EventSource.EventData*):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
</Suppressions>

14 changes: 0 additions & 14 deletions
src/coreclr/nativeaot/System.Private.CoreLib/src/CompatibilitySuppressions.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -959,43 +959,29 @@
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,``0):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,System.Diagnostics.Tracing.EventSourceOptions@,``0@):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <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>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEvent(System.Int32,System.Object[]):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventCore(System.Int32,System.Int32,System.Diagnostics.Tracing.EventSource.EventData*):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventWithRelatedActivityId(System.Int32,System.Guid,System.Object[]):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventWithRelatedActivityIdCore(System.Int32,System.Guid*,System.Int32,System.Diagnostics.Tracing.EventSource.EventData*):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
</Suppressions>

4 changes: 2 additions & 2 deletions
src/coreclr/tools/Common/TypeSystem/Ecma/SymbolReader/UnmanagedPdbSymbolReader.cs

View file


Open in desktop

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

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

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

6 changes: 0 additions & 6 deletions
src/coreclr/tools/aot/Directory.Build.props

View file


Open in desktop


This file was deleted.


6 changes: 6 additions & 0 deletions
src/coreclr/tools/aot/Directory.Build.targets

View file


Open in desktop

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

5 changes: 5 additions & 0 deletions
...oreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj

View file


Open in desktop

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

Comment on lines

+19
 to 
+23

@ViktorHoferViktorHoferAug 24, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Are you sure this is still necessary? From what I can see, the IsTrimmable=true property is now only set for .NETCoreApp under tools/aot.
 </PropertyGroup>

 <ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -114,7 +114,7 @@
 <CoreCLRCrossTargetFiles Condition="'%(FileName)%(Extension)' == 'mscordbi.dll' and '$(TargetsWindows)' == 'true'">
 <TargetPath>tools/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture)</TargetPath>
 </CoreCLRCrossTargetFiles>
 <CoreCLROptimizationFiles Include="$(CoreCLRArtifactsPath)StandardOptimizationData.mibc"
 <CoreCLROptimizationFiles Include="$(CoreCLRArtifactsPath)StandardOptimizationData.mibc"
 Condition="Exists('$(CoreCLRArtifactsPath)StandardOptimizationData.mibc')">
 <TargetPath>tools</TargetPath>
 </CoreCLROptimizationFiles>
Expand Down

2 changes: 1 addition & 1 deletion
src/installer/tests/Assets/TestUtils/TestProjects.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
 -->

 <PropertyGroup>
 <NetCoreAppCurrent>net8.0</NetCoreAppCurrent>
 <NetCoreAppCurrent>net9.0</NetCoreAppCurrent>
@marek-safarmarek-safarSep 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Why not to use NetCoreAppCurrentVersion?
@ViktorHoferViktorHoferSep 1, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

These projects don't import the repo infrastructure.
 <!-- Turn off end of life target framework checks as we intentionally build older .NETCoreApp configurations. -->
 <CheckEolTargetFramework>false</CheckEolTargetFramework>
 <!--
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Upgrade our TFM to net9.0#90880

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

ViktorHofer
merged 21 commits into

from

Aug 31, 2023
 Merged


Upgrade our TFM to net9.0
#90880
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


21 commits


Select commit
Hold shift + click to select a range
02bcb36

Update TFM to net9.0


fanyang-mono Aug 23, 2023
2fd5797

Fix ApiCompat failures.


jkoritzinsky Aug 23, 2023
608fe0c

Create a separate workload for net9 vs net8. Let's see if this fixes …


jkoritzinsky Aug 23, 2023
5516dae

Remove netcoreappX.X, net6.0, net7.0 and net8.0 conditions and clean-up


ViktorHofer Aug 25, 2023
152c332

Merge branch 'main' into net90tfm


ViktorHofer Aug 25, 2023
49a4843

Fix build


ViktorHofer Aug 25, 2023
a49cdb8

Make projects target the right set of TFMs and order


ViktorHofer Aug 25, 2023
f32781e

Update assembly version


ViktorHofer Aug 25, 2023
f92050d

Remove dead property


ViktorHofer Aug 25, 2023
b7b8bb3

revert all wasm changes


radical Aug 25, 2023
fcceee9

[wasm] WBT: Override runtime pack with the locally built one


radical Aug 28, 2023
afdca7b

Merge branch 'main' into net90tfm


radical Aug 29, 2023
1f5a55b

[wasm] Move the override targets to a separate file, and use for wasi…


radical Aug 30, 2023
fcc6935

overwrite when copying


radical Aug 30, 2023
ecadc3b

add missing file


radical Aug 30, 2023
718d654

Update WebAssembly.Pack version also


radical Aug 30, 2023
bef19e5

fix tests


radical Aug 30, 2023
e070989

Disable non-wasm build tests


radical Aug 30, 2023
41d7eb9

Override runtime pack for multithread


radical Aug 30, 2023
cd5f671

[wasm] more fixes for wbt


radical Aug 31, 2023
5f952f1

[wasm] override packs only when using workloads


radical Aug 31, 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


14 changes: 8 additions & 6 deletions
Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,24 +80,25 @@

 <!-- The TFMs to build and test against. -->
 <PropertyGroup>
 <NetCoreAppCurrentVersion>8.0</NetCoreAppCurrentVersion>
 <NetCoreAppCurrentVersion>9.0</NetCoreAppCurrentVersion>
 <NetCoreAppCurrentIdentifier>.NETCoreApp</NetCoreAppCurrentIdentifier>
 <NetCoreAppCurrentTargetFrameworkMoniker>$(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppCurrentVersion)</NetCoreAppCurrentTargetFrameworkMoniker>
 <MicrosoftNetCoreAppFrameworkName>Microsoft.NETCore.App</MicrosoftNetCoreAppFrameworkName>
 <NetCoreAppCurrentBrandName>.NET $(NetCoreAppCurrentVersion)</NetCoreAppCurrentBrandName>
 <NetCoreAppCurrent>net$(NetCoreAppCurrentVersion)</NetCoreAppCurrent>

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

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

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

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

 <TargetFrameworkForNETFrameworkTasks>$(NetFrameworkToolCurrent)</TargetFrameworkForNETFrameworkTasks>
 <!-- Don't build for NETFramework during source-build. -->
Expand DownExpand Up@@ -429,6 +430,7 @@
 <PublishWindowsPdb>false</PublishWindowsPdb>
 </PropertyGroup>


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

7 changes: 7 additions & 0 deletions
eng/Analyzers.targets

View file


Open in desktop

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

5 changes: 2 additions & 3 deletions
eng/Versions.props

View file


Open in desktop

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

4 changes: 2 additions & 2 deletions
eng/build.ps1

View file


Open in desktop

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

4 changes: 2 additions & 2 deletions
eng/build.sh

View file


Open in desktop

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

2 changes: 1 addition & 1 deletion
eng/pipelines/libraries/base-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ parameters:
 archType: ''
 osSubgroup: ''
 crossBuild: false
 framework: 'net8.0'
 framework: 'net9.0'
 isOfficialAllConfigurations: false
 isSourceBuild: false
 liveRuntimeBuildConfig: ''
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/libraries/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ parameters:
 archType: ''
 targetRid: ''
 crossBuild: false
 framework: 'net8.0'
 framework: 'net9.0'
 isOfficialBuild: false
 isOfficialAllConfigurations: false
 runtimeVariant: ''
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/libraries/run-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ parameters:
 osSubgroup: ''
 archType: ''
 targetRid: ''
 framework: 'net8.0'
 framework: 'net9.0'
 isOfficialBuild: false
 liveRuntimeBuildConfig: ''
 runtimeFlavor: 'coreclr'
Expand Down

16 changes: 12 additions & 4 deletions
eng/targetingpacks.targets

View file


Open in desktop

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

 <!-- Add known packs from the downlevel TFM until we are building with an SDK that supports the new TFM all-up. -->
 <ItemGroup Condition="'$(NetCoreAppToolCurrent)' != '$(NetCoreAppCurrent)'">
 <KnownILLinkPack Include="@(KnownILLinkPack->WithMetadataValue('Identity', 'Microsoft.NET.ILLink.Tasks')->WithMetadataValue('TargetFramework', '$(NetCoreAppToolCurrent)'))">
 <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
 </KnownILLinkPack>
 </ItemGroup>

 <!-- Simple name references will be resolved from the targeting pack folders and should never be copied to the output. -->
 <ItemGroup>
 <Reference Update="@(Reference)">
Expand All@@ -92,7 +99,7 @@
 </PropertyGroup>
 </Target>

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

 <!--
 <!--
 TODO: Remove this target when an 8.0.100 SDK is consumed that respects EnableAppHostPackDownload.
 -->
 <Target Name="RemoveAppHostPackFromDownloadItem"
Expand All@@ -131,7 +139,7 @@
 AfterTargets="ResolveFrameworkReferences">
 <Error Text="The shared framework must be built before the local targeting pack can be consumed."
 Condition="!Exists('$(MicrosoftNetCoreAppRefPackDir)data\FrameworkList.xml')" />

 <ItemGroup>
 <ResolvedTargetingPack Path="$(MicrosoftNetCoreAppRefPackDir.TrimEnd('/\'))"
 NuGetPackageVersion="$(ProductVersion)"
Expand Down

4 changes: 2 additions & 2 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
{
 "sdk": {
 "version": "8.0.100-preview.7.23376.3",
 "version": "8.0.100-rc.1.23415.11",
 "allowPrerelease": true,
 "rollForward": "major"
 },
 "tools": {
 "dotnet": "8.0.100-preview.7.23376.3"
 "dotnet": "8.0.100-rc.1.23415.11"
Comment thread
ViktorHofer marked this conversation as resolved.

 },
 "msbuild-sdks": {
 "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23428.2",
Expand Down

15 changes: 1 addition & 14 deletions
src/coreclr/System.Private.CoreLib/CompatibilitySuppressions.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,45 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,``0):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,System.Diagnostics.Tracing.EventSourceOptions@,``0@):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <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>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEvent(System.Int32,System.Object[]):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventCore(System.Int32,System.Int32,System.Diagnostics.Tracing.EventSource.EventData*):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventWithRelatedActivityId(System.Int32,System.Guid,System.Object[]):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventWithRelatedActivityIdCore(System.Int32,System.Guid*,System.Int32,System.Diagnostics.Tracing.EventSource.EventData*):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
</Suppressions>

14 changes: 0 additions & 14 deletions
src/coreclr/nativeaot/System.Private.CoreLib/src/CompatibilitySuppressions.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -959,43 +959,29 @@
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,``0):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,System.Diagnostics.Tracing.EventSourceOptions@,``0@):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <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>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEvent(System.Int32,System.Object[]):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventCore(System.Int32,System.Int32,System.Diagnostics.Tracing.EventSource.EventData*):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventWithRelatedActivityId(System.Int32,System.Guid,System.Object[]):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventWithRelatedActivityIdCore(System.Int32,System.Guid*,System.Int32,System.Diagnostics.Tracing.EventSource.EventData*):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
</Suppressions>

4 changes: 2 additions & 2 deletions
src/coreclr/tools/Common/TypeSystem/Ecma/SymbolReader/UnmanagedPdbSymbolReader.cs

View file


Open in desktop

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

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

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

6 changes: 0 additions & 6 deletions
src/coreclr/tools/aot/Directory.Build.props

View file


Open in desktop


This file was deleted.


6 changes: 6 additions & 0 deletions
src/coreclr/tools/aot/Directory.Build.targets

View file


Open in desktop

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

5 changes: 5 additions & 0 deletions
...oreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj

View file


Open in desktop

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

Comment on lines

+19
 to 
+23

@ViktorHoferViktorHoferAug 24, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Are you sure this is still necessary? From what I can see, the IsTrimmable=true property is now only set for .NETCoreApp under tools/aot.
 </PropertyGroup>

 <ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -114,7 +114,7 @@
 <CoreCLRCrossTargetFiles Condition="'%(FileName)%(Extension)' == 'mscordbi.dll' and '$(TargetsWindows)' == 'true'">
 <TargetPath>tools/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture)</TargetPath>
 </CoreCLRCrossTargetFiles>
 <CoreCLROptimizationFiles Include="$(CoreCLRArtifactsPath)StandardOptimizationData.mibc"
 <CoreCLROptimizationFiles Include="$(CoreCLRArtifactsPath)StandardOptimizationData.mibc"
 Condition="Exists('$(CoreCLRArtifactsPath)StandardOptimizationData.mibc')">
 <TargetPath>tools</TargetPath>
 </CoreCLROptimizationFiles>
Expand Down

2 changes: 1 addition & 1 deletion
src/installer/tests/Assets/TestUtils/TestProjects.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
 -->

 <PropertyGroup>
 <NetCoreAppCurrent>net8.0</NetCoreAppCurrent>
 <NetCoreAppCurrent>net9.0</NetCoreAppCurrent>
@marek-safarmarek-safarSep 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Why not to use NetCoreAppCurrentVersion?
@ViktorHoferViktorHoferSep 1, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

These projects don't import the repo infrastructure.
 <!-- Turn off end of life target framework checks as we intentionally build older .NETCoreApp configurations. -->
 <CheckEolTargetFramework>false</CheckEolTargetFramework>
 <!--
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Upgrade our TFM to net9.0#90880

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

ViktorHofer
merged 21 commits into

from

Aug 31, 2023
 Merged


Upgrade our TFM to net9.0
#90880
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


21 commits


Select commit
Hold shift + click to select a range
02bcb36

Update TFM to net9.0


fanyang-mono Aug 23, 2023
2fd5797

Fix ApiCompat failures.


jkoritzinsky Aug 23, 2023
608fe0c

Create a separate workload for net9 vs net8. Let's see if this fixes …


jkoritzinsky Aug 23, 2023
5516dae

Remove netcoreappX.X, net6.0, net7.0 and net8.0 conditions and clean-up


ViktorHofer Aug 25, 2023
152c332

Merge branch 'main' into net90tfm


ViktorHofer Aug 25, 2023
49a4843

Fix build


ViktorHofer Aug 25, 2023
a49cdb8

Make projects target the right set of TFMs and order


ViktorHofer Aug 25, 2023
f32781e

Update assembly version


ViktorHofer Aug 25, 2023
f92050d

Remove dead property


ViktorHofer Aug 25, 2023
b7b8bb3

revert all wasm changes


radical Aug 25, 2023
fcceee9

[wasm] WBT: Override runtime pack with the locally built one


radical Aug 28, 2023
afdca7b

Merge branch 'main' into net90tfm


radical Aug 29, 2023
1f5a55b

[wasm] Move the override targets to a separate file, and use for wasi…


radical Aug 30, 2023
fcc6935

overwrite when copying


radical Aug 30, 2023
ecadc3b

add missing file


radical Aug 30, 2023
718d654

Update WebAssembly.Pack version also


radical Aug 30, 2023
bef19e5

fix tests


radical Aug 30, 2023
e070989

Disable non-wasm build tests


radical Aug 30, 2023
41d7eb9

Override runtime pack for multithread


radical Aug 30, 2023
cd5f671

[wasm] more fixes for wbt


radical Aug 31, 2023
5f952f1

[wasm] override packs only when using workloads


radical Aug 31, 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


14 changes: 8 additions & 6 deletions
Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,24 +80,25 @@

 <!-- The TFMs to build and test against. -->
 <PropertyGroup>
 <NetCoreAppCurrentVersion>8.0</NetCoreAppCurrentVersion>
 <NetCoreAppCurrentVersion>9.0</NetCoreAppCurrentVersion>
 <NetCoreAppCurrentIdentifier>.NETCoreApp</NetCoreAppCurrentIdentifier>
 <NetCoreAppCurrentTargetFrameworkMoniker>$(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppCurrentVersion)</NetCoreAppCurrentTargetFrameworkMoniker>
 <MicrosoftNetCoreAppFrameworkName>Microsoft.NETCore.App</MicrosoftNetCoreAppFrameworkName>
 <NetCoreAppCurrentBrandName>.NET $(NetCoreAppCurrentVersion)</NetCoreAppCurrentBrandName>
 <NetCoreAppCurrent>net$(NetCoreAppCurrentVersion)</NetCoreAppCurrent>

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

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

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

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

 <TargetFrameworkForNETFrameworkTasks>$(NetFrameworkToolCurrent)</TargetFrameworkForNETFrameworkTasks>
 <!-- Don't build for NETFramework during source-build. -->
Expand DownExpand Up@@ -429,6 +430,7 @@
 <PublishWindowsPdb>false</PublishWindowsPdb>
 </PropertyGroup>


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

7 changes: 7 additions & 0 deletions
eng/Analyzers.targets

View file


Open in desktop

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

5 changes: 2 additions & 3 deletions
eng/Versions.props

View file


Open in desktop

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

4 changes: 2 additions & 2 deletions
eng/build.ps1

View file


Open in desktop

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

4 changes: 2 additions & 2 deletions
eng/build.sh

View file


Open in desktop

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

2 changes: 1 addition & 1 deletion
eng/pipelines/libraries/base-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ parameters:
 archType: ''
 osSubgroup: ''
 crossBuild: false
 framework: 'net8.0'
 framework: 'net9.0'
 isOfficialAllConfigurations: false
 isSourceBuild: false
 liveRuntimeBuildConfig: ''
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/libraries/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ parameters:
 archType: ''
 targetRid: ''
 crossBuild: false
 framework: 'net8.0'
 framework: 'net9.0'
 isOfficialBuild: false
 isOfficialAllConfigurations: false
 runtimeVariant: ''
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/libraries/run-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ parameters:
 osSubgroup: ''
 archType: ''
 targetRid: ''
 framework: 'net8.0'
 framework: 'net9.0'
 isOfficialBuild: false
 liveRuntimeBuildConfig: ''
 runtimeFlavor: 'coreclr'
Expand Down

16 changes: 12 additions & 4 deletions
eng/targetingpacks.targets

View file


Open in desktop

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

 <!-- Add known packs from the downlevel TFM until we are building with an SDK that supports the new TFM all-up. -->
 <ItemGroup Condition="'$(NetCoreAppToolCurrent)' != '$(NetCoreAppCurrent)'">
 <KnownILLinkPack Include="@(KnownILLinkPack->WithMetadataValue('Identity', 'Microsoft.NET.ILLink.Tasks')->WithMetadataValue('TargetFramework', '$(NetCoreAppToolCurrent)'))">
 <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
 </KnownILLinkPack>
 </ItemGroup>

 <!-- Simple name references will be resolved from the targeting pack folders and should never be copied to the output. -->
 <ItemGroup>
 <Reference Update="@(Reference)">
Expand All@@ -92,7 +99,7 @@
 </PropertyGroup>
 </Target>

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

 <!--
 <!--
 TODO: Remove this target when an 8.0.100 SDK is consumed that respects EnableAppHostPackDownload.
 -->
 <Target Name="RemoveAppHostPackFromDownloadItem"
Expand All@@ -131,7 +139,7 @@
 AfterTargets="ResolveFrameworkReferences">
 <Error Text="The shared framework must be built before the local targeting pack can be consumed."
 Condition="!Exists('$(MicrosoftNetCoreAppRefPackDir)data\FrameworkList.xml')" />

 <ItemGroup>
 <ResolvedTargetingPack Path="$(MicrosoftNetCoreAppRefPackDir.TrimEnd('/\'))"
 NuGetPackageVersion="$(ProductVersion)"
Expand Down

4 changes: 2 additions & 2 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
{
 "sdk": {
 "version": "8.0.100-preview.7.23376.3",
 "version": "8.0.100-rc.1.23415.11",
 "allowPrerelease": true,
 "rollForward": "major"
 },
 "tools": {
 "dotnet": "8.0.100-preview.7.23376.3"
 "dotnet": "8.0.100-rc.1.23415.11"
Comment thread
ViktorHofer marked this conversation as resolved.

 },
 "msbuild-sdks": {
 "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23428.2",
Expand Down

15 changes: 1 addition & 14 deletions
src/coreclr/System.Private.CoreLib/CompatibilitySuppressions.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,45 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,``0):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,System.Diagnostics.Tracing.EventSourceOptions@,``0@):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <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>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEvent(System.Int32,System.Object[]):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventCore(System.Int32,System.Int32,System.Diagnostics.Tracing.EventSource.EventData*):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventWithRelatedActivityId(System.Int32,System.Guid,System.Object[]):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventWithRelatedActivityIdCore(System.Int32,System.Guid*,System.Int32,System.Diagnostics.Tracing.EventSource.EventData*):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
</Suppressions>

14 changes: 0 additions & 14 deletions
src/coreclr/nativeaot/System.Private.CoreLib/src/CompatibilitySuppressions.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -959,43 +959,29 @@
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,``0):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,System.Diagnostics.Tracing.EventSourceOptions@,``0@):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <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>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEvent(System.Int32,System.Object[]):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventCore(System.Int32,System.Int32,System.Diagnostics.Tracing.EventSource.EventData*):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventWithRelatedActivityId(System.Int32,System.Guid,System.Object[]):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventWithRelatedActivityIdCore(System.Int32,System.Guid*,System.Int32,System.Diagnostics.Tracing.EventSource.EventData*):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
</Suppressions>

4 changes: 2 additions & 2 deletions
src/coreclr/tools/Common/TypeSystem/Ecma/SymbolReader/UnmanagedPdbSymbolReader.cs

View file


Open in desktop

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

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

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

6 changes: 0 additions & 6 deletions
src/coreclr/tools/aot/Directory.Build.props

View file


Open in desktop


This file was deleted.


6 changes: 6 additions & 0 deletions
src/coreclr/tools/aot/Directory.Build.targets

View file


Open in desktop

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

5 changes: 5 additions & 0 deletions
...oreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj

View file


Open in desktop

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

Comment on lines

+19
 to 
+23

@ViktorHoferViktorHoferAug 24, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Are you sure this is still necessary? From what I can see, the IsTrimmable=true property is now only set for .NETCoreApp under tools/aot.
 </PropertyGroup>

 <ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -114,7 +114,7 @@
 <CoreCLRCrossTargetFiles Condition="'%(FileName)%(Extension)' == 'mscordbi.dll' and '$(TargetsWindows)' == 'true'">
 <TargetPath>tools/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture)</TargetPath>
 </CoreCLRCrossTargetFiles>
 <CoreCLROptimizationFiles Include="$(CoreCLRArtifactsPath)StandardOptimizationData.mibc"
 <CoreCLROptimizationFiles Include="$(CoreCLRArtifactsPath)StandardOptimizationData.mibc"
 Condition="Exists('$(CoreCLRArtifactsPath)StandardOptimizationData.mibc')">
 <TargetPath>tools</TargetPath>
 </CoreCLROptimizationFiles>
Expand Down

2 changes: 1 addition & 1 deletion
src/installer/tests/Assets/TestUtils/TestProjects.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
 -->

 <PropertyGroup>
 <NetCoreAppCurrent>net8.0</NetCoreAppCurrent>
 <NetCoreAppCurrent>net9.0</NetCoreAppCurrent>
@marek-safarmarek-safarSep 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Why not to use NetCoreAppCurrentVersion?
@ViktorHoferViktorHoferSep 1, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

These projects don't import the repo infrastructure.
 <!-- Turn off end of life target framework checks as we intentionally build older .NETCoreApp configurations. -->
 <CheckEolTargetFramework>false</CheckEolTargetFramework>
 <!--
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Upgrade our TFM to net9.0#90880

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

ViktorHofer
merged 21 commits into

from

Aug 31, 2023
 Merged


Upgrade our TFM to net9.0
#90880
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


21 commits


Select commit
Hold shift + click to select a range
02bcb36

Update TFM to net9.0


fanyang-mono Aug 23, 2023
2fd5797

Fix ApiCompat failures.


jkoritzinsky Aug 23, 2023
608fe0c

Create a separate workload for net9 vs net8. Let's see if this fixes …


jkoritzinsky Aug 23, 2023
5516dae

Remove netcoreappX.X, net6.0, net7.0 and net8.0 conditions and clean-up


ViktorHofer Aug 25, 2023
152c332

Merge branch 'main' into net90tfm


ViktorHofer Aug 25, 2023
49a4843

Fix build


ViktorHofer Aug 25, 2023
a49cdb8

Make projects target the right set of TFMs and order


ViktorHofer Aug 25, 2023
f32781e

Update assembly version


ViktorHofer Aug 25, 2023
f92050d

Remove dead property


ViktorHofer Aug 25, 2023
b7b8bb3

revert all wasm changes


radical Aug 25, 2023
fcceee9

[wasm] WBT: Override runtime pack with the locally built one


radical Aug 28, 2023
afdca7b

Merge branch 'main' into net90tfm


radical Aug 29, 2023
1f5a55b

[wasm] Move the override targets to a separate file, and use for wasi…


radical Aug 30, 2023
fcc6935

overwrite when copying


radical Aug 30, 2023
ecadc3b

add missing file


radical Aug 30, 2023
718d654

Update WebAssembly.Pack version also


radical Aug 30, 2023
bef19e5

fix tests


radical Aug 30, 2023
e070989

Disable non-wasm build tests


radical Aug 30, 2023
41d7eb9

Override runtime pack for multithread


radical Aug 30, 2023
cd5f671

[wasm] more fixes for wbt


radical Aug 31, 2023
5f952f1

[wasm] override packs only when using workloads


radical Aug 31, 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


14 changes: 8 additions & 6 deletions
Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,24 +80,25 @@

 <!-- The TFMs to build and test against. -->
 <PropertyGroup>
 <NetCoreAppCurrentVersion>8.0</NetCoreAppCurrentVersion>
 <NetCoreAppCurrentVersion>9.0</NetCoreAppCurrentVersion>
 <NetCoreAppCurrentIdentifier>.NETCoreApp</NetCoreAppCurrentIdentifier>
 <NetCoreAppCurrentTargetFrameworkMoniker>$(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppCurrentVersion)</NetCoreAppCurrentTargetFrameworkMoniker>
 <MicrosoftNetCoreAppFrameworkName>Microsoft.NETCore.App</MicrosoftNetCoreAppFrameworkName>
 <NetCoreAppCurrentBrandName>.NET $(NetCoreAppCurrentVersion)</NetCoreAppCurrentBrandName>
 <NetCoreAppCurrent>net$(NetCoreAppCurrentVersion)</NetCoreAppCurrent>

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

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

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

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

 <TargetFrameworkForNETFrameworkTasks>$(NetFrameworkToolCurrent)</TargetFrameworkForNETFrameworkTasks>
 <!-- Don't build for NETFramework during source-build. -->
Expand DownExpand Up@@ -429,6 +430,7 @@
 <PublishWindowsPdb>false</PublishWindowsPdb>
 </PropertyGroup>


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

7 changes: 7 additions & 0 deletions
eng/Analyzers.targets

View file


Open in desktop

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

5 changes: 2 additions & 3 deletions
eng/Versions.props

View file


Open in desktop

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

4 changes: 2 additions & 2 deletions
eng/build.ps1

View file


Open in desktop

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

4 changes: 2 additions & 2 deletions
eng/build.sh

View file


Open in desktop

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

2 changes: 1 addition & 1 deletion
eng/pipelines/libraries/base-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ parameters:
 archType: ''
 osSubgroup: ''
 crossBuild: false
 framework: 'net8.0'
 framework: 'net9.0'
 isOfficialAllConfigurations: false
 isSourceBuild: false
 liveRuntimeBuildConfig: ''
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/libraries/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ parameters:
 archType: ''
 targetRid: ''
 crossBuild: false
 framework: 'net8.0'
 framework: 'net9.0'
 isOfficialBuild: false
 isOfficialAllConfigurations: false
 runtimeVariant: ''
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/libraries/run-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ parameters:
 osSubgroup: ''
 archType: ''
 targetRid: ''
 framework: 'net8.0'
 framework: 'net9.0'
 isOfficialBuild: false
 liveRuntimeBuildConfig: ''
 runtimeFlavor: 'coreclr'
Expand Down

16 changes: 12 additions & 4 deletions
eng/targetingpacks.targets

View file


Open in desktop

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

 <!-- Add known packs from the downlevel TFM until we are building with an SDK that supports the new TFM all-up. -->
 <ItemGroup Condition="'$(NetCoreAppToolCurrent)' != '$(NetCoreAppCurrent)'">
 <KnownILLinkPack Include="@(KnownILLinkPack->WithMetadataValue('Identity', 'Microsoft.NET.ILLink.Tasks')->WithMetadataValue('TargetFramework', '$(NetCoreAppToolCurrent)'))">
 <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
 </KnownILLinkPack>
 </ItemGroup>

 <!-- Simple name references will be resolved from the targeting pack folders and should never be copied to the output. -->
 <ItemGroup>
 <Reference Update="@(Reference)">
Expand All@@ -92,7 +99,7 @@
 </PropertyGroup>
 </Target>

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

 <!--
 <!--
 TODO: Remove this target when an 8.0.100 SDK is consumed that respects EnableAppHostPackDownload.
 -->
 <Target Name="RemoveAppHostPackFromDownloadItem"
Expand All@@ -131,7 +139,7 @@
 AfterTargets="ResolveFrameworkReferences">
 <Error Text="The shared framework must be built before the local targeting pack can be consumed."
 Condition="!Exists('$(MicrosoftNetCoreAppRefPackDir)data\FrameworkList.xml')" />

 <ItemGroup>
 <ResolvedTargetingPack Path="$(MicrosoftNetCoreAppRefPackDir.TrimEnd('/\'))"
 NuGetPackageVersion="$(ProductVersion)"
Expand Down

4 changes: 2 additions & 2 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
{
 "sdk": {
 "version": "8.0.100-preview.7.23376.3",
 "version": "8.0.100-rc.1.23415.11",
 "allowPrerelease": true,
 "rollForward": "major"
 },
 "tools": {
 "dotnet": "8.0.100-preview.7.23376.3"
 "dotnet": "8.0.100-rc.1.23415.11"
Comment thread
ViktorHofer marked this conversation as resolved.

 },
 "msbuild-sdks": {
 "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23428.2",
Expand Down

15 changes: 1 addition & 14 deletions
src/coreclr/System.Private.CoreLib/CompatibilitySuppressions.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,45 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,``0):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,System.Diagnostics.Tracing.EventSourceOptions@,``0@):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <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>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEvent(System.Int32,System.Object[]):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventCore(System.Int32,System.Int32,System.Diagnostics.Tracing.EventSource.EventData*):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventWithRelatedActivityId(System.Int32,System.Guid,System.Object[]):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventWithRelatedActivityIdCore(System.Int32,System.Guid*,System.Int32,System.Diagnostics.Tracing.EventSource.EventData*):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
</Suppressions>

14 changes: 0 additions & 14 deletions
src/coreclr/nativeaot/System.Private.CoreLib/src/CompatibilitySuppressions.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -959,43 +959,29 @@
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,``0):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,System.Diagnostics.Tracing.EventSourceOptions@,``0@):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <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>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEvent(System.Int32,System.Object[]):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventCore(System.Int32,System.Int32,System.Diagnostics.Tracing.EventSource.EventData*):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventWithRelatedActivityId(System.Int32,System.Guid,System.Object[]):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventWithRelatedActivityIdCore(System.Int32,System.Guid*,System.Int32,System.Diagnostics.Tracing.EventSource.EventData*):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
</Suppressions>

4 changes: 2 additions & 2 deletions
src/coreclr/tools/Common/TypeSystem/Ecma/SymbolReader/UnmanagedPdbSymbolReader.cs

View file


Open in desktop

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

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

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

6 changes: 0 additions & 6 deletions
src/coreclr/tools/aot/Directory.Build.props

View file


Open in desktop


This file was deleted.


6 changes: 6 additions & 0 deletions
src/coreclr/tools/aot/Directory.Build.targets

View file


Open in desktop

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

5 changes: 5 additions & 0 deletions
...oreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj

View file


Open in desktop

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

Comment on lines

+19
 to 
+23

@ViktorHoferViktorHoferAug 24, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Are you sure this is still necessary? From what I can see, the IsTrimmable=true property is now only set for .NETCoreApp under tools/aot.
 </PropertyGroup>

 <ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -114,7 +114,7 @@
 <CoreCLRCrossTargetFiles Condition="'%(FileName)%(Extension)' == 'mscordbi.dll' and '$(TargetsWindows)' == 'true'">
 <TargetPath>tools/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture)</TargetPath>
 </CoreCLRCrossTargetFiles>
 <CoreCLROptimizationFiles Include="$(CoreCLRArtifactsPath)StandardOptimizationData.mibc"
 <CoreCLROptimizationFiles Include="$(CoreCLRArtifactsPath)StandardOptimizationData.mibc"
 Condition="Exists('$(CoreCLRArtifactsPath)StandardOptimizationData.mibc')">
 <TargetPath>tools</TargetPath>
 </CoreCLROptimizationFiles>
Expand Down

2 changes: 1 addition & 1 deletion
src/installer/tests/Assets/TestUtils/TestProjects.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
 -->

 <PropertyGroup>
 <NetCoreAppCurrent>net8.0</NetCoreAppCurrent>
 <NetCoreAppCurrent>net9.0</NetCoreAppCurrent>
@marek-safarmarek-safarSep 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Why not to use NetCoreAppCurrentVersion?
@ViktorHoferViktorHoferSep 1, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

These projects don't import the repo infrastructure.
 <!-- Turn off end of life target framework checks as we intentionally build older .NETCoreApp configurations. -->
 <CheckEolTargetFramework>false</CheckEolTargetFramework>
 <!--
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Upgrade our TFM to net9.0#90880

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

ViktorHofer
merged 21 commits into

from

Aug 31, 2023
 Merged


Upgrade our TFM to net9.0
#90880
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


21 commits


Select commit
Hold shift + click to select a range
02bcb36

Update TFM to net9.0


fanyang-mono Aug 23, 2023
2fd5797

Fix ApiCompat failures.


jkoritzinsky Aug 23, 2023
608fe0c

Create a separate workload for net9 vs net8. Let's see if this fixes …


jkoritzinsky Aug 23, 2023
5516dae

Remove netcoreappX.X, net6.0, net7.0 and net8.0 conditions and clean-up


ViktorHofer Aug 25, 2023
152c332

Merge branch 'main' into net90tfm


ViktorHofer Aug 25, 2023
49a4843

Fix build


ViktorHofer Aug 25, 2023
a49cdb8

Make projects target the right set of TFMs and order


ViktorHofer Aug 25, 2023
f32781e

Update assembly version


ViktorHofer Aug 25, 2023
f92050d

Remove dead property


ViktorHofer Aug 25, 2023
b7b8bb3

revert all wasm changes


radical Aug 25, 2023
fcceee9

[wasm] WBT: Override runtime pack with the locally built one


radical Aug 28, 2023
afdca7b

Merge branch 'main' into net90tfm


radical Aug 29, 2023
1f5a55b

[wasm] Move the override targets to a separate file, and use for wasi…


radical Aug 30, 2023
fcc6935

overwrite when copying


radical Aug 30, 2023
ecadc3b

add missing file


radical Aug 30, 2023
718d654

Update WebAssembly.Pack version also


radical Aug 30, 2023
bef19e5

fix tests


radical Aug 30, 2023
e070989

Disable non-wasm build tests


radical Aug 30, 2023
41d7eb9

Override runtime pack for multithread


radical Aug 30, 2023
cd5f671

[wasm] more fixes for wbt


radical Aug 31, 2023
5f952f1

[wasm] override packs only when using workloads


radical Aug 31, 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


14 changes: 8 additions & 6 deletions
Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,24 +80,25 @@

 <!-- The TFMs to build and test against. -->
 <PropertyGroup>
 <NetCoreAppCurrentVersion>8.0</NetCoreAppCurrentVersion>
 <NetCoreAppCurrentVersion>9.0</NetCoreAppCurrentVersion>
 <NetCoreAppCurrentIdentifier>.NETCoreApp</NetCoreAppCurrentIdentifier>
 <NetCoreAppCurrentTargetFrameworkMoniker>$(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppCurrentVersion)</NetCoreAppCurrentTargetFrameworkMoniker>
 <MicrosoftNetCoreAppFrameworkName>Microsoft.NETCore.App</MicrosoftNetCoreAppFrameworkName>
 <NetCoreAppCurrentBrandName>.NET $(NetCoreAppCurrentVersion)</NetCoreAppCurrentBrandName>
 <NetCoreAppCurrent>net$(NetCoreAppCurrentVersion)</NetCoreAppCurrent>

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

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

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

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

 <TargetFrameworkForNETFrameworkTasks>$(NetFrameworkToolCurrent)</TargetFrameworkForNETFrameworkTasks>
 <!-- Don't build for NETFramework during source-build. -->
Expand DownExpand Up@@ -429,6 +430,7 @@
 <PublishWindowsPdb>false</PublishWindowsPdb>
 </PropertyGroup>


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

7 changes: 7 additions & 0 deletions
eng/Analyzers.targets

View file


Open in desktop

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

5 changes: 2 additions & 3 deletions
eng/Versions.props

View file


Open in desktop

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

4 changes: 2 additions & 2 deletions
eng/build.ps1

View file


Open in desktop

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

4 changes: 2 additions & 2 deletions
eng/build.sh

View file


Open in desktop

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

2 changes: 1 addition & 1 deletion
eng/pipelines/libraries/base-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ parameters:
 archType: ''
 osSubgroup: ''
 crossBuild: false
 framework: 'net8.0'
 framework: 'net9.0'
 isOfficialAllConfigurations: false
 isSourceBuild: false
 liveRuntimeBuildConfig: ''
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/libraries/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ parameters:
 archType: ''
 targetRid: ''
 crossBuild: false
 framework: 'net8.0'
 framework: 'net9.0'
 isOfficialBuild: false
 isOfficialAllConfigurations: false
 runtimeVariant: ''
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/libraries/run-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ parameters:
 osSubgroup: ''
 archType: ''
 targetRid: ''
 framework: 'net8.0'
 framework: 'net9.0'
 isOfficialBuild: false
 liveRuntimeBuildConfig: ''
 runtimeFlavor: 'coreclr'
Expand Down

16 changes: 12 additions & 4 deletions
eng/targetingpacks.targets

View file


Open in desktop

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

 <!-- Add known packs from the downlevel TFM until we are building with an SDK that supports the new TFM all-up. -->
 <ItemGroup Condition="'$(NetCoreAppToolCurrent)' != '$(NetCoreAppCurrent)'">
 <KnownILLinkPack Include="@(KnownILLinkPack->WithMetadataValue('Identity', 'Microsoft.NET.ILLink.Tasks')->WithMetadataValue('TargetFramework', '$(NetCoreAppToolCurrent)'))">
 <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
 </KnownILLinkPack>
 </ItemGroup>

 <!-- Simple name references will be resolved from the targeting pack folders and should never be copied to the output. -->
 <ItemGroup>
 <Reference Update="@(Reference)">
Expand All@@ -92,7 +99,7 @@
 </PropertyGroup>
 </Target>

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

 <!--
 <!--
 TODO: Remove this target when an 8.0.100 SDK is consumed that respects EnableAppHostPackDownload.
 -->
 <Target Name="RemoveAppHostPackFromDownloadItem"
Expand All@@ -131,7 +139,7 @@
 AfterTargets="ResolveFrameworkReferences">
 <Error Text="The shared framework must be built before the local targeting pack can be consumed."
 Condition="!Exists('$(MicrosoftNetCoreAppRefPackDir)data\FrameworkList.xml')" />

 <ItemGroup>
 <ResolvedTargetingPack Path="$(MicrosoftNetCoreAppRefPackDir.TrimEnd('/\'))"
 NuGetPackageVersion="$(ProductVersion)"
Expand Down

4 changes: 2 additions & 2 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
{
 "sdk": {
 "version": "8.0.100-preview.7.23376.3",
 "version": "8.0.100-rc.1.23415.11",
 "allowPrerelease": true,
 "rollForward": "major"
 },
 "tools": {
 "dotnet": "8.0.100-preview.7.23376.3"
 "dotnet": "8.0.100-rc.1.23415.11"
Comment thread
ViktorHofer marked this conversation as resolved.

 },
 "msbuild-sdks": {
 "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23428.2",
Expand Down

15 changes: 1 addition & 14 deletions
src/coreclr/System.Private.CoreLib/CompatibilitySuppressions.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,45 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,``0):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,System.Diagnostics.Tracing.EventSourceOptions@,``0@):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <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>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEvent(System.Int32,System.Object[]):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventCore(System.Int32,System.Int32,System.Diagnostics.Tracing.EventSource.EventData*):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventWithRelatedActivityId(System.Int32,System.Guid,System.Object[]):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventWithRelatedActivityIdCore(System.Int32,System.Guid*,System.Int32,System.Diagnostics.Tracing.EventSource.EventData*):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
</Suppressions>

14 changes: 0 additions & 14 deletions
src/coreclr/nativeaot/System.Private.CoreLib/src/CompatibilitySuppressions.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -959,43 +959,29 @@
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,``0):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,System.Diagnostics.Tracing.EventSourceOptions@,``0@):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <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>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEvent(System.Int32,System.Object[]):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventCore(System.Int32,System.Int32,System.Diagnostics.Tracing.EventSource.EventData*):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventWithRelatedActivityId(System.Int32,System.Guid,System.Object[]):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventWithRelatedActivityIdCore(System.Int32,System.Guid*,System.Int32,System.Diagnostics.Tracing.EventSource.EventData*):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
</Suppressions>

4 changes: 2 additions & 2 deletions
src/coreclr/tools/Common/TypeSystem/Ecma/SymbolReader/UnmanagedPdbSymbolReader.cs

View file


Open in desktop

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

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

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

6 changes: 0 additions & 6 deletions
src/coreclr/tools/aot/Directory.Build.props

View file


Open in desktop


This file was deleted.


6 changes: 6 additions & 0 deletions
src/coreclr/tools/aot/Directory.Build.targets

View file


Open in desktop

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

5 changes: 5 additions & 0 deletions
...oreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj

View file


Open in desktop

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

Comment on lines

+19
 to 
+23

@ViktorHoferViktorHoferAug 24, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Are you sure this is still necessary? From what I can see, the IsTrimmable=true property is now only set for .NETCoreApp under tools/aot.
 </PropertyGroup>

 <ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -114,7 +114,7 @@
 <CoreCLRCrossTargetFiles Condition="'%(FileName)%(Extension)' == 'mscordbi.dll' and '$(TargetsWindows)' == 'true'">
 <TargetPath>tools/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture)</TargetPath>
 </CoreCLRCrossTargetFiles>
 <CoreCLROptimizationFiles Include="$(CoreCLRArtifactsPath)StandardOptimizationData.mibc"
 <CoreCLROptimizationFiles Include="$(CoreCLRArtifactsPath)StandardOptimizationData.mibc"
 Condition="Exists('$(CoreCLRArtifactsPath)StandardOptimizationData.mibc')">
 <TargetPath>tools</TargetPath>
 </CoreCLROptimizationFiles>
Expand Down

2 changes: 1 addition & 1 deletion
src/installer/tests/Assets/TestUtils/TestProjects.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
 -->

 <PropertyGroup>
 <NetCoreAppCurrent>net8.0</NetCoreAppCurrent>
 <NetCoreAppCurrent>net9.0</NetCoreAppCurrent>
@marek-safarmarek-safarSep 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Why not to use NetCoreAppCurrentVersion?
@ViktorHoferViktorHoferSep 1, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

These projects don't import the repo infrastructure.
 <!-- Turn off end of life target framework checks as we intentionally build older .NETCoreApp configurations. -->
 <CheckEolTargetFramework>false</CheckEolTargetFramework>
 <!--
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Upgrade our TFM to net9.0#90880

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

ViktorHofer
merged 21 commits into

from

Aug 31, 2023
 Merged


Upgrade our TFM to net9.0
#90880
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


21 commits


Select commit
Hold shift + click to select a range
02bcb36

Update TFM to net9.0


fanyang-mono Aug 23, 2023
2fd5797

Fix ApiCompat failures.


jkoritzinsky Aug 23, 2023
608fe0c

Create a separate workload for net9 vs net8. Let's see if this fixes …


jkoritzinsky Aug 23, 2023
5516dae

Remove netcoreappX.X, net6.0, net7.0 and net8.0 conditions and clean-up


ViktorHofer Aug 25, 2023
152c332

Merge branch 'main' into net90tfm


ViktorHofer Aug 25, 2023
49a4843

Fix build


ViktorHofer Aug 25, 2023
a49cdb8

Make projects target the right set of TFMs and order


ViktorHofer Aug 25, 2023
f32781e

Update assembly version


ViktorHofer Aug 25, 2023
f92050d

Remove dead property


ViktorHofer Aug 25, 2023
b7b8bb3

revert all wasm changes


radical Aug 25, 2023
fcceee9

[wasm] WBT: Override runtime pack with the locally built one


radical Aug 28, 2023
afdca7b

Merge branch 'main' into net90tfm


radical Aug 29, 2023
1f5a55b

[wasm] Move the override targets to a separate file, and use for wasi…


radical Aug 30, 2023
fcc6935

overwrite when copying


radical Aug 30, 2023
ecadc3b

add missing file


radical Aug 30, 2023
718d654

Update WebAssembly.Pack version also


radical Aug 30, 2023
bef19e5

fix tests


radical Aug 30, 2023
e070989

Disable non-wasm build tests


radical Aug 30, 2023
41d7eb9

Override runtime pack for multithread


radical Aug 30, 2023
cd5f671

[wasm] more fixes for wbt


radical Aug 31, 2023
5f952f1

[wasm] override packs only when using workloads


radical Aug 31, 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


14 changes: 8 additions & 6 deletions
Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,24 +80,25 @@

 <!-- The TFMs to build and test against. -->
 <PropertyGroup>
 <NetCoreAppCurrentVersion>8.0</NetCoreAppCurrentVersion>
 <NetCoreAppCurrentVersion>9.0</NetCoreAppCurrentVersion>
 <NetCoreAppCurrentIdentifier>.NETCoreApp</NetCoreAppCurrentIdentifier>
 <NetCoreAppCurrentTargetFrameworkMoniker>$(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppCurrentVersion)</NetCoreAppCurrentTargetFrameworkMoniker>
 <MicrosoftNetCoreAppFrameworkName>Microsoft.NETCore.App</MicrosoftNetCoreAppFrameworkName>
 <NetCoreAppCurrentBrandName>.NET $(NetCoreAppCurrentVersion)</NetCoreAppCurrentBrandName>
 <NetCoreAppCurrent>net$(NetCoreAppCurrentVersion)</NetCoreAppCurrent>

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

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

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

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

 <TargetFrameworkForNETFrameworkTasks>$(NetFrameworkToolCurrent)</TargetFrameworkForNETFrameworkTasks>
 <!-- Don't build for NETFramework during source-build. -->
Expand DownExpand Up@@ -429,6 +430,7 @@
 <PublishWindowsPdb>false</PublishWindowsPdb>
 </PropertyGroup>


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

7 changes: 7 additions & 0 deletions
eng/Analyzers.targets

View file


Open in desktop

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

5 changes: 2 additions & 3 deletions
eng/Versions.props

View file


Open in desktop

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

4 changes: 2 additions & 2 deletions
eng/build.ps1

View file


Open in desktop

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

4 changes: 2 additions & 2 deletions
eng/build.sh

View file


Open in desktop

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

2 changes: 1 addition & 1 deletion
eng/pipelines/libraries/base-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ parameters:
 archType: ''
 osSubgroup: ''
 crossBuild: false
 framework: 'net8.0'
 framework: 'net9.0'
 isOfficialAllConfigurations: false
 isSourceBuild: false
 liveRuntimeBuildConfig: ''
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/libraries/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ parameters:
 archType: ''
 targetRid: ''
 crossBuild: false
 framework: 'net8.0'
 framework: 'net9.0'
 isOfficialBuild: false
 isOfficialAllConfigurations: false
 runtimeVariant: ''
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/libraries/run-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ parameters:
 osSubgroup: ''
 archType: ''
 targetRid: ''
 framework: 'net8.0'
 framework: 'net9.0'
 isOfficialBuild: false
 liveRuntimeBuildConfig: ''
 runtimeFlavor: 'coreclr'
Expand Down

16 changes: 12 additions & 4 deletions
eng/targetingpacks.targets

View file


Open in desktop

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

 <!-- Add known packs from the downlevel TFM until we are building with an SDK that supports the new TFM all-up. -->
 <ItemGroup Condition="'$(NetCoreAppToolCurrent)' != '$(NetCoreAppCurrent)'">
 <KnownILLinkPack Include="@(KnownILLinkPack->WithMetadataValue('Identity', 'Microsoft.NET.ILLink.Tasks')->WithMetadataValue('TargetFramework', '$(NetCoreAppToolCurrent)'))">
 <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
 </KnownILLinkPack>
 </ItemGroup>

 <!-- Simple name references will be resolved from the targeting pack folders and should never be copied to the output. -->
 <ItemGroup>
 <Reference Update="@(Reference)">
Expand All@@ -92,7 +99,7 @@
 </PropertyGroup>
 </Target>

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

 <!--
 <!--
 TODO: Remove this target when an 8.0.100 SDK is consumed that respects EnableAppHostPackDownload.
 -->
 <Target Name="RemoveAppHostPackFromDownloadItem"
Expand All@@ -131,7 +139,7 @@
 AfterTargets="ResolveFrameworkReferences">
 <Error Text="The shared framework must be built before the local targeting pack can be consumed."
 Condition="!Exists('$(MicrosoftNetCoreAppRefPackDir)data\FrameworkList.xml')" />

 <ItemGroup>
 <ResolvedTargetingPack Path="$(MicrosoftNetCoreAppRefPackDir.TrimEnd('/\'))"
 NuGetPackageVersion="$(ProductVersion)"
Expand Down

4 changes: 2 additions & 2 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
{
 "sdk": {
 "version": "8.0.100-preview.7.23376.3",
 "version": "8.0.100-rc.1.23415.11",
 "allowPrerelease": true,
 "rollForward": "major"
 },
 "tools": {
 "dotnet": "8.0.100-preview.7.23376.3"
 "dotnet": "8.0.100-rc.1.23415.11"
Comment thread
ViktorHofer marked this conversation as resolved.

 },
 "msbuild-sdks": {
 "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23428.2",
Expand Down

15 changes: 1 addition & 14 deletions
src/coreclr/System.Private.CoreLib/CompatibilitySuppressions.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,45 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,``0):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,System.Diagnostics.Tracing.EventSourceOptions@,``0@):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <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>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEvent(System.Int32,System.Object[]):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventCore(System.Int32,System.Int32,System.Diagnostics.Tracing.EventSource.EventData*):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventWithRelatedActivityId(System.Int32,System.Guid,System.Object[]):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventWithRelatedActivityIdCore(System.Int32,System.Guid*,System.Int32,System.Diagnostics.Tracing.EventSource.EventData*):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
</Suppressions>

14 changes: 0 additions & 14 deletions
src/coreclr/nativeaot/System.Private.CoreLib/src/CompatibilitySuppressions.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -959,43 +959,29 @@
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,``0):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,System.Diagnostics.Tracing.EventSourceOptions@,``0@):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <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>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEvent(System.Int32,System.Object[]):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventCore(System.Int32,System.Int32,System.Diagnostics.Tracing.EventSource.EventData*):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventWithRelatedActivityId(System.Int32,System.Guid,System.Object[]):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventWithRelatedActivityIdCore(System.Int32,System.Guid*,System.Int32,System.Diagnostics.Tracing.EventSource.EventData*):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
</Suppressions>

4 changes: 2 additions & 2 deletions
src/coreclr/tools/Common/TypeSystem/Ecma/SymbolReader/UnmanagedPdbSymbolReader.cs

View file


Open in desktop

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

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

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

6 changes: 0 additions & 6 deletions
src/coreclr/tools/aot/Directory.Build.props

View file


Open in desktop


This file was deleted.


6 changes: 6 additions & 0 deletions
src/coreclr/tools/aot/Directory.Build.targets

View file


Open in desktop

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

5 changes: 5 additions & 0 deletions
...oreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj

View file


Open in desktop

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

Comment on lines

+19
 to 
+23

@ViktorHoferViktorHoferAug 24, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Are you sure this is still necessary? From what I can see, the IsTrimmable=true property is now only set for .NETCoreApp under tools/aot.
 </PropertyGroup>

 <ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -114,7 +114,7 @@
 <CoreCLRCrossTargetFiles Condition="'%(FileName)%(Extension)' == 'mscordbi.dll' and '$(TargetsWindows)' == 'true'">
 <TargetPath>tools/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture)</TargetPath>
 </CoreCLRCrossTargetFiles>
 <CoreCLROptimizationFiles Include="$(CoreCLRArtifactsPath)StandardOptimizationData.mibc"
 <CoreCLROptimizationFiles Include="$(CoreCLRArtifactsPath)StandardOptimizationData.mibc"
 Condition="Exists('$(CoreCLRArtifactsPath)StandardOptimizationData.mibc')">
 <TargetPath>tools</TargetPath>
 </CoreCLROptimizationFiles>
Expand Down

2 changes: 1 addition & 1 deletion
src/installer/tests/Assets/TestUtils/TestProjects.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
 -->

 <PropertyGroup>
 <NetCoreAppCurrent>net8.0</NetCoreAppCurrent>
 <NetCoreAppCurrent>net9.0</NetCoreAppCurrent>
@marek-safarmarek-safarSep 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Why not to use NetCoreAppCurrentVersion?
@ViktorHoferViktorHoferSep 1, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

These projects don't import the repo infrastructure.
 <!-- Turn off end of life target framework checks as we intentionally build older .NETCoreApp configurations. -->
 <CheckEolTargetFramework>false</CheckEolTargetFramework>
 <!--
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Upgrade our TFM to net9.0#90880

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

ViktorHofer
merged 21 commits into

from

Aug 31, 2023
 Merged


Upgrade our TFM to net9.0
#90880
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


21 commits


Select commit
Hold shift + click to select a range
02bcb36

Update TFM to net9.0


fanyang-mono Aug 23, 2023
2fd5797

Fix ApiCompat failures.


jkoritzinsky Aug 23, 2023
608fe0c

Create a separate workload for net9 vs net8. Let's see if this fixes …


jkoritzinsky Aug 23, 2023
5516dae

Remove netcoreappX.X, net6.0, net7.0 and net8.0 conditions and clean-up


ViktorHofer Aug 25, 2023
152c332

Merge branch 'main' into net90tfm


ViktorHofer Aug 25, 2023
49a4843

Fix build


ViktorHofer Aug 25, 2023
a49cdb8

Make projects target the right set of TFMs and order


ViktorHofer Aug 25, 2023
f32781e

Update assembly version


ViktorHofer Aug 25, 2023
f92050d

Remove dead property


ViktorHofer Aug 25, 2023
b7b8bb3

revert all wasm changes


radical Aug 25, 2023
fcceee9

[wasm] WBT: Override runtime pack with the locally built one


radical Aug 28, 2023
afdca7b

Merge branch 'main' into net90tfm


radical Aug 29, 2023
1f5a55b

[wasm] Move the override targets to a separate file, and use for wasi…


radical Aug 30, 2023
fcc6935

overwrite when copying


radical Aug 30, 2023
ecadc3b

add missing file


radical Aug 30, 2023
718d654

Update WebAssembly.Pack version also


radical Aug 30, 2023
bef19e5

fix tests


radical Aug 30, 2023
e070989

Disable non-wasm build tests


radical Aug 30, 2023
41d7eb9

Override runtime pack for multithread


radical Aug 30, 2023
cd5f671

[wasm] more fixes for wbt


radical Aug 31, 2023
5f952f1

[wasm] override packs only when using workloads


radical Aug 31, 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


14 changes: 8 additions & 6 deletions
Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,24 +80,25 @@

 <!-- The TFMs to build and test against. -->
 <PropertyGroup>
 <NetCoreAppCurrentVersion>8.0</NetCoreAppCurrentVersion>
 <NetCoreAppCurrentVersion>9.0</NetCoreAppCurrentVersion>
 <NetCoreAppCurrentIdentifier>.NETCoreApp</NetCoreAppCurrentIdentifier>
 <NetCoreAppCurrentTargetFrameworkMoniker>$(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppCurrentVersion)</NetCoreAppCurrentTargetFrameworkMoniker>
 <MicrosoftNetCoreAppFrameworkName>Microsoft.NETCore.App</MicrosoftNetCoreAppFrameworkName>
 <NetCoreAppCurrentBrandName>.NET $(NetCoreAppCurrentVersion)</NetCoreAppCurrentBrandName>
 <NetCoreAppCurrent>net$(NetCoreAppCurrentVersion)</NetCoreAppCurrent>

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

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

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

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

 <TargetFrameworkForNETFrameworkTasks>$(NetFrameworkToolCurrent)</TargetFrameworkForNETFrameworkTasks>
 <!-- Don't build for NETFramework during source-build. -->
Expand DownExpand Up@@ -429,6 +430,7 @@
 <PublishWindowsPdb>false</PublishWindowsPdb>
 </PropertyGroup>


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

7 changes: 7 additions & 0 deletions
eng/Analyzers.targets

View file


Open in desktop

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

5 changes: 2 additions & 3 deletions
eng/Versions.props

View file


Open in desktop

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

4 changes: 2 additions & 2 deletions
eng/build.ps1

View file


Open in desktop

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

4 changes: 2 additions & 2 deletions
eng/build.sh

View file


Open in desktop

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

2 changes: 1 addition & 1 deletion
eng/pipelines/libraries/base-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ parameters:
 archType: ''
 osSubgroup: ''
 crossBuild: false
 framework: 'net8.0'
 framework: 'net9.0'
 isOfficialAllConfigurations: false
 isSourceBuild: false
 liveRuntimeBuildConfig: ''
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/libraries/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ parameters:
 archType: ''
 targetRid: ''
 crossBuild: false
 framework: 'net8.0'
 framework: 'net9.0'
 isOfficialBuild: false
 isOfficialAllConfigurations: false
 runtimeVariant: ''
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/libraries/run-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ parameters:
 osSubgroup: ''
 archType: ''
 targetRid: ''
 framework: 'net8.0'
 framework: 'net9.0'
 isOfficialBuild: false
 liveRuntimeBuildConfig: ''
 runtimeFlavor: 'coreclr'
Expand Down

16 changes: 12 additions & 4 deletions
eng/targetingpacks.targets

View file


Open in desktop

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

 <!-- Add known packs from the downlevel TFM until we are building with an SDK that supports the new TFM all-up. -->
 <ItemGroup Condition="'$(NetCoreAppToolCurrent)' != '$(NetCoreAppCurrent)'">
 <KnownILLinkPack Include="@(KnownILLinkPack->WithMetadataValue('Identity', 'Microsoft.NET.ILLink.Tasks')->WithMetadataValue('TargetFramework', '$(NetCoreAppToolCurrent)'))">
 <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
 </KnownILLinkPack>
 </ItemGroup>

 <!-- Simple name references will be resolved from the targeting pack folders and should never be copied to the output. -->
 <ItemGroup>
 <Reference Update="@(Reference)">
Expand All@@ -92,7 +99,7 @@
 </PropertyGroup>
 </Target>

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

 <!--
 <!--
 TODO: Remove this target when an 8.0.100 SDK is consumed that respects EnableAppHostPackDownload.
 -->
 <Target Name="RemoveAppHostPackFromDownloadItem"
Expand All@@ -131,7 +139,7 @@
 AfterTargets="ResolveFrameworkReferences">
 <Error Text="The shared framework must be built before the local targeting pack can be consumed."
 Condition="!Exists('$(MicrosoftNetCoreAppRefPackDir)data\FrameworkList.xml')" />

 <ItemGroup>
 <ResolvedTargetingPack Path="$(MicrosoftNetCoreAppRefPackDir.TrimEnd('/\'))"
 NuGetPackageVersion="$(ProductVersion)"
Expand Down

4 changes: 2 additions & 2 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
{
 "sdk": {
 "version": "8.0.100-preview.7.23376.3",
 "version": "8.0.100-rc.1.23415.11",
 "allowPrerelease": true,
 "rollForward": "major"
 },
 "tools": {
 "dotnet": "8.0.100-preview.7.23376.3"
 "dotnet": "8.0.100-rc.1.23415.11"
Comment thread
ViktorHofer marked this conversation as resolved.

 },
 "msbuild-sdks": {
 "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23428.2",
Expand Down

15 changes: 1 addition & 14 deletions
src/coreclr/System.Private.CoreLib/CompatibilitySuppressions.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,45 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,``0):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,System.Diagnostics.Tracing.EventSourceOptions@,``0@):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <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>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEvent(System.Int32,System.Object[]):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventCore(System.Int32,System.Int32,System.Diagnostics.Tracing.EventSource.EventData*):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventWithRelatedActivityId(System.Int32,System.Guid,System.Object[]):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventWithRelatedActivityIdCore(System.Int32,System.Guid*,System.Int32,System.Diagnostics.Tracing.EventSource.EventData*):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
</Suppressions>

14 changes: 0 additions & 14 deletions
src/coreclr/nativeaot/System.Private.CoreLib/src/CompatibilitySuppressions.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -959,43 +959,29 @@
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,``0):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.Write``1(System.String,System.Diagnostics.Tracing.EventSourceOptions@,``0@):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <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>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEvent(System.Int32,System.Object[]):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventCore(System.Int32,System.Int32,System.Diagnostics.Tracing.EventSource.EventData*):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventWithRelatedActivityId(System.Int32,System.Guid,System.Object[]):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
 <Suppression>
 <DiagnosticId>CP0015</DiagnosticId>
 <Target>M:System.Diagnostics.Tracing.EventSource.WriteEventWithRelatedActivityIdCore(System.Int32,System.Guid*,System.Int32,System.Diagnostics.Tracing.EventSource.EventData*):[T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute]</Target>
 <Left>ref/net8.0/System.Private.CoreLib.dll</Left>
 <Right>lib/net8.0/System.Private.CoreLib.dll</Right>
 </Suppression>
</Suppressions>

4 changes: 2 additions & 2 deletions
src/coreclr/tools/Common/TypeSystem/Ecma/SymbolReader/UnmanagedPdbSymbolReader.cs

View file


Open in desktop

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

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

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

6 changes: 0 additions & 6 deletions
src/coreclr/tools/aot/Directory.Build.props

View file


Open in desktop


This file was deleted.


6 changes: 6 additions & 0 deletions
src/coreclr/tools/aot/Directory.Build.targets

View file


Open in desktop

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

5 changes: 5 additions & 0 deletions
...oreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj

View file


Open in desktop

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

Comment on lines

+19
 to 
+23

@ViktorHoferViktorHoferAug 24, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Are you sure this is still necessary? From what I can see, the IsTrimmable=true property is now only set for .NETCoreApp under tools/aot.
 </PropertyGroup>

 <ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -114,7 +114,7 @@
 <CoreCLRCrossTargetFiles Condition="'%(FileName)%(Extension)' == 'mscordbi.dll' and '$(TargetsWindows)' == 'true'">
 <TargetPath>tools/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture)</TargetPath>
 </CoreCLRCrossTargetFiles>
 <CoreCLROptimizationFiles Include="$(CoreCLRArtifactsPath)StandardOptimizationData.mibc"
 <CoreCLROptimizationFiles Include="$(CoreCLRArtifactsPath)StandardOptimizationData.mibc"
 Condition="Exists('$(CoreCLRArtifactsPath)StandardOptimizationData.mibc')">
 <TargetPath>tools</TargetPath>
 </CoreCLROptimizationFiles>
Expand Down

2 changes: 1 addition & 1 deletion
src/installer/tests/Assets/TestUtils/TestProjects.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
 -->

 <PropertyGroup>
 <NetCoreAppCurrent>net8.0</NetCoreAppCurrent>
 <NetCoreAppCurrent>net9.0</NetCoreAppCurrent>
@marek-safarmarek-safarSep 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Why not to use NetCoreAppCurrentVersion?
@ViktorHoferViktorHoferSep 1, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

These projects don't import the repo infrastructure.
 <!-- Turn off end of life target framework checks as we intentionally build older .NETCoreApp configurations. -->
 <CheckEolTargetFramework>false</CheckEolTargetFramework>
 <!--
Expand Down
Loading