Browse Source

Update dependencies from https://github.com/dotnet/arcade build 20210723.11 (#1131)

[main] Update dependencies from dotnet/arcade
pull/1133/head
dotnet-maestro[bot] 5 years ago
committed by GitHub
parent
commit
a348dad39a
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 20
      eng/Version.Details.xml
  2. 6
      eng/common/templates/steps/source-build.yml
  3. 4
      global.json

20
eng/Version.Details.xml

@ -3,25 +3,25 @@
<ProductDependencies> <ProductDependencies>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21370.12"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21373.11">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>89806f0b9e93ad2bbe32c654412835c0801a2032</Sha> <Sha>c6a28c81f96d196338b3ea520bc1e6dc7c440ee2</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21370.12"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21373.11">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>89806f0b9e93ad2bbe32c654412835c0801a2032</Sha> <Sha>c6a28c81f96d196338b3ea520bc1e6dc7c440ee2</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.21370.12"> <Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.21373.11">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>89806f0b9e93ad2bbe32c654412835c0801a2032</Sha> <Sha>c6a28c81f96d196338b3ea520bc1e6dc7c440ee2</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21370.12"> <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21373.11">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>89806f0b9e93ad2bbe32c654412835c0801a2032</Sha> <Sha>c6a28c81f96d196338b3ea520bc1e6dc7c440ee2</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="6.0.0-beta.21370.12"> <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="6.0.0-beta.21373.11">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>89806f0b9e93ad2bbe32c654412835c0801a2032</Sha> <Sha>c6a28c81f96d196338b3ea520bc1e6dc7c440ee2</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.19556.4"> <Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.19556.4">
<Uri>https://github.com/dotnet/arcade-services</Uri> <Uri>https://github.com/dotnet/arcade-services</Uri>

6
eng/common/templates/steps/source-build.yml

@ -29,6 +29,11 @@ steps:
officialBuildArgs='/p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)' officialBuildArgs='/p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)'
fi fi
internalRuntimeDownloadArgs=
if [ '$(dotnetclimsrc-read-sas-token-base64)' != '$''(dotnetclimsrc-read-sas-token-base64)' ]; then
internalRuntimeDownloadArgs='--runtimesourcefeed https://dotnetclimsrc.blob.core.windows.net/dotnet --runtimesourcefeedkey $(dotnetclimsrc-read-sas-token-base64)'
fi
targetRidArgs= targetRidArgs=
if [ '${{ parameters.platform.targetRID }}' != '' ]; then if [ '${{ parameters.platform.targetRID }}' != '' ]; then
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
@ -43,6 +48,7 @@ steps:
--configuration $buildConfig \ --configuration $buildConfig \
--restore --build --pack $publishArgs -bl \ --restore --build --pack $publishArgs -bl \
$officialBuildArgs \ $officialBuildArgs \
$internalRuntimeDownloadArgs \
$targetRidArgs \ $targetRidArgs \
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
/p:ArcadeBuildFromSource=true /p:ArcadeBuildFromSource=true

4
global.json

@ -1,6 +1,6 @@
{ {
"tools": { "tools": {
"dotnet": "6.0.100-preview.4.21255.9", "dotnet": "6.0.100-preview.6.21355.2",
"runtimes": { "runtimes": {
"dotnet": [ "dotnet": [
"3.1.14" "3.1.14"
@ -11,6 +11,6 @@
} }
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21370.12" "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21373.11"
} }
} }

Loading…
Cancel
Save