diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index ada6411c72dd..79a3d612e6f1 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -34,65 +34,65 @@
https://github.com/dotnet/corefx
976b84b4d969ce5d87bc437d811ec8864b47947a
-
+
https://github.com/dotnet/arcade
- 15f00efd583eab4372b2e9ca25bd80ace5b119ad
+ 1a55276ab9d16792cec595ba870df39a9d97d5ca
https://github.com/dotnet/standard
a5b5f2e1e369972c8ff1e2183979fab6099f52ef
-
+
https://github.com/dotnet/arcade
- 15f00efd583eab4372b2e9ca25bd80ace5b119ad
+ 1a55276ab9d16792cec595ba870df39a9d97d5ca
-
+
https://github.com/dotnet/arcade
- 15f00efd583eab4372b2e9ca25bd80ace5b119ad
+ 1a55276ab9d16792cec595ba870df39a9d97d5ca
-
+
https://github.com/dotnet/arcade
- 15f00efd583eab4372b2e9ca25bd80ace5b119ad
+ 1a55276ab9d16792cec595ba870df39a9d97d5ca
-
+
https://github.com/dotnet/arcade
- 15f00efd583eab4372b2e9ca25bd80ace5b119ad
+ 1a55276ab9d16792cec595ba870df39a9d97d5ca
-
+
https://github.com/dotnet/arcade
- 15f00efd583eab4372b2e9ca25bd80ace5b119ad
+ 1a55276ab9d16792cec595ba870df39a9d97d5ca
-
+
https://github.com/dotnet/arcade
- 15f00efd583eab4372b2e9ca25bd80ace5b119ad
+ 1a55276ab9d16792cec595ba870df39a9d97d5ca
-
+
https://github.com/dotnet/arcade
- 15f00efd583eab4372b2e9ca25bd80ace5b119ad
+ 1a55276ab9d16792cec595ba870df39a9d97d5ca
-
+
https://github.com/dotnet/arcade
- 15f00efd583eab4372b2e9ca25bd80ace5b119ad
+ 1a55276ab9d16792cec595ba870df39a9d97d5ca
-
+
https://github.com/dotnet/arcade
- 15f00efd583eab4372b2e9ca25bd80ace5b119ad
+ 1a55276ab9d16792cec595ba870df39a9d97d5ca
-
+
https://github.com/dotnet/arcade
- 15f00efd583eab4372b2e9ca25bd80ace5b119ad
+ 1a55276ab9d16792cec595ba870df39a9d97d5ca
-
+
https://github.com/dotnet/arcade
- 15f00efd583eab4372b2e9ca25bd80ace5b119ad
+ 1a55276ab9d16792cec595ba870df39a9d97d5ca
-
+
https://github.com/dotnet/arcade
- 15f00efd583eab4372b2e9ca25bd80ace5b119ad
+ 1a55276ab9d16792cec595ba870df39a9d97d5ca
-
+
https://github.com/dotnet/arcade
- 15f00efd583eab4372b2e9ca25bd80ace5b119ad
+ 1a55276ab9d16792cec595ba870df39a9d97d5ca
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
diff --git a/eng/Versions.props b/eng/Versions.props
index d003d6e81716..51e2c84b27ce 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -34,16 +34,16 @@
- 1.0.0-beta.20113.5
- 1.0.0-beta.20113.5
- 1.0.0-beta.20113.5
- 1.0.0-beta.20113.5
- 2.4.1-beta.20113.5
- 2.5.1-beta.20113.5
- 1.0.0-beta.20113.5
- 1.0.0-beta.20113.5
- 2.2.0-beta.20113.5
- 1.0.0-beta.20113.5
+ 1.0.0-beta.20213.4
+ 1.0.0-beta.20213.4
+ 1.0.0-beta.20213.4
+ 1.0.0-beta.20213.4
+ 2.4.1-beta.20213.4
+ 2.5.1-beta.20213.4
+ 1.0.0-beta.20213.4
+ 1.0.0-beta.20213.4
+ 2.2.0-beta.20213.4
+ 1.0.0-beta.20213.4
3.3.0-beta2-19367-02
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index 94965a8fd2a9..acbb0c5b3ffd 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -210,7 +210,14 @@ function InstallDotNet {
local runtimeSourceFeedKey=''
if [[ -n "${7:-}" ]]; then
- decodedFeedKey=`echo $7 | base64 --decode`
+ # The 'base64' binary on alpine uses '-d' and doesn't support '--decode'
+ # '-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`
runtimeSourceFeedKey="--feed-credential $decodedFeedKey"
fi
diff --git a/global.json b/global.json
index 893ed054fb7d..6f93fe542662 100644
--- a/global.json
+++ b/global.json
@@ -7,10 +7,10 @@
"dotnet": "3.1.100"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20113.5",
- "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20113.5",
- "Microsoft.DotNet.Build.Tasks.Configuration": "1.0.0-beta.20113.5",
- "Microsoft.DotNet.CoreFxTesting": "1.0.0-beta.20113.5",
+ "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20213.4",
+ "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20213.4",
+ "Microsoft.DotNet.Build.Tasks.Configuration": "1.0.0-beta.20213.4",
+ "Microsoft.DotNet.CoreFxTesting": "1.0.0-beta.20213.4",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "3.1.4-servicing.20202.1"
}
diff --git a/src/System.Collections.NonGeneric/src/Resources/Strings.resx b/src/System.Collections.NonGeneric/src/Resources/Strings.resx
index c2f3eb1c61be..2f022b658b9e 100644
--- a/src/System.Collections.NonGeneric/src/Resources/Strings.resx
+++ b/src/System.Collections.NonGeneric/src/Resources/Strings.resx
@@ -57,7 +57,7 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
Item has already been added. Key in dictionary: '{0}' Key being added: '{1}'