diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e3156fbc00396b..0a9dce8715dfb6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - ac7697a28716e68e986d3db72cbc10324f8961fe + feea7b8dcee39fd35ee6c415197e47d19102bb0b https://github.com/dotnet/msquic @@ -85,19 +85,19 @@ 02fe27cd6a9b001c8feb7938e6ef4b3799745759b - + https://github.com/dotnet/cecil - 64a8874f3c485657e732ca56a5f24e2095740103 + 45dd3a73dd5b64b010c4251303b3664bb30df029 - + https://github.com/dotnet/emsdk - 0c28b5cfe0f9173000450a3edc808dc8c2b9286e + 1b7f3a6560f6fb5f32b2758603c0376037f555ea - + https://github.com/dotnet/source-build-reference-packages - 7b55da982fc6e71c1776c4de89111aee0eecb45a + b4fa7f2e1e65ef49881be2ab2df27624280a8c55 @@ -107,9 +107,9 @@ - + https://github.com/dotnet/arcade - 60a2e897fb13b2042e64d3be6a4f9d43f39b6f07 + e6be64c3e27aeb29f93f6aa751fad972e4ef2d52 @@ -117,69 +117,69 @@ 73f0850939d96131c28cf6ea6ee5aacb4da0083a - + https://github.com/dotnet/arcade - 60a2e897fb13b2042e64d3be6a4f9d43f39b6f07 + e6be64c3e27aeb29f93f6aa751fad972e4ef2d52 - + https://github.com/dotnet/arcade - 60a2e897fb13b2042e64d3be6a4f9d43f39b6f07 + e6be64c3e27aeb29f93f6aa751fad972e4ef2d52 - + https://github.com/dotnet/arcade - 60a2e897fb13b2042e64d3be6a4f9d43f39b6f07 + e6be64c3e27aeb29f93f6aa751fad972e4ef2d52 - + https://github.com/dotnet/arcade - 60a2e897fb13b2042e64d3be6a4f9d43f39b6f07 + e6be64c3e27aeb29f93f6aa751fad972e4ef2d52 - + https://github.com/dotnet/arcade - 60a2e897fb13b2042e64d3be6a4f9d43f39b6f07 + e6be64c3e27aeb29f93f6aa751fad972e4ef2d52 - + https://github.com/dotnet/arcade - 60a2e897fb13b2042e64d3be6a4f9d43f39b6f07 + e6be64c3e27aeb29f93f6aa751fad972e4ef2d52 - + https://github.com/dotnet/arcade - 60a2e897fb13b2042e64d3be6a4f9d43f39b6f07 + e6be64c3e27aeb29f93f6aa751fad972e4ef2d52 - + https://github.com/dotnet/arcade - 60a2e897fb13b2042e64d3be6a4f9d43f39b6f07 + e6be64c3e27aeb29f93f6aa751fad972e4ef2d52 - + https://github.com/dotnet/arcade - 60a2e897fb13b2042e64d3be6a4f9d43f39b6f07 + e6be64c3e27aeb29f93f6aa751fad972e4ef2d52 - + https://github.com/dotnet/arcade - 60a2e897fb13b2042e64d3be6a4f9d43f39b6f07 + e6be64c3e27aeb29f93f6aa751fad972e4ef2d52 - + https://github.com/dotnet/arcade - 60a2e897fb13b2042e64d3be6a4f9d43f39b6f07 + e6be64c3e27aeb29f93f6aa751fad972e4ef2d52 - + https://github.com/dotnet/arcade - 60a2e897fb13b2042e64d3be6a4f9d43f39b6f07 + e6be64c3e27aeb29f93f6aa751fad972e4ef2d52 - + https://github.com/dotnet/arcade - 60a2e897fb13b2042e64d3be6a4f9d43f39b6f07 + e6be64c3e27aeb29f93f6aa751fad972e4ef2d52 - + https://github.com/dotnet/arcade - 60a2e897fb13b2042e64d3be6a4f9d43f39b6f07 + e6be64c3e27aeb29f93f6aa751fad972e4ef2d52 - + https://github.com/dotnet/arcade - 60a2e897fb13b2042e64d3be6a4f9d43f39b6f07 + e6be64c3e27aeb29f93f6aa751fad972e4ef2d52 - + https://github.com/dotnet/arcade - 60a2e897fb13b2042e64d3be6a4f9d43f39b6f07 + e6be64c3e27aeb29f93f6aa751fad972e4ef2d52 https://github.com/dotnet/runtime-assets @@ -330,9 +330,9 @@ https://github.com/dotnet/xharness 480b9159eb7e69b182a87581d5a336e97e0b6dae - + https://github.com/dotnet/arcade - 60a2e897fb13b2042e64d3be6a4f9d43f39b6f07 + e6be64c3e27aeb29f93f6aa751fad972e4ef2d52 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -350,9 +350,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization 17ea99c28d05ae088ff372f517e63f91c7b715ae - + https://github.com/dotnet/hotreload-utils - 94979ba9c2904e39ddb9aa255a288caacd6ce166 + 0808f735fcb35276120b2e1221d6c3395d5543d6 https://github.com/dotnet/runtime-assets @@ -371,13 +371,13 @@ https://github.com/dotnet/roslyn d49b29ecbf9bd72fe6023ad1b8aad9a8db7e7c3a - + https://github.com/dotnet/roslyn-analyzers - 4a7701fd72094614897b33e4cb1d9640c221d862 + 4ff28092cdb2006c30869fb35b2fd6b7b11382b1 - + https://github.com/dotnet/roslyn-analyzers - 4a7701fd72094614897b33e4cb1d9640c221d862 + 4ff28092cdb2006c30869fb35b2fd6b7b11382b1 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 7078c2d2f01eb5..102d254a4256bd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,8 +36,8 @@ - 3.11.0-beta1.23472.1 - 8.0.0-preview.23472.1 + 3.11.0-beta1.23516.2 + 8.0.0-preview.23516.2 8.0.100-preview.7.23329.3 - 8.0.0-beta.23477.4 - 8.0.0-beta.23477.4 - 8.0.0-beta.23477.4 - 8.0.0-beta.23477.4 - 8.0.0-beta.23477.4 - 2.5.1-beta.23477.4 - 8.0.0-beta.23477.4 - 8.0.0-beta.23477.4 - 8.0.0-beta.23477.4 - 8.0.0-beta.23477.4 - 8.0.0-beta.23477.4 - 8.0.0-beta.23477.4 - 8.0.0-beta.23477.4 - 8.0.0-beta.23477.4 - 8.0.0-beta.23477.4 + 8.0.0-beta.23505.1 + 8.0.0-beta.23505.1 + 8.0.0-beta.23505.1 + 8.0.0-beta.23505.1 + 8.0.0-beta.23505.1 + 2.5.1-beta.23505.1 + 8.0.0-beta.23505.1 + 8.0.0-beta.23505.1 + 8.0.0-beta.23505.1 + 8.0.0-beta.23505.1 + 8.0.0-beta.23505.1 + 8.0.0-beta.23505.1 + 8.0.0-beta.23505.1 + 8.0.0-beta.23505.1 + 8.0.0-beta.23505.1 6.0.0-preview.1.102 @@ -186,7 +186,7 @@ 8.0.0-prerelease.23407.2 8.0.0-prerelease.23407.2 8.0.0-prerelease.23407.2 - 8.0.0-alpha.0.23502.1 + 8.0.0-alpha.0.23509.1 2.4.2 1.0.0 2.4.5 @@ -213,11 +213,11 @@ 8.0.0-rc.1.23406.6 - 0.11.4-alpha.23502.1 + 0.11.4-alpha.23509.2 8.0.0-rc.1.23406.6 - 8.0.0-rc.2.23468.2 + 8.0.0-rtm.23511.1 2.2.2 8.0.0-alpha.1.23468.1 @@ -240,7 +240,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-8_0_100_Transport --> - 8.0.0-rtm.23504.4 + 8.0.0-rtm.23511.3 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion) 1.1.87-gba258badda diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index ff5342eb5c1947..91f8196cc808db 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -64,7 +64,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.7.2" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.7.2-1" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 19e9fa66239be6..84cfe7cd9cb463 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -379,13 +379,13 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = } # Minimum VS version to require. - $vsMinVersionReqdStr = '17.6' + $vsMinVersionReqdStr = '17.7' $vsMinVersionReqd = [Version]::new($vsMinVersionReqdStr) # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.7.2 - $defaultXCopyMSBuildVersion = '17.7.2' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.7.2-1 + $defaultXCopyMSBuildVersion = '17.7.2-1' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index 38d6bdc6407177..b3fdf36ccb3d25 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "8.0.100-rc.1.23455.8" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23477.4", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23477.4", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23477.4", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23505.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23505.1", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23505.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6"