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.

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

[main] Update dependencies from dotnet/arcade #110477

Merged
merged 41 commits into from
Dec 16, 2024
Merged

[main] Update dependencies from dotnet/arcade #110477

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
db1fb6f
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Dec 6, 2024
9d57e6e
Set roll forward for cdac-build-tool
akoeplinger Dec 6, 2024
f8f00a8
Bump NetCoreAppToolCurrent to net10.0
akoeplinger Dec 6, 2024
497ed57
Fix CustomEventSource test
sbomer Dec 6, 2024
15a30ef
Fix tests with Type checks
sbomer Dec 6, 2024
5c144c7
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Dec 7, 2024
660beb4
Disable nativeAOT components for win-x86 temporarily
ViktorHofer Dec 9, 2024
b239a96
Merge branch 'main' into darc-main-9dbe0517-45a5-433c-8ef5-b5807629e7e2
ViktorHofer Dec 9, 2024
89dcd4d
Update baseline entries
ViktorHofer Dec 9, 2024
09f0e26
Bump AspNetCoreAppCurrent
ViktorHofer Dec 9, 2024
6321b4c
Update pinned package versions
ViktorHofer Dec 9, 2024
fe3fccf
Update sdk dependencies
ViktorHofer Dec 9, 2024
f2d7686
Merge branch 'main' into darc-main-9dbe0517-45a5-433c-8ef5-b5807629e7e2
akoeplinger Dec 9, 2024
4813d87
Fix path to WebAssembly build task
akoeplinger Dec 9, 2024
8faa705
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Dec 10, 2024
9fc21e0
Build XUnitLogChecker as SingleFile when we can't AOT it. Our infra e…
jkoritzinsky Dec 10, 2024
9545538
Update SDK and remove obsolete condition
ViktorHofer Dec 10, 2024
7a8c1fb
Revert "Fix tests with Type checks"
MichalStrehovsky Dec 11, 2024
d32b968
Fix illink tests
MichalStrehovsky Dec 11, 2024
b1acbb0
Reapply "Fix tests with Type checks"
MichalStrehovsky Dec 11, 2024
5901471
Attempt 2
MichalStrehovsky Dec 11, 2024
41d9b03
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Dec 11, 2024
f6cdede
Update sdk dependencies that are used for workloads tests
akoeplinger Dec 11, 2024
0af04df
Based on https://github.com/dotnet/runtime/pull/93693, Update Wasm.Bu…
jkoritzinsky Dec 11, 2024
b2a5c99
Change disable condition as hybrid globalization in the browser has b…
jkoritzinsky Dec 11, 2024
c5e129d
Merge branch 'main' of https://github.com/dotnet/runtime into darc-ma…
jkoritzinsky Dec 11, 2024
0787ae6
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Dec 12, 2024
0e05150
Merge remote-tracking branch 'upstream/main' into darc-main-9dbe0517-…
akoeplinger Dec 12, 2024
a149938
Use feature switch to disable DataSet xml serialization related tests
akoeplinger Dec 12, 2024
542380d
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Dec 13, 2024
96bf283
Workload fixes and improvements
akoeplinger Dec 13, 2024
c587848
Remove runtimes-windows from workload manifest, it is unused
akoeplinger Dec 13, 2024
c33f055
Add net10 entries in workloads.csproj
akoeplinger Dec 13, 2024
a2b10a0
Fix mistakes in net8 workload manifest
akoeplinger Dec 13, 2024
5f83c2c
Update emsdk
akoeplinger Dec 14, 2024
bbdd012
Fix msbuild conditions
akoeplinger Dec 14, 2024
64e62f9
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Dec 14, 2024
30461f3
Fix regex for runtime pack path to allow space
akoeplinger Dec 16, 2024
ae3e00f
Fix condition in WorkloadManifest.targets.in to actually match net10.0
akoeplinger Dec 16, 2024
36b80ec
Fix net version in wasm templates
akoeplinger Dec 16, 2024
a0c7ed7
Fix one more hardcoded net9.0
akoeplinger Dec 16, 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
Prev Previous commit
Next Next commit
Workload fixes and improvements
  • Loading branch information
@akoeplinger
akoeplinger committed Dec 13, 2024
commit 96bf283a63e29a97369d3ae05bee349a914f6a68
1 change: 1 addition & 0 deletions eng/pipelines/runtime-official.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,7 @@ extends:
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NET.Workload.Mono.ToolChain.net6.Manifest*.nupkg
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NET.Workload.Mono.ToolChain.net7.Manifest*.nupkg
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NET.Workload.Mono.ToolChain.net8.Manifest*.nupkg
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NET.Workload.Mono.ToolChain.net9.Manifest*.nupkg
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NET.Runtime.MonoTargets.Sdk*.nupkg
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NET.Runtime.MonoAOTCompiler.Task*.nupkg
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NET.Runtime.WebAssembly.Sdk*.nupkg
Expand Down
7 changes: 7 additions & 0 deletions eng/testing/workloads-browser.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@
Variant="latest"
Version="$(PackageVersionForWorkloadManifests)" />

<WorkloadIdForTesting Include="wasm-tools-net9;wasm-experimental-net9"
ManifestName="Microsoft.NET.Workload.Mono.ToolChain.net9"
Variant="net9"
Version="$(PackageVersionForWorkloadManifests)"
Condition="'$(WorkloadsTestPreviousVersions)' == 'true'" />

<WorkloadIdForTesting Include="wasm-tools-net8;wasm-experimental-net8"
ManifestName="Microsoft.NET.Workload.Mono.ToolChain.net8"
Variant="net8"
Expand All @@ -34,6 +40,7 @@
Condition="'$(WorkloadsTestPreviousVersions)' == 'true'" />

<WorkloadCombinationsToInstall Include="latest" Variants="latest" />
<WorkloadCombinationsToInstall Include="net9" Variants="net9" Condition="'$(WorkloadsTestPreviousVersions)' == 'true'" />
<WorkloadCombinationsToInstall Include="net8" Variants="net8" Condition="'$(WorkloadsTestPreviousVersions)' == 'true'" />
<WorkloadCombinationsToInstall Include="net7" Variants="net7" Condition="'$(WorkloadsTestPreviousVersions)' == 'true'" />
<WorkloadCombinationsToInstall Include="net7+latest" Variants="net7;latest" Condition="'$(WorkloadsTestPreviousVersions)' == 'true'" />
Expand Down
7 changes: 7 additions & 0 deletions eng/testing/workloads-wasi.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,20 @@
Variant="latest"
Version="$(PackageVersionForWorkloadManifests)" />

<WorkloadIdForTesting Include="wasi-experimental-net9;wasi-experimental"
ManifestName="Microsoft.NET.Workload.Mono.ToolChain.net9"
Variant="net9"
Version="$(PackageVersionForWorkloadManifests)"
Condition="'$(WorkloadsTestPreviousVersions)' == 'true'" />

<WorkloadIdForTesting Include="wasi-experimental-net8;wasi-experimental"
ManifestName="Microsoft.NET.Workload.Mono.ToolChain.net8"
Variant="net8"
Version="$(PackageVersionForWorkloadManifests)"
Condition="'$(WorkloadsTestPreviousVersions)' == 'true'" />

<WorkloadCombinationsToInstall Include="latest" Variants="latest" />
<WorkloadCombinationsToInstall Include="net9" Variants="net9" Condition="'$(WorkloadsTestPreviousVersions)' == 'true'" />
<WorkloadCombinationsToInstall Include="net8" Variants="net8" Condition="'$(WorkloadsTestPreviousVersions)' == 'true'" />
</ItemGroup>
</Target>
Expand Down
1 change: 1 addition & 0 deletions ...et/Microsoft.NET.Sdk.WebAssembly.Pack/build/Microsoft.NET.Sdk.WebAssembly.Browser.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ Copyright (c) .NET Foundation. All rights reserved.
<Target Name="_ResolveWasmConfiguration" DependsOnTargets="_ResolveGlobalizationConfiguration">
<PropertyGroup>
<_TargetingNET80OrLater>false</_TargetingNET80OrLater>
<_TargetingNET90OrLater>false</_TargetingNET90OrLater>
<_TargetingNET80OrLater Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals('$(TargetFrameworkVersion)', '8.0'))">true</_TargetingNET80OrLater>
<_TargetingNET90OrLater Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals('$(TargetFrameworkVersion)', '9.0'))">true</_TargetingNET90OrLater>

Expand Down
3 changes: 3 additions & 0 deletions ...Toolchain.Current.Manifest/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@
<_WorkloadManifestValues Include="EmscriptenVersion" Value="$(MicrosoftNETRuntimeEmscriptenVersion)" />
</ItemGroup>

<Error Condition="'%(_WorkloadManifestValues.Value)' == ''"
Text="No version specified for template variable '%(_WorkloadManifestValues.Identity)'" />

<GenerateFileFromTemplate
TemplateFile="WorkloadManifest.json.in"
Properties="@(_WorkloadManifestValues->'%(Identity)=%(Value)')"
Expand Down
46 changes: 23 additions & 23 deletions ...ono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.json.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"Microsoft.NETCore.App.Runtime.AOT.Cross.${NetVersion}.browser-wasm"
],
"extends": [ "microsoft-net-runtime-mono-tooling", "microsoft-net-sdk-emscripten" ],
"platforms": [ "win-x64", "win-arm64", "linux-x64", "linux-arm64", "linux-musl-x64", "linux-musl-arm64", "osx-x64", "osx-arm64"]
"platforms": [ "win-x64", "win-arm64", "linux-x64", "linux-arm64", "linux-musl-x64", "linux-musl-arm64", "osx-x64", "osx-arm64" ]
},
"wasm-experimental": {
"description": ".NET WebAssembly experimental tooling for ${NetVersion}.0",
Expand Down Expand Up @@ -173,35 +173,35 @@
"kind": "Sdk",
"version": "${PackageVersion}",
"alias-to": {
"any": "Microsoft.NET.Runtime.MonoTargets.Sdk"
"any": "Microsoft.NET.Runtime.MonoTargets.Sdk"
}
},
"Microsoft.NET.Runtime.LibraryBuilder.Sdk.${NetVersion}": {
"kind": "Sdk",
"version": "${PackageVersion}",
"alias-to": {
"any": "Microsoft.NET.Runtime.LibraryBuilder.Sdk"
"any": "Microsoft.NET.Runtime.LibraryBuilder.Sdk"
}
},
"Microsoft.NET.Runtime.WebAssembly.Sdk.${NetVersion}": {
"kind": "Sdk",
"version": "${PackageVersion}",
"alias-to": {
"any": "Microsoft.NET.Runtime.WebAssembly.Sdk"
"any": "Microsoft.NET.Runtime.WebAssembly.Sdk"
}
},
"Microsoft.NET.Sdk.WebAssembly.Pack.${NetVersion}": {
"kind": "library",
"version": "${PackageVersion}",
"alias-to": {
"any": "Microsoft.NET.Sdk.WebAssembly.Pack"
"any": "Microsoft.NET.Sdk.WebAssembly.Pack"
}
},
"Microsoft.NET.Runtime.WebAssembly.Wasi.Sdk.${NetVersion}": {
"kind": "Sdk",
"version": "${PackageVersion}",
"alias-to": {
"any": "Microsoft.NET.Runtime.WebAssembly.Wasi.Sdk"
"any": "Microsoft.NET.Runtime.WebAssembly.Wasi.Sdk"
}
},
"Microsoft.NET.Runtime.WebAssembly.Templates.${NetVersion}": {
Expand All @@ -212,28 +212,28 @@
"kind": "framework",
"version": "${PackageVersion}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.Mono.android-arm"
"any": "Microsoft.NETCore.App.Runtime.Mono.android-arm"
}
},
"Microsoft.NETCore.App.Runtime.Mono.${NetVersion}.android-arm64": {
"kind": "framework",
"version": "${PackageVersion}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.Mono.android-arm64"
"any": "Microsoft.NETCore.App.Runtime.Mono.android-arm64"
}
},
"Microsoft.NETCore.App.Runtime.Mono.${NetVersion}.android-x64": {
"kind": "framework",
"version": "${PackageVersion}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.Mono.android-x64"
"any": "Microsoft.NETCore.App.Runtime.Mono.android-x64"
}
},
"Microsoft.NETCore.App.Runtime.Mono.${NetVersion}.android-x86": {
"kind": "framework",
"version": "${PackageVersion}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.Mono.android-x86"
"any": "Microsoft.NETCore.App.Runtime.Mono.android-x86"
}
},
"Microsoft.NETCore.App.Runtime.AOT.Cross.${NetVersion}.android-x86": {
Expand Down Expand Up @@ -288,35 +288,35 @@
"kind": "framework",
"version": "${PackageVersion}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.Mono.maccatalyst-arm64"
"any": "Microsoft.NETCore.App.Runtime.Mono.maccatalyst-arm64"
}
},
"Microsoft.NETCore.App.Runtime.Mono.${NetVersion}.maccatalyst-x64": {
"kind": "framework",
"version": "${PackageVersion}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.Mono.maccatalyst-x64"
"any": "Microsoft.NETCore.App.Runtime.Mono.maccatalyst-x64"
}
},
"Microsoft.NETCore.App.Runtime.Mono.${NetVersion}.osx-arm64": {
"kind": "framework",
"version": "${PackageVersion}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"
"any": "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"
}
},
"Microsoft.NETCore.App.Runtime.Mono.${NetVersion}.osx-x64": {
"kind": "framework",
"version": "${PackageVersion}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.Mono.osx-x64"
"any": "Microsoft.NETCore.App.Runtime.Mono.osx-x64"
}
},
"Microsoft.NETCore.App.Runtime.${NetVersion}.osx-arm64": {
"kind": "framework",
"version": "${PackageVersion}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.osx-arm64"
"any": "Microsoft.NETCore.App.Runtime.osx-arm64"
}
},
"Microsoft.NETCore.App.Runtime.${NetVersion}.osx-x64": {
Expand All @@ -330,14 +330,14 @@
"kind": "framework",
"version": "${PackageVersion}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.Mono.ios-arm64"
"any": "Microsoft.NETCore.App.Runtime.Mono.ios-arm64"
}
},
"Microsoft.NETCore.App.Runtime.Mono.${NetVersion}.iossimulator-arm64" : {
"kind": "framework",
"version": "${PackageVersion}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.Mono.iossimulator-arm64"
"any": "Microsoft.NETCore.App.Runtime.Mono.iossimulator-arm64"
}
},
"Microsoft.NETCore.App.Runtime.Mono.${NetVersion}.iossimulator-x64" : {
Expand All @@ -351,29 +351,29 @@
"kind": "Sdk",
"version": "${PackageVersion}",
"alias-to": {
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvos-arm64",
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-arm64.Cross.tvos-arm64",
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvos-arm64"
}
},
"Microsoft.NETCore.App.Runtime.Mono.${NetVersion}.tvos-arm64" : {
"kind": "framework",
"version": "${PackageVersion}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.Mono.tvos-arm64"
"any": "Microsoft.NETCore.App.Runtime.Mono.tvos-arm64"
}
},
"Microsoft.NETCore.App.Runtime.Mono.${NetVersion}.tvossimulator-arm64" : {
"kind": "framework",
"version": "${PackageVersion}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.Mono.tvossimulator-arm64"
"any": "Microsoft.NETCore.App.Runtime.Mono.tvossimulator-arm64"
}
},
"Microsoft.NETCore.App.Runtime.Mono.${NetVersion}.tvossimulator-x64" : {
"kind": "framework",
"version": "${PackageVersion}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.Mono.tvossimulator-x64"
"any": "Microsoft.NETCore.App.Runtime.Mono.tvossimulator-x64"
}
},
"Microsoft.NETCore.App.Runtime.AOT.Cross.${NetVersion}.maccatalyst-arm64": {
Expand Down Expand Up @@ -464,14 +464,14 @@
"kind": "framework",
"version": "${PackageVersion}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.Mono.browser-wasm"
"any": "Microsoft.NETCore.App.Runtime.Mono.browser-wasm"
}
},
"Microsoft.NETCore.App.Runtime.Mono.multithread.${NetVersion}.browser-wasm" : {
"kind": "framework",
"version": "${PackageVersion}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.Mono.multithread.browser-wasm"
"any": "Microsoft.NETCore.App.Runtime.Mono.multithread.browser-wasm"
}
},
"Microsoft.NETCore.App.Runtime.Mono.${NetVersion}.wasi-wasm" : {
Expand Down
Loading