Skip to content

Commit 2d2edff

Browse files
author
John Luo
committed
Merged PR 8414: Update branding for 2.2.12
Update branding for 2.2.11
1 parent 7217163 commit 2d2edff

File tree

6 files changed

+27
-17
lines changed

6 files changed

+27
-17
lines changed

‎eng/Baseline.Designer.props

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project>
33
<PropertyGroup>
44
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
5-
<AspNetCoreBaselineVersion>2.2.10</AspNetCoreBaselineVersion>
5+
<AspNetCoreBaselineVersion>2.2.11</AspNetCoreBaselineVersion>
66
</PropertyGroup>
77
<!-- Package: dotnet-dev-certs-->
88
<PropertyGroup Condition=" '$(PackageId)' == 'dotnet-dev-certs' ">
@@ -99,7 +99,7 @@
9999
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
100100
</PropertyGroup>
101101
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.AzureAD.UI' AND '$(TargetFramework)' == 'netstandard2.0' ">
102-
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="[2.2.10, )" />
102+
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="[2.2.0, )" />
103103
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="[2.2.0, )" />
104104
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="[2.2.0, )" />
105105
<BaselinePackageReference Include="Microsoft.AspNetCore.Mvc" Version="[2.2.0, )" />
@@ -109,7 +109,7 @@
109109
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
110110
</PropertyGroup>
111111
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.AzureADB2C.UI' AND '$(TargetFramework)' == 'netstandard2.0' ">
112-
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="[2.2.10, )" />
112+
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="[2.2.0, )" />
113113
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="[2.2.0, )" />
114114
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="[2.2.0, )" />
115115
<BaselinePackageReference Include="Microsoft.AspNetCore.Mvc" Version="[2.2.0, )" />
@@ -600,7 +600,7 @@
600600
</PropertyGroup>
601601
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity' AND '$(TargetFramework)' == 'netstandard2.0' ">
602602
<BaselinePackageReference Include="Microsoft.Extensions.Identity.Core" Version="[2.2.0, )" />
603-
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="[2.2.10, )" />
603+
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="[2.2.0, )" />
604604
<BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="[2.2.0, )" />
605605
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.2.0, )" />
606606
</ItemGroup>
@@ -662,7 +662,7 @@
662662
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
663663
</PropertyGroup>
664664
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.ApiExplorer' AND '$(TargetFramework)' == 'netstandard2.0' ">
665-
<BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="[2.2.10, )" />
665+
<BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="[2.2.0, )" />
666666
</ItemGroup>
667667
<!-- Package: Microsoft.AspNetCore.Mvc.Core-->
668668
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Core' ">
@@ -683,39 +683,39 @@
683683
<BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="[2.2.0, )" />
684684
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.2.0, )" />
685685
<BaselinePackageReference Include="System.Diagnostics.DiagnosticSource" Version="[4.5.1, )" />
686-
<BaselinePackageReference Include="System.Threading.Tasks.Extensions" Version="[4.5.1, )" />
686+
<BaselinePackageReference Include="System.Threading.Tasks.Extensions" Version="[4.5.3, )" />
687687
</ItemGroup>
688688
<!-- Package: Microsoft.AspNetCore.Mvc.Cors-->
689689
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Cors' ">
690690
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
691691
</PropertyGroup>
692692
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Cors' AND '$(TargetFramework)' == 'netstandard2.0' ">
693-
<BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="[2.2.10, )" />
693+
<BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="[2.2.0, )" />
694694
<BaselinePackageReference Include="Microsoft.AspNetCore.Cors" Version="[2.2.0, )" />
695695
</ItemGroup>
696696
<!-- Package: Microsoft.AspNetCore.Mvc.DataAnnotations-->
697697
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.DataAnnotations' ">
698698
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
699699
</PropertyGroup>
700700
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.DataAnnotations' AND '$(TargetFramework)' == 'netstandard2.0' ">
701-
<BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="[2.2.10, )" />
701+
<BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="[2.2.0, )" />
702702
<BaselinePackageReference Include="Microsoft.Extensions.Localization" Version="[2.2.0, )" />
703703
<BaselinePackageReference Include="System.ComponentModel.Annotations" Version="[4.5.0, )" />
704704
</ItemGroup>
705705
<!-- Package: Microsoft.AspNetCore.Mvc.Formatters.Json-->
706706
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Formatters.Json' ">
707-
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
707+
<BaselinePackageVersion>2.2.11</BaselinePackageVersion>
708708
</PropertyGroup>
709709
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Formatters.Json' AND '$(TargetFramework)' == 'netstandard2.0' ">
710-
<BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="[2.2.10, )" />
711710
<BaselinePackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="[2.2.0, )" />
711+
<BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="[2.2.10, )" />
712712
</ItemGroup>
713713
<!-- Package: Microsoft.AspNetCore.Mvc.Formatters.Xml-->
714714
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Formatters.Xml' ">
715715
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
716716
</PropertyGroup>
717717
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Formatters.Xml' AND '$(TargetFramework)' == 'netstandard2.0' ">
718-
<BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="[2.2.10, )" />
718+
<BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="[2.2.0, )" />
719719
</ItemGroup>
720720
<!-- Package: Microsoft.AspNetCore.Mvc.Localization-->
721721
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Localization' ">
@@ -798,15 +798,15 @@
798798
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
799799
</PropertyGroup>
800800
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Testing' AND '$(TargetFramework)' == 'netstandard2.0' ">
801-
<BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="[2.2.10, )" />
801+
<BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="[2.2.0, )" />
802802
<BaselinePackageReference Include="Microsoft.AspNetCore.TestHost" Version="[2.2.0, )" />
803803
</ItemGroup>
804804
<!-- Package: Microsoft.AspNetCore.Mvc.ViewFeatures-->
805805
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.ViewFeatures' ">
806806
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
807807
</PropertyGroup>
808808
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.ViewFeatures' AND '$(TargetFramework)' == 'netstandard2.0' ">
809-
<BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="[2.2.10, )" />
809+
<BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="[2.2.0, )" />
810810
<BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.DataAnnotations" Version="[2.2.0, )" />
811811
<BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.Formatters.Json" Version="[2.2.0, )" />
812812
<BaselinePackageReference Include="Microsoft.AspNetCore.Antiforgery" Version="[2.2.0, )" />
@@ -820,7 +820,7 @@
820820
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
821821
</PropertyGroup>
822822
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.WebApiCompatShim' AND '$(TargetFramework)' == 'netstandard2.0' ">
823-
<BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="[2.2.10, )" />
823+
<BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="[2.2.0, )" />
824824
<BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.Formatters.Json" Version="[2.2.0, )" />
825825
<BaselinePackageReference Include="Microsoft.AspNet.WebApi.Client" Version="[5.2.6, )" />
826826
<BaselinePackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="[2.2.0, )" />

‎eng/Baseline.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This file contains a list of all the packages and their versions which were rele
44
build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
55
66
-->
7-
<Baseline Version="2.2.10">
7+
<Baseline Version="2.2.11">
88
<Package Id="dotnet-dev-certs" Version="2.2.0" />
99
<Package Id="dotnet-sql-cache" Version="2.2.0" />
1010
<Package Id="dotnet-user-secrets" Version="2.2.0" />
@@ -79,7 +79,7 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
7979
<Package Id="Microsoft.AspNetCore.Mvc.Core" Version="2.2.10" />
8080
<Package Id="Microsoft.AspNetCore.Mvc.Cors" Version="2.2.0" />
8181
<Package Id="Microsoft.AspNetCore.Mvc.DataAnnotations" Version="2.2.0" />
82-
<Package Id="Microsoft.AspNetCore.Mvc.Formatters.Json" Version="2.2.0" />
82+
<Package Id="Microsoft.AspNetCore.Mvc.Formatters.Json" Version="2.2.11" />
8383
<Package Id="Microsoft.AspNetCore.Mvc.Formatters.Xml" Version="2.2.0" />
8484
<Package Id="Microsoft.AspNetCore.Mvc.Localization" Version="2.2.0" />
8585
<Package Id="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="2.2.0" />

‎eng/PatchConfig.props

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,4 +100,8 @@ Later on, this will be checked using this condition:
100100
Microsoft.AspNetCore.Mvc.Formatters.Json;
101101
</PackagesInPatch>
102102
</PropertyGroup>
103+
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.12' ">
104+
<PackagesInPatch>
105+
</PackagesInPatch>
106+
</PropertyGroup>
103107
</Project>

‎src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.2.11.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
runtime.native.system.io.compression\4.1.0\.signature.p7s
2+
system.globalization.extensions\4.3.0\.signature.p7s
3+
system.reflection.typeextensions\4.3.0\.signature.p7s

‎src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.2.11.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
runtime.native.system.io.compression\4.1.0\.signature.p7s
2+
system.globalization.extensions\4.3.0\.signature.p7s
3+
system.reflection.typeextensions\4.3.0\.signature.p7s

‎version.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<AspNetCoreMajorVersion>2</AspNetCoreMajorVersion>
44
<AspNetCoreMinorVersion>2</AspNetCoreMinorVersion>
5-
<AspNetCorePatchVersion>11</AspNetCorePatchVersion>
5+
<AspNetCorePatchVersion>12</AspNetCorePatchVersion>
66
<PreReleaseLabel>servicing</PreReleaseLabel>
77
<PreReleaseBrandingLabel></PreReleaseBrandingLabel>
88
<BuildNumber Condition="'$(BuildNumber)' == '' OR '$(UsingLocalBuildNumber)' == 'true'">$([System.DateTime]::Now.ToString('yyMMdd'))-99</BuildNumber>

0 commit comments

Comments
 (0)