Skip to content

Commit

Permalink
Update dependencies from https://github.com/dotnet/arcade build 20210…
Browse files Browse the repository at this point in the history
…628.2 (microsoft#897)

Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.SignTool , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.21324.3 -> To Version 6.0.0-beta.21328.2

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
  • Loading branch information
dotnet-maestro[bot] and dotnet-maestro[bot] committed Jun 29, 2021
1 parent 463f5b6 commit f017fa2
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
Expand Up @@ -15,25 +15,25 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21324.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21328.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a68ec1edf328e737b31a09cb49e1929c28e91d0c</Sha>
<Sha>685c1a4fa207d81e881a402a32ffa1c0fb191b42</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21324.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21328.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a68ec1edf328e737b31a09cb49e1929c28e91d0c</Sha>
<Sha>685c1a4fa207d81e881a402a32ffa1c0fb191b42</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.21324.3">
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.21328.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a68ec1edf328e737b31a09cb49e1929c28e91d0c</Sha>
<Sha>685c1a4fa207d81e881a402a32ffa1c0fb191b42</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21324.3">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21328.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a68ec1edf328e737b31a09cb49e1929c28e91d0c</Sha>
<Sha>685c1a4fa207d81e881a402a32ffa1c0fb191b42</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="6.0.0-beta.21324.3">
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="6.0.0-beta.21328.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a68ec1edf328e737b31a09cb49e1929c28e91d0c</Sha>
<Sha>685c1a4fa207d81e881a402a32ffa1c0fb191b42</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.20258.6">
<Uri>https://github.com/dotnet/arcade-services</Uri>
Expand Down
6 changes: 3 additions & 3 deletions eng/Versions.props
Expand Up @@ -97,8 +97,8 @@
<XUnitVersion>2.4.1</XUnitVersion>
<XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion>
<XUnitVSRunnerVersion>2.4.1</XUnitVSRunnerVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21324.3</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetSignToolVersion>6.0.0-beta.21324.3</MicrosoftDotNetSignToolVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21328.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetSignToolVersion>6.0.0-beta.21328.2</MicrosoftDotNetSignToolVersion>
<MicrosoftAzureDocumentDBVersion>1.22.0</MicrosoftAzureDocumentDBVersion>
<MicrosoftAzureCosmosDBTableVersion>1.1.2</MicrosoftAzureCosmosDBTableVersion>
<MicrosoftAspNetCoreAllVersion>2.0.0</MicrosoftAspNetCoreAllVersion>
Expand All @@ -108,7 +108,7 @@
<MicrosoftDotNetMaestroClientVersion>1.1.0-beta.20258.6</MicrosoftDotNetMaestroClientVersion>
<MicrosoftSourceLinkGitHubVersion>1.1.0-beta-21228-01</MicrosoftSourceLinkGitHubVersion>
<MicrosoftSourceLinkAzureReposGitVersion>1.1.0-beta-21228-01</MicrosoftSourceLinkAzureReposGitVersion>
<MicrosoftDotNetSwaggerGeneratorMSBuildVersion>6.0.0-beta.21324.3</MicrosoftDotNetSwaggerGeneratorMSBuildVersion>
<MicrosoftDotNetSwaggerGeneratorMSBuildVersion>6.0.0-beta.21328.2</MicrosoftDotNetSwaggerGeneratorMSBuildVersion>
<XliffTasksVersion>1.0.0-beta.21265.1</XliffTasksVersion>
<MicrosoftDotNetMaestroTasksVersion>1.1.0-beta.21228.1</MicrosoftDotNetMaestroTasksVersion>
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21264.3</MicrosoftDotNetXHarnessCLIVersion>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/tools.ps1
Expand Up @@ -380,7 +380,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
$msbuildVersionDir = if ([int]$vsMajorVersion -lt 16) { "$vsMajorVersion.0" } else { "Current" }

$local:BinFolder = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin"
$local:Prefer64bit = if ($vsRequirements.Prefer64bit) { $vsRequirements.Prefer64bit } else { $false }
$local:Prefer64bit = if (Get-Member -InputObject $vsRequirements -Name 'Prefer64bit') { $vsRequirements.Prefer64bit } else { $false }
if ($local:Prefer64bit -and (Test-Path(Join-Path $local:BinFolder "amd64"))) {
$global:_MSBuildExe = Join-Path $local:BinFolder "amd64\msbuild.exe"
} else {
Expand Down
4 changes: 2 additions & 2 deletions global.json
Expand Up @@ -12,7 +12,7 @@
"vswhere": "2.5.2"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21324.3",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21324.3"
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21328.2",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21328.2"
}
}

0 comments on commit f017fa2

Please sign in to comment.