diff options
author | dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> | 2022-11-07 16:52:40 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-07 16:52:40 +0300 |
commit | addd106f545cd69833b330a0084c39550fda7755 (patch) | |
tree | fc3a802f46b435a7c236b13cadf53831add43334 | |
parent | 37e45ddf04fe430c3c0c4f6a45ebaea965b2c085 (diff) |
Update dependencies from https://github.com/dotnet/arcade build 20221104.2 (#307)
[objwriter/12.x] Update dependencies from dotnet/arcade
-rw-r--r-- | eng/Version.Details.xml | 12 | ||||
-rw-r--r-- | eng/Versions.props | 2 | ||||
-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, 12 insertions, 12 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a825ed3a84d3..b02ec6029166 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,17 +3,17 @@ <ProductDependencies> </ProductDependencies> <ToolsetDependencies> - <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> </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> - <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.22524.5"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" 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 cd2dfa0eda1c..193f628298e1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,6 +6,6 @@ <PreReleaseVersionIteration>1</PreReleaseVersionIteration> </PropertyGroup> <PropertyGroup> - <MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.22524.5</MicrosoftDotNetBuildTasksPackagingVersion> + <MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.22554.2</MicrosoftDotNetBuildTasksPackagingVersion> </PropertyGroup> </Project> diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index c35087a06019..39be08d4b16c 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 aba6308ad313..449126943299 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 4fd4f2081c08..53babe70436f 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "7.0.100-rc.1.22431.12" }, "msbuild-sdks": { - "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", "Microsoft.Build.Traversal": "2.0.34" } } |