Update branding to 2.1.10

- reorder PatchConfig.props while adding 2.1.10 section - need the latest baseline even though Extensions wasn't included
dotnet · Mar 14, 2019 · d6a8450 · d6a8450
1 parent 46aa691
commit d6a8450
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 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.6</ExtensionsBaselineVersion>
+    <ExtensionsBaselineVersion>2.1.9</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.6">
+<Baseline Version="2.1.9">
   <Package Id="Microsoft.Extensions.Caching.Abstractions" Version="2.1.2" />
   <Package Id="Microsoft.Extensions.Caching.Memory" Version="2.1.2" />
   <Package Id="Microsoft.Extensions.Caching.Redis" Version="2.1.2" />

diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props
@@ -1,14 +1,19 @@
 <Project>
 
+  <PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.6' ">
+    <PackagesInPatch>
+      Microsoft.Extensions.ObjectPool;
+      Microsoft.Extensions.Primitives;
+    </PackagesInPatch>
+  </PropertyGroup>
+
   <PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.7' ">
     <PackagesInPatch>
     </PackagesInPatch>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.6' ">
+  <PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.10' ">
     <PackagesInPatch>
-      Microsoft.Extensions.ObjectPool;
-      Microsoft.Extensions.Primitives;
     </PackagesInPatch>
   </PropertyGroup>
 

diff --git a/version.props b/version.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <MajorVersion>2</MajorVersion>
     <MinorVersion>1</MinorVersion>
-    <PatchVersion>7</PatchVersion>
+    <PatchVersion>10</PatchVersion>
     <PreReleaseLabel>servicing</PreReleaseLabel>
     <PreReleaseBrandingLabel></PreReleaseBrandingLabel>
     <OfficialBuildId Condition="'$(OfficialBuildId)' == ''">$(BUILD_BUILDNUMBER)</OfficialBuildId>