File tree Expand file tree Collapse file tree 5 files changed +18
-10
lines changed Expand file tree Collapse file tree 5 files changed +18
-10
lines changed Original file line number Diff line number Diff line change 4
4
<clear />
5
5
<!-- Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
6
6
<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" />
7
8
<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" />
8
9
<!-- End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
9
10
<add key =" dotnet3" value =" https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json" />
Original file line number Diff line number Diff line change 89
89
</Dependency >
90
90
</ProductDependencies >
91
91
<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 " >
93
93
<Uri >https://github.com/dotnet/arcade</Uri >
94
- <Sha >15f00efd583eab4372b2e9ca25bd80ace5b119ad </Sha >
94
+ <Sha >1a55276ab9d16792cec595ba870df39a9d97d5ca </Sha >
95
95
</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 " >
97
97
<Uri >https://github.com/dotnet/arcade</Uri >
98
- <Sha >15f00efd583eab4372b2e9ca25bd80ace5b119ad </Sha >
98
+ <Sha >1a55276ab9d16792cec595ba870df39a9d97d5ca </Sha >
99
99
</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 " >
101
101
<Uri >https://github.com/dotnet/arcade</Uri >
102
- <Sha >15f00efd583eab4372b2e9ca25bd80ace5b119ad </Sha >
102
+ <Sha >1a55276ab9d16792cec595ba870df39a9d97d5ca </Sha >
103
103
</Dependency >
104
104
<Dependency Name =" Microsoft.Net.Compilers.Toolset" Version =" 3.4.1-beta4-20127-10" >
105
105
<Uri >https://github.com/dotnet/roslyn</Uri >
Original file line number Diff line number Diff line change 75
75
<!-- Workaround https://github.com/dotnet/cli/issues/10528-->
76
76
<MicrosoftNETCorePlatformsPackageVersion >3.1.1</MicrosoftNETCorePlatformsPackageVersion >
77
77
<!-- Packages from dotnet/arcade -->
78
- <MicrosoftDotNetGenAPIPackageVersion >1.0.0-beta.20113.5 </MicrosoftDotNetGenAPIPackageVersion >
78
+ <MicrosoftDotNetGenAPIPackageVersion >1.0.0-beta.20213.4 </MicrosoftDotNetGenAPIPackageVersion >
79
79
<!-- Packages from dotnet/roslyn -->
80
80
<MicrosoftNetCompilersToolsetVersion >3.4.1-beta4-20127-10</MicrosoftNetCompilersToolsetVersion >
81
81
</PropertyGroup >
Original file line number Diff line number Diff line change @@ -210,7 +210,14 @@ function InstallDotNet {
210
210
211
211
local runtimeSourceFeedKey=' '
212
212
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 `
214
221
runtimeSourceFeedKey=" --feed-credential $decodedFeedKey "
215
222
fi
216
223
Original file line number Diff line number Diff line change 11
11
}
12
12
},
13
13
"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 "
16
16
}
17
17
}
You can’t perform that action at this time.
0 commit comments