diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 609e2026b289e4..3182232edf9cdc 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -40,45 +40,45 @@ This file should be imported by eng/Versions.props 19.1.0-alpha.1.25461.1 19.1.0-alpha.1.25461.1 - 5.0.0-2.25468.104 - 5.0.0-2.25468.104 - 5.0.0-2.25468.104 - 10.0.100-rc.2.25468.104 - 10.0.100-rc.2.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 0.11.5-alpha.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 2.9.3-beta.25468.104 - 2.9.3-beta.25468.104 - 10.0.0-beta.25468.104 - 5.0.0-2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.100-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 7.0.0-preview.2.46904 - 7.0.0-preview.2.46904 - 7.0.0-preview.2.46904 - 7.0.0-preview.2.46904 - 10.0.0-rc.2.25468.104 - 2.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 + 5.0.0-2.25474.118 + 5.0.0-2.25474.118 + 5.0.0-2.25474.118 + 10.0.100-rc.2.25474.118 + 10.0.100-rc.2.25474.118 + 10.0.0-beta.25474.118 + 10.0.0-beta.25474.118 + 10.0.0-beta.25474.118 + 10.0.0-beta.25474.118 + 10.0.0-beta.25474.118 + 10.0.0-beta.25474.118 + 10.0.0-beta.25474.118 + 10.0.0-beta.25474.118 + 0.11.5-alpha.25474.118 + 10.0.0-beta.25474.118 + 10.0.0-beta.25474.118 + 10.0.0-beta.25474.118 + 10.0.0-beta.25474.118 + 10.0.0-beta.25474.118 + 10.0.0-beta.25474.118 + 10.0.0-beta.25474.118 + 10.0.0-beta.25474.118 + 2.9.3-beta.25474.118 + 2.9.3-beta.25474.118 + 10.0.0-beta.25474.118 + 5.0.0-2.25474.118 + 10.0.0-rc.2.25474.118 + 10.0.100-rc.2.25474.118 + 10.0.0-rc.2.25474.118 + 10.0.0-rc.2.25474.118 + 7.0.0-rc.47518 + 7.0.0-rc.47518 + 7.0.0-rc.47518 + 7.0.0-rc.47518 + 10.0.0-rc.2.25474.118 + 2.0.0-rc.2.25474.118 + 10.0.0-rc.2.25474.118 + 10.0.0-rc.2.25474.118 + 10.0.0-rc.2.25474.118 10.0.0-beta.25418.1 10.0.0-beta.25418.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 00e8a191d32486..9b670002c61866 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 2cfe42ea4a7fe364dcb197beca469af8edec0ad6 - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df https://github.com/dotnet/runtime-assets @@ -263,33 +263,33 @@ https://github.com/dotnet/llvm-project 2cfe42ea4a7fe364dcb197beca469af8edec0ad6 - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df https://github.com/dotnet/xharness @@ -303,9 +303,9 @@ https://github.com/dotnet/xharness cbaa911ef1bce4cf92a7e4f7ffa5171eddd1a8fd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -331,29 +331,29 @@ https://github.com/dotnet/runtime-assets 3910cd6230be3d4d283edd6a52bff27f549dd675 - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -365,21 +365,21 @@ - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 04104ba742ae9a61dd6cf01b2697fd21348132df https://github.com/dotnet/node diff --git a/eng/Versions.props b/eng/Versions.props index d906bcb8b677e1..e16f68d34f638a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,7 @@ 10.2.0 17.0.46 - 9.0.0-preview-20241010.1 + 10.0.0-preview-20250912.1 2.4.15 9.0.0-alpha.1.24167.3 diff --git a/eng/intellisense.targets b/eng/intellisense.targets index 53614511d96725..e53bf035e91367 100644 --- a/eng/intellisense.targets +++ b/eng/intellisense.targets @@ -6,10 +6,10 @@ $([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'microsoft.private.intellisense', '$(MicrosoftPrivateIntellisenseVersion)', 'IntellisenseFiles')) + $([MSBuild]::NormalizePath('$(IntellisensePackageXmlRootFolder)', 'net-$(NetCoreAppCurrentVersion)', '1033', '$(AssemblyName).xml')) $([MSBuild]::NormalizePath('$(IntellisensePackageXmlRootFolder)', 'net', '1033', '$(AssemblyName).xml')) - $([MSBuild]::NormalizePath('$(IntellisensePackageXmlRootFolder)', 'dotnet-plat-ext', '1033', '$(AssemblyName).xml')) + $(IntellisensePackageXmlFilePathFromNetVersionFolder) $(IntellisensePackageXmlFilePathFromNetFolder) - $(IntellisensePackageXmlFilePathFromDotNetPlatExtFolder) $([MSBuild]::NormalizePath('$(IntermediateOutputPath)', 'intellisense-package', '$(TargetName).xml')) diff --git a/global.json b/global.json index 371b7c75a57e94..2979010bb01b84 100644 --- a/global.json +++ b/global.json @@ -8,11 +8,11 @@ "dotnet": "10.0.100-rc.1.25451.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25468.104", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25468.104", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25468.104", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25474.118", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25474.118", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25474.118", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "10.0.0-rc.2.25468.104" + "Microsoft.NET.Sdk.IL": "10.0.0-rc.2.25474.118" } } diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.targets b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.targets index c61db973796d3a..8230c38e50cdf4 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.targets +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.targets @@ -6,13 +6,13 @@ - + - - - - - + + + + + diff --git a/src/installer/pkg/sfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj b/src/installer/pkg/sfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj index 6fd5ffa2eb98dd..ca964ce663a88b 100644 --- a/src/installer/pkg/sfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj +++ b/src/installer/pkg/sfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj @@ -20,13 +20,13 @@ - + - - - - - + + + + + diff --git a/src/installer/pkg/sfx/installers/Directory.Build.targets b/src/installer/pkg/sfx/installers/Directory.Build.targets index 0395881d630122..dded62b7d746f1 100644 --- a/src/installer/pkg/sfx/installers/Directory.Build.targets +++ b/src/installer/pkg/sfx/installers/Directory.Build.targets @@ -3,7 +3,7 @@ - + diff --git a/src/mono/nuget/Directory.Build.targets b/src/mono/nuget/Directory.Build.targets index c5a434cbbf9c85..8e2f1b6a5c2e33 100644 --- a/src/mono/nuget/Directory.Build.targets +++ b/src/mono/nuget/Directory.Build.targets @@ -2,7 +2,7 @@ - $(ProductVersion) + $(ProductVersion)