diff options
| author | William Godbe <wigodbe@microsoft.com> | 2022-03-10 23:38:13 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-10 23:38:13 +0300 |
| commit | 76f3e3bd1c8a667248cb64f8563a8b64ed4f48d3 (patch) | |
| tree | 3af259abcb74ca50b8f5abc05a3ed185aa1e437c | |
| parent | 3d894b333207b8f640bd701a6009313d6bb046af (diff) | |
| parent | af6b1f8b0ca07254fc08d8e304c3bfbb6c24b9d9 (diff) | |
Merge pull request #40644 from wtgodbe/wtgodbe/2133v2.1.33
Update branding to 2.1.33 and merge internal commits
| -rw-r--r-- | eng/Baseline.Designer.props | 2 | ||||
| -rw-r--r-- | eng/Baseline.xml | 2 | ||||
| -rw-r--r-- | eng/PatchConfig.props | 4 | ||||
| -rw-r--r-- | src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.32.txt | 1 | ||||
| -rw-r--r-- | src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.32.txt | 1 | ||||
| -rw-r--r-- | version.props | 2 |
6 files changed, 9 insertions, 3 deletions
diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 30f0c5b1ec..cd9690bf70 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,7 +2,7 @@ <Project> <PropertyGroup> <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects> - <AspNetCoreBaselineVersion>2.1.31</AspNetCoreBaselineVersion> + <AspNetCoreBaselineVersion>2.1.32</AspNetCoreBaselineVersion> </PropertyGroup> <!-- Package: dotnet-dev-certs--> <PropertyGroup Condition=" '$(PackageId)' == 'dotnet-dev-certs' "> diff --git a/eng/Baseline.xml b/eng/Baseline.xml index ca1de7eb2c..911a0ecb6a 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.31"> +<Baseline Version="2.1.32"> <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 d96deb365d..784f0cce0c 100644 --- a/eng/PatchConfig.props +++ b/eng/PatchConfig.props @@ -114,4 +114,8 @@ Later on, this will be checked using this condition: <PackagesInPatch> </PackagesInPatch> </PropertyGroup> + <PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.33' "> + <PackagesInPatch> + </PackagesInPatch> + </PropertyGroup> </Project> diff --git a/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.32.txt b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.32.txt new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.32.txt @@ -0,0 +1 @@ + diff --git a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.32.txt b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.32.txt new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.32.txt @@ -0,0 +1 @@ + diff --git a/version.props b/version.props index ceeee06753..e840ed7d56 100644 --- a/version.props +++ b/version.props @@ -2,7 +2,7 @@ <PropertyGroup> <AspNetCoreMajorVersion>2</AspNetCoreMajorVersion> <AspNetCoreMinorVersion>1</AspNetCoreMinorVersion> - <AspNetCorePatchVersion>32</AspNetCorePatchVersion> + <AspNetCorePatchVersion>33</AspNetCorePatchVersion> <ValidateBaseline>true</ValidateBaseline> <PreReleaseLabel>servicing</PreReleaseLabel> |