Merge pull request #3847 from dotnet/johluo/2.1

[2.1] Update SDK and baseline
dotnet · Mar 9, 2021 · e4f8396 · e4f8396
2 parents 0bc6ead + ce1876b
commit e4f8396
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <ExtensionsBaselineVersion>2.1.25</ExtensionsBaselineVersion>
+    <ExtensionsBaselineVersion>2.1.26</ExtensionsBaselineVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.Extensions.Caching.Abstractions-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Caching.Abstractions' ">

diff --git a/eng/Baseline.xml b/eng/Baseline.xml
@@ -1,4 +1,4 @@
-<Baseline Version="2.1.25">
+<Baseline Version="2.1.26">
   <Package Id="Microsoft.Extensions.Caching.Abstractions" Version="2.1.23" />
   <Package Id="Microsoft.Extensions.Caching.Memory" Version="2.1.23" />
   <Package Id="Microsoft.Extensions.Caching.Redis" Version="2.1.2" />

diff --git a/korebuild-lock.txt b/korebuild-lock.txt
@@ -1,3 +1,2 @@
-version:2.1.7-build-20210209.2
-commithash:e2b019a5c8d338b060644e2ea5437beea1f5a888
-
+version:2.1.7-build-20210309.1
+commithash:661bf72b3a220a08f26c1919c6f33113e894466d
diff --git a/version.props b/version.props
@@ -3,8 +3,8 @@
     <MajorVersion>2</MajorVersion>
     <MinorVersion>1</MinorVersion>
     <PatchVersion>27</PatchVersion>
-    <ValidateBaseline>false</ValidateBaseline>
-    
+    <ValidateBaseline>true</ValidateBaseline>
+
     <PreReleaseLabel>servicing</PreReleaseLabel>
     <PreReleaseBrandingLabel></PreReleaseBrandingLabel>
     <OfficialBuildId Condition="'$(OfficialBuildId)' == ''">$(BUILD_BUILDNUMBER)</OfficialBuildId>