Update branding to 2.1.23

- dotnet/aspnetcore-internal#3676 - do actual branding and prepare for 2.1.23 patches, if any - update package baselines from 2.1.22 - remove Microsoft.Extensions.Logging.Testing from the baselines, not released
dotnet · Sep 8, 2020 · 2f33c1c · 2f33c1c
1 parent 8aa1789
commit 2f33c1c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 32 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.21</ExtensionsBaselineVersion>
+    <ExtensionsBaselineVersion>2.1.22</ExtensionsBaselineVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.Extensions.Caching.Abstractions-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Caching.Abstractions' ">
@@ -321,32 +321,6 @@
     <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[2.1.1, )" />
     <BaselinePackageReference Include="Newtonsoft.Json" Version="[11.0.2, )" />
   </ItemGroup>
-  <!-- Package: Microsoft.Extensions.Logging.Testing-->
-  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Logging.Testing' ">
-    <BaselinePackageVersion>2.1.1</BaselinePackageVersion>
-  </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Logging.Testing' AND '$(TargetFramework)' == 'net461' ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Console" Version="[2.1.1, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[2.1.1, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Testing" Version="[2.1.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[2.1.1, )" />
-    <BaselinePackageReference Include="Serilog.Extensions.Logging" Version="[1.4.0, )" />
-    <BaselinePackageReference Include="Serilog.Sinks.File" Version="[3.2.0, )" />
-    <BaselinePackageReference Include="xunit.abstractions" Version="[2.0.1, )" />
-    <BaselinePackageReference Include="xunit.assert" Version="[2.3.1, )" />
-    <BaselinePackageReference Include="xunit.extensibility.execution" Version="[2.3.1, )" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Logging.Testing' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Console" Version="[2.1.1, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[2.1.1, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Testing" Version="[2.1.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[2.1.1, )" />
-    <BaselinePackageReference Include="Serilog.Extensions.Logging" Version="[1.4.0, )" />
-    <BaselinePackageReference Include="Serilog.Sinks.File" Version="[3.2.0, )" />
-    <BaselinePackageReference Include="xunit.abstractions" Version="[2.0.1, )" />
-    <BaselinePackageReference Include="xunit.assert" Version="[2.3.1, )" />
-    <BaselinePackageReference Include="xunit.extensibility.execution" Version="[2.3.1, )" />
-  </ItemGroup>
   <!-- Package: Microsoft.Extensions.Logging.TraceSource-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Logging.TraceSource' ">
     <BaselinePackageVersion>2.1.1</BaselinePackageVersion>

diff --git a/eng/Baseline.xml b/eng/Baseline.xml
@@ -1,4 +1,4 @@
-<Baseline Version="2.1.21">
+<Baseline Version="2.1.22">
   <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" />
@@ -37,12 +37,11 @@
   <Package Id="Microsoft.Extensions.Logging.Debug" Version="2.1.1" />
   <Package Id="Microsoft.Extensions.Logging.EventLog" Version="2.1.1" />
   <Package Id="Microsoft.Extensions.Logging.EventSource" Version="2.1.1" />
-  <Package Id="Microsoft.Extensions.Logging.Testing" Version="2.1.1" />
   <Package Id="Microsoft.Extensions.Logging.TraceSource" Version="2.1.1" />
   <Package Id="Microsoft.Extensions.Logging" Version="2.1.1" />
   <Package Id="Microsoft.Extensions.ObjectPool" Version="2.1.6" />
   <Package Id="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" />
   <Package Id="Microsoft.Extensions.Options" Version="2.1.1" />
   <Package Id="Microsoft.Extensions.Primitives" Version="2.1.6" />
   <Package Id="Microsoft.Extensions.WebEncoders" Version="2.1.1" />
-</Baseline>
+</Baseline>
diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props
@@ -11,7 +11,7 @@
       Microsoft.Extensions.Configuration.Binder;
     </PackagesInPatch>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.22' ">
+  <PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.23' ">
     <PackagesInPatch>
     </PackagesInPatch>
   </PropertyGroup>

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