Skip to content

[main] Update dependencies from dotnet/arcade #84698

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
lewing merged 11 commits into from
Apr 15, 2023
Merged

[main] Update dependencies from dotnet/arcade #84698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9d23a5b
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Apr 12, 2023
46aee75
Mark NativeBuild_WithDeployOnBuild_UsedByVS as an active issue
lewing Apr 12, 2023
f446204
Revert codespaces workaround from #83331
akoeplinger Apr 14, 2023
fd7fecf
Bring in missing arcade changes
akoeplinger Apr 14, 2023
289c11f
Update dependencies from .NET Eng - Latest manually
ViktorHofer Apr 14, 2023
8a4f5e7
Merge branch 'darc-main-400fc197-649a-4255-b836-d7df677ee592' of http…
ViktorHofer Apr 14, 2023
5bff8d5
Update Version.Details.xml
ViktorHofer Apr 14, 2023
a49ccfb
Update Versions.props
ViktorHofer Apr 14, 2023
e868e54
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Apr 14, 2023
d61eb61
Merge remote-tracking branch 'origin/main' into darc-main-400fc197-64…
sbomer Apr 14, 2023
e051a3b
Fix ILCompiler build with newer SDK
sbomer Apr 14, 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
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "1.0.0-prerelease.23178.2",
"version": "1.0.0-prerelease.23212.1",
"commands": [
"xharness"
]
Expand Down
4 changes: 0 additions & 4 deletions .devcontainer/scripts/onCreateCommand.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@

set -e

# bump the dotnet sdk version to get msbuild bugfix: https://github.com/dotnet/msbuild/issues/8531
# TODO: remove once we're on a newer sdk in global.json
sed -i 's/8.0.100-preview.1.23115.2/8.0.100-preview.3.23159.20/g' global.json || true

opt=$1
case "$opt" in

Expand Down
88 changes: 44 additions & 44 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,73 +92,73 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23210.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23213.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e5c569253a4cecd110830acbf1ffae96d5a37cc6</Sha>
<Sha>fb14cae30eacbe844468ac297b3d4c61e0bb9dc0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23210.3">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23213.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e5c569253a4cecd110830acbf1ffae96d5a37cc6</Sha>
<Sha>fb14cae30eacbe844468ac297b3d4c61e0bb9dc0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23210.3">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23213.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e5c569253a4cecd110830acbf1ffae96d5a37cc6</Sha>
<Sha>fb14cae30eacbe844468ac297b3d4c61e0bb9dc0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23210.3">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23213.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e5c569253a4cecd110830acbf1ffae96d5a37cc6</Sha>
<Sha>fb14cae30eacbe844468ac297b3d4c61e0bb9dc0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23210.3">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23213.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e5c569253a4cecd110830acbf1ffae96d5a37cc6</Sha>
<Sha>fb14cae30eacbe844468ac297b3d4c61e0bb9dc0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23210.3">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23213.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e5c569253a4cecd110830acbf1ffae96d5a37cc6</Sha>
<Sha>fb14cae30eacbe844468ac297b3d4c61e0bb9dc0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23210.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23213.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e5c569253a4cecd110830acbf1ffae96d5a37cc6</Sha>
<Sha>fb14cae30eacbe844468ac297b3d4c61e0bb9dc0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23210.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23213.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e5c569253a4cecd110830acbf1ffae96d5a37cc6</Sha>
<Sha>fb14cae30eacbe844468ac297b3d4c61e0bb9dc0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23210.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23213.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e5c569253a4cecd110830acbf1ffae96d5a37cc6</Sha>
<Sha>fb14cae30eacbe844468ac297b3d4c61e0bb9dc0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23210.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23213.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e5c569253a4cecd110830acbf1ffae96d5a37cc6</Sha>
<Sha>fb14cae30eacbe844468ac297b3d4c61e0bb9dc0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23210.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23213.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e5c569253a4cecd110830acbf1ffae96d5a37cc6</Sha>
<Sha>fb14cae30eacbe844468ac297b3d4c61e0bb9dc0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23210.3">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23213.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e5c569253a4cecd110830acbf1ffae96d5a37cc6</Sha>
<Sha>fb14cae30eacbe844468ac297b3d4c61e0bb9dc0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23210.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23213.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e5c569253a4cecd110830acbf1ffae96d5a37cc6</Sha>
<Sha>fb14cae30eacbe844468ac297b3d4c61e0bb9dc0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23210.3">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23213.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e5c569253a4cecd110830acbf1ffae96d5a37cc6</Sha>
<Sha>fb14cae30eacbe844468ac297b3d4c61e0bb9dc0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23210.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23213.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e5c569253a4cecd110830acbf1ffae96d5a37cc6</Sha>
<Sha>fb14cae30eacbe844468ac297b3d4c61e0bb9dc0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23210.3">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23213.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e5c569253a4cecd110830acbf1ffae96d5a37cc6</Sha>
<Sha>fb14cae30eacbe844468ac297b3d4c61e0bb9dc0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23210.3">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23213.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e5c569253a4cecd110830acbf1ffae96d5a37cc6</Sha>
<Sha>fb14cae30eacbe844468ac297b3d4c61e0bb9dc0</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.23179.4">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -276,21 +276,21 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>beb708f6fe999cbbe5542846c9985ce596569097</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="1.0.0-prerelease.23178.2">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="1.0.0-prerelease.23212.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>389c851b0dc1d2c50d03e4aad000b7802d0ebed6</Sha>
<Sha>cc6611a8c5eee02e5095d9d14a8b0c509ac46e86</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.23178.2">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.23212.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>389c851b0dc1d2c50d03e4aad000b7802d0ebed6</Sha>
<Sha>cc6611a8c5eee02e5095d9d14a8b0c509ac46e86</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.23178.2">
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.23212.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>389c851b0dc1d2c50d03e4aad000b7802d0ebed6</Sha>
<Sha>cc6611a8c5eee02e5095d9d14a8b0c509ac46e86</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23210.3">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23213.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e5c569253a4cecd110830acbf1ffae96d5a37cc6</Sha>
<Sha>fb14cae30eacbe844468ac297b3d4c61e0bb9dc0</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23175.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down Expand Up @@ -330,11 +330,11 @@
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.3.5-beta1.23207.2">
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
<Sha>80eb21fba86dd2ac2522a052d0243136a3d2324c</Sha>
<Sha>ccd85bc350c9a994b74642f3b7613d8a98f5be2d</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23207.2">
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
<Sha>80eb21fba86dd2ac2522a052d0243136a3d2324c</Sha>
<Sha>ccd85bc350c9a994b74642f3b7613d8a98f5be2d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="8.0.100-preview.2.23107.1">
<Uri>https://github.com/dotnet/sdk</Uri>
Expand Down
36 changes: 18 additions & 18 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,21 +84,21 @@
<!-- SDK dependencies -->
<MicrosoftDotNetApiCompatTaskVersion>8.0.100-preview.2.23107.1</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23210.3</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23210.3</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.23210.3</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23210.3</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23210.3</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23210.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23210.3</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23210.3</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23210.3</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23210.3</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23210.3</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23210.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23210.3</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23210.3</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23210.3</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23213.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23213.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.23213.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23213.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23213.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23213.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23213.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23213.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23213.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23213.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23213.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23213.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23213.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23213.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23213.1</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down Expand Up @@ -183,9 +183,9 @@
<!-- Testing -->
<MicrosoftNETCoreCoreDisToolsVersion>1.1.0</MicrosoftNETCoreCoreDisToolsVersion>
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>1.0.0-prerelease.23178.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.23178.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.23178.2</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>1.0.0-prerelease.23212.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.23212.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.23212.1</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>1.1.0-alpha.0.23179.3</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<XUnitVersion>2.4.2</XUnitVersion>
<XUnitAnalyzersVersion>1.0.0</XUnitAnalyzersVersion>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/cross/arm/sources.list.xenial
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ deb http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted

deb http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
2 changes: 1 addition & 1 deletion eng/common/cross/arm64/sources.list.xenial
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ deb http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted

deb http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
10 changes: 5 additions & 5 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"sdk": {
"version": "8.0.100-preview.1.23115.2",
"version": "8.0.100-preview.3.23178.7",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "8.0.100-preview.1.23115.2"
"dotnet": "8.0.100-preview.3.23178.7"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23210.3",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23210.3",
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23210.3",
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23213.1",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23213.1",
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23213.1",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "8.0.0-preview.4.23177.1"
Expand Down
12 changes: 1 addition & 11 deletions src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,6 @@
<PublishTrimmed Condition="'$(NativeAotSupported)' != 'true'">true</PublishTrimmed>
</PropertyGroup>

<!-- TODO: remove this once we pick up an SDK with https://github.com/dotnet/runtime/pull/82645.
This works around an incorrect ILC host package name when targeting linux-musl-x64 from linux-x64. -->
<Target Name="_FixIlcHostArch"
BeforeTargets="ImportRuntimeIlcPackageTarget">
<PropertyGroup>
<_hostOS>$(NETCoreSdkPortableRuntimeIdentifier.SubString(0, $(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-'))))</_hostOS>
<OSIdentifier>$(_hostOS)</OSIdentifier>
<IlcHostPackageName>runtime.$(OSIdentifier)-$(IlcHostArch).Microsoft.DotNet.ILCompiler</IlcHostPackageName>
</PropertyGroup>
</Target>

<!-- Needed for the amd64 -> amd64 musl cross-build to pass the target flag. -->
<Target Name="_FixIlcTargetTriple"
Expand Down Expand Up @@ -72,7 +62,7 @@
</Target>

<ItemGroup Condition="'$(NativeAotSupported)' == 'true'">
<CustomLinkerArg Condition="'$(CrossBuild)' == 'true' and '$(IlcHostArch)' == '$(TargetArchitecture)' and '$(_hostOS)' != 'windows'" Include="--gcc-toolchain=$(ROOTFS_DIR)/usr" />
<CustomLinkerArg Condition="'$(CrossBuild)' == 'true' and '$(_hostArchitecture)' == '$(_targetArchitecture)' and '$(_hostOS)' != 'windows'" Include="--gcc-toolchain=$(ROOTFS_DIR)/usr" />
</ItemGroup>

<Target Name="PublishCompiler"
Expand Down
1 change: 1 addition & 0 deletions src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ public MiscTests(ITestOutputHelper output, SharedBuildPerTestClassFixture buildC
}

[Theory]
[ActiveIssue("https://github.com/dotnet/runtime/issues/84722")]
[InlineData("Debug", true)]
[InlineData("Debug", false)]
[InlineData("Release", true)]
Expand Down