Skip to content
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.

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

Move to building with the 9.0 SDK and move our ToolCurrent TFM to 9.0 #95980

Merged
merged 54 commits into from
Jan 17, 2024
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
caf570e
Move to building with the 9.0 SDK and move our ToolCurrent TFM to 9.0
jkoritzinsky Dec 13, 2023
b8004d1
Update CompatibilitySuppressions.xml
ViktorHofer Dec 15, 2023
ad27b82
Update PathUtilities.cs
ViktorHofer Dec 15, 2023
45c577d
Update TestProjects.targets
ViktorHofer Dec 15, 2023
4376128
Merge branch 'main' into 9.0-sdk
akoeplinger Dec 15, 2023
eca212e
Merge branch 'main' into 9.0-sdk
akoeplinger Dec 19, 2023
708eca8
Update hotreload-utils dependencies
akoeplinger Dec 19, 2023
b134b94
Bump sdk version
akoeplinger Dec 19, 2023
b5aecc4
Update ILLink.RoslynAnalyzer.Tests.csproj
ViktorHofer Dec 19, 2023
e66999a
Update Mono.Linker.Tests.csproj
ViktorHofer Dec 19, 2023
c98d3e4
Update CecilVersionCheck.cs
ViktorHofer Dec 19, 2023
e7c5aea
Update PathUtilities.cs
ViktorHofer Dec 19, 2023
1d3d9ec
Update PathUtilities.cs
ViktorHofer Dec 19, 2023
47572ac
Update SourceBuildPrebuiltBaseline.xml
akoeplinger Dec 19, 2023
c3032e0
Merge branch 'main' into 9.0-sdk
akoeplinger Dec 21, 2023
cc45846
Fix ILLink analyzer tests
sbomer Dec 29, 2023
fefcda1
Update src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/TestCaseUtil…
ViktorHofer Dec 29, 2023
199e27b
Update src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/TestCaseUtil…
ViktorHofer Dec 29, 2023
0ce08d6
Update src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/TestCaseUtil…
ViktorHofer Dec 29, 2023
a73a7c1
Remove NuGet restore for reference assemblies
ViktorHofer Dec 29, 2023
e3519f9
Fix ILCompiler tests
ViktorHofer Dec 29, 2023
4d691f0
[wasi] Always add wasi-wasm rid to KnownRuntimePack for local builds …
radical Jan 3, 2024
276bd0f
Merge remote-tracking branch 'origin/main' into 9.0-sdk
radical Jan 3, 2024
275ead5
wip
radical Jan 3, 2024
01cf82a
disable unrelated builds
radical Jan 3, 2024
0ffff54
Merge remote-tracking branch 'origin/main' into 9.0-sdk
radical Jan 8, 2024
ebbc657
split ci
radical Jan 8, 2024
1904bc4
Revert "split ci"
radical Jan 8, 2024
0657a86
Revert "disable unrelated builds"
radical Jan 8, 2024
88889cc
Revert "wip"
radical Jan 8, 2024
e8dd013
Merge branch 'main' into 9.0-sdk
radical Jan 8, 2024
5d433a7
Merge remote-tracking branch 'origin/main' into 9.0-sdk
radical Jan 9, 2024
ad2b9ba
[wasm] Extract workload testing bits from tests.*.targets into separa…
radical Jan 9, 2024
9ca4eaa
[wasm] Wasm.Build.Tests - build for host os/arch instead of wasm
radical Jan 9, 2024
1c4bf91
[wasm] fix local builds - makefile
radical Jan 9, 2024
2a4fd5d
[wasm] Run WBT with dotnet 8 (global.json)
radical Jan 9, 2024
e282f4b
[wasm] fix local debugger tests run
radical Jan 9, 2024
27baa92
[wasm] Browser.targets: track tfm change for tasks
radical Jan 9, 2024
51ca44e
[wasm] fix wbt build
radical Jan 9, 2024
a54adf7
[wasm] WBT: don't use publishTrimmed=true
radical Jan 9, 2024
9580bfd
Set workload testing specific properties in workloads-testing.targets
radical Jan 9, 2024
8f50adc
[wasm] Fix checking for icudt files against the runtime pack
radical Jan 9, 2024
2574529
cleanup
radical Jan 9, 2024
9bc55b7
WBT: Update TargetFrameworkForTasks=net9.0
radical Jan 9, 2024
e26b92d
WBT: Set chromedriver path
radical Jan 9, 2024
238ccec
eng/targetingpack.targets: Add wasi-wasm only for the latest tfm
radical Jan 9, 2024
3c449dc
Merge branch 'main' into 9.0-sdk
radical Jan 16, 2024
73d7efd
Update CompatibilitySuppressions.xml
ViktorHofer Jan 16, 2024
e8026dd
[wasm] WBT ProcessExtensions: Use Process.Kill(true)
radical Jan 10, 2024
dc34fdd
[wasm] WBT: don't try to read ExitCode after process.Kill
radical Jan 10, 2024
7bb42b4
[wasm] WBT: disable failing tests
radical Jan 16, 2024
0701143
fix build
radical Jan 16, 2024
f065ad9
fix build
radical Jan 17, 2024
275359e
disable some missed tests
radical Jan 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,11 @@
<!-- when this is updated, make sure to keep $(_TargetFrameworkForNETCoreTasks)
in src/mono/wasm/build/WasmApp.LocalBuild.props
and in src/mono/msbuild/apple/build/AppleBuild.LocalBuild.props in sync -->
<NetCoreAppToolCurrentVersion>8.0</NetCoreAppToolCurrentVersion>
<NetCoreAppToolCurrentVersion>9.0</NetCoreAppToolCurrentVersion>
<NetCoreAppToolCurrent>net$(NetCoreAppToolCurrentVersion)</NetCoreAppToolCurrent>
<NetCoreAppCurrentToolTargetFrameworkMoniker>$(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppToolCurrentVersion)</NetCoreAppCurrentToolTargetFrameworkMoniker>

<AspNetCoreAppCurrentVersion>8.0</AspNetCoreAppCurrentVersion>
<AspNetCoreAppCurrentVersion>9.0</AspNetCoreAppCurrentVersion>
<AspNetCoreAppCurrent>net$(AspNetCoreAppCurrentVersion)</AspNetCoreAppCurrent>

<NetFrameworkMinimum>net462</NetFrameworkMinimum>
Expand Down
8 changes: 4 additions & 4 deletions eng/SourceBuildPrebuiltBaseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
<UsagePattern IdentityGlob="Microsoft.CodeAnalysis*/*4.7.*" />

<!-- Allowed and pinned to major version due to https://github.com/dotnet/source-build/issues/3228 -->
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/*8.*" />
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Runtime.linux-x64/*8.*" />
<UsagePattern IdentityGlob="*Microsoft.DotNet.ILCompiler/*8.*" />
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/*9.*" />
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Runtime.linux-x64/*9.*" />
<UsagePattern IdentityGlob="*Microsoft.DotNet.ILCompiler/*9.*" />

<!-- Allowed and pinned to SDK version -->
<UsagePattern IdentityGlob="Microsoft.NET.ILLink.Tasks/*8.*" />
<UsagePattern IdentityGlob="Microsoft.NET.ILLink.Tasks/*9.*" />

<!-- This version is brought in transitively from NuGet.Packaging.6.2.4.
Once a newer version of NuGet.Packaging is referenced which has a
Expand Down
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -353,9 +353,9 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>fb325047175ea6436e3c2c88f6f56505e0e834c2</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="9.0.0-alpha.0.23611.1">
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="9.0.0-alpha.0.23618.4">
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
<Sha>cc369887e92bac086dd296beb7cd169b6cff9716</Sha>
<Sha>14a6f0b652e5d1053b5213adfcdfe1aaa6d52d6d</Sha>
</Dependency>
<Dependency Name="System.Runtime.Numerics.TestData" Version="9.0.0-beta.23615.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>9.0.0-prerelease.23611.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>9.0.0-prerelease.23611.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.23611.1</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>9.0.0-alpha.0.23611.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>9.0.0-alpha.0.23618.4</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<NUnitVersion>3.12.0</NUnitVersion>
<NUnitTestAdapterVersion>4.1.0</NUnitTestAdapterVersion>
<CoverletCollectorVersion>6.0.0</CoverletCollectorVersion>
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"sdk": {
"version": "8.0.100",
"version": "9.0.100-alpha.1.23615.4",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "8.0.100"
"dotnet": "9.0.100-alpha.1.23615.4"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23607.2",
Expand Down
25 changes: 0 additions & 25 deletions src/installer/tests/Assets/TestUtils/TestProjects.targets
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,4 @@
provides basic info needed for restore and build with the vanilla SDK.
-->

<!-- TODO: Remove when the SDK understands the net9.0 tfm. -->
<PropertyGroup>
<NETCoreAppMaximumVersion>9.0</NETCoreAppMaximumVersion>
</PropertyGroup>

<ItemGroup>
<KnownFrameworkReference Include="Microsoft.NETCore.App"
DefaultRuntimeFrameworkVersion="9.0.0-alpha.1.23615.3"
LatestRuntimeFrameworkVersion="9.0.0-alpha.1.23615.3"
RuntimeFrameworkName="Microsoft.NETCore.App"
RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.**RID**"
RuntimePackRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm64;win-x64;win-x86;linux-musl-arm;osx-arm64;maccatalyst-x64;maccatalyst-arm64;linux-s390x;linux-bionic-arm;linux-bionic-arm64;linux-bionic-x64;linux-bionic-x86"
TargetFramework="$(NetCoreAppCurrent)"
TargetingPackName="Microsoft.NETCore.App.Ref"
TargetingPackVersion="9.0.0-alpha.1.23615.3"
Condition="'@(KnownFrameworkReference)' == '' or !@(KnownFrameworkReference->AnyHaveMetadataValue('TargetFramework', '$(NetCoreAppCurrent)'))" />

<KnownAppHostPack Include="Microsoft.NETCore.App"
ExcludedRuntimeIdentifiers="android"
AppHostPackNamePattern="Microsoft.NETCore.App.Host.**RID**"
AppHostPackVersion="9.0.0-alpha.1.23615.3"
AppHostRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm64;win-x64;win-x86;linux-musl-arm;osx-arm64;linux-s390x;linux-bionic-arm;linux-bionic-arm64;linux-bionic-x64;linux-bionic-x86"
TargetFramework="$(NetCoreAppCurrent)"
Condition="'@(KnownAppHostPack)' == '' or !@(KnownAppHostPack->AnyHaveMetadataValue('TargetFramework', '$(NetCoreAppCurrent)'))" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/mono/msbuild/apple/build/AppleBuild.LocalBuild.props
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<!-- Keep these underscored targets in sync with the root Directory.Build.props -->
<_NetCoreAppCurrent>net9.0</_NetCoreAppCurrent>
<TargetFramework>$(_NetCoreAppCurrent)</TargetFramework>
<_NetCoreAppToolCurrent>net8.0</_NetCoreAppToolCurrent>
<_NetCoreAppToolCurrent>net9.0</_NetCoreAppToolCurrent>
<MSBuildEnableWorkloadResolver>false</MSBuildEnableWorkloadResolver>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/mono/wasm/build/WasmApp.LocalBuild.props
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<Import Project="$(_WasmTargetsDir)$(_TargetsBaseName).props" />

<PropertyGroup>
<_TargetFrameworkForNETCoreTasks>net8.0</_TargetFrameworkForNETCoreTasks>
<_TargetFrameworkForNETCoreTasks>net9.0</_TargetFrameworkForNETCoreTasks>
<MSBuildEnableWorkloadResolver>false</MSBuildEnableWorkloadResolver>
<SelfContained>true</SelfContained>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/tools/illink/src/ILLink.Tasks/LinkTask.cs
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ public string ILLinkPath {
var taskDirectory = Path.GetDirectoryName (Assembly.GetExecutingAssembly ().Location);
#pragma warning restore IL3000 // Avoid accessing Assembly file path when publishing as a single file
// IL Linker always runs on .NET Core, even when using desktop MSBuild to host ILLink.Tasks.
_illinkPath = Path.Combine (Path.GetDirectoryName (taskDirectory), "net8.0", "illink.dll");
_illinkPath = Path.Combine (Path.GetDirectoryName (taskDirectory), "net9.0", "illink.dll");
return _illinkPath;
}
set => _illinkPath = value;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ Copyright (c) .NET Foundation. All rights reserved.
<!-- N.B. The ILLinkTargetsPath is used as a sentinel to indicate a version of this file has already been imported. It will also be the path
used to import the targets later in the SDK. -->
<ILLinkTargetsPath Condition="'$(ILLinkTargetsPath)' == ''">$(MSBuildThisFileDirectory)Microsoft.NET.ILLink.targets</ILLinkTargetsPath>
<!-- Older SDKs used this property as a sentinel instead, to control the import of this file
<!-- Older SDKs used this property as a sentinel instead, to control the import of this file
(but not the targets, which were included with the SDK). -->
<UsingILLinkTasksSdk>true</UsingILLinkTasksSdk>
<ILLinkTasksAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net8.0\ILLink.Tasks.dll</ILLinkTasksAssembly>
<ILLinkTasksAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net9.0\ILLink.Tasks.dll</ILLinkTasksAssembly>
<ILLinkTasksAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\ILLink.Tasks.dll</ILLinkTasksAssembly>

<ILLinkAnalyzersPropsPath Condition="'$(ILLinkAnalyzersPropsPath)' == ''">$(MSBuildThisFileDirectory)Microsoft.NET.ILLink.Analyzers.props</ILLinkAnalyzersPropsPath>
Expand Down
Loading
Loading