diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 868b1eaf579ac4..673a6767712732 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,61 +58,61 @@ - + https://github.com/dotnet/arcade - 549475dff607986e6d9626f0dc8678e9736b7d0c + d049b49aad6509d769ef9f308834a178eb66721a - + https://github.com/dotnet/arcade - 549475dff607986e6d9626f0dc8678e9736b7d0c + d049b49aad6509d769ef9f308834a178eb66721a - + https://github.com/dotnet/arcade - 549475dff607986e6d9626f0dc8678e9736b7d0c + d049b49aad6509d769ef9f308834a178eb66721a - + https://github.com/dotnet/arcade - 549475dff607986e6d9626f0dc8678e9736b7d0c + d049b49aad6509d769ef9f308834a178eb66721a - + https://github.com/dotnet/arcade - 549475dff607986e6d9626f0dc8678e9736b7d0c + d049b49aad6509d769ef9f308834a178eb66721a - + https://github.com/dotnet/arcade - 549475dff607986e6d9626f0dc8678e9736b7d0c + d049b49aad6509d769ef9f308834a178eb66721a - + https://github.com/dotnet/arcade - 549475dff607986e6d9626f0dc8678e9736b7d0c + d049b49aad6509d769ef9f308834a178eb66721a - + https://github.com/dotnet/arcade - 549475dff607986e6d9626f0dc8678e9736b7d0c + d049b49aad6509d769ef9f308834a178eb66721a - + https://github.com/dotnet/arcade - 549475dff607986e6d9626f0dc8678e9736b7d0c + d049b49aad6509d769ef9f308834a178eb66721a - + https://github.com/dotnet/arcade - 549475dff607986e6d9626f0dc8678e9736b7d0c + d049b49aad6509d769ef9f308834a178eb66721a - + https://github.com/dotnet/arcade - 549475dff607986e6d9626f0dc8678e9736b7d0c + d049b49aad6509d769ef9f308834a178eb66721a - + https://github.com/dotnet/arcade - 549475dff607986e6d9626f0dc8678e9736b7d0c + d049b49aad6509d769ef9f308834a178eb66721a - + https://github.com/dotnet/arcade - 549475dff607986e6d9626f0dc8678e9736b7d0c + d049b49aad6509d769ef9f308834a178eb66721a - + https://github.com/dotnet/arcade - 549475dff607986e6d9626f0dc8678e9736b7d0c + d049b49aad6509d769ef9f308834a178eb66721a https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 4dff17d691796e..a4114c0bf4ad6a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,16 +32,16 @@ - 5.0.0-beta.19575.7 - 5.0.0-beta.19575.7 - 5.0.0-beta.19575.7 - 5.0.0-beta.19575.7 - 5.0.0-beta.19575.7 - 5.0.0-beta.19575.7 - 2.5.1-beta.19575.7 - 5.0.0-beta.19575.7 - 5.0.0-beta.19575.7 - 5.0.0-beta.19575.7 + 5.0.0-beta.19577.2 + 5.0.0-beta.19577.2 + 5.0.0-beta.19577.2 + 5.0.0-beta.19577.2 + 5.0.0-beta.19577.2 + 5.0.0-beta.19577.2 + 2.5.1-beta.19577.2 + 5.0.0-beta.19577.2 + 5.0.0-beta.19577.2 + 5.0.0-beta.19577.2 5.0.0-alpha.1.19562.8 5.0.0-alpha.1.19563.6 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 26a6d03c8a0a65..d762c9f044a652 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -247,7 +247,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = if ($msbuildCmd -ne $null) { # Workaround for https://github.com/dotnet/roslyn/issues/35793 # Due to this issue $msbuildCmd.Version returns 0.0.0.0 for msbuild.exe 16.2+ - $msbuildVersion = [Version]::new((Get-Item $msbuildCmd.Path).VersionInfo.ProductVersion.Split(@('-', '+'))[0]) + $msbuildVersion = [Version]::new((Get-Item $msbuildCmd.Path).VersionInfo.ProductVersion.Split([char[]]@('-', '+'))[0]) if ($msbuildVersion -ge $vsMinVersion) { return $global:_MSBuildExe = $msbuildCmd.Path diff --git a/global.json b/global.json index dd4d5636a1cb2d..c3e309154be47e 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python": "2.7.15" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19575.7", - "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.19575.7", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.19575.7", - "Microsoft.DotNet.Build.Tasks.Configuration": "5.0.0-beta.19575.7", + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19577.2", + "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.19577.2", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.19577.2", + "Microsoft.DotNet.Build.Tasks.Configuration": "5.0.0-beta.19577.2", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-alpha1.19563.3", "Microsoft.Build.NoTargets": "1.0.53",