Skip to content

[automated] Merge branch 'release/2.1' => 'release/3.1' #3848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
13 commits merged into from
Mar 11, 2021
Merged

[automated] Merge branch 'release/2.1' => 'release/3.1' #3848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
cb3c49d
[internal/release/3.1] Update dependencies from dnceng/internal/dotne…
dotnet-bot Feb 12, 2021
b07e4a9
Merge
wtgodbe Feb 12, 2021
d760767
Merged PR 12846: Merge from github
wtgodbe Feb 12, 2021
945dd07
[internal/release/3.1] Update dependencies from dnceng/internal/dotne…
dotnet-bot Feb 16, 2021
0bc6ead
Update branding to 2.1.27 (#3842)
wtgodbe Feb 27, 2021
ce1876b
Update SDK and baseline
Mar 9, 2021
40820fc
Merge commit '945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f' into wtgodbe/…
wtgodbe Mar 9, 2021
fcfe939
Update baseline & SDK
wtgodbe Mar 9, 2021
e4f8396
Merge pull request #3847 from dotnet/johluo/2.1
Mar 9, 2021
be2863d
Merge pull request #3849 from dotnet/wtgodbe/31CodeMergeMarch
wtgodbe Mar 9, 2021
6e89794
Update dependencies from https://github.com/dotnet/arcade build 20210…
dotnet-maestro[bot] Mar 10, 2021
0199173
Merge branch 'release/2.1' into release/3.1
jkotalik Mar 11, 2021
7d4963d
End line
jkotalik Mar 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<add key="darc-int-dotnet-core-setup-0267ad0" value="true" />
<!-- End: Package sources from dotnet-core-setup -->
<!-- Begin: Package sources from dotnet-corefx -->
<add key="darc-int-dotnet-corefx-9299d90" value="true" />
<add key="darc-int-dotnet-corefx-50a99d5" value="true" />
<add key="darc-int-dotnet-corefx-50a99d5" value="true" />
<!-- End: Package sources from dotnet-corefx -->
Expand Down
484 changes: 242 additions & 242 deletions eng/Baseline.Designer.props
View file
Open in desktop

Large diffs are not rendered by default.

108 changes: 54 additions & 54 deletions eng/Baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,58 +4,58 @@ This file contains a list of all the packages and their versions which were rele
build of Extensions. Update this list when preparing for a new patch.

-->
<Baseline Version="3.1.12">
<Package Id="Microsoft.Extensions.Caching.Abstractions" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Caching.Memory" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Caching.SqlServer" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Caching.StackExchangeRedis" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Configuration" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Configuration.AzureKeyVault" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Configuration.Binder" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Configuration.CommandLine" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Configuration.FileExtensions" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Configuration.Ini" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Configuration.Json" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Configuration.KeyPerFile" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Configuration.NewtonsoftJson" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Configuration.UserSecrets" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Configuration.Xml" Version="3.1.12" />
<Package Id="Microsoft.Extensions.DependencyInjection" Version="3.1.12" />
<Package Id="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.12" />
<Package Id="Microsoft.Extensions.DependencyInjection.Specification.Tests" Version="3.1.12" />
<Package Id="Microsoft.Extensions.DiagnosticAdapter" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="3.1.12" />
<Package Id="Microsoft.Extensions.FileProviders.Abstractions" Version="3.1.12" />
<Package Id="Microsoft.Extensions.FileProviders.Composite" Version="3.1.12" />
<Package Id="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.12" />
<Package Id="Microsoft.Extensions.FileProviders.Physical" Version="3.1.12" />
<Package Id="Microsoft.Extensions.FileSystemGlobbing" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Hosting" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Hosting.Systemd" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Hosting.WindowsServices" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Http" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Http.Polly" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Localization" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Localization.Abstractions" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Logging" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Logging.Abstractions" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Logging.AzureAppServices" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Logging.Configuration" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Logging.Console" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Logging.Debug" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Logging.EventLog" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Logging.EventSource" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Logging.TraceSource" Version="3.1.12" />
<Package Id="Microsoft.Extensions.ObjectPool" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Options" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Options.DataAnnotations" Version="3.1.12" />
<Package Id="Microsoft.Extensions.Primitives" Version="3.1.12" />
<Package Id="Microsoft.Extensions.WebEncoders" Version="3.1.12" />
<Package Id="Microsoft.JSInterop" Version="3.1.12" />
<Package Id="Microsoft.JSInterop" Version="3.1.12" />
<Baseline Version="3.1.13">
<Package Id="Microsoft.Extensions.Caching.Abstractions" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Caching.Memory" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Caching.SqlServer" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Caching.StackExchangeRedis" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Configuration" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Configuration.AzureKeyVault" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Configuration.Binder" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Configuration.CommandLine" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Configuration.FileExtensions" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Configuration.Ini" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Configuration.Json" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Configuration.KeyPerFile" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Configuration.NewtonsoftJson" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Configuration.UserSecrets" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Configuration.Xml" Version="3.1.13" />
<Package Id="Microsoft.Extensions.DependencyInjection" Version="3.1.13" />
<Package Id="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.13" />
<Package Id="Microsoft.Extensions.DependencyInjection.Specification.Tests" Version="3.1.13" />
<Package Id="Microsoft.Extensions.DiagnosticAdapter" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="3.1.13" />
<Package Id="Microsoft.Extensions.FileProviders.Abstractions" Version="3.1.13" />
<Package Id="Microsoft.Extensions.FileProviders.Composite" Version="3.1.13" />
<Package Id="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.13" />
<Package Id="Microsoft.Extensions.FileProviders.Physical" Version="3.1.13" />
<Package Id="Microsoft.Extensions.FileSystemGlobbing" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Hosting" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Hosting.Systemd" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Hosting.WindowsServices" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Http" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Http.Polly" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Localization" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Localization.Abstractions" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Logging" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Logging.Abstractions" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Logging.AzureAppServices" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Logging.Configuration" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Logging.Console" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Logging.Debug" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Logging.EventLog" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Logging.EventSource" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Logging.TraceSource" Version="3.1.13" />
<Package Id="Microsoft.Extensions.ObjectPool" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Options" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Options.DataAnnotations" Version="3.1.13" />
<Package Id="Microsoft.Extensions.Primitives" Version="3.1.13" />
<Package Id="Microsoft.Extensions.WebEncoders" Version="3.1.13" />
<Package Id="Microsoft.JSInterop" Version="3.1.13" />
<Package Id="Microsoft.JSInterop" Version="3.1.13" />
</Baseline>
28 changes: 14 additions & 14 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="4.7.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Dependency Name="System.Text.Encodings.Web" Version="4.7.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-corefx</Uri>
<Sha>059a4a19e602494bfbed473dbbb18f2dbfbd0878</Sha>
<Sha>9299d909ff6c03c664a3f9a3ef995a9fa2eeec3e</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="4.7.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-corefx</Uri>
Expand All @@ -82,21 +82,21 @@
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
All Runtime.$rid packages should have the same version.
-->
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.12">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.13">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
<Sha>0267ad09c6f2e2a37b23b7d230ffbf9e787dd388</Sha>
<Sha>64df28ec4a52d6cc23efffbb918eab87ee42600f</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="3.1.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
<Sha>3acd9b0cd16596bad450c82be08780875a73c05c</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.12-servicing.21069.9">
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.13-servicing.21116.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
<Sha>0267ad09c6f2e2a37b23b7d230ffbf9e787dd388</Sha>
<Sha>64df28ec4a52d6cc23efffbb918eab87ee42600f</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.5" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-corefx</Uri>
<Sha>50a99d5d3c6e68aecf70627897c0d862a92fc283</Sha>
<Sha>9299d909ff6c03c664a3f9a3ef995a9fa2eeec3e</Sha>
</Dependency>
<!-- Keep this dependency at the bottom of ProductDependencies, else it will be picked as the parent for CoherentParentDependencies -->
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.1.0" Pinned="true">
Expand All @@ -109,17 +109,17 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21110.10">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21158.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>251249a04a9686ca2660e2acaa3094446a48f10d</Sha>
<Sha>ab42d248928f65dd174a2383f3256e68d9379bb7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.21110.10">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.21158.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>251249a04a9686ca2660e2acaa3094446a48f10d</Sha>
<Sha>ab42d248928f65dd174a2383f3256e68d9379bb7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.21110.10">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.21158.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>251249a04a9686ca2660e2acaa3094446a48f10d</Sha>
<Sha>ab42d248928f65dd174a2383f3256e68d9379bb7</Sha>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.4.1-beta4-20127-10">
<Uri>https://github.com/dotnet/roslyn</Uri>
Expand Down
13 changes: 6 additions & 7 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
<MajorVersion>3</MajorVersion>
<MinorVersion>1</MinorVersion>
<PatchVersion>14</PatchVersion>
<ValidateBaseline>false</ValidateBaseline>

<ValidateBaseline>true</ValidateBaseline>
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
<AssemblyVersion Condition="'$(IsReferenceAssemblyProject)' != 'true'">$(VersionPrefix).0</AssemblyVersion>
Expand Down Expand Up @@ -58,8 +57,8 @@
<!-- Packages from dotnet/core-setup -->
<MicrosoftDotNetPlatformAbstractionsPackageVersion>3.1.6</MicrosoftDotNetPlatformAbstractionsPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.12</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>3.1.12-servicing.21069.9</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.13</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>3.1.13-servicing.21116.2</MicrosoftNETCoreAppInternalPackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
<!-- Packages from dotnet/corefx -->
<MicrosoftBclAsyncInterfacesPackageVersion>1.1.1</MicrosoftBclAsyncInterfacesPackageVersion>
Expand All @@ -76,13 +75,13 @@
<SystemSecurityCryptographyCngPackageVersion>4.7.0</SystemSecurityCryptographyCngPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>4.7.0</SystemSecurityCryptographyXmlPackageVersion>
<SystemServiceProcessServiceControllerPackageVersion>4.7.0</SystemServiceProcessServiceControllerPackageVersion>
<SystemTextEncodingsWebPackageVersion>4.7.1</SystemTextEncodingsWebPackageVersion>
<SystemTextEncodingsWebPackageVersion>4.7.2</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>4.7.2</SystemTextJsonPackageVersion>
<SystemThreadingChannelsPackageVersion>4.7.1</SystemThreadingChannelsPackageVersion>
<!-- Workaround https://github.com/dotnet/cli/issues/10528-->
<MicrosoftNETCorePlatformsPackageVersion>3.1.4</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>3.1.5</MicrosoftNETCorePlatformsPackageVersion>
<!-- Packages from dotnet/arcade -->
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.21110.10</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.21158.9</MicrosoftDotNetGenAPIPackageVersion>
<!-- Packages from dotnet/roslyn -->
<MicrosoftNetCompilersToolsetVersion>3.4.1-beta4-20127-10</MicrosoftNetCompilersToolsetVersion>
</PropertyGroup>
Expand Down
Loading