Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
/ corefx Public archive

Commit

Permalink
Merge in 'release/3.1' changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@dotnet-bot
dotnet-bot committed Apr 14, 2020
2 parents b1319e7 + 60ffc71 commit c416492
Show file tree
Hide file tree
Showing 5 changed files with 51 additions and 44 deletions.
56 changes: 28 additions & 28 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,65 +34,65 @@
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>976b84b4d969ce5d87bc437d811ec8864b47947a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20113.5">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20213.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>15f00efd583eab4372b2e9ca25bd80ace5b119ad</Sha>
<Sha>1a55276ab9d16792cec595ba870df39a9d97d5ca</Sha>
</Dependency>
<Dependency Name="NETStandard.Library" Version="2.1.0">
<Uri>https://github.com/dotnet/standard</Uri>
<Sha>a5b5f2e1e369972c8ff1e2183979fab6099f52ef</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.20113.5">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.20213.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>15f00efd583eab4372b2e9ca25bd80ace5b119ad</Sha>
<Sha>1a55276ab9d16792cec595ba870df39a9d97d5ca</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.20113.5">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.20213.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>15f00efd583eab4372b2e9ca25bd80ace5b119ad</Sha>
<Sha>1a55276ab9d16792cec595ba870df39a9d97d5ca</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.20113.5">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.20213.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>15f00efd583eab4372b2e9ca25bd80ace5b119ad</Sha>
<Sha>1a55276ab9d16792cec595ba870df39a9d97d5ca</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="1.0.0-beta.20113.5">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="1.0.0-beta.20213.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>15f00efd583eab4372b2e9ca25bd80ace5b119ad</Sha>
<Sha>1a55276ab9d16792cec595ba870df39a9d97d5ca</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="2.4.1-beta.20113.5">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="2.4.1-beta.20213.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>15f00efd583eab4372b2e9ca25bd80ace5b119ad</Sha>
<Sha>1a55276ab9d16792cec595ba870df39a9d97d5ca</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.20113.5">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.20213.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>15f00efd583eab4372b2e9ca25bd80ace5b119ad</Sha>
<Sha>1a55276ab9d16792cec595ba870df39a9d97d5ca</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.20113.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.20213.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>15f00efd583eab4372b2e9ca25bd80ace5b119ad</Sha>
<Sha>1a55276ab9d16792cec595ba870df39a9d97d5ca</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.20113.5">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.20213.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>15f00efd583eab4372b2e9ca25bd80ace5b119ad</Sha>
<Sha>1a55276ab9d16792cec595ba870df39a9d97d5ca</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CoreFxTesting" Version="1.0.0-beta.20113.5">
<Dependency Name="Microsoft.DotNet.CoreFxTesting" Version="1.0.0-beta.20213.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>15f00efd583eab4372b2e9ca25bd80ace5b119ad</Sha>
<Sha>1a55276ab9d16792cec595ba870df39a9d97d5ca</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="1.0.0-beta.20113.5">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="1.0.0-beta.20213.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>15f00efd583eab4372b2e9ca25bd80ace5b119ad</Sha>
<Sha>1a55276ab9d16792cec595ba870df39a9d97d5ca</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="1.0.0-beta.20113.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="1.0.0-beta.20213.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>15f00efd583eab4372b2e9ca25bd80ace5b119ad</Sha>
<Sha>1a55276ab9d16792cec595ba870df39a9d97d5ca</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.20113.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.20213.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>15f00efd583eab4372b2e9ca25bd80ace5b119ad</Sha>
<Sha>1a55276ab9d16792cec595ba870df39a9d97d5ca</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="1.0.0-beta.20113.5">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="1.0.0-beta.20213.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>15f00efd583eab4372b2e9ca25bd80ace5b119ad</Sha>
<Sha>1a55276ab9d16792cec595ba870df39a9d97d5ca</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="3.0.0-release-20190930.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
20 changes: 10 additions & 10 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,16 @@
</PropertyGroup>
<PropertyGroup>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatPackageVersion>1.0.0-beta.20113.5</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.20113.5</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.20113.5</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>1.0.0-beta.20113.5</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>2.4.1-beta.20113.5</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetXUnitConsoleRunnerPackageVersion>2.5.1-beta.20113.5</MicrosoftDotNetXUnitConsoleRunnerPackageVersion>
<MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.20113.5</MicrosoftDotNetBuildTasksPackagingPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>1.0.0-beta.20113.5</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.20113.5</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetVersionToolsTasksPackageVersion>1.0.0-beta.20113.5</MicrosoftDotNetVersionToolsTasksPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>1.0.0-beta.20213.4</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.20213.4</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.20213.4</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>1.0.0-beta.20213.4</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>2.4.1-beta.20213.4</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetXUnitConsoleRunnerPackageVersion>2.5.1-beta.20213.4</MicrosoftDotNetXUnitConsoleRunnerPackageVersion>
<MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.20213.4</MicrosoftDotNetBuildTasksPackagingPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>1.0.0-beta.20213.4</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.20213.4</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetVersionToolsTasksPackageVersion>1.0.0-beta.20213.4</MicrosoftDotNetVersionToolsTasksPackageVersion>
<!-- roslyn -->
<MicrosoftNetCompilersToolsetVersion>3.3.0-beta2-19367-02</MicrosoftNetCompilersToolsetVersion>
<!-- Core-setup dependencies -->
Expand Down
9 changes: 8 additions & 1 deletion eng/common/tools.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions global.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion src/System.Collections.NonGeneric/src/Resources/Strings.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Argument_AddingDuplicate_OldAndNewKeys " xml:space="preserve">
<data name="Argument_AddingDuplicate_OldAndNewKeys" xml:space="preserve">
<value>Item has already been added. Key in dictionary: '{0}' Key being added: '{1}'</value>
</data>
<data name="Arg_ArrayPlusOffTooSmall" xml:space="preserve">
Expand Down

0 comments on commit c416492

Please sign in to comment.