Skip to content

Commit a085554

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20200213.5 (#19036)
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.20113.5 - Microsoft.DotNet.GenAPI - 1.0.0-beta.20113.5 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.20113.5
1 parent 439f4af commit a085554

File tree

6 files changed

+35
-19
lines changed

6 files changed

+35
-19
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -417,17 +417,17 @@
417417
<Uri>https://github.com/dotnet/extensions</Uri>
418418
<Sha>1286a6ff55e300352dabeb6d778c9fcdd258bd08</Sha>
419419
</Dependency>
420-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19607.3">
420+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.20113.5">
421421
<Uri>https://github.com/dotnet/arcade</Uri>
422-
<Sha>4d80b9cfa53e309c8f685abff3512f60c3d8a3d1</Sha>
422+
<Sha>15f00efd583eab4372b2e9ca25bd80ace5b119ad</Sha>
423423
</Dependency>
424-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19607.3">
424+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20113.5">
425425
<Uri>https://github.com/dotnet/arcade</Uri>
426-
<Sha>4d80b9cfa53e309c8f685abff3512f60c3d8a3d1</Sha>
426+
<Sha>15f00efd583eab4372b2e9ca25bd80ace5b119ad</Sha>
427427
</Dependency>
428-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19607.3">
428+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.20113.5">
429429
<Uri>https://github.com/dotnet/arcade</Uri>
430-
<Sha>4d80b9cfa53e309c8f685abff3512f60c3d8a3d1</Sha>
430+
<Sha>15f00efd583eab4372b2e9ca25bd80ace5b119ad</Sha>
431431
</Dependency>
432432
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.2-servicing.20067.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
433433
<Uri>https://github.com/dotnet/extensions</Uri>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
-->
6363
<PropertyGroup Label="Automated">
6464
<!-- Packages from dotnet/arcade -->
65-
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19607.3</MicrosoftDotNetGenAPIPackageVersion>
65+
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.20113.5</MicrosoftDotNetGenAPIPackageVersion>
6666
<!-- Packages from dotnet/roslyn -->
6767
<MicrosoftNetCompilersToolsetPackageVersion>3.4.1-beta4-19614-01</MicrosoftNetCompilersToolsetPackageVersion>
6868
<!-- Packages from dotnet/core-setup -->

eng/common/darc-init.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ function InstallDarcCli ($darcVersion) {
2727

2828
Write-Host "Installing Darc CLI version $darcVersion..."
2929
Write-Host "You may need to restart your command window if this is the first dotnet tool you have installed."
30-
& "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g
30+
& "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g --framework netcoreapp2.1
3131
}
3232

3333
InstallDarcCli $darcVersion

eng/common/templates/post-build/post-build.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,4 +341,28 @@ stages:
341341
channelId: 557
342342
transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json'
343343
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json'
344+
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json'
345+
346+
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
347+
parameters:
348+
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
349+
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
350+
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
351+
stageName: 'NETCore_SDK_313xx_Publishing'
352+
channelName: '.NET Core SDK 3.1.3xx'
353+
channelId: 759
354+
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json'
355+
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json'
356+
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json'
357+
358+
- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
359+
parameters:
360+
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
361+
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
362+
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
363+
stageName: 'NETCore_SDK_313xx_Internal_Publishing'
364+
channelName: '.NET Core SDK 3.1.3xx Internal'
365+
channelId: 760
366+
transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json'
367+
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json'
344368
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json'

eng/common/tools.sh

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -210,15 +210,7 @@ function InstallDotNet {
210210

211211
local runtimeSourceFeedKey=''
212212
if [[ -n "${7:-}" ]]; then
213-
# The 'base64' binary on alpine uses '-d' and doesn't support '--decode'
214-
# like the rest of the unix variants. At the same time, MacOS doesn't support
215-
# '-d'. To work around this, do a simple detection and switch the parameter
216-
# accordingly.
217-
decodeArg="--decode"
218-
if base64 --help 2>&1 | grep -q "BusyBox"; then
219-
decodeArg="-d"
220-
fi
221-
decodedFeedKey=`echo $7 | base64 $decodeArg`
213+
decodedFeedKey=`echo $7 | base64 --decode`
222214
runtimeSourceFeedKey="--feed-credential $decodedFeedKey"
223215
fi
224216

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
"msbuild-sdks": {
2727
"Yarn.MSBuild": "1.15.2",
28-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19607.3",
29-
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19607.3"
28+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20113.5",
29+
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20113.5"
3030
}
3131
}

0 commit comments

Comments
 (0)