diff options
-rw-r--r-- | eng/Version.Details.xml | 16 | ||||
-rw-r--r-- | eng/Versions.props | 4 | ||||
-rw-r--r-- | eng/common/sdk-task.ps1 | 2 | ||||
-rw-r--r-- | eng/common/tools.ps1 | 4 | ||||
-rw-r--r-- | global.json | 4 |
5 files changed, 15 insertions, 15 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 52035762a5..5c69fa1c84 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -302,22 +302,22 @@ <Uri>https://github.com/dotnet/runtime</Uri> <Sha>bdd67af67dbf43c0f5e9151b98dc100b9555898a</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22524.5"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22554.2"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>c5dd6a1da2e6d9b3423ab809fcda8af2927a408b</Sha> + <Sha>80b6be47e1425ea90c5febffac119250043a0c92</Sha> <SourceBuild RepoName="arcade" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.22524.5"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.22554.2"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>c5dd6a1da2e6d9b3423ab809fcda8af2927a408b</Sha> + <Sha>80b6be47e1425ea90c5febffac119250043a0c92</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.22524.5"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.22554.2"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>c5dd6a1da2e6d9b3423ab809fcda8af2927a408b</Sha> + <Sha>80b6be47e1425ea90c5febffac119250043a0c92</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22524.5"> + <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22554.2"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>c5dd6a1da2e6d9b3423ab809fcda8af2927a408b</Sha> + <Sha>80b6be47e1425ea90c5febffac119250043a0c92</Sha> </Dependency> </ToolsetDependencies> </Dependencies> diff --git a/eng/Versions.props b/eng/Versions.props index 1787eafd82..dcd1289881 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -135,8 +135,8 @@ <MicrosoftEntityFrameworkCoreVersion>8.0.0-alpha.1.22553.1</MicrosoftEntityFrameworkCoreVersion> <MicrosoftEntityFrameworkCoreDesignVersion>8.0.0-alpha.1.22553.1</MicrosoftEntityFrameworkCoreDesignVersion> <!-- Packages from dotnet/arcade --> - <MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.22524.5</MicrosoftDotNetBuildTasksInstallersVersion> - <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.22524.5</MicrosoftDotNetBuildTasksTemplatingVersion> + <MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.22554.2</MicrosoftDotNetBuildTasksInstallersVersion> + <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.22554.2</MicrosoftDotNetBuildTasksTemplatingVersion> <!-- Packages from dotnet/source-build-externals --> <MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.22513.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion> <!-- Packages from dotnet/xdt --> diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index c35087a060..39be08d4b1 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.2.1" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.3.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 aba6308ad3..4491269432 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -365,8 +365,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.2.1&view=overview - $defaultXCopyMSBuildVersion = '17.2.1' + # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.3.1view=overview + $defaultXCopyMSBuildVersion = '17.3.1' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index 6cac28c6b3..38cc0a5391 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.22.10", - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22524.5", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22524.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22554.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22554.2" } } |