diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8d6b7ef854..0661b5d559 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,268 +41,268 @@ https://github.com/dotnet/efcore 252dee5c84eb5d7d1ef2254974f1100f3cb9cc1a - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/runtime - d0889f1159b6ea044b5e491921b7a37a688ce465 + 4b339d8ba42a03cd8624adc0c3cbe73817a76b77 - + https://github.com/dotnet/arcade - 96c65ad967d2abbbd8e770ba752a6b64255ec669 + fef373440d604c428950236fbc2b99ce0df368a9 - + https://github.com/dotnet/arcade - 96c65ad967d2abbbd8e770ba752a6b64255ec669 + fef373440d604c428950236fbc2b99ce0df368a9 - + https://github.com/dotnet/arcade - 96c65ad967d2abbbd8e770ba752a6b64255ec669 + fef373440d604c428950236fbc2b99ce0df368a9 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 71a5a7ec78..739a713ba9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,72 +62,72 @@ --> - 5.0.0-beta.20278.4 + 5.0.0-beta.20280.1 3.7.0-3.20271.4 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 - 5.0.0-preview.7.20305.1 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 + 5.0.0-preview.7.20306.3 - 5.0.0-preview.7.20305.1 + 5.0.0-preview.7.20306.3 3.2.0 diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index f997be4331..32ad5c7e91 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -65,8 +65,13 @@ try { if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "16.5.0-alpha" -MemberType NoteProperty } + if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { + $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true + } + if ($xcopyMSBuildToolsFolder -eq $null) { + throw 'Unable to get xcopy downloadable version of msbuild' + } - $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true $global:_MSBuildExe = "$($xcopyMSBuildToolsFolder)\MSBuild\Current\Bin\MSBuild.exe" } diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 9f6e75f7e2..d68684e2a1 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -293,8 +293,11 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = return $global:_MSBuildExe } + $vsMinVersionReqdStr = '16.5' + $vsMinVersionReqd = [Version]::new($vsMinVersionReqdStr) + if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } - $vsMinVersionStr = if ($vsRequirements.version) { $vsRequirements.version } else { '15.9' } + $vsMinVersionStr = if ($vsRequirements.version) { $vsRequirements.version } else { $vsMinVersionReqdStr } $vsMinVersion = [Version]::new($vsMinVersionStr) # Try msbuild command available in the environment. @@ -327,8 +330,18 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = $xcopyMSBuildVersion = $GlobalJson.tools.'xcopy-msbuild' $vsMajorVersion = $xcopyMSBuildVersion.Split('.')[0] } else { - $vsMajorVersion = $vsMinVersion.Major - $xcopyMSBuildVersion = "$vsMajorVersion.$($vsMinVersion.Minor).0-alpha" + #if vs version provided in global.json is incompatible then use the default version for xcopy msbuild download + if($vsMinVersion -lt $vsMinVersionReqd){ + Write-Host "Using xcopy-msbuild version of $vsMinVersionReqdStr.0-alpha since VS version $vsMinVersionStr provided in global.json is not compatible" + $vsMajorVersion = $vsMinVersionReqd.Major + $vsMinorVersion = $vsMinVersionReqd.Minor + } + else{ + $vsMajorVersion = $vsMinVersion.Major + $vsMinorVersion = $vsMinVersion.Minor + } + + $xcopyMSBuildVersion = "$vsMajorVersion.$vsMinorVersion.0-alpha" } $vsInstallDir = $null diff --git a/global.json b/global.json index c86382e97e..61f8bc64a3 100644 --- a/global.json +++ b/global.json @@ -30,7 +30,7 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.15.2", - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20278.4", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20278.4" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20280.1", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20280.1" } }