Skip to content

Commit f8d203d

Browse files
[release/3.1] Update dependencies from dotnet/arcade (#3178)
* Update dependencies from https://github.com/dotnet/arcade build 20200413.4 - Microsoft.DotNet.Arcade.Sdk: 1.0.0-beta.20113.5 -> 1.0.0-beta.20213.4 - Microsoft.DotNet.GenAPI: 1.0.0-beta.20113.5 -> 1.0.0-beta.20213.4 - Microsoft.DotNet.Helix.Sdk: 2.0.0-beta.20113.5 -> 2.0.0-beta.20213.4 * Fixup nuget.config Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: William Godbe <[email protected]>
1 parent fe53801 commit f8d203d

File tree

5 files changed

+18
-10
lines changed

5 files changed

+18
-10
lines changed

NuGet.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<add key="darc-pub-dotnet-core-setup-57d5bbb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-57d5bbb5/nuget/v3/index.json" />
7+
<add key="darc-pub-dotnet-corefx-8a3ffed" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-8a3ffed5/nuget/v3/index.json" />
78
<add key="darc-pub-dotnet-corefx-282d5b9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-282d5b9f/nuget/v3/index.json" />
89
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
910
<add key="dotnet3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json" />

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,17 +89,17 @@
8989
</Dependency>
9090
</ProductDependencies>
9191
<ToolsetDependencies>
92-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20113.5">
92+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20213.4">
9393
<Uri>https://github.com/dotnet/arcade</Uri>
94-
<Sha>15f00efd583eab4372b2e9ca25bd80ace5b119ad</Sha>
94+
<Sha>1a55276ab9d16792cec595ba870df39a9d97d5ca</Sha>
9595
</Dependency>
96-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.20113.5">
96+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.20213.4">
9797
<Uri>https://github.com/dotnet/arcade</Uri>
98-
<Sha>15f00efd583eab4372b2e9ca25bd80ace5b119ad</Sha>
98+
<Sha>1a55276ab9d16792cec595ba870df39a9d97d5ca</Sha>
9999
</Dependency>
100-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.20113.5">
100+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.20213.4">
101101
<Uri>https://github.com/dotnet/arcade</Uri>
102-
<Sha>15f00efd583eab4372b2e9ca25bd80ace5b119ad</Sha>
102+
<Sha>1a55276ab9d16792cec595ba870df39a9d97d5ca</Sha>
103103
</Dependency>
104104
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.4.1-beta4-20127-10">
105105
<Uri>https://github.com/dotnet/roslyn</Uri>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<!-- Workaround https://github.com/dotnet/cli/issues/10528-->
7676
<MicrosoftNETCorePlatformsPackageVersion>3.1.1</MicrosoftNETCorePlatformsPackageVersion>
7777
<!-- Packages from dotnet/arcade -->
78-
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.20113.5</MicrosoftDotNetGenAPIPackageVersion>
78+
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.20213.4</MicrosoftDotNetGenAPIPackageVersion>
7979
<!-- Packages from dotnet/roslyn -->
8080
<MicrosoftNetCompilersToolsetVersion>3.4.1-beta4-20127-10</MicrosoftNetCompilersToolsetVersion>
8181
</PropertyGroup>

eng/common/tools.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,14 @@ function InstallDotNet {
210210

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

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
}
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20113.5",
15-
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20113.5"
14+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20213.4",
15+
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20213.4"
1616
}
1717
}

0 commit comments

Comments
 (0)