diff options
author | dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> | 2022-05-02 17:17:12 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-02 17:17:12 +0300 |
commit | 76bf5b1dca8c1f5a1f2a709ef525d380cc89c751 (patch) | |
tree | cf496b5933cf4fddbc1bf8965c2cc02fc96922d8 | |
parent | 8ccf1e5e86bec4817c192fbda6f35146797c512c (diff) |
Update dependencies from https://github.com/dotnet/arcade build 20220425.6 (#199)
[release/11.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 65f3c95d4ae9..651139d71e2f 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="7.0.0-beta.22222.4"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22225.6"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>5f04b602a86b74f6cdd12f48aca2d1868e6425f3</Sha> + <Sha>5145e86df0c491e082b589aa31d69eea300adc02</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22222.4"> + <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22225.6"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>5f04b602a86b74f6cdd12f48aca2d1868e6425f3</Sha> + <Sha>5145e86df0c491e082b589aa31d69eea300adc02</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22222.4"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22225.6"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>5f04b602a86b74f6cdd12f48aca2d1868e6425f3</Sha> + <Sha>5145e86df0c491e082b589aa31d69eea300adc02</Sha> </Dependency> </ToolsetDependencies> </Dependencies> diff --git a/eng/Versions.props b/eng/Versions.props index 432ebbf2a023..48033479d291 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,6 +6,6 @@ <PreReleaseVersionIteration>1</PreReleaseVersionIteration> </PropertyGroup> <PropertyGroup> - <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22222.4</MicrosoftDotNetBuildTasksPackagingVersion> + <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22225.6</MicrosoftDotNetBuildTasksPackagingVersion> </PropertyGroup> </Project> diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index b1bca63ab1d8..119a6c660d1a 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 "16.10.0-preview2" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.1.0" -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 f1e1cb53953b..797f05292a85 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=16.10.0-preview2&view=overview - $defaultXCopyMSBuildVersion = '16.10.0-preview2' + # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.1.0&view=overview + $defaultXCopyMSBuildVersion = '17.1.0' if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } $vsMinVersionStr = if ($vsRequirements.version) { $vsRequirements.version } else { $vsMinVersionReqdStr } diff --git a/global.json b/global.json index c89e0d7ad667..b78c8452fd09 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "7.0.100-preview.2.22153.17" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22222.4", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22222.4", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22225.6", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22225.6", "Microsoft.Build.Traversal": "2.0.2" } } |