From 373f048bae3c46810bc030ed7c1ee0568ee5ecc0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 19:49:10 +0100 Subject: [PATCH] [main] Update dependencies from dotnet/arcade (#110477) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update dependencies from https://github.com/dotnet/arcade build 20241205.6 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24605.1 -> To Version 10.0.0-beta.24605.6 * Set roll forward for cdac-build-tool * Bump NetCoreAppToolCurrent to net10.0 * Fix CustomEventSource test https://github.com/dotnet/runtime/pull/110001 updated annotations on EventSource. This adjusts the expected preserved members to match. * Fix tests with Type checks With https://github.com/dotnet/runtime/pull/106497/files, object.GetType is no longer an internalcall. This means we no longer mark the ctor of the return type, System.Type, so the type check removal optimization is kicking in where it didn't before. * Update dependencies from https://github.com/dotnet/arcade build 20241206.6 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24605.1 -> To Version 10.0.0-beta.24606.6 * Disable nativeAOT components for win-x86 temporarily * Update baseline entries * Bump AspNetCoreAppCurrent * Update pinned package versions * Update sdk dependencies * Fix path to WebAssembly build task * Update dependencies from https://github.com/dotnet/arcade build 20241210.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24605.1 -> To Version 10.0.0-beta.24610.1 * Build XUnitLogChecker as SingleFile when we can't AOT it. Our infra expects us to publish this with a host. Publishing as single file makes this a little easier (and keeps it as one file). * Update SDK and remove obsolete condition * Revert "Fix tests with Type checks" This reverts commit 15a30efc19e9827c5e4812c9d7c4b72efed47324. * Fix illink tests * Reapply "Fix tests with Type checks" This reverts commit 7a8c1fb5363ded7cbd47fb2528a5752a6a595573. * Attempt 2 * Update dependencies from https://github.com/dotnet/arcade build 20241210.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24605.1 -> To Version 10.0.0-beta.24610.2 * Update sdk dependencies that are used for workloads tests * Based on https://github.com/dotnet/runtime/pull/93693, Update Wasm.Build.Tests and Wasi.Build.Tests for net10.0 * Change disable condition as hybrid globalization in the browser has been disabled and the test fails due to this condition being false now. * Update dependencies from https://github.com/dotnet/arcade build 20241211.4 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24605.1 -> To Version 10.0.0-beta.24611.4 * Use feature switch to disable DataSet xml serialization related tests * Update dependencies from https://github.com/dotnet/arcade build 20241212.4 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24605.1 -> To Version 10.0.0-beta.24612.4 * Workload fixes and improvements * Remove runtimes-windows from workload manifest, it is unused * Add net10 entries in workloads.csproj * Fix mistakes in net8 workload manifest * Update emsdk * Fix msbuild conditions * Update dependencies from https://github.com/dotnet/arcade build 20241213.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24605.1 -> To Version 10.0.0-beta.24613.2 * Fix regex for runtime pack path to allow space * Fix condition in WorkloadManifest.targets.in to actually match net10.0 * Fix net version in wasm templates * Fix one more hardcoded net9.0 --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Alexander Köplinger Co-authored-by: Sven Boemer Co-authored-by: Viktor Hofer Co-authored-by: Jeremy Koritzinsky Co-authored-by: Michal Strehovský --- Directory.Build.props | 4 +- eng/SourceBuildPrebuiltBaseline.xml | 8 +- eng/Version.Details.xml | 100 ++-- eng/Versions.props | 37 +- .../core-templates/steps/source-build.yml | 2 +- eng/common/cross/build-rootfs.sh | 22 +- eng/common/cross/toolchain.cmake | 82 ++- eng/pipelines/runtime-official.yml | 1 + eng/testing/workloads-browser.targets | 7 + eng/testing/workloads-wasi.targets | 7 + global.json | 10 +- .../TestUtilities/System/PlatformDetection.cs | 6 + .../tests/System/Data/DataSetTest.cs | 10 +- .../tests/System/Data/DataTableTest5.cs | 28 +- .../Data/RestrictedTypeHandlingTests.cs | 14 +- .../tests/DataContractSerializer.cs | 3 +- .../apple/build/AppleBuild.LocalBuild.props | 2 +- ...rosoft.NET.Sdk.WebAssembly.Browser.targets | 3 +- ...ad.Mono.Toolchain.Current.Manifest.pkgproj | 3 + .../WorkloadManifest.json.in | 78 +-- .../WorkloadManifest.targets.in | 148 +++--- .../localize/WorkloadManifest.cs.json | 3 +- .../localize/WorkloadManifest.de.json | 3 +- .../localize/WorkloadManifest.en.json | 3 +- .../localize/WorkloadManifest.es.json | 3 +- .../localize/WorkloadManifest.fr.json | 3 +- .../localize/WorkloadManifest.it.json | 3 +- .../localize/WorkloadManifest.ja.json | 3 +- .../localize/WorkloadManifest.ko.json | 3 +- .../localize/WorkloadManifest.pl.json | 3 +- .../localize/WorkloadManifest.pt-BR.json | 3 +- .../localize/WorkloadManifest.ru.json | 3 +- .../localize/WorkloadManifest.tr.json | 3 +- .../localize/WorkloadManifest.zh-Hans.json | 3 +- .../localize/WorkloadManifest.zh-Hant.json | 3 +- .../WorkloadManifest.json.in | 6 +- .../localize/WorkloadManifest.cs.json | 2 +- ...kload.Mono.Toolchain.net9.Manifest.pkgproj | 63 +++ .../WorkloadManifest.json.in | 476 ++++++++++++++++++ .../WorkloadManifest.targets.in | 96 ++++ .../localize/WorkloadManifest.cs.json | 4 + .../localize/WorkloadManifest.de.json | 4 + .../localize/WorkloadManifest.en.json | 4 + .../localize/WorkloadManifest.es.json | 4 + .../localize/WorkloadManifest.fr.json | 4 + .../localize/WorkloadManifest.it.json | 4 + .../localize/WorkloadManifest.ja.json | 4 + .../localize/WorkloadManifest.ko.json | 4 + .../localize/WorkloadManifest.pl.json | 4 + .../localize/WorkloadManifest.pt-BR.json | 4 + .../localize/WorkloadManifest.ru.json | 4 + .../localize/WorkloadManifest.tr.json | 4 + .../localize/WorkloadManifest.zh-Hans.json | 4 + .../localize/WorkloadManifest.zh-Hant.json | 4 + src/mono/nuget/manifest-packages.proj | 1 + .../sample/wasm/blazor-frame/blazor.csproj | 4 +- .../Wasm.Browser.Bench.Sample.csproj | 6 +- .../wasi/Wasi.Build.Tests/BuildTestBase.cs | 7 +- .../Wasi.Build.Tests/Wasi.Build.Tests.csproj | 5 +- .../wasm/Wasm.Build.Tests/BuildTestBase.cs | 8 +- .../NonWasmTemplateBuildTests.cs | 8 +- .../Wasm.Build.Tests/ProjectProviderBase.cs | 2 +- .../Wasm.Build.Tests/SatelliteLoadingTests.cs | 2 +- .../Templates/WasmTemplateTests.cs | 7 +- .../Templates/WasmTemplateTestsBase.cs | 10 +- .../Wasm.Build.Tests/Wasm.Build.Tests.csproj | 6 +- .../data/{nuget8.config => nuget10.config} | 3 +- .../wasm/Wasm.Build.Tests/data/nuget7.config | 18 - src/mono/wasm/build/WasmApp.LocalBuild.props | 2 +- ...t.NET.Runtime.WebAssembly.Templates.csproj | 1 + .../browser/.template.config/template.json | 12 +- .../templates/browser/browser.0.csproj | 2 +- .../console/.template.config/template.json | 12 +- .../templates/console/console.0.csproj | 2 +- .../.template.config/template.json | 10 +- .../App/BlazorBasicTestApp.csproj | 6 +- .../RazorClassLibrary.csproj | 4 +- .../LibraryWithResources.csproj | 2 +- .../App/WasmBasicTestApp.csproj | 2 +- .../WasmBasicTestApp/Json/Json.csproj | 2 +- .../WasmBasicTestApp/Library/Library.csproj | 2 +- .../ResourceLibrary/ResourceLibrary.csproj | 2 +- .../AspNetCoreServer/AspNetCoreServer.csproj | 4 +- .../BlazorClient/BlazorClient.csproj | 6 +- .../WasmOnAspNetCore/Shared/Shared.csproj | 6 +- .../WasmBrowserClient.csproj | 2 +- .../XUnitLogChecker/XUnitLogChecker.csproj | 2 + .../src/linker/Linker.Steps/MarkStep.cs | 1 + ...DynamicallyAccessedMembersAnalyzerTests.cs | 2 +- .../BCLFeatures/ETW/CustomEventSource.cs | 6 - .../DataFlow/IReflectDataflow.cs | 2 +- .../DataFlow/MethodByRefParameterDataFlow.cs | 3 - .../DataFlow/NullableAnnotations.cs | 9 + .../UnreachableBlock/ComplexConditions.cs | 10 + src/workloads/workloads.csproj | 53 +- 95 files changed, 1127 insertions(+), 443 deletions(-) create mode 100644 src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest.pkgproj create mode 100644 src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/WorkloadManifest.json.in create mode 100644 src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/WorkloadManifest.targets.in create mode 100644 src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.cs.json create mode 100644 src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.de.json create mode 100644 src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.en.json create mode 100644 src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.es.json create mode 100644 src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.fr.json create mode 100644 src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.it.json create mode 100644 src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.ja.json create mode 100644 src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.ko.json create mode 100644 src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.pl.json create mode 100644 src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.pt-BR.json create mode 100644 src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.ru.json create mode 100644 src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.tr.json create mode 100644 src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.zh-Hans.json create mode 100644 src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.zh-Hant.json rename src/mono/wasm/Wasm.Build.Tests/data/{nuget8.config => nuget10.config} (68%) delete mode 100644 src/mono/wasm/Wasm.Build.Tests/data/nuget7.config diff --git a/Directory.Build.props b/Directory.Build.props index f30877332027d0..79ec992824c389 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -105,11 +105,11 @@ - 9.0 + 10.0 net$(NetCoreAppToolCurrentVersion) $(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppToolCurrentVersion) - 9.0 + 10.0 net$(AspNetCoreAppCurrentVersion) net462 diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index ae969b3baa65e5..4e5b0e471c1565 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -11,12 +11,12 @@ - - - + + + - + - + https://github.com/dotnet/emsdk - 235d38cd586eeed59513cf865f4771914d654e4a + 11e2cd6f4b4bd65b10692fbdc17f597fa79793c8 @@ -84,87 +84,87 @@ - + https://github.com/dotnet/arcade - 110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed + 255d5e0c89958af276883a988108c2d616438805 - + https://github.com/dotnet/arcade - 110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed + 255d5e0c89958af276883a988108c2d616438805 - + https://github.com/dotnet/arcade - 110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed + 255d5e0c89958af276883a988108c2d616438805 - + https://github.com/dotnet/arcade - 110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed + 255d5e0c89958af276883a988108c2d616438805 - + https://github.com/dotnet/arcade - 110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed + 255d5e0c89958af276883a988108c2d616438805 - + https://github.com/dotnet/arcade - 110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed + 255d5e0c89958af276883a988108c2d616438805 - + https://github.com/dotnet/arcade - 110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed + 255d5e0c89958af276883a988108c2d616438805 - + https://github.com/dotnet/arcade - 110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed + 255d5e0c89958af276883a988108c2d616438805 - + https://github.com/dotnet/arcade - 110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed + 255d5e0c89958af276883a988108c2d616438805 - + https://github.com/dotnet/arcade - 110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed + 255d5e0c89958af276883a988108c2d616438805 - + https://github.com/dotnet/arcade - 110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed + 255d5e0c89958af276883a988108c2d616438805 - + https://github.com/dotnet/arcade - 110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed + 255d5e0c89958af276883a988108c2d616438805 - + https://github.com/dotnet/arcade - 110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed + 255d5e0c89958af276883a988108c2d616438805 - + https://github.com/dotnet/arcade - 110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed + 255d5e0c89958af276883a988108c2d616438805 - + https://github.com/dotnet/arcade - 110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed + 255d5e0c89958af276883a988108c2d616438805 - + https://github.com/dotnet/arcade - 110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed + 255d5e0c89958af276883a988108c2d616438805 - + https://github.com/dotnet/arcade - 110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed + 255d5e0c89958af276883a988108c2d616438805 - + https://github.com/dotnet/arcade - 110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed + 255d5e0c89958af276883a988108c2d616438805 - + https://github.com/dotnet/arcade - 110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed + 255d5e0c89958af276883a988108c2d616438805 - + https://github.com/dotnet/arcade - 110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed + 255d5e0c89958af276883a988108c2d616438805 https://github.com/dotnet/runtime-assets @@ -348,9 +348,9 @@ https://github.com/dotnet/xharness 9fca69998474507f6515c1351efe027dbf194c87 - + https://github.com/dotnet/arcade - 110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed + 255d5e0c89958af276883a988108c2d616438805 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -402,14 +402,14 @@ 86d60f7a00b0274a806a40afde8801a89d27e6bc - + https://github.com/dotnet/sdk - 9de571282093d76401a3f457a8e9f4427e088778 + 138afc2ac17650f5cc1cf46de85f12ea756c54e7 - + https://github.com/dotnet/sdk - 9de571282093d76401a3f457a8e9f4427e088778 + 138afc2ac17650f5cc1cf46de85f12ea756c54e7 diff --git a/eng/Versions.props b/eng/Versions.props index 788fd0df01aa64..c5cc32e6f7ab81 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,6 +7,7 @@ 0 0 $(MajorVersion).0.100 + 9.0.0 8.0.8 7.0.20 6.0.$([MSBuild]::Add($([System.Version]::Parse('$(PackageVersionNet8)').Build),25)) @@ -82,24 +83,24 @@ 0.2.0 - 10.0.100-alpha.1.24480.5 + 10.0.100-alpha.1.24610.7 - 10.0.0-beta.24605.1 - 10.0.0-beta.24605.1 - 10.0.0-beta.24605.1 - 10.0.0-beta.24605.1 - 2.9.2-beta.24605.1 - 10.0.0-beta.24605.1 - 2.9.2-beta.24605.1 - 10.0.0-beta.24605.1 - 10.0.0-beta.24605.1 - 10.0.0-beta.24605.1 - 10.0.0-beta.24605.1 - 10.0.0-beta.24605.1 - 10.0.0-beta.24605.1 - 10.0.0-beta.24605.1 - 10.0.0-beta.24605.1 - 10.0.0-beta.24605.1 + 10.0.0-beta.24613.2 + 10.0.0-beta.24613.2 + 10.0.0-beta.24613.2 + 10.0.0-beta.24613.2 + 2.9.2-beta.24613.2 + 10.0.0-beta.24613.2 + 2.9.2-beta.24613.2 + 10.0.0-beta.24613.2 + 10.0.0-beta.24613.2 + 10.0.0-beta.24613.2 + 10.0.0-beta.24613.2 + 10.0.0-beta.24613.2 + 10.0.0-beta.24613.2 + 10.0.0-beta.24613.2 + 10.0.0-beta.24613.2 + 10.0.0-beta.24613.2 1.4.0 @@ -250,7 +251,7 @@ Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-10_0_100_Transport --> - 10.0.0-alpha.1.24575.2 + 10.0.0-alpha.1.24613.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion) 1.1.87-gba258badda diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 4da05afe054471..f9ba1625c20f18 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -78,7 +78,7 @@ steps: portableBuildArgs= if [ '${{ parameters.platform.portableBuild }}' != '' ]; then - portableBuildArgs='/p:PortabelBuild=${{ parameters.platform.portableBuild }}' + portableBuildArgs='/p:PortableBuild=${{ parameters.platform.portableBuild }}' fi ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 20ae8c28687b66..de9807297909d6 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -52,14 +52,12 @@ __UbuntuPackages+=" symlinks" __UbuntuPackages+=" libicu-dev" __UbuntuPackages+=" liblttng-ust-dev" __UbuntuPackages+=" libunwind8-dev" -__UbuntuPackages+=" libnuma-dev" __AlpinePackages+=" gettext-dev" __AlpinePackages+=" icu-dev" __AlpinePackages+=" libunwind-dev" __AlpinePackages+=" lttng-ust-dev" __AlpinePackages+=" compiler-rt" -__AlpinePackages+=" numactl-dev" # runtime libraries' dependencies __UbuntuPackages+=" libcurl4-openssl-dev" @@ -73,8 +71,8 @@ __AlpinePackages+=" krb5-dev" __AlpinePackages+=" openssl-dev" __AlpinePackages+=" zlib-dev" -__FreeBSDBase="13.3-RELEASE" -__FreeBSDPkg="1.17.0" +__FreeBSDBase="13.4-RELEASE" +__FreeBSDPkg="1.21.3" __FreeBSDABI="13" __FreeBSDPackages="libunwind" __FreeBSDPackages+=" icu" @@ -371,7 +369,7 @@ while :; do ;; freebsd14) __CodeName=freebsd - __FreeBSDBase="14.0-RELEASE" + __FreeBSDBase="14.2-RELEASE" __FreeBSDABI="14" __SkipUnmount=1 ;; @@ -424,13 +422,12 @@ case "$__AlpineVersion" in elif [[ "$__AlpineArch" == "riscv64" ]]; then __AlpineLlvmLibsLookup=1 __AlpineVersion=edge # minimum version with APKINDEX.tar.gz (packages archive) + elif [[ -n "$__AlpineVersion" ]]; then + # use whichever alpine version is provided and select the latest toolchain libs + __AlpineLlvmLibsLookup=1 else __AlpineVersion=3.13 # 3.13 to maximize compatibility __AlpinePackages+=" llvm10-libs" - - if [[ "$__AlpineArch" == "armv7" ]]; then - __AlpinePackages="${__AlpinePackages//numactl-dev/}" - fi fi esac @@ -444,11 +441,6 @@ if [[ "$__BuildArch" == "armel" ]]; then __LLDB_Package="lldb-3.5-dev" fi -if [[ "$__CodeName" == "xenial" && "$__UbuntuArch" == "armhf" ]]; then - # libnuma-dev is not available on armhf for xenial - __UbuntuPackages="${__UbuntuPackages//libnuma-dev/}" -fi - __UbuntuPackages+=" ${__LLDB_Package:-}" if [[ -z "$__UbuntuRepo" ]]; then @@ -574,7 +566,7 @@ elif [[ "$__CodeName" == "freebsd" ]]; then curl -SL "https://download.freebsd.org/ftp/releases/${__FreeBSDArch}/${__FreeBSDMachineArch}/${__FreeBSDBase}/base.txz" | tar -C "$__RootfsDir" -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version fi echo "ABI = \"FreeBSD:${__FreeBSDABI}:${__FreeBSDMachineArch}\"; FINGERPRINTS = \"${__RootfsDir}/usr/share/keys\"; REPOS_DIR = [\"${__RootfsDir}/etc/pkg\"]; REPO_AUTOUPDATE = NO; RUN_SCRIPTS = NO;" > "${__RootfsDir}"/usr/local/etc/pkg.conf - echo "FreeBSD: { url: \"pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly\", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"${__RootfsDir}/usr/share/keys/pkg\", enabled: yes }" > "${__RootfsDir}"/etc/pkg/FreeBSD.conf + echo "FreeBSD: { url: \"pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly\", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"/usr/share/keys/pkg\", enabled: yes }" > "${__RootfsDir}"/etc/pkg/FreeBSD.conf mkdir -p "$__RootfsDir"/tmp # get and build package manager if [[ "$__hasWget" == 1 ]]; then diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 9a7ecfbd42c5f3..0ff85cf0367ee6 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -67,6 +67,13 @@ elseif(TARGET_ARCH_NAME STREQUAL "armv6") else() set(TOOLCHAIN "arm-linux-gnueabihf") endif() +elseif(TARGET_ARCH_NAME STREQUAL "loongarch64") + set(CMAKE_SYSTEM_PROCESSOR "loongarch64") + if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/loongarch64-alpine-linux-musl) + set(TOOLCHAIN "loongarch64-alpine-linux-musl") + else() + set(TOOLCHAIN "loongarch64-linux-gnu") + endif() elseif(TARGET_ARCH_NAME STREQUAL "ppc64le") set(CMAKE_SYSTEM_PROCESSOR ppc64le) if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/powerpc64le-alpine-linux-musl) @@ -118,7 +125,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu") endif() else() - message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, ppc64le, riscv64, s390x, x64 and x86 are supported!") + message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, loongarch64, ppc64le, riscv64, s390x, x64 and x86 are supported!") endif() if(DEFINED ENV{TOOLCHAIN}) @@ -148,6 +155,25 @@ if(TIZEN) include_directories(SYSTEM ${TIZEN_TOOLCHAIN_PATH}/include/c++/${TIZEN_TOOLCHAIN}) endif() +function(locate_toolchain_exec exec var) + set(TOOLSET_PREFIX ${TOOLCHAIN}-) + string(TOUPPER ${exec} EXEC_UPPERCASE) + if(NOT "$ENV{CLR_${EXEC_UPPERCASE}}" STREQUAL "") + set(${var} "$ENV{CLR_${EXEC_UPPERCASE}}" PARENT_SCOPE) + return() + endif() + + find_program(EXEC_LOCATION_${exec} + NAMES + "${TOOLSET_PREFIX}${exec}${CLR_CMAKE_COMPILER_FILE_NAME_VERSION}" + "${TOOLSET_PREFIX}${exec}") + + if (EXEC_LOCATION_${exec} STREQUAL "EXEC_LOCATION_${exec}-NOTFOUND") + message(FATAL_ERROR "Unable to find toolchain executable. Name: ${exec}, Prefix: ${TOOLSET_PREFIX}.") + endif() + set(${var} ${EXEC_LOCATION_${exec}} PARENT_SCOPE) +endfunction() + if(ANDROID) if(TARGET_ARCH_NAME STREQUAL "arm") set(ANDROID_ABI armeabi-v7a) @@ -178,66 +204,24 @@ elseif(FREEBSD) set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -fuse-ld=lld") elseif(ILLUMOS) set(CMAKE_SYSROOT "${CROSS_ROOTFS}") + set(CMAKE_SYSTEM_PREFIX_PATH "${CROSS_ROOTFS}") + set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp") + set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp") include_directories(SYSTEM ${CROSS_ROOTFS}/include) - set(TOOLSET_PREFIX ${TOOLCHAIN}-) - function(locate_toolchain_exec exec var) - string(TOUPPER ${exec} EXEC_UPPERCASE) - if(NOT "$ENV{CLR_${EXEC_UPPERCASE}}" STREQUAL "") - set(${var} "$ENV{CLR_${EXEC_UPPERCASE}}" PARENT_SCOPE) - return() - endif() - - find_program(EXEC_LOCATION_${exec} - NAMES - "${TOOLSET_PREFIX}${exec}${CLR_CMAKE_COMPILER_FILE_NAME_VERSION}" - "${TOOLSET_PREFIX}${exec}") - - if (EXEC_LOCATION_${exec} STREQUAL "EXEC_LOCATION_${exec}-NOTFOUND") - message(FATAL_ERROR "Unable to find toolchain executable. Name: ${exec}, Prefix: ${TOOLSET_PREFIX}.") - endif() - set(${var} ${EXEC_LOCATION_${exec}} PARENT_SCOPE) - endfunction() - - set(CMAKE_SYSTEM_PREFIX_PATH "${CROSS_ROOTFS}") - locate_toolchain_exec(gcc CMAKE_C_COMPILER) locate_toolchain_exec(g++ CMAKE_CXX_COMPILER) - - set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp") - set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp") elseif(HAIKU) set(CMAKE_SYSROOT "${CROSS_ROOTFS}") set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin") - - set(TOOLSET_PREFIX ${TOOLCHAIN}-) - function(locate_toolchain_exec exec var) - string(TOUPPER ${exec} EXEC_UPPERCASE) - if(NOT "$ENV{CLR_${EXEC_UPPERCASE}}" STREQUAL "") - set(${var} "$ENV{CLR_${EXEC_UPPERCASE}}" PARENT_SCOPE) - return() - endif() - - find_program(EXEC_LOCATION_${exec} - NAMES - "${TOOLSET_PREFIX}${exec}${CLR_CMAKE_COMPILER_FILE_NAME_VERSION}" - "${TOOLSET_PREFIX}${exec}") - - if (EXEC_LOCATION_${exec} STREQUAL "EXEC_LOCATION_${exec}-NOTFOUND") - message(FATAL_ERROR "Unable to find toolchain executable. Name: ${exec}, Prefix: ${TOOLSET_PREFIX}.") - endif() - set(${var} ${EXEC_LOCATION_${exec}} PARENT_SCOPE) - endfunction() - set(CMAKE_SYSTEM_PREFIX_PATH "${CROSS_ROOTFS}") + set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp") + set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp") locate_toolchain_exec(gcc CMAKE_C_COMPILER) locate_toolchain_exec(g++ CMAKE_CXX_COMPILER) - set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp") - set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp") - # let CMake set up the correct search paths include(Platform/Haiku) else() @@ -307,7 +291,7 @@ endif() # Specify compile options -if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|ppc64le|riscv64|s390x|x64|x86)$" AND NOT ANDROID AND NOT FREEBSD) OR ILLUMOS OR HAIKU) +if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|loongarch64|ppc64le|riscv64|s390x|x64|x86)$" AND NOT ANDROID AND NOT FREEBSD) OR ILLUMOS OR HAIKU) set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN}) set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN}) set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN}) diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml index e3e10911f52e90..9647fca1e8c9dd 100644 --- a/eng/pipelines/runtime-official.yml +++ b/eng/pipelines/runtime-official.yml @@ -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 diff --git a/eng/testing/workloads-browser.targets b/eng/testing/workloads-browser.targets index f54d9a1d9de34e..8f610916ff9837 100644 --- a/eng/testing/workloads-browser.targets +++ b/eng/testing/workloads-browser.targets @@ -14,6 +14,12 @@ Variant="latest" Version="$(PackageVersionForWorkloadManifests)" /> + + + diff --git a/eng/testing/workloads-wasi.targets b/eng/testing/workloads-wasi.targets index 5b9b4240228e9f..1fa46bc733adda 100644 --- a/eng/testing/workloads-wasi.targets +++ b/eng/testing/workloads-wasi.targets @@ -14,6 +14,12 @@ Variant="latest" Version="$(PackageVersionForWorkloadManifests)" /> + + + diff --git a/global.json b/global.json index a2c6b3dabb3dce..796b273c5d159c 100644 --- a/global.json +++ b/global.json @@ -1,16 +1,16 @@ { "sdk": { - "version": "9.0.100", + "version": "10.0.100-alpha.1.24610.7", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "9.0.100" + "dotnet": "10.0.100-alpha.1.24610.7" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24605.1", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24605.1", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.24605.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24613.2", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24613.2", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.24613.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "10.0.0-alpha.1.24565.3" diff --git a/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs b/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs index a37457fda62a54..7d9711aa78adb7 100644 --- a/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs +++ b/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs @@ -290,6 +290,12 @@ public static bool IsMetadataTokenSupported public static bool IsBrowserAndIsBuiltWithAggressiveTrimming => IsBuiltWithAggressiveTrimming && IsBrowser; public static bool IsTrimmedWithILLink => IsBuiltWithAggressiveTrimming && !IsNativeAot; +#if NET + public static bool DataSetXmlSerializationIsSupported => AppContext.TryGetSwitch("System.Data.DataSet.XmlSerializationIsSupported", out bool isSupported) ? isSupported : true; +#else + public static bool DataSetXmlSerializationIsSupported => true; +#endif + // Windows - Schannel supports alpn from win8.1/2012 R2 and higher. // Linux - OpenSsl supports alpn from openssl 1.0.2 and higher. // Android - Platform supports alpn from API level 29 and higher diff --git a/src/libraries/System.Data.Common/tests/System/Data/DataSetTest.cs b/src/libraries/System.Data.Common/tests/System/Data/DataSetTest.cs index 523d4c47bf38f4..05586adfeb56ee 100644 --- a/src/libraries/System.Data.Common/tests/System/Data/DataSetTest.cs +++ b/src/libraries/System.Data.Common/tests/System/Data/DataSetTest.cs @@ -364,7 +364,7 @@ public void IgnoreColumnEmptyNamespace() Assert.Equal(xml, sw.ToString()); } - [Fact] + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.DataSetXmlSerializationIsSupported))] public void SerializeDataSet() { // see GetReady() for current culture @@ -384,7 +384,7 @@ public void SerializeDataSet() Assert.Equal(result.Replace("\r\n", "\n"), xml.Replace("\r\n", "\n")); } - [Fact] + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.DataSetXmlSerializationIsSupported))] public void SerializeDataSet2() { DataSet quota = new DataSet("Quota"); @@ -417,7 +417,7 @@ public void SerializeDataSet2() DataSet ds = (DataSet)ser.Deserialize(new StringReader(sw.ToString())); } - [Fact] + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.DataSetXmlSerializationIsSupported))] [ActiveIssue("https://github.com/dotnet/runtime/issues/30154")] public void SerializeDataSet3() { @@ -475,7 +475,7 @@ public void SerializeDataSet3() Assert.Equal(xml, result.Replace("\r\n", "").Replace("\n", ""), ignoreCase: false, ignoreLineEndingDifferences: true, ignoreWhiteSpaceDifferences: true); } - [Fact] + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.DataSetXmlSerializationIsSupported))] public void DeserializeDataSet() { string xml = @" @@ -1355,7 +1355,7 @@ public void WriteXmlModeSchema1() } } - [Fact] + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.DataSetXmlSerializationIsSupported))] public void DeserializeModifiedDataSet() { // Serialization begins diff --git a/src/libraries/System.Data.Common/tests/System/Data/DataTableTest5.cs b/src/libraries/System.Data.Common/tests/System/Data/DataTableTest5.cs index 4187991048afb6..0d759ed54d8896 100644 --- a/src/libraries/System.Data.Common/tests/System/Data/DataTableTest5.cs +++ b/src/libraries/System.Data.Common/tests/System/Data/DataTableTest5.cs @@ -472,7 +472,7 @@ private void VerifyTableSchema(DataTable table, string tableName, DataSet ds) Assert.Equal(3, row["DepartmentID"]); } - [Fact] + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.DataSetXmlSerializationIsSupported))] public void XmlTest1() { //Make a table without any relations @@ -490,7 +490,7 @@ public void XmlTest1() VerifyTableSchema(table, _parentTable1.TableName, null);//parentTable1.DataSet); } - [Fact] + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.DataSetXmlSerializationIsSupported))] public void XmlTest2() { MakeParentTable1(); @@ -509,7 +509,7 @@ public void XmlTest2() VerifyTableSchema(table, _parentTable1.TableName, ds); } - [Fact] + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.DataSetXmlSerializationIsSupported))] public void XmlTest3() { //Create a parent table and create child tables @@ -529,7 +529,7 @@ public void XmlTest3() VerifyTableSchema(table, _parentTable1.TableName, null); } - [Fact] + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.DataSetXmlSerializationIsSupported))] public void XmlTest4() { //Create a parent table and create child tables @@ -653,7 +653,7 @@ public void XmlTest4() Assert.Equal(3, row["ParentID"]); } - [Fact] + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.DataSetXmlSerializationIsSupported))] public void XmlTest5() { MakeParentTable1(); @@ -691,7 +691,7 @@ public void XmlTest5() Assert.Equal("3", row[0]); } - [Fact] + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.DataSetXmlSerializationIsSupported))] public void XmlTest6() { MakeParentTable1(); @@ -723,7 +723,7 @@ public void XmlTest6() Assert.NotNull(table.DataSet); } - [Fact] + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.DataSetXmlSerializationIsSupported))] public void XmlTest7() { MakeParentTable1(); @@ -784,7 +784,7 @@ public void XmlTest7() Assert.Equal(3, row["DepartmentID"]); } - [Fact] + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.DataSetXmlSerializationIsSupported))] public void XmlTest8() { MakeParentTable1(); @@ -826,7 +826,7 @@ public void XmlTest8() Assert.Equal(3, row[1]); } - [Fact] + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.DataSetXmlSerializationIsSupported))] public void XmlTest9() { MakeParentTable1(); @@ -864,7 +864,7 @@ public void XmlTest9() Assert.Equal(3, row[0]); } - [Fact] + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.DataSetXmlSerializationIsSupported))] public void XmlTest10() { MakeParentTable1(); @@ -906,7 +906,7 @@ public void XmlTest10() Assert.Equal("3", row[1]); } - [Fact] + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.DataSetXmlSerializationIsSupported))] public void XmlTest11() { MakeDummyTable(); @@ -945,7 +945,7 @@ public void XmlTest11() Assert.Equal(DataRowState.Unchanged, row.RowState); } - [Fact] + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.DataSetXmlSerializationIsSupported))] public void XmlTest14() { MakeParentTable1(); @@ -991,7 +991,7 @@ public void XmlTest14() Assert.Equal(3, row[2]); } - [Fact] + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.DataSetXmlSerializationIsSupported))] public void XmlTest15() { MakeDummyTable(); @@ -1030,7 +1030,7 @@ public void XmlTest15() Assert.Equal(DataRowState.Unchanged, row.RowState); } - [Fact] + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.DataSetXmlSerializationIsSupported))] public void XmlTest16() { DataSet ds = new DataSet(); diff --git a/src/libraries/System.Data.Common/tests/System/Data/RestrictedTypeHandlingTests.cs b/src/libraries/System.Data.Common/tests/System/Data/RestrictedTypeHandlingTests.cs index 4b425eaea464e5..40044d336ec5a2 100644 --- a/src/libraries/System.Data.Common/tests/System/Data/RestrictedTypeHandlingTests.cs +++ b/src/libraries/System.Data.Common/tests/System/Data/RestrictedTypeHandlingTests.cs @@ -122,7 +122,7 @@ public static IEnumerable ForbiddenTypes() yield return new object[] { typeof(void) }; } - [Theory] + [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.DataSetXmlSerializationIsSupported))] [MemberData(nameof(AllowedTypes))] public void DataTable_ReadXml_AllowsKnownTypes(Type type) { @@ -145,7 +145,7 @@ public void DataTable_ReadXml_AllowsKnownTypes(Type type) Assert.Equal(type, table.Columns[0].DataType); } - [Theory] + [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.DataSetXmlSerializationIsSupported))] [MemberData(nameof(ForbiddenTypes))] public void DataTable_ReadXml_ForbidsUnknownTypes(Type type) { @@ -204,7 +204,7 @@ public void DataTable_ReadXmlSchema_AllowsUnknownTypes(Type type) Assert.Equal(type, table.Columns[0].DataType); } - [Fact] + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.DataSetXmlSerializationIsSupported))] public void DataTable_HonorsGloballyDefinedAllowList() { // Arrange @@ -295,7 +295,7 @@ public void DataTable_HonorsGloballyDefinedAllowListForSqlTypes() } } - [Fact] + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.DataSetXmlSerializationIsSupported))] public void DataColumn_ConvertExpression_SubjectToAllowList_Success() { // Arrange @@ -318,7 +318,7 @@ public void DataColumn_ConvertExpression_SubjectToAllowList_Success() Assert.Equal("CONVERT('42', 'System.Int32')", table.Columns[0].Expression); } - [Fact] + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.DataSetXmlSerializationIsSupported))] public void DataColumn_ConvertExpression_SubjectToAllowList_Failure() { // Arrange @@ -341,7 +341,7 @@ public void DataColumn_ConvertExpression_SubjectToAllowList_Failure() Assert.Throws(() => table.Rows.Add(new StringBuilder())); } - [Theory] + [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.DataSetXmlSerializationIsSupported))] [MemberData(nameof(AllowedTypes))] public void DataSet_ReadXml_AllowsKnownTypes(Type type) { @@ -371,7 +371,7 @@ public void DataSet_ReadXml_AllowsKnownTypes(Type type) Assert.Equal(type, table.Columns[0].DataType); } - [Theory] + [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.DataSetXmlSerializationIsSupported))] [MemberData(nameof(ForbiddenTypes))] public void DataSet_ReadXml_ForbidsUnknownTypes(Type type) { diff --git a/src/libraries/System.Runtime.Serialization.Xml/tests/DataContractSerializer.cs b/src/libraries/System.Runtime.Serialization.Xml/tests/DataContractSerializer.cs index 34550236dda8e0..91afc052ae742c 100644 --- a/src/libraries/System.Runtime.Serialization.Xml/tests/DataContractSerializer.cs +++ b/src/libraries/System.Runtime.Serialization.Xml/tests/DataContractSerializer.cs @@ -3541,8 +3541,7 @@ public static void DCS_BasicPerSerializerRoundTripAndCompare_SampleTypes() TestObjectInObjectContainerWithSimpleResolver(genericBase2, $@"<_data z:Id=""i1"" i:type=""a:SerializationTestTypes.GenericBase2`2[[SerializationTestTypes.KT1Base, {assemblyName}],[SerializationTestTypes.NonDCPerson, {assemblyName}]]***"" xmlns:z=""http://schemas.microsoft.com/2003/10/Serialization/"" xmlns:a=""http://schemas.datacontract.org/2004/07/SerializationTestTypes.GenericBase2`2[[SerializationTestTypes.KT1Base, {assemblyName}],[SerializationTestTypes.NonDCPerson, {assemblyName}]]***"">TestData20jeff<_data2 z:Ref=""i1"" xmlns:z=""http://schemas.microsoft.com/2003/10/Serialization/""/>"); } - - [Fact] + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.DataSetXmlSerializationIsSupported))] public static void DCS_BasicPerSerializerRoundTripAndCompare_DataSet() { diff --git a/src/mono/msbuild/apple/build/AppleBuild.LocalBuild.props b/src/mono/msbuild/apple/build/AppleBuild.LocalBuild.props index b3319b190b9c47..221d9f34feea52 100644 --- a/src/mono/msbuild/apple/build/AppleBuild.LocalBuild.props +++ b/src/mono/msbuild/apple/build/AppleBuild.LocalBuild.props @@ -24,7 +24,7 @@ <_NetCoreAppCurrent>net10.0 $(_NetCoreAppCurrent) - <_NetCoreAppToolCurrent>net9.0 + <_NetCoreAppToolCurrent>net10.0 false diff --git a/src/mono/nuget/Microsoft.NET.Sdk.WebAssembly.Pack/build/Microsoft.NET.Sdk.WebAssembly.Browser.targets b/src/mono/nuget/Microsoft.NET.Sdk.WebAssembly.Pack/build/Microsoft.NET.Sdk.WebAssembly.Browser.targets index be593d84efa0f9..12a3e2121a8ab8 100644 --- a/src/mono/nuget/Microsoft.NET.Sdk.WebAssembly.Pack/build/Microsoft.NET.Sdk.WebAssembly.Browser.targets +++ b/src/mono/nuget/Microsoft.NET.Sdk.WebAssembly.Pack/build/Microsoft.NET.Sdk.WebAssembly.Browser.targets @@ -45,7 +45,7 @@ Copyright (c) .NET Foundation. All rights reserved. $(MSBuildThisFileDirectory)..\ - <_WebAssemblySdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">net9.0 + <_WebAssemblySdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">net10.0 <_WebAssemblySdkTasksTFM Condition=" '$(MSBuildRuntimeType)' != 'Core'">net472 <_WebAssemblySdkTasksAssembly>$(WebAssemblySdkDirectoryRoot)tools\$(_WebAssemblySdkTasksTFM)\Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.dll @@ -176,6 +176,7 @@ Copyright (c) .NET Foundation. All rights reserved. <_TargetingNET80OrLater>false + <_TargetingNET90OrLater>false <_TargetingNET80OrLater Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals('$(TargetFrameworkVersion)', '8.0'))">true <_TargetingNET90OrLater Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals('$(TargetFrameworkVersion)', '9.0'))">true diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest.pkgproj b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest.pkgproj index abe270ad165eac..2997dc75ffa94e 100644 --- a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest.pkgproj +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest.pkgproj @@ -57,6 +57,9 @@ <_WorkloadManifestValues Include="EmscriptenVersion" Value="$(MicrosoftNETRuntimeEmscriptenVersion)" /> + + ${PackageVersionNet6} true - + + + true @@ -40,9 +43,9 @@ $(WasmNativeWorkload) false $(WasmNativeWorkloadAvailable) - - + + @@ -83,12 +86,74 @@ true + + <_MonoWorkloadTargetsMobile>true + + false true - + + + true + 1.0 + + + + + + + + true + 1.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -96,7 +161,7 @@ - + @@ -157,84 +222,27 @@ - - <_MonoWorkloadTargetsMobile>true + <_MonoWorkloadRuntimePackPackageVersion>$(_RuntimePackInWorkloadVersionCurrent) <_KnownWebAssemblySdkPackVersion>$(_RuntimePackInWorkloadVersionCurrent) - - - true - 1.0 - - - - - - - - true - 1.0 - - - - - - + - %(RuntimePackRuntimeIdentifiers);wasi-wasm + %(RuntimePackRuntimeIdentifiers);wasi-wasm - $(_MonoWorkloadRuntimePackPackageVersion) + $(_MonoWorkloadRuntimePackPackageVersion) - Microsoft.NETCore.App.Runtime.Mono.multithread.**RID** + Microsoft.NETCore.App.Runtime.Mono.multithread.**RID** - $(_MonoWorkloadRuntimePackPackageVersion) + $(_MonoWorkloadRuntimePackPackageVersion) - $(_KnownWebAssemblySdkPackVersion) - $(_KnownWebAssemblySdkPackVersion) - $(_KnownWebAssemblySdkPackVersion) + $(_KnownWebAssemblySdkPackVersion) - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.cs.json b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.cs.json index 57460f86f637de..083905682eb2b4 100644 --- a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.cs.json +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.cs.json @@ -1,5 +1,4 @@ { "workloads/wasm-tools/description": "Nástroje pro sestavení .NET WebAssembly", - "workloads/wasm-experimental/description": "Experimentální nástroje .NET WebAssembly", - "workloads/runtimes-windows/description": "Runtime balíčky pro Windows" + "workloads/wasm-experimental/description": "Experimentální nástroje .NET WebAssembly" } \ No newline at end of file diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.de.json b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.de.json index 6632e9c176b483..b80bc811b31833 100644 --- a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.de.json +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.de.json @@ -1,5 +1,4 @@ { "workloads/wasm-tools/description": ".NET WebAssembly-Buildtools", - "workloads/wasm-experimental/description": "Experimentelle .NET WebAssembly-Tools", - "workloads/runtimes-windows/description": "Windows-Runtime-Pakete" + "workloads/wasm-experimental/description": "Experimentelle .NET WebAssembly-Tools" } \ No newline at end of file diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.en.json b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.en.json index 16bae7ec7b88b1..25e1c9cce17efa 100644 --- a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.en.json +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.en.json @@ -1,5 +1,4 @@ { "workloads/wasm-tools/description": ".NET WebAssembly build tools", - "workloads/wasm-experimental/description": ".NET WebAssembly experimental tooling", - "workloads/runtimes-windows/description": "Windows Runtime Packs" + "workloads/wasm-experimental/description": ".NET WebAssembly experimental tooling" } diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.es.json b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.es.json index 45886c1b558f0d..875f9784b9b009 100644 --- a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.es.json +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.es.json @@ -1,5 +1,4 @@ { "workloads/wasm-tools/description": "Herramientas de compilación de WebAssembly de .NET", - "workloads/wasm-experimental/description": "Herramientas experimentales .NET WebAssembly", - "workloads/runtimes-windows/description": "Paquetes de tiempo de ejecución de Windows" + "workloads/wasm-experimental/description": "Herramientas experimentales .NET WebAssembly" } \ No newline at end of file diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.fr.json b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.fr.json index b3989d6c44a816..faae2221f8eca5 100644 --- a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.fr.json +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.fr.json @@ -1,5 +1,4 @@ { "workloads/wasm-tools/description": "Outils de build .NET WebAssembly", - "workloads/wasm-experimental/description": "Outils expérimentaux .NET WebAssembly", - "workloads/runtimes-windows/description": "Packs d'exécution Windows" + "workloads/wasm-experimental/description": "Outils expérimentaux .NET WebAssembly" } \ No newline at end of file diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.it.json b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.it.json index 04a6fc30048c3c..abf3332a4daf1e 100644 --- a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.it.json +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.it.json @@ -1,5 +1,4 @@ { "workloads/wasm-tools/description": "Strumenti di compilazione WebAssembly .NET", - "workloads/wasm-experimental/description": "Strumenti sperimentali di .NET WebAssembly", - "workloads/runtimes-windows/description": "Pacchetti di Windows Runtime" + "workloads/wasm-experimental/description": "Strumenti sperimentali di .NET WebAssembly" } \ No newline at end of file diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.ja.json b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.ja.json index 556dcea77eebd4..20372a8d9e22df 100644 --- a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.ja.json +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.ja.json @@ -1,5 +1,4 @@ { "workloads/wasm-tools/description": ".NET WebAssembly ビルドツール", - "workloads/wasm-experimental/description": ".NET WebAssembly 実験的ツール", - "workloads/runtimes-windows/description": "Windows ランタイム パック" + "workloads/wasm-experimental/description": ".NET WebAssembly 実験的ツール" } \ No newline at end of file diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.ko.json b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.ko.json index 98c2a9e341d90e..6037888b43c7c9 100644 --- a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.ko.json +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.ko.json @@ -1,5 +1,4 @@ { "workloads/wasm-tools/description": ".NET WebAssembly 빌드 도구", - "workloads/wasm-experimental/description": ".NET WebAssembly 실험 도구", - "workloads/runtimes-windows/description": "Windows 런타임 팩" + "workloads/wasm-experimental/description": ".NET WebAssembly 실험 도구" } \ No newline at end of file diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.pl.json b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.pl.json index ac42d4cbf51c94..c2c791f6803b27 100644 --- a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.pl.json +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.pl.json @@ -1,5 +1,4 @@ { "workloads/wasm-tools/description": "Narzędzia kompilacji zestawu WebAssembly platformy .NET", - "workloads/wasm-experimental/description": "Eksperymentalne narzędzia .NET WebAssembly", - "workloads/runtimes-windows/description": "Pakiety środowiska wykonawczego systemu Windows" + "workloads/wasm-experimental/description": "Eksperymentalne narzędzia .NET WebAssembly" } \ No newline at end of file diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.pt-BR.json b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.pt-BR.json index 95101d70547e76..6dac4833386207 100644 --- a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.pt-BR.json +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.pt-BR.json @@ -1,5 +1,4 @@ { "workloads/wasm-tools/description": "Ferramentas de build para .NET WebAssembly", - "workloads/wasm-experimental/description": "Ferramentas experimentais para .NET WebAssembly", - "workloads/runtimes-windows/description": "Pacotes de tempo de execução do Windows" + "workloads/wasm-experimental/description": "Ferramentas experimentais para .NET WebAssembly" } \ No newline at end of file diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.ru.json b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.ru.json index 5831473984c770..476488ce5ba74d 100644 --- a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.ru.json +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.ru.json @@ -1,5 +1,4 @@ { "workloads/wasm-tools/description": "Средства сборки WebAssembly .NET", - "workloads/wasm-experimental/description": "Экспериментальный инструментарий .NET WebAssembly", - "workloads/runtimes-windows/description": "Пакеты среды выполнения Windows" + "workloads/wasm-experimental/description": "Экспериментальный инструментарий .NET WebAssembly" } \ No newline at end of file diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.tr.json b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.tr.json index 5c2ae06b4482d1..6feb36dc8e4b1b 100644 --- a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.tr.json +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.tr.json @@ -1,5 +1,4 @@ { "workloads/wasm-tools/description": ".NET WebAssembly derleme araçları", - "workloads/wasm-experimental/description": ".NET WebAssembly deneysel araçlar", - "workloads/runtimes-windows/description": "Windows Çalışma Zamanı Paketleri" + "workloads/wasm-experimental/description": ".NET WebAssembly deneysel araçlar" } \ No newline at end of file diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.zh-Hans.json b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.zh-Hans.json index 30205fa4f85315..e79da4bd7b6172 100644 --- a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.zh-Hans.json +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.zh-Hans.json @@ -1,5 +1,4 @@ { "workloads/wasm-tools/description": ".NET WebAssembly 生成工具", - "workloads/wasm-experimental/description": ".NET WebAssembly 实验工具", - "workloads/runtimes-windows/description": "Windows 运行时包" + "workloads/wasm-experimental/description": ".NET WebAssembly 实验工具" } \ No newline at end of file diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.zh-Hant.json b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.zh-Hant.json index c63f2cb9f12ebe..6c9e6a5994d5fd 100644 --- a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.zh-Hant.json +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/localize/WorkloadManifest.zh-Hant.json @@ -1,5 +1,4 @@ { "workloads/wasm-tools/description": ".NET WebAssembly 組建工具", - "workloads/wasm-experimental/description": ".NET WebAssembly 實驗工具", - "workloads/runtimes-windows/description": "Windows 運行時包" + "workloads/wasm-experimental/description": ".NET WebAssembly 實驗工具" } \ No newline at end of file diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net8.Manifest/WorkloadManifest.json.in b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net8.Manifest/WorkloadManifest.json.in index 5fd792e7048ab4..3c3e63c3ae584c 100644 --- a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net8.Manifest/WorkloadManifest.json.in +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net8.Manifest/WorkloadManifest.json.in @@ -277,7 +277,7 @@ "kind": "framework", "version": "${PackageVersionNet8}", "alias-to": { - "any": "Microsoft.NETCore.App.Runtime.Mono.osx-arm64" + "any": "Microsoft.NETCore.App.Runtime.osx-arm64" } }, "Microsoft.NETCore.App.Runtime.net8.osx-x64": { @@ -312,8 +312,8 @@ "kind": "Sdk", "version": "${PackageVersionNet8}", "alias-to": { - "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-arm64.Cross.tvos-arm64", - "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvos-arm64" + "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvos-arm64", + "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-arm64.Cross.tvos-arm64" } }, "Microsoft.NETCore.App.Runtime.Mono.net8.tvos-arm64" : { diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net8.Manifest/localize/WorkloadManifest.cs.json b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net8.Manifest/localize/WorkloadManifest.cs.json index c79d39ad7f74a1..8f5e91b79e1cea 100644 --- a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net8.Manifest/localize/WorkloadManifest.cs.json +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net8.Manifest/localize/WorkloadManifest.cs.json @@ -1,3 +1,3 @@ { - "workloads/wasm-tools-net7/description": "Nástroje pro sestavení .NET WebAssembly" + "workloads/wasm-tools-net8/description": "Nástroje pro sestavení .NET WebAssembly" } diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest.pkgproj b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest.pkgproj new file mode 100644 index 00000000000000..164c39b75f871b --- /dev/null +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest.pkgproj @@ -0,0 +1,63 @@ + + + + + Internal toolchain package not meant for direct consumption. Please do not reference directly. + + + + + + + + Microsoft.NET.Workload.Mono.ToolChain.net9.Manifest-$(SdkBandVersionForWorkload_FromRuntimeVersions) + + + + $(IntermediateOutputPath)WorkloadManifest.json + $(IntermediateOutputPath)WorkloadManifest.targets + + + + + + + + + + data/localize + + + + + + + + PackageVersion=$(PackageVersion); + + + + <_WorkloadManifestValues Include="WorkloadVersion" Value="$(PackageVersion)" /> + <_WorkloadManifestValues Include="PackageVersionNet9" Value="$(PackageVersionNet9)" /> + <_WorkloadManifestValues Include="NetCoreAppCurrent" Value="$(NetCoreAppCurrent)" /> + <_WorkloadManifestValues Include="EmscriptenVersion" Value="$(MicrosoftNETRuntimeEmscriptenVersion)" /> + + + + + + + + + + + + diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/WorkloadManifest.json.in b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/WorkloadManifest.json.in new file mode 100644 index 00000000000000..cef3fc23f871ca --- /dev/null +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/WorkloadManifest.json.in @@ -0,0 +1,476 @@ +{ + "version": "${WorkloadVersion}", + "depends-on": { + "Microsoft.NET.Workload.Emscripten.net9": "${EmscriptenVersion}" + }, + "workloads": { + "wasm-tools-net9": { + "description": ".NET WebAssembly build tools for net9.0", + "packs": [ + "Microsoft.NET.Runtime.WebAssembly.Sdk.net9", + "Microsoft.NET.Sdk.WebAssembly.Pack.net9", + "Microsoft.NETCore.App.Runtime.Mono.net9.browser-wasm", + "Microsoft.NETCore.App.Runtime.AOT.Cross.net9.browser-wasm" + ], + "extends": [ "microsoft-net-runtime-mono-tooling-net9", "microsoft-net-sdk-emscripten-net9" ], + "platforms": [ "win-x64", "win-arm64", "linux-x64", "linux-arm64", "linux-musl-x64", "linux-musl-arm64", "osx-x64", "osx-arm64" ] + }, + "wasm-experimental-net9": { + "description": ".NET WebAssembly experimental tooling for net9.0", + "packs": [ + "Microsoft.NET.Runtime.WebAssembly.Templates.net9", + "Microsoft.NETCore.App.Runtime.Mono.multithread.net9.browser-wasm" + ], + "extends": [ "wasm-tools-net9" ], + "platforms": [ "win-x64", "win-arm64", "linux-x64", "linux-arm64", "linux-musl-x64", "linux-musl-arm64", "osx-x64", "osx-arm64" ] + }, + "wasi-experimental-net9": { + "description": ".NET WASI experimental tooing for for net9.0", + "packs": [ + "Microsoft.NET.Runtime.WebAssembly.Wasi.Sdk.net9", + "Microsoft.NETCore.App.Runtime.Mono.net9.wasi-wasm", + "Microsoft.NET.Runtime.WebAssembly.Templates.net9", + "Microsoft.NETCore.App.Runtime.AOT.Cross.net9.wasi-wasm" + ], + "extends": [ "microsoft-net-runtime-mono-tooling-net9" ], + "platforms": [ "win-x64", "win-arm64", "linux-x64", "linux-arm64", "linux-musl-x64", "linux-musl-arm64", "osx-x64", "osx-arm64" ] + }, + "mobile-librarybuilder-net9.0": { + "description": "Mobile SDK for building a self-contained .NET native library in net9.0", + "packs": [ + "Microsoft.NET.Runtime.LibraryBuilder.Sdk.net9" + ], + "extends": [ "microsoft-net-runtime-android-aot-net9", "microsoft-net-runtime-ios-net9", "microsoft-net-runtime-maccatalyst-net9", "microsoft-net-runtime-tvos-net9" ], + "platforms": [ "win-x64", "win-arm64", "osx-x64", "osx-arm64" ] + }, + "microsoft-net-runtime-android-net9": { + "abstract": true, + "description": "Android Mono Runtime", + "packs": [ + "Microsoft.NETCore.App.Runtime.Mono.net9.android-arm", + "Microsoft.NETCore.App.Runtime.Mono.net9.android-arm64", + "Microsoft.NETCore.App.Runtime.Mono.net9.android-x64", + "Microsoft.NETCore.App.Runtime.Mono.net9.android-x86" + ], + "extends": [ "microsoft-net-runtime-mono-tooling-net9" ], + "platforms": [ "win-x64", "win-arm64", "linux-x64", "linux-arm64", "osx-x64", "osx-arm64" ] + }, + "microsoft-net-runtime-android-aot-net9": { + "abstract": true, + "description": "Android Mono AOT Workload", + "packs": [ + "Microsoft.NETCore.App.Runtime.AOT.Cross.net9.android-x86", + "Microsoft.NETCore.App.Runtime.AOT.Cross.net9.android-x64", + "Microsoft.NETCore.App.Runtime.AOT.Cross.net9.android-arm", + "Microsoft.NETCore.App.Runtime.AOT.Cross.net9.android-arm64" + ], + "extends": [ "microsoft-net-runtime-android-net9" ], + "platforms": [ "win-x64", "win-arm64", "linux-x64", "linux-arm64", "osx-x64", "osx-arm64" ] + }, + "microsoft-net-runtime-ios-net9": { + "abstract": true, + "description": "iOS Mono Runtime and AOT Workload", + "packs": [ + "Microsoft.NETCore.App.Runtime.AOT.Cross.net9.ios-arm64", + "Microsoft.NETCore.App.Runtime.AOT.Cross.net9.iossimulator-arm64", + "Microsoft.NETCore.App.Runtime.AOT.Cross.net9.iossimulator-x64" + ], + "extends": [ "runtimes-ios-net9" ], + "platforms": [ "win-x64", "win-arm64", "osx-arm64", "osx-x64" ] + }, + "runtimes-ios-net9": { + "abstract": true, + "description": "iOS Mono Runtime Packs", + "packs": [ + "Microsoft.NETCore.App.Runtime.Mono.net9.ios-arm64", + "Microsoft.NETCore.App.Runtime.Mono.net9.iossimulator-arm64", + "Microsoft.NETCore.App.Runtime.Mono.net9.iossimulator-x64" + ], + "extends": [ "microsoft-net-runtime-mono-tooling-net9" ], + "platforms": [ "win-x64", "win-arm64", "osx-arm64", "osx-x64" ] + }, + "microsoft-net-runtime-maccatalyst-net9": { + "abstract": true, + "description": "MacCatalyst Mono Runtime and AOT Workload", + "packs": [ + "Microsoft.NETCore.App.Runtime.AOT.Cross.net9.maccatalyst-arm64", + "Microsoft.NETCore.App.Runtime.AOT.Cross.net9.maccatalyst-x64" + ], + "extends": [ "runtimes-maccatalyst-net9" ], + "platforms": [ "win-x64", "win-arm64", "osx-arm64", "osx-x64" ] + }, + "runtimes-maccatalyst-net9": { + "abstract": true, + "description": "MacCatalyst Mono Runtime Packs", + "packs": [ + "Microsoft.NETCore.App.Runtime.Mono.net9.maccatalyst-arm64", + "Microsoft.NETCore.App.Runtime.Mono.net9.maccatalyst-x64" + ], + "extends": [ "microsoft-net-runtime-mono-tooling-net9" ], + "platforms": [ "win-x64", "win-arm64", "osx-arm64", "osx-x64" ] + }, + "microsoft-net-runtime-macos-net9": { + "abstract": true, + "description": "MacOS CoreCLR and Mono Runtime Workload", + "packs": [ + "Microsoft.NETCore.App.Runtime.Mono.net9.osx-arm64", + "Microsoft.NETCore.App.Runtime.Mono.net9.osx-x64", + "Microsoft.NETCore.App.Runtime.osx-arm64", + "Microsoft.NETCore.App.Runtime.osx-x64" + ], + "extends": [ "microsoft-net-runtime-mono-tooling-net9" ], + "platforms": [ "osx-arm64", "osx-x64" ] + }, + "microsoft-net-runtime-tvos-net9": { + "abstract": true, + "description": "tvOS Mono Runtime and AOT Workload", + "packs": [ + "Microsoft.NETCore.App.Runtime.AOT.Cross.net9.tvos-arm64", + "Microsoft.NETCore.App.Runtime.AOT.Cross.net9.tvossimulator-arm64", + "Microsoft.NETCore.App.Runtime.AOT.Cross.net9.tvossimulator-x64" + ], + "extends": [ "runtimes-tvos-net9" ], + "platforms": [ "win-x64", "win-arm64", "osx-arm64", "osx-x64" ] + }, + "runtimes-tvos-net9": { + "abstract": true, + "description": "tvOS Mono Runtime Packs", + "packs": [ + "Microsoft.NETCore.App.Runtime.Mono.net9.tvos-arm64", + "Microsoft.NETCore.App.Runtime.Mono.net9.tvossimulator-arm64", + "Microsoft.NETCore.App.Runtime.Mono.net9.tvossimulator-x64" + ], + "extends": [ "microsoft-net-runtime-mono-tooling-net9" ], + "platforms": [ "win-x64", "win-arm64", "osx-arm64", "osx-x64" ] + }, + "microsoft-net-runtime-mono-tooling-net9": { + "abstract": true, + "description": "Shared native build tooling for Mono runtime", + "packs": [ + "Microsoft.NET.Runtime.MonoAOTCompiler.Task.net9", + "Microsoft.NET.Runtime.MonoTargets.Sdk.net9" + ] + } + }, + "packs": { + "Microsoft.NET.Runtime.MonoAOTCompiler.Task.net9": { + "kind": "Sdk", + "version": "${PackageVersionNet9}", + "alias-to": { + "any": "Microsoft.NET.Runtime.MonoAOTCompiler.Task" + } + }, + "Microsoft.NET.Runtime.MonoTargets.Sdk.net9": { + "kind": "Sdk", + "version": "${PackageVersionNet9}", + "alias-to": { + "any": "Microsoft.NET.Runtime.MonoTargets.Sdk" + } + }, + "Microsoft.NET.Runtime.LibraryBuilder.Sdk.net9": { + "kind": "Sdk", + "version": "${PackageVersionNet9}", + "alias-to": { + "any": "Microsoft.NET.Runtime.LibraryBuilder.Sdk" + } + }, + "Microsoft.NET.Runtime.WebAssembly.Sdk.net9": { + "kind": "Sdk", + "version": "${PackageVersionNet9}", + "alias-to": { + "any": "Microsoft.NET.Runtime.WebAssembly.Sdk" + } + }, + "Microsoft.NET.Sdk.WebAssembly.Pack.net9": { + "kind": "library", + "version": "${PackageVersionNet9}", + "alias-to": { + "any": "Microsoft.NET.Sdk.WebAssembly.Pack" + } + }, + "Microsoft.NET.Runtime.WebAssembly.Wasi.Sdk.net9": { + "kind": "Sdk", + "version": "${PackageVersionNet9}", + "alias-to": { + "any": "Microsoft.NET.Runtime.WebAssembly.Wasi.Sdk" + } + }, + "Microsoft.NET.Runtime.WebAssembly.Templates.net9": { + "kind": "template", + "version": "${PackageVersionNet9}" + }, + "Microsoft.NETCore.App.Runtime.Mono.net9.android-arm": { + "kind": "framework", + "version": "${PackageVersionNet9}", + "alias-to": { + "any": "Microsoft.NETCore.App.Runtime.Mono.android-arm" + } + }, + "Microsoft.NETCore.App.Runtime.Mono.net9.android-arm64": { + "kind": "framework", + "version": "${PackageVersionNet9}", + "alias-to": { + "any": "Microsoft.NETCore.App.Runtime.Mono.android-arm64" + } + }, + "Microsoft.NETCore.App.Runtime.Mono.net9.android-x64": { + "kind": "framework", + "version": "${PackageVersionNet9}", + "alias-to": { + "any": "Microsoft.NETCore.App.Runtime.Mono.android-x64" + } + }, + "Microsoft.NETCore.App.Runtime.Mono.net9.android-x86": { + "kind": "framework", + "version": "${PackageVersionNet9}", + "alias-to": { + "any": "Microsoft.NETCore.App.Runtime.Mono.android-x86" + } + }, + "Microsoft.NETCore.App.Runtime.AOT.Cross.net9.android-x86": { + "kind": "Sdk", + "version": "${PackageVersionNet9}", + "alias-to": { + "win-x64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.android-x86", + "win-arm64": "Microsoft.NETCore.App.Runtime.AOT.win-arm64.Cross.android-x86", + "linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.android-x86", + "linux-arm64": "Microsoft.NETCore.App.Runtime.AOT.linux-arm64.Cross.android-x86", + "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-x86", + "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-arm64.Cross.android-x86" + } + }, + "Microsoft.NETCore.App.Runtime.AOT.Cross.net9.android-x64": { + "kind": "Sdk", + "version": "${PackageVersionNet9}", + "alias-to": { + "win-x64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.android-x64", + "win-arm64": "Microsoft.NETCore.App.Runtime.AOT.win-arm64.Cross.android-x64", + "linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.android-x64", + "linux-arm64": "Microsoft.NETCore.App.Runtime.AOT.linux-arm64.Cross.android-x64", + "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-x64", + "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-arm64.Cross.android-x64" + } + }, + "Microsoft.NETCore.App.Runtime.AOT.Cross.net9.android-arm": { + "kind": "Sdk", + "version": "${PackageVersionNet9}", + "alias-to": { + "win-x64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.android-arm", + "win-arm64": "Microsoft.NETCore.App.Runtime.AOT.win-arm64.Cross.android-arm", + "linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.android-arm", + "linux-arm64": "Microsoft.NETCore.App.Runtime.AOT.linux-arm64.Cross.android-arm", + "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-arm", + "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-arm64.Cross.android-arm" + } + }, + "Microsoft.NETCore.App.Runtime.AOT.Cross.net9.android-arm64": { + "kind": "Sdk", + "version": "${PackageVersionNet9}", + "alias-to": { + "win-x64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.android-arm64", + "win-arm64": "Microsoft.NETCore.App.Runtime.AOT.win-arm64.Cross.android-arm64", + "linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.android-arm64", + "linux-arm64": "Microsoft.NETCore.App.Runtime.AOT.linux-arm64.Cross.android-arm64", + "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-arm64", + "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-arm64.Cross.android-arm64" + } + }, + "Microsoft.NETCore.App.Runtime.Mono.net9.maccatalyst-arm64": { + "kind": "framework", + "version": "${PackageVersionNet9}", + "alias-to": { + "any": "Microsoft.NETCore.App.Runtime.Mono.maccatalyst-arm64" + } + }, + "Microsoft.NETCore.App.Runtime.Mono.net9.maccatalyst-x64": { + "kind": "framework", + "version": "${PackageVersionNet9}", + "alias-to": { + "any": "Microsoft.NETCore.App.Runtime.Mono.maccatalyst-x64" + } + }, + "Microsoft.NETCore.App.Runtime.Mono.net9.osx-arm64": { + "kind": "framework", + "version": "${PackageVersionNet9}", + "alias-to": { + "any": "Microsoft.NETCore.App.Runtime.Mono.osx-arm64" + } + }, + "Microsoft.NETCore.App.Runtime.Mono.net9.osx-x64": { + "kind": "framework", + "version": "${PackageVersionNet9}", + "alias-to": { + "any": "Microsoft.NETCore.App.Runtime.Mono.osx-x64" + } + }, + "Microsoft.NETCore.App.Runtime.net9.osx-arm64": { + "kind": "framework", + "version": "${PackageVersionNet9}", + "alias-to": { + "any": "Microsoft.NETCore.App.Runtime.osx-arm64" + } + }, + "Microsoft.NETCore.App.Runtime.net9.osx-x64": { + "kind": "framework", + "version": "${PackageVersionNet9}", + "alias-to": { + "any": "Microsoft.NETCore.App.Runtime.osx-x64" + } + }, + "Microsoft.NETCore.App.Runtime.Mono.net9.ios-arm64" : { + "kind": "framework", + "version": "${PackageVersionNet9}", + "alias-to": { + "any": "Microsoft.NETCore.App.Runtime.Mono.ios-arm64" + } + }, + "Microsoft.NETCore.App.Runtime.Mono.net9.iossimulator-arm64" : { + "kind": "framework", + "version": "${PackageVersionNet9}", + "alias-to": { + "any": "Microsoft.NETCore.App.Runtime.Mono.iossimulator-arm64" + } + }, + "Microsoft.NETCore.App.Runtime.Mono.net9.iossimulator-x64" : { + "kind": "framework", + "version": "${PackageVersionNet9}", + "alias-to": { + "any": "Microsoft.NETCore.App.Runtime.Mono.iossimulator-x64" + } + }, + "Microsoft.NETCore.App.Runtime.AOT.Cross.net9.tvos-arm64": { + "kind": "Sdk", + "version": "${PackageVersionNet9}", + "alias-to": { + "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.net9.tvos-arm64" : { + "kind": "framework", + "version": "${PackageVersionNet9}", + "alias-to": { + "any": "Microsoft.NETCore.App.Runtime.Mono.tvos-arm64" + } + }, + "Microsoft.NETCore.App.Runtime.Mono.net9.tvossimulator-arm64" : { + "kind": "framework", + "version": "${PackageVersionNet9}", + "alias-to": { + "any": "Microsoft.NETCore.App.Runtime.Mono.tvossimulator-arm64" + } + }, + "Microsoft.NETCore.App.Runtime.Mono.net9.tvossimulator-x64" : { + "kind": "framework", + "version": "${PackageVersionNet9}", + "alias-to": { + "any": "Microsoft.NETCore.App.Runtime.Mono.tvossimulator-x64" + } + }, + "Microsoft.NETCore.App.Runtime.AOT.Cross.net9.maccatalyst-arm64": { + "kind": "Sdk", + "version": "${PackageVersionNet9}", + "alias-to": { + "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-arm64.Cross.maccatalyst-arm64", + "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.maccatalyst-arm64" + } + }, + "Microsoft.NETCore.App.Runtime.AOT.Cross.net9.maccatalyst-x64": { + "kind": "Sdk", + "version": "${PackageVersionNet9}", + "alias-to": { + "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-arm64.Cross.maccatalyst-x64", + "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.maccatalyst-x64" + } + }, + "Microsoft.NETCore.App.Runtime.AOT.Cross.net9.tvossimulator-arm64": { + "kind": "Sdk", + "version": "${PackageVersionNet9}", + "alias-to": { + "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-arm64.Cross.tvossimulator-arm64", + "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvossimulator-arm64" + } + }, + "Microsoft.NETCore.App.Runtime.AOT.Cross.net9.tvossimulator-x64": { + "kind": "Sdk", + "version": "${PackageVersionNet9}", + "alias-to": { + "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-arm64.Cross.tvossimulator-x64", + "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvossimulator-x64" + } + }, + "Microsoft.NETCore.App.Runtime.AOT.Cross.net9.ios-arm64": { + "kind": "Sdk", + "version": "${PackageVersionNet9}", + "alias-to": { + "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.ios-arm64", + "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-arm64.Cross.ios-arm64" + } + }, + "Microsoft.NETCore.App.Runtime.AOT.Cross.net9.iossimulator-arm64": { + "kind": "Sdk", + "version": "${PackageVersionNet9}", + "alias-to": { + "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-arm64.Cross.iossimulator-arm64", + "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.iossimulator-arm64" + } + }, + "Microsoft.NETCore.App.Runtime.AOT.Cross.net9.iossimulator-x64": { + "kind": "Sdk", + "version": "${PackageVersionNet9}", + "alias-to": { + "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-arm64.Cross.iossimulator-x64", + "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.iossimulator-x64" + } + }, + "Microsoft.NETCore.App.Runtime.AOT.Cross.net9.browser-wasm": { + "kind": "Sdk", + "version": "${PackageVersionNet9}", + "alias-to": { + "win-x64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm", + "win-arm64": "Microsoft.NETCore.App.Runtime.AOT.win-arm64.Cross.browser-wasm", + "linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.browser-wasm", + "linux-arm64": "Microsoft.NETCore.App.Runtime.AOT.linux-arm64.Cross.browser-wasm", + "linux-musl-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-musl-x64.Cross.browser-wasm", + "linux-musl-arm64": "Microsoft.NETCore.App.Runtime.AOT.linux-musl-arm64.Cross.browser-wasm", + "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.browser-wasm", + "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-arm64.Cross.browser-wasm" + } + }, + "Microsoft.NETCore.App.Runtime.AOT.Cross.net9.wasi-wasm": { + "kind": "Sdk", + "version": "${PackageVersionNet9}", + "alias-to": { + "win-x64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.wasi-wasm", + "win-arm64": "Microsoft.NETCore.App.Runtime.AOT.win-arm64.Cross.wasi-wasm", + "linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.wasi-wasm", + "linux-arm64": "Microsoft.NETCore.App.Runtime.AOT.linux-arm64.Cross.wasi-wasm", + "linux-musl-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-musl-x64.Cross.wasi-wasm", + "linux-musl-arm64": "Microsoft.NETCore.App.Runtime.AOT.linux-musl-arm64.Cross.wasi-wasm", + "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.wasi-wasm", + "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-arm64.Cross.wasi-wasm" + } + }, + "Microsoft.NETCore.App.Runtime.Mono.net9.browser-wasm" : { + "kind": "framework", + "version": "${PackageVersionNet9}", + "alias-to": { + "any": "Microsoft.NETCore.App.Runtime.Mono.browser-wasm" + } + }, + "Microsoft.NETCore.App.Runtime.Mono.multithread.net9.browser-wasm" : { + "kind": "framework", + "version": "${PackageVersionNet9}", + "alias-to": { + "any": "Microsoft.NETCore.App.Runtime.Mono.multithread.browser-wasm" + } + }, + "Microsoft.NETCore.App.Runtime.Mono.net9.wasi-wasm" : { + "kind": "framework", + "version": "${PackageVersionNet9}", + "alias-to": { + "any": "Microsoft.NETCore.App.Runtime.Mono.wasi-wasm" + } + } + } +} diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/WorkloadManifest.targets.in b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/WorkloadManifest.targets.in new file mode 100644 index 00000000000000..11b58a3db421d9 --- /dev/null +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/WorkloadManifest.targets.in @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_MonoWorkloadRuntimePackPackageVersion>$(_RuntimePackInWorkloadVersion9) + <_KnownWebAssemblySdkPackVersion>$(_RuntimePackInWorkloadVersion9) + + + + + + %(RuntimePackRuntimeIdentifiers);wasi-wasm + + $(_MonoWorkloadRuntimePackPackageVersion) + + Microsoft.NETCore.App.Runtime.Mono.multithread.**RID** + + + $(_MonoWorkloadRuntimePackPackageVersion) + + + $(_KnownWebAssemblySdkPackVersion) + + + + + diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.cs.json b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.cs.json new file mode 100644 index 00000000000000..1b8cdaeccf9586 --- /dev/null +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.cs.json @@ -0,0 +1,4 @@ +{ + "workloads/wasm-tools-net9/description": "Nástroje pro sestavení .NET WebAssembly", + "workloads/wasm-experimental-net9/description": "Experimentální nástroje .NET WebAssembly" +} \ No newline at end of file diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.de.json b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.de.json new file mode 100644 index 00000000000000..e09f6548c80799 --- /dev/null +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.de.json @@ -0,0 +1,4 @@ +{ + "workloads/wasm-tools-net9/description": ".NET 9.0 WebAssembly-Buildtools", + "workloads/wasm-experimental-net9/description": "Experimentelle .NET 9.0 WebAssembly-Tools" +} \ No newline at end of file diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.en.json b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.en.json new file mode 100644 index 00000000000000..ee91965f903185 --- /dev/null +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.en.json @@ -0,0 +1,4 @@ +{ + "workloads/wasm-tools-net9/description": ".NET WebAssembly build tools for .NET 9.0", + "workloads/wasm-experimental-net9/description": ".NET WebAssembly experimental tooling for .NET 9.0" +} diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.es.json b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.es.json new file mode 100644 index 00000000000000..e46722cf92b383 --- /dev/null +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.es.json @@ -0,0 +1,4 @@ +{ + "workloads/wasm-tools-net9/description": "Herramientas de compilación de WebAssembly de .NET 9.0", + "workloads/wasm-experimental-net9/description": "Herramientas experimentales .NET 9.0 WebAssembly" +} \ No newline at end of file diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.fr.json b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.fr.json new file mode 100644 index 00000000000000..59f88f5862de4a --- /dev/null +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.fr.json @@ -0,0 +1,4 @@ +{ + "workloads/wasm-tools-net9/description": "Outils de build .NET 9.0 WebAssembly", + "workloads/wasm-experimental-net9/description": "Outils expérimentaux .NET 9.0 WebAssembly" +} \ No newline at end of file diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.it.json b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.it.json new file mode 100644 index 00000000000000..561401e21ca676 --- /dev/null +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.it.json @@ -0,0 +1,4 @@ +{ + "workloads/wasm-tools-net9/description": "Strumenti di compilazione WebAssembly .NET 9.0", + "workloads/wasm-experimental-net9/description": "Strumenti sperimentali di .NET 9.0 WebAssembly" +} \ No newline at end of file diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.ja.json b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.ja.json new file mode 100644 index 00000000000000..6d7802a867defa --- /dev/null +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.ja.json @@ -0,0 +1,4 @@ +{ + "workloads/wasm-tools-net9/description": ".NET 9.0 WebAssembly ビルドツール", + "workloads/wasm-experimental-net9/description": ".NET 9.0 WebAssembly 実験的ツール" +} \ No newline at end of file diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.ko.json b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.ko.json new file mode 100644 index 00000000000000..92d811a09db7b1 --- /dev/null +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.ko.json @@ -0,0 +1,4 @@ +{ + "workloads/wasm-tools-net9/description": ".NET 9.0 WebAssembly 빌드 도구", + "workloads/wasm-experimental-net9/description": ".NET 9.0 WebAssembly 실험 도구" +} \ No newline at end of file diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.pl.json b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.pl.json new file mode 100644 index 00000000000000..1900c54b9d1558 --- /dev/null +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.pl.json @@ -0,0 +1,4 @@ +{ + "workloads/wasm-tools-net9/description": "Narzędzia kompilacji zestawu WebAssembly platformy .NET 9.0", + "workloads/wasm-experimental-net9/description": "Eksperymentalne narzędzia .NET 9.0 WebAssembly" +} \ No newline at end of file diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.pt-BR.json b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.pt-BR.json new file mode 100644 index 00000000000000..2e915fe50ee647 --- /dev/null +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.pt-BR.json @@ -0,0 +1,4 @@ +{ + "workloads/wasm-tools-net9/description": "Ferramentas de build para .NET 9.0 WebAssembly", + "workloads/wasm-experimental-net9/description": "Ferramentas experimentais para .NET 9.0 WebAssembly" +} \ No newline at end of file diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.ru.json b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.ru.json new file mode 100644 index 00000000000000..5679e95fef4c59 --- /dev/null +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.ru.json @@ -0,0 +1,4 @@ +{ + "workloads/wasm-tools-net9/description": "Средства сборки WebAssembly .NET 9.0", + "workloads/wasm-experimental-net9/description": "Экспериментальный инструментарий .NET 9.0 WebAssembly" +} \ No newline at end of file diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.tr.json b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.tr.json new file mode 100644 index 00000000000000..965d431a5e4a29 --- /dev/null +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.tr.json @@ -0,0 +1,4 @@ +{ + "workloads/wasm-tools-net9/description": ".NET 9.0 WebAssembly derleme araçları", + "workloads/wasm-experimental-net9/description": ".NET 9.0 WebAssembly deneysel araçlar" +} \ No newline at end of file diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.zh-Hans.json b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.zh-Hans.json new file mode 100644 index 00000000000000..9508731f3da258 --- /dev/null +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.zh-Hans.json @@ -0,0 +1,4 @@ +{ + "workloads/wasm-tools-net9/description": ".NET 9.0 WebAssembly 生成工具", + "workloads/wasm-experimental-net9/description": ".NET 9.0 WebAssembly 实验工具" +} \ No newline at end of file diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.zh-Hant.json b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.zh-Hant.json new file mode 100644 index 00000000000000..284773c609cb30 --- /dev/null +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/localize/WorkloadManifest.zh-Hant.json @@ -0,0 +1,4 @@ +{ + "workloads/wasm-tools-net9/description": ".NET 9.0 WebAssembly 組建工具", + "workloads/wasm-experimental-net9/description": ".NET 9.0 WebAssembly 實驗工具" +} \ No newline at end of file diff --git a/src/mono/nuget/manifest-packages.proj b/src/mono/nuget/manifest-packages.proj index e7cd9607a4a02b..c617ca8af03c78 100644 --- a/src/mono/nuget/manifest-packages.proj +++ b/src/mono/nuget/manifest-packages.proj @@ -4,5 +4,6 @@ + diff --git a/src/mono/sample/wasm/blazor-frame/blazor.csproj b/src/mono/sample/wasm/blazor-frame/blazor.csproj index f632df8d3830a3..20ff42598cd6a8 100644 --- a/src/mono/sample/wasm/blazor-frame/blazor.csproj +++ b/src/mono/sample/wasm/blazor-frame/blazor.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/src/mono/sample/wasm/browser-bench/Wasm.Browser.Bench.Sample.csproj b/src/mono/sample/wasm/browser-bench/Wasm.Browser.Bench.Sample.csproj index fcd418021eb8aa..b1cc1e204b827e 100644 --- a/src/mono/sample/wasm/browser-bench/Wasm.Browser.Bench.Sample.csproj +++ b/src/mono/sample/wasm/browser-bench/Wasm.Browser.Bench.Sample.csproj @@ -56,9 +56,9 @@ - diff --git a/src/mono/wasi/Wasi.Build.Tests/BuildTestBase.cs b/src/mono/wasi/Wasi.Build.Tests/BuildTestBase.cs index c05c99d72c8c9e..db8a45889b58cd 100644 --- a/src/mono/wasi/Wasi.Build.Tests/BuildTestBase.cs +++ b/src/mono/wasi/Wasi.Build.Tests/BuildTestBase.cs @@ -26,7 +26,7 @@ namespace Wasm.Build.Tests { public abstract class BuildTestBase : IClassFixture, IDisposable { - public const string DefaultTargetFramework = "net9.0"; + public const string DefaultTargetFramework = "net10.0"; protected static readonly bool s_skipProjectCleanup; protected static readonly string s_xharnessRunnerCommand; protected string? _projectDir; @@ -46,7 +46,7 @@ public abstract class BuildTestBase : IClassFixture s_buildEnv.IsWorkload; public static bool IsNotUsingWorkloads => !s_buildEnv.IsWorkload; public static string GetNuGetConfigPathFor(string targetFramework) => - Path.Combine(BuildEnvironment.TestDataPath, "nuget9.config"); - // targetFramework == "net7.0" ? "nuget7.config" : "nuget8.config"); + Path.Combine(BuildEnvironment.TestDataPath, "nuget10.config"); static BuildTestBase() { diff --git a/src/mono/wasi/Wasi.Build.Tests/Wasi.Build.Tests.csproj b/src/mono/wasi/Wasi.Build.Tests/Wasi.Build.Tests.csproj index f6ffee82eef9fc..0c6b9c9509f45f 100644 --- a/src/mono/wasi/Wasi.Build.Tests/Wasi.Build.Tests.csproj +++ b/src/mono/wasi/Wasi.Build.Tests/Wasi.Build.Tests.csproj @@ -101,7 +101,10 @@ <_RuntimePackCurrentVersion Condition="'$(StabilizePackageVersion)' != 'true'">$(PackageVersion) - <_RuntimePackVersions Include="$(_RuntimePackCurrentVersion)" EnvVarName="RUNTIME_PACK_VER9" /> + <_RuntimePackVersions Include="$(_RuntimePackCurrentVersion)" EnvVarName="RUNTIME_PACK_VER10" /> + + <_RuntimePackVersions Include="$(PackageVersionNet9)" EnvVarName="RUNTIME_PACK_VER9" Condition="'$(PackageVersionNet9)' != ''" /> + <_RuntimePackVersions Include="$(_RuntimePackCurrentVersion)" EnvVarName="RUNTIME_PACK_VER9" Condition="'$(PackageVersionNet9)' == ''" /> <_RuntimePackVersions Include="$(PackageVersionNet8)" EnvVarName="RUNTIME_PACK_VER8" Condition="'$(PackageVersionNet8)' != ''" /> <_RuntimePackVersions Include="$(_RuntimePackCurrentVersion)" EnvVarName="RUNTIME_PACK_VER8" Condition="'$(PackageVersionNet8)' == ''" /> diff --git a/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs b/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs index a8f36495f9032d..6a6cb7103631e2 100644 --- a/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs +++ b/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs @@ -26,9 +26,9 @@ namespace Wasm.Build.Tests { public abstract class BuildTestBase : IClassFixture, IDisposable { - public const string DefaultTargetFramework = "net9.0"; - public const string DefaultTargetFrameworkForBlazor = "net9.0"; - public const string TargetFrameworkForTasks = "net9.0"; + public const string DefaultTargetFramework = "net10.0"; + public const string DefaultTargetFrameworkForBlazor = "net10.0"; + public const string TargetFrameworkForTasks = "net10.0"; private const string DefaultEnvironmentLocale = "en-US"; protected static readonly string s_unicodeChars = "\u9FC0\u8712\u679B\u906B\u486B\u7149"; protected static readonly bool s_skipProjectCleanup; @@ -62,7 +62,7 @@ public abstract class BuildTestBase : IClassFixture s_buildEnv.IsWorkloadWithMultiThreadingForDefaultFramework; public static bool UseWebcil => s_buildEnv.UseWebcil; public static string GetNuGetConfigPathFor(string targetFramework) - => Path.Combine(BuildEnvironment.TestDataPath, targetFramework == "net9.0" ? "nuget9.config" : "nuget8.config"); + => Path.Combine(BuildEnvironment.TestDataPath, targetFramework == "net10.0" ? "nuget10.config" : "nuget9.config"); public TProvider GetProvider() where TProvider : ProjectProviderBase => (TProvider)_providerOfBaseType; diff --git a/src/mono/wasm/Wasm.Build.Tests/NonWasmTemplateBuildTests.cs b/src/mono/wasm/Wasm.Build.Tests/NonWasmTemplateBuildTests.cs index f383864a4b4de7..55d4f9e34887a1 100644 --- a/src/mono/wasm/Wasm.Build.Tests/NonWasmTemplateBuildTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/NonWasmTemplateBuildTests.cs @@ -23,10 +23,10 @@ public NonWasmTemplateBuildTests(ITestOutputHelper output, SharedBuildPerTestCla // So, copy the reference for latest TFM, and add that back with the // TFM=DefaultTargetFramework // - // This is useful for the case when we are on tfm=net8.0, but sdk, and packages - // are really 9.0 . - private const string s_latestTargetFramework = "net9.0"; - private const string s_previousTargetFramework = "net8.0"; + // This is useful for the case when we are on tfm=net10.0, but sdk, and packages + // are really 10.0 . + private const string s_latestTargetFramework = "net10.0"; + private const string s_previousTargetFramework = "net9.0"; private static string s_directoryBuildTargetsForPreviousTFM = $$""" diff --git a/src/mono/wasm/Wasm.Build.Tests/ProjectProviderBase.cs b/src/mono/wasm/Wasm.Build.Tests/ProjectProviderBase.cs index 236d8f1901c0d3..7bf3ce67c2c9b5 100644 --- a/src/mono/wasm/Wasm.Build.Tests/ProjectProviderBase.cs +++ b/src/mono/wasm/Wasm.Build.Tests/ProjectProviderBase.cs @@ -26,7 +26,7 @@ public abstract class ProjectProviderBase(ITestOutputHelper _testOutput, string? public static string WasmAssemblyExtension = BuildTestBase.s_buildEnv.UseWebcil ? ".wasm" : ".dll"; protected const string s_dotnetVersionHashRegex = @"\.(?[a-zA-Z0-9]+)\."; - private const string s_runtimePackPathPattern = "\\*\\* MicrosoftNetCoreAppRuntimePackDir : '([^ ']*)'"; + private const string s_runtimePackPathPattern = "\\*\\* MicrosoftNetCoreAppRuntimePackDir : '([^']*)'"; private static Regex s_runtimePackPathRegex = new Regex(s_runtimePackPathPattern); private static string[] s_dotnetExtensionsToIgnore = new[] { diff --git a/src/mono/wasm/Wasm.Build.Tests/SatelliteLoadingTests.cs b/src/mono/wasm/Wasm.Build.Tests/SatelliteLoadingTests.cs index 1dcd957811738c..98d40e6e9eefc9 100644 --- a/src/mono/wasm/Wasm.Build.Tests/SatelliteLoadingTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/SatelliteLoadingTests.cs @@ -73,7 +73,7 @@ public async Task LoadSatelliteAssemblyFromReference() projectReference.Remove(); var reference = new XElement("Reference"); - reference.SetAttributeValue("Include", "..\\ResourceLibrary\\bin\\Release\\net9.0\\ResourceLibrary.dll"); + reference.SetAttributeValue("Include", $"..\\ResourceLibrary\\bin\\Release\\{DefaultTargetFramework}\\ResourceLibrary.dll"); itemGroup.Add(reference); appCsproj.Save(appCsprojPath); diff --git a/src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTests.cs b/src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTests.cs index d994297493d56a..873fda2f3e47fb 100644 --- a/src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTests.cs @@ -108,10 +108,13 @@ private async Task BrowserRunTwiceWithAndThenWithoutBuildAsync(Configuration con public static IEnumerable BrowserBuildAndRunTestData() { yield return new object?[] { "", BuildTestBase.DefaultTargetFramework, DefaultRuntimeAssetsRelativePath }; - yield return new object?[] { "-f net9.0", "net9.0", DefaultRuntimeAssetsRelativePath }; + yield return new object?[] { "-f net10.0", "net10.0", DefaultRuntimeAssetsRelativePath }; if (EnvironmentVariables.WorkloadsTestPreviousVersions) + { + yield return new object?[] { "-f net9.0", "net9.0", DefaultRuntimeAssetsRelativePath }; yield return new object?[] { "-f net8.0", "net8.0", DefaultRuntimeAssetsRelativePath }; + } // ActiveIssue("https://github.com/dotnet/runtime/issues/90979") // yield return new object?[] { "", BuildTestBase.DefaultTargetFramework, "./" }; @@ -136,7 +139,7 @@ public async Task BrowserBuildAndRun(string extraNewArgs, string targetFramework addFrameworkArg: extraNewArgs.Length == 0 ); - if (targetFramework != "net8.0") + if (new Version(targetFramework.Replace("net", "")).Major > 8) UpdateBrowserProgramFile(); UpdateBrowserMainJs(targetFramework, runtimeAssetsRelativePath); diff --git a/src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTestsBase.cs b/src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTestsBase.cs index 06ed777bab5dc2..752f6ebf8a4d80 100644 --- a/src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTestsBase.cs +++ b/src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTestsBase.cs @@ -161,8 +161,7 @@ public virtual (string projectDir, string buildOutput) BuildProject( if (buildOptions.ExtraBuildEnvironmentVariables is null) buildOptions = buildOptions with { ExtraBuildEnvironmentVariables = new Dictionary() }; - // TODO: reenable this when the SDK supports targetting net10.0 - //buildOptions.ExtraBuildEnvironmentVariables["TreatPreviousAsCurrent"] = "false"; + buildOptions.ExtraBuildEnvironmentVariables["TreatPreviousAsCurrent"] = "false"; (CommandResult res, string logFilePath) = BuildProjectWithoutAssert(configuration, info.ProjectName, buildOptions); @@ -230,17 +229,18 @@ protected void UpdateBrowserMainJs(string targetFramework = DefaultTargetFramewo { string mainJsPath = Path.Combine(_projectDir, "wwwroot", "main.js"); string mainJsContent = File.ReadAllText(mainJsPath); + Version targetFrameworkVersion = new Version(targetFramework.Replace("net", "")); string updatedMainJsContent = StringReplaceWithAssert( mainJsContent, ".create()", - (targetFramework == "net8.0" || targetFramework == "net9.0") + (targetFrameworkVersion.Major >= 8) ? ".withConsoleForwarding().withElementOnExit().withExitCodeLogging().withExitOnUnhandledError().create()" : ".withConsoleForwarding().withElementOnExit().withExitCodeLogging().create()" ); - // dotnet.run() is already used in <= net8.0 - if (targetFramework != "net8.0") + // dotnet.run() is used instead of runMain() in net9.0+ + if (targetFrameworkVersion.Major >= 9) updatedMainJsContent = StringReplaceWithAssert(updatedMainJsContent, "runMain()", "dotnet.run()"); updatedMainJsContent = StringReplaceWithAssert(updatedMainJsContent, "from './_framework/dotnet.js'", $"from '{runtimeAssetsRelativePath}dotnet.js'"); diff --git a/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj b/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj index c58bed440b6a1f..800d78d93bccb7 100644 --- a/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj +++ b/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj @@ -58,7 +58,7 @@ - + @@ -148,8 +148,10 @@ <_RuntimePackCurrentVersion Condition="'$(StabilizePackageVersion)' != 'true'">$(PackageVersion) - <_RuntimePackVersions Include="$(_RuntimePackCurrentVersion)" EnvVarName="RUNTIME_PACK_VER9" /> + <_RuntimePackVersions Include="$(_RuntimePackCurrentVersion)" EnvVarName="RUNTIME_PACK_VER10" /> + <_RuntimePackVersions Include="$(PackageVersionNet9)" EnvVarName="RUNTIME_PACK_VER9" Condition="'$(PackageVersionNet9)' != ''" /> + <_RuntimePackVersions Include="$(_RuntimePackCurrentVersion)" EnvVarName="RUNTIME_PACK_VER9" Condition="'$(PackageVersionNet9)' == ''" /> <_RuntimePackVersions Include="$(PackageVersionNet8)" EnvVarName="RUNTIME_PACK_VER8" Condition="'$(PackageVersionNet8)' != ''" /> <_RuntimePackVersions Include="$(_RuntimePackCurrentVersion)" EnvVarName="RUNTIME_PACK_VER8" Condition="'$(PackageVersionNet8)' == ''" /> <_RuntimePackVersions Include="$(PackageVersionNet7)" EnvVarName="RUNTIME_PACK_VER7" Condition="'$(PackageVersionNet7)' != ''" /> diff --git a/src/mono/wasm/Wasm.Build.Tests/data/nuget8.config b/src/mono/wasm/Wasm.Build.Tests/data/nuget10.config similarity index 68% rename from src/mono/wasm/Wasm.Build.Tests/data/nuget8.config rename to src/mono/wasm/Wasm.Build.Tests/data/nuget10.config index 03ae744d154fdf..bd07cf50b12f61 100644 --- a/src/mono/wasm/Wasm.Build.Tests/data/nuget8.config +++ b/src/mono/wasm/Wasm.Build.Tests/data/nuget10.config @@ -7,7 +7,8 @@ - + + diff --git a/src/mono/wasm/Wasm.Build.Tests/data/nuget7.config b/src/mono/wasm/Wasm.Build.Tests/data/nuget7.config deleted file mode 100644 index eafee46fe62817..00000000000000 --- a/src/mono/wasm/Wasm.Build.Tests/data/nuget7.config +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/src/mono/wasm/build/WasmApp.LocalBuild.props b/src/mono/wasm/build/WasmApp.LocalBuild.props index dc9b562089a3a9..a12d0a40af0f94 100644 --- a/src/mono/wasm/build/WasmApp.LocalBuild.props +++ b/src/mono/wasm/build/WasmApp.LocalBuild.props @@ -22,7 +22,7 @@ - <_NetCoreAppToolCurrent>net9.0 + <_NetCoreAppToolCurrent>net10.0 false true diff --git a/src/mono/wasm/templates/Microsoft.NET.Runtime.WebAssembly.Templates.csproj b/src/mono/wasm/templates/Microsoft.NET.Runtime.WebAssembly.Templates.csproj index 83b97fb30c6f25..3a0957bcfbe060 100644 --- a/src/mono/wasm/templates/Microsoft.NET.Runtime.WebAssembly.Templates.csproj +++ b/src/mono/wasm/templates/Microsoft.NET.Runtime.WebAssembly.Templates.csproj @@ -2,6 +2,7 @@ Template + Microsoft.NET.Runtime.WebAssembly.Templates.net10 WebAssembly Templates Microsoft diff --git a/src/mono/wasm/templates/templates/browser/.template.config/template.json b/src/mono/wasm/templates/templates/browser/.template.config/template.json index 9d3e32811b8fa9..aa939b87eb951f 100644 --- a/src/mono/wasm/templates/templates/browser/.template.config/template.json +++ b/src/mono/wasm/templates/templates/browser/.template.config/template.json @@ -5,7 +5,7 @@ "generatorVersions": "[1.0.0.0-*)", "groupIdentity": "WebAssembly.Browser", "precedence": 9000, - "identity": "WebAssembly.Browser.9.0", + "identity": "WebAssembly.Browser.10.0", "name": "WebAssembly Browser App", "description": "A project template for creating a .NET app that runs on WebAssembly in a browser", "shortName": "wasmbrowser", @@ -40,13 +40,13 @@ "datatype": "choice", "choices": [ { - "choice": "net9.0", - "description": "Target net9.0", - "displayName": ".NET 9.0" + "choice": "net10.0", + "description": "Target net10.0", + "displayName": ".NET 10.0" } ], - "defaultValue": "net9.0", - "replaces": "net7.0", + "defaultValue": "net10.0", + "replaces": "netX.0", "displayName": "framework" } } diff --git a/src/mono/wasm/templates/templates/browser/browser.0.csproj b/src/mono/wasm/templates/templates/browser/browser.0.csproj index 1bc8c1bdc15c66..e551c61437add7 100644 --- a/src/mono/wasm/templates/templates/browser/browser.0.csproj +++ b/src/mono/wasm/templates/templates/browser/browser.0.csproj @@ -1,6 +1,6 @@ - net7.0 + netX.0 true diff --git a/src/mono/wasm/templates/templates/console/.template.config/template.json b/src/mono/wasm/templates/templates/console/.template.config/template.json index a3dd13fc2d10c0..c5372c82d13e9e 100644 --- a/src/mono/wasm/templates/templates/console/.template.config/template.json +++ b/src/mono/wasm/templates/templates/console/.template.config/template.json @@ -4,7 +4,7 @@ "classifications": [ "Web", "WebAssembly", "Console" ], "groupIdentity": "WebAssembly.Console", "precedence": 9000, - "identity": "WebAssembly.Console.9.0", + "identity": "WebAssembly.Console.10.0", "name": "WebAssembly Console App", "description": "A project template for creating a .NET app that runs on WebAssembly on Node JS or V8", "shortName": "wasmconsole", @@ -21,13 +21,13 @@ "datatype": "choice", "choices": [ { - "choice": "net9.0", - "description": "Target net9.0", - "displayName": ".NET 9.0" + "choice": "net10.0", + "description": "Target net10.0", + "displayName": ".NET 10.0" } ], - "defaultValue": "net9.0", - "replaces": "net7.0", + "defaultValue": "net10.0", + "replaces": "netX.0", "displayName": "framework" } } diff --git a/src/mono/wasm/templates/templates/console/console.0.csproj b/src/mono/wasm/templates/templates/console/console.0.csproj index e2704722e95661..62bc363295bea5 100644 --- a/src/mono/wasm/templates/templates/console/console.0.csproj +++ b/src/mono/wasm/templates/templates/console/console.0.csproj @@ -1,6 +1,6 @@ - net7.0 + netX.0 browser-wasm Exe true diff --git a/src/mono/wasm/templates/templates/wasi-console/.template.config/template.json b/src/mono/wasm/templates/templates/wasi-console/.template.config/template.json index 810934c5d486c1..c24adb95117742 100644 --- a/src/mono/wasm/templates/templates/wasi-console/.template.config/template.json +++ b/src/mono/wasm/templates/templates/wasi-console/.template.config/template.json @@ -4,7 +4,7 @@ "classifications": [ "Wasi", "WasiConsole" ], "groupIdentity": "Wasi.Console", "precedence": 9000, - "identity": "Wasi.Console.9.0", + "identity": "Wasi.Console.10.0", "name": "Wasi Console App", "description": "A project template for creating a .NET app that runs on a WASI runtime", "shortName": "wasiconsole", @@ -21,12 +21,12 @@ "datatype": "choice", "choices": [ { - "choice": "net9.0", - "description": "Target net9.0", - "displayName": ".NET 9.0" + "choice": "net10.0", + "description": "Target net10.0", + "displayName": ".NET 10.0" } ], - "defaultValue": "net9.0", + "defaultValue": "net10.0", "replaces": "netX.0", "displayName": "framework" } diff --git a/src/mono/wasm/testassets/BlazorBasicTestApp/App/BlazorBasicTestApp.csproj b/src/mono/wasm/testassets/BlazorBasicTestApp/App/BlazorBasicTestApp.csproj index 5030d68c356ee4..d9067726d9bba1 100644 --- a/src/mono/wasm/testassets/BlazorBasicTestApp/App/BlazorBasicTestApp.csproj +++ b/src/mono/wasm/testassets/BlazorBasicTestApp/App/BlazorBasicTestApp.csproj @@ -1,14 +1,14 @@ - net9.0 + net10.0 enable enable - - + + diff --git a/src/mono/wasm/testassets/BlazorBasicTestApp/RazorClassLibrary/RazorClassLibrary.csproj b/src/mono/wasm/testassets/BlazorBasicTestApp/RazorClassLibrary/RazorClassLibrary.csproj index a4991806ea06ca..9ab5da455e2f3a 100644 --- a/src/mono/wasm/testassets/BlazorBasicTestApp/RazorClassLibrary/RazorClassLibrary.csproj +++ b/src/mono/wasm/testassets/BlazorBasicTestApp/RazorClassLibrary/RazorClassLibrary.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 enable enable @@ -12,7 +12,7 @@ - + diff --git a/src/mono/wasm/testassets/SatelliteAssemblyFromProjectRef/LibraryWithResources/LibraryWithResources.csproj b/src/mono/wasm/testassets/SatelliteAssemblyFromProjectRef/LibraryWithResources/LibraryWithResources.csproj index 3043227ce00b5f..555ae434a707e3 100644 --- a/src/mono/wasm/testassets/SatelliteAssemblyFromProjectRef/LibraryWithResources/LibraryWithResources.csproj +++ b/src/mono/wasm/testassets/SatelliteAssemblyFromProjectRef/LibraryWithResources/LibraryWithResources.csproj @@ -1,5 +1,5 @@ - net9.0 + net10.0 diff --git a/src/mono/wasm/testassets/WasmBasicTestApp/App/WasmBasicTestApp.csproj b/src/mono/wasm/testassets/WasmBasicTestApp/App/WasmBasicTestApp.csproj index d65c69a4ba4aba..a6a75bbab5efce 100644 --- a/src/mono/wasm/testassets/WasmBasicTestApp/App/WasmBasicTestApp.csproj +++ b/src/mono/wasm/testassets/WasmBasicTestApp/App/WasmBasicTestApp.csproj @@ -1,6 +1,6 @@ - net9.0 + net10.0 browser-wasm Exe true diff --git a/src/mono/wasm/testassets/WasmBasicTestApp/Json/Json.csproj b/src/mono/wasm/testassets/WasmBasicTestApp/Json/Json.csproj index 6e4494931a1a3b..f3b9c89cb1f648 100644 --- a/src/mono/wasm/testassets/WasmBasicTestApp/Json/Json.csproj +++ b/src/mono/wasm/testassets/WasmBasicTestApp/Json/Json.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 Library true diff --git a/src/mono/wasm/testassets/WasmBasicTestApp/Library/Library.csproj b/src/mono/wasm/testassets/WasmBasicTestApp/Library/Library.csproj index 3d5e0e2093c1a9..a3006ce340b772 100644 --- a/src/mono/wasm/testassets/WasmBasicTestApp/Library/Library.csproj +++ b/src/mono/wasm/testassets/WasmBasicTestApp/Library/Library.csproj @@ -1,6 +1,6 @@ - net9.0 + net10.0 Library true diff --git a/src/mono/wasm/testassets/WasmBasicTestApp/ResourceLibrary/ResourceLibrary.csproj b/src/mono/wasm/testassets/WasmBasicTestApp/ResourceLibrary/ResourceLibrary.csproj index 3d5e0e2093c1a9..a3006ce340b772 100644 --- a/src/mono/wasm/testassets/WasmBasicTestApp/ResourceLibrary/ResourceLibrary.csproj +++ b/src/mono/wasm/testassets/WasmBasicTestApp/ResourceLibrary/ResourceLibrary.csproj @@ -1,6 +1,6 @@ - net9.0 + net10.0 Library true diff --git a/src/mono/wasm/testassets/WasmOnAspNetCore/AspNetCoreServer/AspNetCoreServer.csproj b/src/mono/wasm/testassets/WasmOnAspNetCore/AspNetCoreServer/AspNetCoreServer.csproj index 09cff55b36760b..e873b8660db5ba 100644 --- a/src/mono/wasm/testassets/WasmOnAspNetCore/AspNetCoreServer/AspNetCoreServer.csproj +++ b/src/mono/wasm/testassets/WasmOnAspNetCore/AspNetCoreServer/AspNetCoreServer.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 enable enable true @@ -10,7 +10,7 @@ - + diff --git a/src/mono/wasm/testassets/WasmOnAspNetCore/BlazorClient/BlazorClient.csproj b/src/mono/wasm/testassets/WasmOnAspNetCore/BlazorClient/BlazorClient.csproj index ab9171eb142c58..6ca0a0f488b8dc 100644 --- a/src/mono/wasm/testassets/WasmOnAspNetCore/BlazorClient/BlazorClient.csproj +++ b/src/mono/wasm/testassets/WasmOnAspNetCore/BlazorClient/BlazorClient.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 enable enable true @@ -12,8 +12,8 @@ - - + + diff --git a/src/mono/wasm/testassets/WasmOnAspNetCore/Shared/Shared.csproj b/src/mono/wasm/testassets/WasmOnAspNetCore/Shared/Shared.csproj index 248678d638ebd5..83e2a274b02d05 100644 --- a/src/mono/wasm/testassets/WasmOnAspNetCore/Shared/Shared.csproj +++ b/src/mono/wasm/testassets/WasmOnAspNetCore/Shared/Shared.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 Library true enable @@ -10,7 +10,7 @@ - - + + diff --git a/src/mono/wasm/testassets/WasmOnAspNetCore/WasmBrowserClient/WasmBrowserClient.csproj b/src/mono/wasm/testassets/WasmOnAspNetCore/WasmBrowserClient/WasmBrowserClient.csproj index 92ae54e5883401..cad4994d13942c 100644 --- a/src/mono/wasm/testassets/WasmOnAspNetCore/WasmBrowserClient/WasmBrowserClient.csproj +++ b/src/mono/wasm/testassets/WasmOnAspNetCore/WasmBrowserClient/WasmBrowserClient.csproj @@ -1,6 +1,6 @@ - net9.0 + net10.0 browser-wasm Exe true diff --git a/src/tests/Common/XUnitLogChecker/XUnitLogChecker.csproj b/src/tests/Common/XUnitLogChecker/XUnitLogChecker.csproj index 0c7731b95696ea..4d5a2881ac1823 100644 --- a/src/tests/Common/XUnitLogChecker/XUnitLogChecker.csproj +++ b/src/tests/Common/XUnitLogChecker/XUnitLogChecker.csproj @@ -5,7 +5,9 @@ $(NetCoreAppToolCurrent) true true + true true + true false diff --git a/src/tools/illink/src/linker/Linker.Steps/MarkStep.cs b/src/tools/illink/src/linker/Linker.Steps/MarkStep.cs index 84a4f26a983ecd..885f0039928ec7 100644 --- a/src/tools/illink/src/linker/Linker.Steps/MarkStep.cs +++ b/src/tools/illink/src/linker/Linker.Steps/MarkStep.cs @@ -2597,6 +2597,7 @@ protected virtual bool AlwaysMarkTypeAsInstantiated (TypeDefinition td) case "ValueType": case "Enum": case "Array": + case "RuntimeType": // works around https://github.com/dotnet/runtime/issues/110605 return td.Namespace == "System"; } diff --git a/src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/DynamicallyAccessedMembersAnalyzerTests.cs b/src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/DynamicallyAccessedMembersAnalyzerTests.cs index fccb0de0d95e35..6d1e422f748d79 100644 --- a/src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/DynamicallyAccessedMembersAnalyzerTests.cs +++ b/src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/DynamicallyAccessedMembersAnalyzerTests.cs @@ -655,7 +655,7 @@ public override PropertyInfo[] GetProperties (BindingFlags bindingAttr) throw new NotImplementedException (); } - [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] + [DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors | DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods | DynamicallyAccessedMemberTypes.PublicFields | DynamicallyAccessedMemberTypes.NonPublicFields | DynamicallyAccessedMemberTypes.PublicProperties | DynamicallyAccessedMemberTypes.NonPublicProperties)] public override object InvokeMember (string name, BindingFlags invokeAttr, Binder binder, object target, object[] args, ParameterModifier[] modifiers, CultureInfo culture, string[] namedParameters) { throw new NotImplementedException (); diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/BCLFeatures/ETW/CustomEventSource.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases/BCLFeatures/ETW/CustomEventSource.cs index 8aa02759e06a0d..28e0d002062ef3 100644 --- a/src/tools/illink/test/Mono.Linker.Tests.Cases/BCLFeatures/ETW/CustomEventSource.cs +++ b/src/tools/illink/test/Mono.Linker.Tests.Cases/BCLFeatures/ETW/CustomEventSource.cs @@ -17,8 +17,6 @@ public static void Main () [Kept] [KeptBaseType (typeof (EventSource))] [KeptAttributeAttribute (typeof (EventSourceAttribute))] - [KeptMember (".ctor()")] - [KeptMember (".cctor()")] [EventSource (Name = "MyCompany")] class MyCompanyEventSource : EventSource @@ -45,16 +43,12 @@ public class Tasks public int Unused; } - [KeptMember (".ctor()")] - [Kept] class NotMatching { } - [Kept] public static MyCompanyEventSource Log = new MyCompanyEventSource (); - [Kept] int private_member; [Kept] diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/IReflectDataflow.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/IReflectDataflow.cs index db2bc09e13e59b..df3acc925ba238 100644 --- a/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/IReflectDataflow.cs +++ b/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/IReflectDataflow.cs @@ -112,7 +112,7 @@ class MyReflect : IReflect public PropertyInfo GetProperty (string name, BindingFlags bindingAttr, Binder binder, Type returnType, Type[] types, ParameterModifier[] modifiers) => throw new NotImplementedException (); [Kept] [KeptAttributeAttribute (typeof (DynamicallyAccessedMembersAttribute))] - [DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.All)] + [DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors | DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods | DynamicallyAccessedMemberTypes.PublicFields | DynamicallyAccessedMemberTypes.NonPublicFields | DynamicallyAccessedMemberTypes.PublicProperties | DynamicallyAccessedMemberTypes.NonPublicProperties)] public object InvokeMember (string name, BindingFlags invokeAttr, Binder binder, object target, object[] args, ParameterModifier[] modifiers, CultureInfo culture, string[] namedParameters) => throw new NotImplementedException (); } diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/MethodByRefParameterDataFlow.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/MethodByRefParameterDataFlow.cs index 3bbdcd035637b5..0df8a2aca142bf 100644 --- a/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/MethodByRefParameterDataFlow.cs +++ b/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/MethodByRefParameterDataFlow.cs @@ -488,9 +488,6 @@ public override PropertyInfo[] GetProperties (BindingFlags bindingAttr) throw new NotImplementedException (); } - [ExpectedWarning ("IL2094", - "Mono.Linker.Tests.Cases.DataFlow.MethodByRefParameterDataFlow.InheritsFromType.InvokeMember(String, BindingFlags, Binder, Object, Object[], ParameterModifier[], CultureInfo, String[])", - "System.Type.InvokeMember(String, BindingFlags, Binder, Object, Object[], ParameterModifier[], CultureInfo, String[])", Tool.Trimmer | Tool.Analyzer, "This will match once we update to a .NET 10 SDK")] [DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors | DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods | DynamicallyAccessedMemberTypes.PublicFields | DynamicallyAccessedMemberTypes.NonPublicFields | DynamicallyAccessedMemberTypes.PublicProperties | DynamicallyAccessedMemberTypes.NonPublicProperties)] public override object InvokeMember (string name, BindingFlags invokeAttr, Binder binder, object target, object[] args, ParameterModifier[] modifiers, CultureInfo culture, string[] namedParameters) { diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/NullableAnnotations.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/NullableAnnotations.cs index 8f11a98281eee7..29b8bf650cbffa 100644 --- a/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/NullableAnnotations.cs +++ b/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/NullableAnnotations.cs @@ -65,6 +65,9 @@ public static void Main () GetUnderlyingTypeOnNonNullableKnownType.Test (); MakeGenericTypeWithUnknownValue (new object[2] { 1, 2 }); MakeGenericTypeWithKnowAndUnknownArray (); + + // Prevents optimizing away 'as Type' conversion. + PreserveSystemType (); } [Kept] @@ -331,5 +334,11 @@ static void MakeGenericTypeWithKnowAndUnknownArray (Type[] unknownTypes = null, nullable.GetProperties (); // This works - we still know it's Nullable<>, so we can get its properties Nullable.GetUnderlyingType (nullable).GetFields (); // This must warn - since we have no idea what the underlying type is for the unknownTypes case } + + [Kept] + static void PreserveSystemType () + { + typeof (Type).RequiresNonPublicConstructors (); + } } } diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/UnreachableBlock/ComplexConditions.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases/UnreachableBlock/ComplexConditions.cs index 68714608fcca98..4d2838c3b9ebfe 100644 --- a/src/tools/illink/test/Mono.Linker.Tests.Cases/UnreachableBlock/ComplexConditions.cs +++ b/src/tools/illink/test/Mono.Linker.Tests.Cases/UnreachableBlock/ComplexConditions.cs @@ -1,6 +1,7 @@ using System; using System.Reflection.Emit; using Mono.Linker.Tests.Cases.Expectations.Assertions; +using Mono.Linker.Tests.Cases.Expectations.Helpers; using Mono.Linker.Tests.Cases.Expectations.Metadata; namespace Mono.Linker.Tests.Cases.UnreachableBlock @@ -14,6 +15,9 @@ public static void Main () { Test_1 (null); Test_2 (9); + + // Prevents optimizing away 'is Type' check. + PreserveSystemType (); } [Kept] @@ -100,5 +104,11 @@ static bool IsDynamicCodeSupported { static void Reached_1 () { } + + [Kept] + static void PreserveSystemType () + { + typeof (Type).RequiresNonPublicConstructors (); + } } } \ No newline at end of file diff --git a/src/workloads/workloads.csproj b/src/workloads/workloads.csproj index 0f94792e257e84..15fa368ecb5ecb 100644 --- a/src/workloads/workloads.csproj +++ b/src/workloads/workloads.csproj @@ -40,32 +40,55 @@ - <_ComponentResources Include="microsoft-net-runtime-mono-tooling" Title=".NET 9.0 Shared Mobile Build Tools" + <_ComponentResources Include="microsoft-net-runtime-mono-tooling" Title=".NET 10.0 Shared Mobile Build Tools" Description="Shared build tasks for mobile platform development."/> - <_ComponentResources Include="wasm-tools" Title=".NET 9.0 WebAssembly Build Tools" + <_ComponentResources Include="wasm-tools" Title=".NET 10.0 WebAssembly Build Tools" Description="Build tools for WebAssembly ahead-of-time (AoT) compilation and native linking."/> - <_ComponentResources Include="wasm-experimental" Title=".NET 9.0 WebAssembly Experimental Tools" - Description=".NET 8.0 WebAssembly experimental tooling"/> - <_ComponentResources Include="wasi-experimental" Title=".NET 9.0 Wasi Experimental" + <_ComponentResources Include="wasm-experimental" Title=".NET 10.0 WebAssembly Experimental Tools" + Description=".NET 10.0 WebAssembly experimental tooling"/> + <_ComponentResources Include="wasi-experimental" Title=".NET 10.0 Wasi Experimental" + Description=".NET 10.0 Experimental SDK and tooling for WASI"/> + <_ComponentResources Include="microsoft-net-runtime-android" Title=".NET 10.0 Android Build Tools" + Description="Build tools for Android compilation and native linking."/> + <_ComponentResources Include="microsoft-net-runtime-android-aot" Title=".NET 10.0 Android Build Tools (AoT)" + Description="Build tools for Android ahead-of-time (AoT) compilation and native linking."/> + <_ComponentResources Include="microsoft-net-runtime-ios" Title=".NET 10.0 iOS Build Tools" + Description="Build tools for iOS compilation and native linking."/> + <_ComponentResources Include="microsoft-net-runtime-tvos" Title=".NET 10.0 tvOS Build Tools" + Description="Build tools for tvOS compilation and native linking."/> + <_ComponentResources Include="microsoft-net-runtime-maccatalyst" Title=".NET 10.0 Mac Catalyst Build Tools" + Description="Build tools for Mac Catalyst compilation and native linking."/> + <_ComponentResources Include="runtimes-ios" Title=".NET 10.0 iOS Runtimes" + Description=".NET 10.0 runtime components for iOS execution."/> + <_ComponentResources Include="runtimes-tvos" Title=".NET 10.0 tvOS Build Tools" + Description=".NET 10.0 runtime components for tvOS execution."/> + <_ComponentResources Include="runtimes-maccatalyst" Title=".NET 10.0 Mac Catalyst Build Tools" + Description=".NET 10.0 runtime components for Mac Catalyst execution."/> + + <_ComponentResources Include="microsoft-net-runtime-mono-tooling-net9" Title=".NET 9.0 Shared Mobile Build Tools" + Description="Shared build tasks for mobile platform development."/> + <_ComponentResources Include="wasm-tools-net9" Title=".NET 9.0 WebAssembly Build Tools" + Description="Build tools for WebAssembly ahead-of-time (AoT) compilation and native linking."/> + <_ComponentResources Include="wasm-experimental-net9" Title=".NET 9.0 WebAssembly Experimental Tools" + Description=".NET 9.0 WebAssembly experimental tooling"/> + <_ComponentResources Include="wasi-experimental-net9" Title=".NET 9.0 Wasi Experimental" Description=".NET 9.0 Experimental SDK and tooling for WASI"/> - <_ComponentResources Include="microsoft-net-runtime-android" Title=".NET 9.0 Android Build Tools" + <_ComponentResources Include="microsoft-net-runtime-android-net9" Title=".NET 9.0 Android Build Tools" Description="Build tools for Android compilation and native linking."/> - <_ComponentResources Include="microsoft-net-runtime-android-aot" Title=".NET 9.0 Android Build Tools (AoT)" + <_ComponentResources Include="microsoft-net-runtime-android-aot-net9" Title=".NET 9.0 Android Build Tools (AoT)" Description="Build tools for Android ahead-of-time (AoT) compilation and native linking."/> - <_ComponentResources Include="microsoft-net-runtime-ios" Title=".NET 9.0 iOS Build Tools" + <_ComponentResources Include="microsoft-net-runtime-ios-net9" Title=".NET 9.0 iOS Build Tools" Description="Build tools for iOS compilation and native linking."/> - <_ComponentResources Include="microsoft-net-runtime-tvos" Title=".NET 9.0 tvOS Build Tools" + <_ComponentResources Include="microsoft-net-runtime-tvos-net9" Title=".NET 9.0 tvOS Build Tools" Description="Build tools for tvOS compilation and native linking."/> - <_ComponentResources Include="microsoft-net-runtime-maccatalyst" Title=".NET 9.0 Mac Catalyst Build Tools" + <_ComponentResources Include="microsoft-net-runtime-maccatalyst-net9" Title=".NET 9.0 Mac Catalyst Build Tools" Description="Build tools for Mac Catalyst compilation and native linking."/> - <_ComponentResources Include="runtimes-ios" Title=".NET 9.0 iOS Runtimes" + <_ComponentResources Include="runtimes-ios-net9" Title=".NET 9.0 iOS Runtimes" Description=".NET 9.0 runtime components for iOS execution."/> - <_ComponentResources Include="runtimes-tvos" Title=".NET 9.0 tvOS Build Tools" + <_ComponentResources Include="runtimes-tvos-net9" Title=".NET 9.0 tvOS Build Tools" Description=".NET 9.0 runtime components for tvOS execution."/> - <_ComponentResources Include="runtimes-maccatalyst" Title=".NET 9.0 Mac Catalyst Build Tools" + <_ComponentResources Include="runtimes-maccatalyst-net9" Title=".NET 9.0 Mac Catalyst Build Tools" Description=".NET 9.0 runtime components for Mac Catalyst execution."/> - <_ComponentResources Include="runtimes-windows" Title=".NET 9.0 Windows Runtimes" - Description=".NET 9.0 runtime components for Windows execution."/> <_ComponentResources Include="microsoft-net-runtime-mono-tooling-net8" Title=".NET 8.0 Shared Mobile Build Tools" Description="Shared build tasks for mobile platform development."/>