diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ca69ba43d..b0d9a4157 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -161,17 +161,17 @@ - + https://github.com/dotnet/arcade - ed14da5934ffb536cff8f41f8b5719334524cbed + 1cf3eaa1f6ada43ab988145a3f3efddb1ffa3b10 - + https://github.com/dotnet/arcade - ed14da5934ffb536cff8f41f8b5719334524cbed + 1cf3eaa1f6ada43ab988145a3f3efddb1ffa3b10 - + https://github.com/dotnet/arcade - ed14da5934ffb536cff8f41f8b5719334524cbed + 1cf3eaa1f6ada43ab988145a3f3efddb1ffa3b10 https://github.com/dotnet/arcade-services @@ -181,9 +181,9 @@ https://github.com/dotnet/arcade-services 1d98f4c0a5b25b72465fe075dd5f24b45ef15c8e - + https://github.com/dotnet/arcade - ed14da5934ffb536cff8f41f8b5719334524cbed + 1cf3eaa1f6ada43ab988145a3f3efddb1ffa3b10 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index fd6b19144..6dd5ea97f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 9.0.0-beta.24266.1 + 9.0.0-beta.24270.3 diff --git a/eng/common/internal/Directory.Build.props b/eng/common/internal/Directory.Build.props index a735fe9a1..f1d041c33 100644 --- a/eng/common/internal/Directory.Build.props +++ b/eng/common/internal/Directory.Build.props @@ -1,6 +1,11 @@ + + false + false + + diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj index 8fa77e5b1..e925952d5 100644 --- a/eng/common/internal/Tools.csproj +++ b/eng/common/internal/Tools.csproj @@ -3,7 +3,6 @@ net472 - false false diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 7fc78a085..0febe696d 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -254,7 +254,6 @@ function Retry($downloadBlock, $maxRetries = 5) { Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Unable to download file in $maxRetries attempts." break } - } } @@ -424,7 +423,6 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = InitializeVisualStudioEnvironmentVariables $vsInstallDir $vsMajorVersion } else { - if (Get-Member -InputObject $GlobalJson.tools -Name 'xcopy-msbuild') { $xcopyMSBuildVersion = $GlobalJson.tools.'xcopy-msbuild' $vsMajorVersion = $xcopyMSBuildVersion.Split('.')[0] @@ -504,6 +502,10 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) { Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath }) + if (!(Test-Path $packagePath)) { + Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "See https://dev.azure.com/dnceng/internal/_wiki/wikis/DNCEng%20Services%20Wiki/1074/Updating-Microsoft.DotNet.Arcade.MSBuild.Xcopy-WAS-RoslynTools.MSBuild-(xcopy-msbuild)-generation?anchor=troubleshooting for help troubleshooting issues with XCopy MSBuild" + throw + } Unzip $packagePath $packageDir } diff --git a/global.json b/global.json index 604223434..5f70a2eb7 100644 --- a/global.json +++ b/global.json @@ -11,8 +11,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24266.1", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24266.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24270.3", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24270.3", "Microsoft.Build.NoTargets": "3.7.0" } }