diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index b54ad439b3ac..bfaab1801fcd 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -417,17 +417,17 @@
https://github.com/dotnet/extensions
1286a6ff55e300352dabeb6d778c9fcdd258bd08
-
+
https://github.com/dotnet/arcade
- 4d80b9cfa53e309c8f685abff3512f60c3d8a3d1
+ 15f00efd583eab4372b2e9ca25bd80ace5b119ad
-
+
https://github.com/dotnet/arcade
- 4d80b9cfa53e309c8f685abff3512f60c3d8a3d1
+ 15f00efd583eab4372b2e9ca25bd80ace5b119ad
-
+
https://github.com/dotnet/arcade
- 4d80b9cfa53e309c8f685abff3512f60c3d8a3d1
+ 15f00efd583eab4372b2e9ca25bd80ace5b119ad
https://github.com/dotnet/extensions
diff --git a/eng/Versions.props b/eng/Versions.props
index 799adc7be603..f82258ff325e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -62,7 +62,7 @@
-->
- 1.0.0-beta.19607.3
+ 1.0.0-beta.20113.5
3.4.1-beta4-19614-01
diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1
index 46d175fdfdca..b94c2f4e411d 100644
--- a/eng/common/darc-init.ps1
+++ b/eng/common/darc-init.ps1
@@ -27,7 +27,7 @@ function InstallDarcCli ($darcVersion) {
Write-Host "Installing Darc CLI version $darcVersion..."
Write-Host "You may need to restart your command window if this is the first dotnet tool you have installed."
- & "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g
+ & "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g --framework netcoreapp2.1
}
InstallDarcCli $darcVersion
diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml
index b121d77e07d1..3c69186f03a7 100644
--- a/eng/common/templates/post-build/post-build.yml
+++ b/eng/common/templates/post-build/post-build.yml
@@ -341,4 +341,28 @@ stages:
channelId: 557
transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json'
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json'
+ symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json'
+
+- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
+ parameters:
+ artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
+ publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
+ symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
+ stageName: 'NETCore_SDK_313xx_Publishing'
+ channelName: '.NET Core SDK 3.1.3xx'
+ channelId: 759
+ transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json'
+ shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json'
+ symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json'
+
+- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
+ parameters:
+ artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
+ publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
+ symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
+ stageName: 'NETCore_SDK_313xx_Internal_Publishing'
+ channelName: '.NET Core SDK 3.1.3xx Internal'
+ channelId: 760
+ transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json'
+ shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json'
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json'
\ No newline at end of file
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index 62218302268f..94965a8fd2a9 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -210,15 +210,7 @@ function InstallDotNet {
local runtimeSourceFeedKey=''
if [[ -n "${7:-}" ]]; then
- # The 'base64' binary on alpine uses '-d' and doesn't support '--decode'
- # like the rest of the unix variants. At the same time, MacOS doesn't support
- # '-d'. To work around this, do a simple detection and switch the parameter
- # accordingly.
- decodeArg="--decode"
- if base64 --help 2>&1 | grep -q "BusyBox"; then
- decodeArg="-d"
- fi
- decodedFeedKey=`echo $7 | base64 $decodeArg`
+ decodedFeedKey=`echo $7 | base64 --decode`
runtimeSourceFeedKey="--feed-credential $decodedFeedKey"
fi
diff --git a/global.json b/global.json
index 3070303dd920..e1e9eebf33bd 100644
--- a/global.json
+++ b/global.json
@@ -25,7 +25,7 @@
},
"msbuild-sdks": {
"Yarn.MSBuild": "1.15.2",
- "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19607.3",
- "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19607.3"
+ "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20113.5",
+ "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20113.5"
}
}