diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 81b9dc541bcf8e..2f42783ed6ec1a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,9 +111,9 @@ - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 9751be9e9065b01a745e1b9e26bfe46ac55d5f82 @@ -121,69 +121,69 @@ 73f0850939d96131c28cf6ea6ee5aacb4da0083a - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 9751be9e9065b01a745e1b9e26bfe46ac55d5f82 - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 9751be9e9065b01a745e1b9e26bfe46ac55d5f82 - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 9751be9e9065b01a745e1b9e26bfe46ac55d5f82 - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 9751be9e9065b01a745e1b9e26bfe46ac55d5f82 - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 9751be9e9065b01a745e1b9e26bfe46ac55d5f82 - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 9751be9e9065b01a745e1b9e26bfe46ac55d5f82 - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 9751be9e9065b01a745e1b9e26bfe46ac55d5f82 - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 9751be9e9065b01a745e1b9e26bfe46ac55d5f82 - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 9751be9e9065b01a745e1b9e26bfe46ac55d5f82 - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 9751be9e9065b01a745e1b9e26bfe46ac55d5f82 - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 9751be9e9065b01a745e1b9e26bfe46ac55d5f82 - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 9751be9e9065b01a745e1b9e26bfe46ac55d5f82 - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 9751be9e9065b01a745e1b9e26bfe46ac55d5f82 - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 9751be9e9065b01a745e1b9e26bfe46ac55d5f82 - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 9751be9e9065b01a745e1b9e26bfe46ac55d5f82 - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 9751be9e9065b01a745e1b9e26bfe46ac55d5f82 https://github.com/dotnet/runtime-assets @@ -334,9 +334,9 @@ https://github.com/dotnet/xharness 402df9c4f5abe6ee8519181dfb5481e04099fab0 - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 9751be9e9065b01a745e1b9e26bfe46ac55d5f82 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 9f3768ffab74f1..fcbb42b58510e8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,6 @@ release -$(PreReleaseVersionLabel) -$(PreReleaseVersionLabel).$(PreReleaseVersionIteration) - $(SdkBandVersion)$(WorkloadVersionSuffix) false 8.0.100 - 8.0.0-beta.25562.3 - 8.0.0-beta.25562.3 - 8.0.0-beta.25562.3 - 8.0.0-beta.25562.3 - 8.0.0-beta.25562.3 - 2.5.1-beta.25562.3 - 8.0.0-beta.25562.3 - 8.0.0-beta.25562.3 - 8.0.0-beta.25562.3 - 8.0.0-beta.25562.3 - 8.0.0-beta.25562.3 - 8.0.0-beta.25562.3 - 8.0.0-beta.25562.3 - 8.0.0-beta.25562.3 - 8.0.0-beta.25562.3 + 8.0.0-beta.26112.1 + 8.0.0-beta.26112.1 + 8.0.0-beta.26112.1 + 8.0.0-beta.26112.1 + 8.0.0-beta.26112.1 + 2.5.1-beta.26112.1 + 8.0.0-beta.26112.1 + 8.0.0-beta.26112.1 + 8.0.0-beta.26112.1 + 8.0.0-beta.26112.1 + 8.0.0-beta.26112.1 + 8.0.0-beta.26112.1 + 8.0.0-beta.26112.1 + 8.0.0-beta.26112.1 + 8.0.0-beta.26112.1 6.0.0-preview.1.102 @@ -256,6 +255,18 @@ --> 8.0.25 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version) + + + <_GlobalJsonContent>$([System.IO.File]::ReadAllText('$([MSBuild]::GetPathOfFileAbove('global.json', '$(MSBuildThisFileDirectory)'))')) + <_GlobalJsonSdkVersion Condition="'$(_GlobalJsonContent)' != ''">$([System.Text.RegularExpressions.Regex]::Match($(_GlobalJsonContent), '"sdk"\s*:\s*\{[^\}]*"version"\s*:\s*"([^"]+)"', System.Text.RegularExpressions.RegexOptions.Singleline).Groups[1].Value) + <_DotnetSdkVersion>$(MicrosoftDotNetApiCompatTaskVersion) + $(_DotnetSdkVersion) + $(_GlobalJsonSdkVersion) + $(SdkBandVersion)$(WorkloadVersionSuffix) 1.1.87-gba258badda @@ -270,9 +281,6 @@ 3.1.7 1.0.406601 - - 8.0.122 - $(MicrosoftDotnetSdkInternalVersion)