diff options
| author | Doug Bunting <6431421+dougbu@users.noreply.github.com> | 2020-06-10 23:59:45 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-10 23:59:45 +0300 |
| commit | 1a560b6b8fac0b465f2a1b47ee25d79ead1aa1cf (patch) | |
| tree | f625efabda4eeff56f22a6c706c7b0e08633d2a1 | |
| parent | 51584c21dd7440e554a21335c65f4051a1fac1bb (diff) | |
Update branding to 2.1.20 (#22757)
| -rw-r--r-- | eng/Baseline.Designer.props | 2 | ||||
| -rw-r--r-- | eng/Baseline.xml | 2 | ||||
| -rw-r--r-- | eng/PatchConfig.props | 6 | ||||
| -rw-r--r-- | src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.19.txt | 1 | ||||
| -rw-r--r-- | src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.19.txt | 1 | ||||
| -rw-r--r-- | version.props | 2 |
6 files changed, 6 insertions, 8 deletions
diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 45e64d60af..1622fa7041 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,7 +2,7 @@ <Project> <PropertyGroup> <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects> - <AspNetCoreBaselineVersion>2.1.18</AspNetCoreBaselineVersion> + <AspNetCoreBaselineVersion>2.1.19</AspNetCoreBaselineVersion> </PropertyGroup> <!-- Package: dotnet-dev-certs--> <PropertyGroup Condition=" '$(PackageId)' == 'dotnet-dev-certs' "> diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 8344a8e586..7497e78a7b 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,7 +4,7 @@ This file contains a list of all the packages and their versions which were rele build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. --> -<Baseline Version="2.1.18"> +<Baseline Version="2.1.19"> <Package Id="dotnet-dev-certs" Version="2.1.1" /> <Package Id="dotnet-sql-cache" Version="2.1.1" /> <Package Id="dotnet-user-secrets" Version="2.1.1" /> diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props index 45de9044c3..0fa48bac75 100644 --- a/eng/PatchConfig.props +++ b/eng/PatchConfig.props @@ -56,16 +56,12 @@ Later on, this will be checked using this condition: Microsoft.AspNetCore.Mvc.Core; </PackagesInPatch> </PropertyGroup> - <PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.17' "> - <PackagesInPatch> - </PackagesInPatch> - </PropertyGroup> <PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.18' "> <PackagesInPatch> Microsoft.AspNetCore.Mvc.Formatters.Json; </PackagesInPatch> </PropertyGroup> - <PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.19' "> + <PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.20' "> <PackagesInPatch> </PackagesInPatch> </PropertyGroup> diff --git a/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.19.txt b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.19.txt new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.19.txt @@ -0,0 +1 @@ + diff --git a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.19.txt b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.19.txt new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.19.txt @@ -0,0 +1 @@ + diff --git a/version.props b/version.props index 061d552d88..8a787e0583 100644 --- a/version.props +++ b/version.props @@ -2,7 +2,7 @@ <PropertyGroup> <AspNetCoreMajorVersion>2</AspNetCoreMajorVersion> <AspNetCoreMinorVersion>1</AspNetCoreMinorVersion> - <AspNetCorePatchVersion>19</AspNetCorePatchVersion> + <AspNetCorePatchVersion>20</AspNetCorePatchVersion> <PreReleaseLabel>servicing</PreReleaseLabel> <PreReleaseBrandingLabel>Servicing</PreReleaseBrandingLabel> <BuildNumber Condition="'$(BuildNumber)' == '' OR '$(UsingLocalBuildNumber)' == 'true'">t000</BuildNumber> |