Merge in 'release/2.1' changes

dotnet · Aug 11, 2021 · 31d5dee · 31d5dee
2 parents b33d1f2 + 099865a
commit 31d5dee
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <AspNetCoreBaselineVersion>2.1.28</AspNetCoreBaselineVersion>
+    <AspNetCoreBaselineVersion>2.1.29</AspNetCoreBaselineVersion>
   </PropertyGroup>
   <!-- Package: dotnet-dev-certs-->
   <PropertyGroup Condition=" '$(PackageId)' == 'dotnet-dev-certs' ">

diff --git 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.28">
+<Baseline Version="2.1.29">
   <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" />
@@ -127,4 +127,4 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
   <Package Id="Microsoft.Net.Http.Headers" Version="2.1.14" />
   <Package Id="Microsoft.Net.Sdk.Razor" Version="2.1.2" />
   <Package Id="Microsoft.Owin.Security.Interop" Version="2.1.2" />
-</Baseline>
+</Baseline>
diff --git a/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.29.txt b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.29.txt
@@ -0,0 +1 @@
+
diff --git a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.29.txt b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.29.txt
@@ -0,0 +1 @@
+
diff --git a/version.props b/version.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AspNetCoreMajorVersion>2</AspNetCoreMajorVersion>
     <AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
-    <AspNetCorePatchVersion>29</AspNetCorePatchVersion>
+    <AspNetCorePatchVersion>30</AspNetCorePatchVersion>
     <ValidateBaseline>true</ValidateBaseline>
 
     <PreReleaseLabel>servicing</PreReleaseLabel>