From 0d5defab8a078b8b4e3fd34e57946e9c574b0d7f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 10 May 2025 02:06:21 +0000 Subject: [PATCH 1/3] [VMR] Codeflow db0da94-db0da94 [[ commit created by automation ]] --- Directory.Build.props | 1 + Directory.Build.targets | 3 +- eng/DotNetBuild.props | 99 ------------------- eng/pipelines/runtime.yml | 4 +- eng/toolAot.targets | 2 +- src/coreclr/runtime.proj | 6 +- .../src/Microsoft.NETCore.Platforms.csproj | 3 + 7 files changed, 12 insertions(+), 106 deletions(-) delete mode 100644 eng/DotNetBuild.props diff --git a/Directory.Build.props b/Directory.Build.props index 30812ae5da450d..7e5c028ecfa209 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -303,6 +303,7 @@ '$(MSBuildProjectExtension)' != '.pkgproj' and '$(UsingMicrosoftNoTargetsSdk)' != 'true' and '$(UsingMicrosoftTraversalSdk)' != 'true'">true + true diff --git a/Directory.Build.targets b/Directory.Build.targets index a557106b869186..2b84a17a6118b5 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -15,7 +15,8 @@ $([MSBuild]::NormalizePath('$(LibrariesProjectRoot)', 'Microsoft.NETCore.Platforms', 'src', 'runtime.json')) - + + $([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'Microsoft.NETCore.Platforms', 'runtime.json')) $([MSBuild]::NormalizePath('$(LibrariesProjectRoot)', 'Microsoft.NETCore.Platforms', 'src', 'runtime.json')) diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props deleted file mode 100644 index 18409ac01e5a7f..00000000000000 --- a/eng/DotNetBuild.props +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - $(TargetRid) - - - - - - - runtime - - .\build.cmd - ./build.sh - - minimal - - - - - - - - $(InnerBuildArgs) $(FlagParameterPrefix)restore $(FlagParameterPrefix)build $(FlagParameterPrefix)publish - $(InnerBuildArgs) $(FlagParameterPrefix)sign - $(InnerBuildArgs) $(FlagParameterPrefix)pack - - $(InnerBuildArgs) $(FlagParameterPrefix)arch $(TargetArchitecture) - $(InnerBuildArgs) $(FlagParameterPrefix)os windows - $(InnerBuildArgs) $(FlagParameterPrefix)os $(PortableOS) - - $(InnerBuildArgs) $(FlagParameterPrefix)cross - $(InnerBuildArgs) $(FlagParameterPrefix)configuration $(Configuration) - $(InnerBuildArgs) $(FlagParameterPrefix)verbosity $(LogVerbosity) - $(InnerBuildArgs) $(FlagParameterPrefix)nodereuse $(ArcadeFalseBoolBuildArg) - $(InnerBuildArgs) $(FlagParameterPrefix)warnAsError $(ArcadeFalseBoolBuildArg) - $(InnerBuildArgs) $(FlagParameterPrefix)usemonoruntime - - $(InnerBuildArgs) --outputrid $(OutputRID) - - $(InnerBuildArgs) /p:AdditionalRuntimeIdentifierParent=$(BaseOS) - - $(InnerBuildArgs) --bootstrap - - $(InnerBuildArgs) /p:WasmEnableThreads=true - $(InnerBuildArgs) /p:MonoEnableLLVM=$(MonoEnableLLVM) - $(InnerBuildArgs) /p:MonoAOTEnableLLVM=$(MonoAOTEnableLLVM) - $(InnerBuildArgs) /p:MonoBundleLLVMOptimizer=$(MonoBundleLLVMOptimizer) - $(InnerBuildArgs) /p:DotNetBuildAllRuntimePacks=$(DotNetBuildAllRuntimePacks) - $(InnerBuildArgs) /p:DotNetBuildPass=$(DotNetBuildPass) - $(InnerBuildArgs) $(FlagParameterPrefix)pgoinstrument - - - $(InnerBuildArgs) /p:DotNetBuildRepo=true - $(InnerBuildArgs) /p:DotNetBuildOrchestrator=true - $(InnerBuildArgs) /p:OfficialBuildId=$(OfficialBuildId) - $(InnerBuildArgs) /p:ContinuousIntegrationBuild=$(ContinuousIntegrationBuild) - $(InnerBuildArgs) /p:PortableBuild=$(PortableBuild) - $(InnerBuildArgs) /p:RestoreConfigFile=$(RestoreConfigFile) - $(InnerBuildArgs) /p:ForceDryRunSigning=$(ForceDryRunSigning) - $(InnerBuildArgs) /p:DefaultArtifactVisibility=$(DefaultArtifactVisibility) - $(InnerBuildArgs) /p:DotNetEsrpToolPath=$(DotNetEsrpToolPath) - $(InnerBuildArgs) /p:DotNetBuildTests=$(DotNetBuildTests) - $(InnerBuildArgs) /p:PublishingVersion=$(PublishingVersion) - $(InnerBuildArgs) /p:RepositoryUrl=$(RepositoryUrl) - - - $(InnerBuildArgs) /p:SourceBuiltAssetsDir=$(SourceBuiltAssetsDir) - $(InnerBuildArgs) /p:SourceBuiltShippingPackagesDir=$(SourceBuiltShippingPackagesDir) - $(InnerBuildArgs) /p:SourceBuiltNonShippingPackagesDir=$(SourceBuiltNonShippingPackagesDir) - $(InnerBuildArgs) /p:SourceBuiltAssetManifestsDir=$(SourceBuiltAssetManifestsDir) - $(InnerBuildArgs) /p:SourceBuiltPdbArtifactsDir=$(SourceBuiltPdbArtifactsDir) - $(InnerBuildArgs) /p:SourceBuiltSymbolsDir=$(SourceBuiltSymbolsDir) - $(InnerBuildArgs) /p:GitHubRepositoryName=$(GitHubRepositoryName) - - - +$(UseSystemLibs) - $(InnerBuildArgs) --cmakeargs -DCLR_CMAKE_USE_SYSTEM_BROTLI=true - $(InnerBuildArgs) --cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=true - - - $(InnerBuildArgs) --cmakeargs -DCLR_CMAKE_USE_SYSTEM_RAPIDJSON=true - $(InnerBuildArgs) --cmakeargs -DCLR_CMAKE_USE_SYSTEM_ZLIB=true - $(InnerBuildArgs) /p:FeatureXplatEventSource=false - - - $(InnerBuildArgs) /p:NetCoreAppToolCurrentVersion=$(NetCoreAppToolCurrentVersion) - - $(InnerBuildArgs) /p:EnableDefaultRidSpecificArtifacts=$(EnableDefaultRidSpecificArtifacts) - - - - diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 5e6ac75cd59f32..3e4cf478d8faa9 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -1768,12 +1768,12 @@ extends: parameters: platforms: - name: CentOS9 - baseOS: linux-x64 + baseRID: linux-x64 targetRID: centos.9-x64 portableBuild: false container: SourceBuild_centos_x64 - name: NonexistentRID - baseOS: linux-x64 + baseRID: linux-x64 targetRID: banana.24-x64 portableBuild: false container: SourceBuild_centos_x64 diff --git a/eng/toolAot.targets b/eng/toolAot.targets index 21b633b596dc0c..919898404078f2 100644 --- a/eng/toolAot.targets +++ b/eng/toolAot.targets @@ -18,7 +18,7 @@ NativeAOT's targets don't handle cross-targeting to a non-portable RID. Change the RID when importing the NativeAOT targets to the corresponding portable RID if specified. --> - $(BaseOS) + $(BaseRid) diff --git a/src/coreclr/runtime.proj b/src/coreclr/runtime.proj index 1286ba903d8ed3..733a586c3e9967 100644 --- a/src/coreclr/runtime.proj +++ b/src/coreclr/runtime.proj @@ -47,9 +47,9 @@ <_CoreClrBuildArg Condition="'$(EnableNativeSanitizers)' != ''" Include="-fsanitize $(EnableNativeSanitizers)" /> <_CoreClrBuildArg Condition="'$(HostCrossOS)' != ''" Include="-hostos $(HostCrossOS)" /> <_CoreClrBuildArg Include="-outputrid $(OutputRID)" /> - - <_CoreClrBuildArg Condition="'$(BaseOS)' == ''" Include="-cmakeargs "-DCLR_DOTNET_RID=$(OutputRID)"" /> - <_CoreClrBuildArg Condition="'$(BaseOS)' != ''" Include="-cmakeargs "-DCLR_DOTNET_RID=$(BaseOS)"" /> + + <_CoreClrBuildArg Condition="'$(BaseRid)' == ''" Include="-cmakeargs "-DCLR_DOTNET_RID=$(OutputRID)"" /> + <_CoreClrBuildArg Condition="'$(BaseRid)' != ''" Include="-cmakeargs "-DCLR_DOTNET_RID=$(BaseRid)"" /> <_CoreClrBuildArg Condition="'$(BuildSubdirectory)' != ''" Include="-subdir $(BuildSubdirectory)" /> <_CoreClrBuildArg Include="-cmakeargs "-DCLR_DOTNET_HOST_PATH=$(DOTNET_HOST_PATH)"" /> <_CoreClrBuildArg Condition="'$(HasCdacBuildTool)' == 'true'" Include="-cmakeargs "-DCDAC_BUILD_TOOL_BINARY_PATH=$(RuntimeBinDir)cdac-build-tool\cdac-build-tool.dll"" /> diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj index cf5cc394e860ae..08ee9aad13b74a 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj +++ b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj @@ -19,6 +19,9 @@ <_generateRuntimeGraphTargetFramework Condition="'$(MSBuildRuntimeType)' != 'core'">$(NetFrameworkToolCurrent) <_generateRuntimeGraphTask>$([MSBuild]::NormalizePath('$(BaseOutputPath)', $(Configuration), '$(_generateRuntimeGraphTargetFramework)', '$(AssemblyName).dll')) + + $(BaseRid) $(AdditionalRuntimeIdentifierParent) From 4d2143cb8e88483a0ca36cad679d6265b0d92597 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 10 May 2025 02:06:31 +0000 Subject: [PATCH 2/3] Update dependencies from https://github.com/dotnet/dotnet build 267725 --- eng/Version.Details.xml | 142 ++++++++++++++++++++-------------------- eng/Versions.props | 64 +++++++++--------- global.json | 8 +-- 3 files changed, 107 insertions(+), 107 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 96d6ec2de38777..1978fb9cb492bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/dotnet/icu @@ -41,91 +41,91 @@ https://github.com/dotnet/llvm-project da5dd054a531e6fea65643b7e754285b73eab433 - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f https://github.com/dotnet/runtime-assets @@ -263,33 +263,33 @@ https://github.com/dotnet/llvm-project da5dd054a531e6fea65643b7e754285b73eab433 - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f https://github.com/dotnet/xharness @@ -303,9 +303,9 @@ https://github.com/dotnet/xharness 6702e80281066daa33390d759263823298486439 - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -331,29 +331,29 @@ https://github.com/dotnet/runtime-assets 0f29fbf11b27f878e41f12a17bd0b94ef6410d42 - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f - + https://github.com/dotnet/dotnet - 954d6157c9c22c8d8b4faddef70b2b703c65e77e + 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 8919f98d959fc2..0f65c2fb02334c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,17 +36,17 @@ - 10.0.0-preview.25257.112 + 10.0.0-preview.25259.104 - 3.12.0-beta1.25257.112 + 5.0.0-1.25259.104 - 5.0.0-1.25257.112 - 5.0.0-1.25257.112 - 5.0.0-1.25257.112 + 5.0.0-1.25259.104 + 5.0.0-1.25259.104 + 5.0.0-1.25259.104 - 10.0.100-preview.5.25257.112 + 10.0.100-preview.5.25259.104 - 10.0.0-beta.25257.112 - 10.0.0-beta.25257.112 - 10.0.0-beta.25257.112 - 10.0.0-beta.25257.112 - 2.9.2-beta.25257.112 - 10.0.0-beta.25257.112 - 2.9.2-beta.25257.112 - 10.0.0-beta.25257.112 - 10.0.0-beta.25257.112 - 10.0.0-beta.25257.112 - 10.0.0-beta.25257.112 - 10.0.0-beta.25257.112 - 10.0.0-beta.25257.112 - 10.0.0-beta.25257.112 - 10.0.0-beta.25257.112 - 10.0.0-beta.25257.112 + 10.0.0-beta.25259.104 + 10.0.0-beta.25259.104 + 10.0.0-beta.25259.104 + 10.0.0-beta.25259.104 + 2.9.2-beta.25259.104 + 10.0.0-beta.25259.104 + 2.9.2-beta.25259.104 + 10.0.0-beta.25259.104 + 10.0.0-beta.25259.104 + 10.0.0-beta.25259.104 + 10.0.0-beta.25259.104 + 10.0.0-beta.25259.104 + 10.0.0-beta.25259.104 + 10.0.0-beta.25259.104 + 10.0.0-beta.25259.104 + 10.0.0-beta.25259.104 1.4.0 6.0.0-preview.1.102 - 10.0.0-preview.5.25257.112 + 10.0.0-preview.5.25259.104 6.0.0 - 10.0.0-preview.5.25257.112 - 10.0.0-preview.5.25257.112 + 10.0.0-preview.5.25259.104 + 10.0.0-preview.5.25259.104 6.0.0 4.6.1 @@ -128,16 +128,16 @@ 8.0.0 8.0.1 5.0.0 - 10.0.0-preview.5.25257.112 - 10.0.0-preview.5.25257.112 + 10.0.0-preview.5.25259.104 + 10.0.0-preview.5.25259.104 6.0.0 5.0.0 5.0.0 5.0.0 7.0.0 - 10.0.0-preview.5.25257.112 + 10.0.0-preview.5.25259.104 7.0.0 - 10.0.0-preview.5.25257.112 + 10.0.0-preview.5.25259.104 8.0.0 4.5.1 @@ -180,7 +180,7 @@ 2.0.0 17.10.0-beta1.24272.1 - 2.0.0-beta5.25257.112 + 2.0.0-beta5.25259.104 3.1.16 2.1.0 2.0.3 @@ -226,7 +226,7 @@ 9.0.0-preview-20241010.1 - 0.11.5-alpha.25257.112 + 0.11.5-alpha.25259.104 10.0.0-preview.5.25255.1 @@ -258,7 +258,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.100-preview.5.25257.112 + 10.0.100-preview.5.25259.104 $(MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion) 1.1.87-gba258badda diff --git a/global.json b/global.json index 19fbdf1f9ded60..93e2a8e221616f 100644 --- a/global.json +++ b/global.json @@ -8,11 +8,11 @@ "dotnet": "10.0.100-preview.3.25201.16" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25257.112", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25257.112", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25257.112", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25259.104", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25259.104", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25259.104", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "10.0.0-preview.5.25257.112" + "Microsoft.NET.Sdk.IL": "10.0.0-preview.5.25259.104" } } From 7331ce08741ace8b01751a80075369c70d7b4701 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 11 May 2025 02:06:28 +0000 Subject: [PATCH 3/3] Update dependencies from https://github.com/dotnet/dotnet build 267776 --- eng/Version.Details.xml | 142 ++++++++++++++++++++-------------------- eng/Versions.props | 64 +++++++++--------- global.json | 8 +-- 3 files changed, 107 insertions(+), 107 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1978fb9cb492bb..c6c760b73b7ce2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/dotnet/icu @@ -41,91 +41,91 @@ https://github.com/dotnet/llvm-project da5dd054a531e6fea65643b7e754285b73eab433 - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 85778473549347b3e4bad3ea009e9438df7b11bb - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 85778473549347b3e4bad3ea009e9438df7b11bb - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 85778473549347b3e4bad3ea009e9438df7b11bb - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 85778473549347b3e4bad3ea009e9438df7b11bb - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 85778473549347b3e4bad3ea009e9438df7b11bb - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 85778473549347b3e4bad3ea009e9438df7b11bb - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 85778473549347b3e4bad3ea009e9438df7b11bb - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 85778473549347b3e4bad3ea009e9438df7b11bb - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 85778473549347b3e4bad3ea009e9438df7b11bb - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 85778473549347b3e4bad3ea009e9438df7b11bb - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 85778473549347b3e4bad3ea009e9438df7b11bb - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 85778473549347b3e4bad3ea009e9438df7b11bb - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 85778473549347b3e4bad3ea009e9438df7b11bb - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 85778473549347b3e4bad3ea009e9438df7b11bb - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 85778473549347b3e4bad3ea009e9438df7b11bb - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 85778473549347b3e4bad3ea009e9438df7b11bb - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 85778473549347b3e4bad3ea009e9438df7b11bb - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 85778473549347b3e4bad3ea009e9438df7b11bb - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 85778473549347b3e4bad3ea009e9438df7b11bb - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 85778473549347b3e4bad3ea009e9438df7b11bb - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 85778473549347b3e4bad3ea009e9438df7b11bb https://github.com/dotnet/runtime-assets @@ -263,33 +263,33 @@ https://github.com/dotnet/llvm-project da5dd054a531e6fea65643b7e754285b73eab433 - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 85778473549347b3e4bad3ea009e9438df7b11bb - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 85778473549347b3e4bad3ea009e9438df7b11bb - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 85778473549347b3e4bad3ea009e9438df7b11bb - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 85778473549347b3e4bad3ea009e9438df7b11bb - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 85778473549347b3e4bad3ea009e9438df7b11bb - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 85778473549347b3e4bad3ea009e9438df7b11bb - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 85778473549347b3e4bad3ea009e9438df7b11bb https://github.com/dotnet/xharness @@ -303,9 +303,9 @@ https://github.com/dotnet/xharness 6702e80281066daa33390d759263823298486439 - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 85778473549347b3e4bad3ea009e9438df7b11bb https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -331,29 +331,29 @@ https://github.com/dotnet/runtime-assets 0f29fbf11b27f878e41f12a17bd0b94ef6410d42 - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 85778473549347b3e4bad3ea009e9438df7b11bb - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 85778473549347b3e4bad3ea009e9438df7b11bb - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 85778473549347b3e4bad3ea009e9438df7b11bb - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 85778473549347b3e4bad3ea009e9438df7b11bb - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 85778473549347b3e4bad3ea009e9438df7b11bb - + https://github.com/dotnet/dotnet - 9a0f13b9e9f8d4ac10ad119d90dfc387cb120e9f + 85778473549347b3e4bad3ea009e9438df7b11bb https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 0f65c2fb02334c..e7026d404bcdd7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,17 +36,17 @@ - 10.0.0-preview.25259.104 + 10.0.0-preview.25260.104 - 5.0.0-1.25259.104 + 5.0.0-1.25260.104 - 5.0.0-1.25259.104 - 5.0.0-1.25259.104 - 5.0.0-1.25259.104 + 5.0.0-1.25260.104 + 5.0.0-1.25260.104 + 5.0.0-1.25260.104 - 10.0.100-preview.5.25259.104 + 10.0.100-preview.5.25260.104 - 10.0.0-beta.25259.104 - 10.0.0-beta.25259.104 - 10.0.0-beta.25259.104 - 10.0.0-beta.25259.104 - 2.9.2-beta.25259.104 - 10.0.0-beta.25259.104 - 2.9.2-beta.25259.104 - 10.0.0-beta.25259.104 - 10.0.0-beta.25259.104 - 10.0.0-beta.25259.104 - 10.0.0-beta.25259.104 - 10.0.0-beta.25259.104 - 10.0.0-beta.25259.104 - 10.0.0-beta.25259.104 - 10.0.0-beta.25259.104 - 10.0.0-beta.25259.104 + 10.0.0-beta.25260.104 + 10.0.0-beta.25260.104 + 10.0.0-beta.25260.104 + 10.0.0-beta.25260.104 + 2.9.2-beta.25260.104 + 10.0.0-beta.25260.104 + 2.9.2-beta.25260.104 + 10.0.0-beta.25260.104 + 10.0.0-beta.25260.104 + 10.0.0-beta.25260.104 + 10.0.0-beta.25260.104 + 10.0.0-beta.25260.104 + 10.0.0-beta.25260.104 + 10.0.0-beta.25260.104 + 10.0.0-beta.25260.104 + 10.0.0-beta.25260.104 1.4.0 6.0.0-preview.1.102 - 10.0.0-preview.5.25259.104 + 10.0.0-preview.5.25260.104 6.0.0 - 10.0.0-preview.5.25259.104 - 10.0.0-preview.5.25259.104 + 10.0.0-preview.5.25260.104 + 10.0.0-preview.5.25260.104 6.0.0 4.6.1 @@ -128,16 +128,16 @@ 8.0.0 8.0.1 5.0.0 - 10.0.0-preview.5.25259.104 - 10.0.0-preview.5.25259.104 + 10.0.0-preview.5.25260.104 + 10.0.0-preview.5.25260.104 6.0.0 5.0.0 5.0.0 5.0.0 7.0.0 - 10.0.0-preview.5.25259.104 + 10.0.0-preview.5.25260.104 7.0.0 - 10.0.0-preview.5.25259.104 + 10.0.0-preview.5.25260.104 8.0.0 4.5.1 @@ -180,7 +180,7 @@ 2.0.0 17.10.0-beta1.24272.1 - 2.0.0-beta5.25259.104 + 2.0.0-beta5.25260.104 3.1.16 2.1.0 2.0.3 @@ -226,7 +226,7 @@ 9.0.0-preview-20241010.1 - 0.11.5-alpha.25259.104 + 0.11.5-alpha.25260.104 10.0.0-preview.5.25255.1 @@ -258,7 +258,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.100-preview.5.25259.104 + 10.0.100-preview.5.25260.104 $(MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion) 1.1.87-gba258badda diff --git a/global.json b/global.json index 93e2a8e221616f..8616c8a6541983 100644 --- a/global.json +++ b/global.json @@ -8,11 +8,11 @@ "dotnet": "10.0.100-preview.3.25201.16" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25259.104", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25259.104", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25259.104", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25260.104", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25260.104", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25260.104", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "10.0.0-preview.5.25259.104" + "Microsoft.NET.Sdk.IL": "10.0.0-preview.5.25260.104" } }