Skip to content

Commit 8ca0d5e

Browse files
author
John Luo
authored
Merge pull request #30056 from dotnet/johluo/2.1.26
Update branding to 2.1.26
2 parents 9f78d7c + 824686b commit 8ca0d5e

File tree

16 files changed

+68
-28
lines changed

16 files changed

+68
-28
lines changed

‎build/dependencies.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<MicrosoftExtensionsCachingSqlServerPackageVersion>2.1.2</MicrosoftExtensionsCachingSqlServerPackageVersion>
3131
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>2.1.1</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
3232
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>2.1.1</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
33-
<MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>2.1.1</MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>
33+
<MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>2.1.24</MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>
3434
<MicrosoftExtensionsConfigurationBinderPackageVersion>2.1.10</MicrosoftExtensionsConfigurationBinderPackageVersion>
3535
<MicrosoftExtensionsConfigurationCommandLinePackageVersion>2.1.1</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
3636
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>2.1.1</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>

‎build/sources.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<RestoreSources Condition=" '$(DotNetBuildOffline)' != 'true' ">
1111
$(RestoreSources);
1212
https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
13-
https://api.nuget.org/v3/index.json;
13+
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json;
1414
</RestoreSources>
1515
<RestoreSources Condition=" '$(DotNetBuildOffline)' != 'true' AND '$(DisableMyGetRestoreSources)' != 'true' ">
1616
$(RestoreSources);

‎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.1.23</AspNetCoreBaselineVersion>
5+
<AspNetCoreBaselineVersion>2.1.25</AspNetCoreBaselineVersion>
66
</PropertyGroup>
77
<!-- Package: dotnet-dev-certs-->
88
<PropertyGroup Condition=" '$(PackageId)' == 'dotnet-dev-certs' ">
@@ -275,7 +275,7 @@
275275
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.Abstractions' AND '$(TargetFramework)' == 'netstandard2.0' " />
276276
<!-- Package: Microsoft.AspNetCore.DataProtection.AzureKeyVault-->
277277
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.AzureKeyVault' ">
278-
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
278+
<BaselinePackageVersion>2.1.24</BaselinePackageVersion>
279279
</PropertyGroup>
280280
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.AzureKeyVault' AND '$(TargetFramework)' == 'netstandard2.0' ">
281281
<BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[2.1.1, )" />
@@ -284,7 +284,7 @@
284284
</ItemGroup>
285285
<!-- Package: Microsoft.AspNetCore.DataProtection.AzureStorage-->
286286
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.AzureStorage' ">
287-
<BaselinePackageVersion>2.1.13</BaselinePackageVersion>
287+
<BaselinePackageVersion>2.1.24</BaselinePackageVersion>
288288
</PropertyGroup>
289289
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.AzureStorage' AND '$(TargetFramework)' == 'netstandard2.0' ">
290290
<BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[2.1.1, )" />
@@ -931,35 +931,35 @@
931931
</ItemGroup>
932932
<!-- Package: Microsoft.AspNetCore.Server.Kestrel.Core-->
933933
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.Kestrel.Core' ">
934-
<BaselinePackageVersion>2.1.7</BaselinePackageVersion>
934+
<BaselinePackageVersion>2.1.25</BaselinePackageVersion>
935935
</PropertyGroup>
936936
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.Kestrel.Core' AND '$(TargetFramework)' == 'netcoreapp2.1' ">
937937
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.1.1, )" />
938938
<BaselinePackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" Version="[2.1.3, )" />
939939
<BaselinePackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="[2.1.1, )" />
940-
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="[2.1.1, )" />
940+
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="[2.1.10, )" />
941941
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.1.1, )" />
942942
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
943943
<BaselinePackageReference Include="Microsoft.Net.Http.Headers" Version="[2.1.1, )" />
944-
<BaselinePackageReference Include="System.Memory" Version="[4.5.2, )" />
944+
<BaselinePackageReference Include="System.Memory" Version="[4.5.4, )" />
945945
<BaselinePackageReference Include="System.Numerics.Vectors" Version="[4.5.0, )" />
946-
<BaselinePackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="[4.5.2, )" />
947-
<BaselinePackageReference Include="System.Security.Cryptography.Cng" Version="[4.5.0, )" />
948-
<BaselinePackageReference Include="System.Threading.Tasks.Extensions" Version="[4.5.1, )" />
946+
<BaselinePackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="[4.5.3, )" />
947+
<BaselinePackageReference Include="System.Security.Cryptography.Cng" Version="[4.5.2, )" />
948+
<BaselinePackageReference Include="System.Threading.Tasks.Extensions" Version="[4.5.4, )" />
949949
</ItemGroup>
950950
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.Kestrel.Core' AND '$(TargetFramework)' == 'netstandard2.0' ">
951951
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.1.1, )" />
952952
<BaselinePackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" Version="[2.1.3, )" />
953953
<BaselinePackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="[2.1.1, )" />
954-
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="[2.1.1, )" />
954+
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="[2.1.10, )" />
955955
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.1.1, )" />
956956
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
957957
<BaselinePackageReference Include="Microsoft.Net.Http.Headers" Version="[2.1.1, )" />
958-
<BaselinePackageReference Include="System.Memory" Version="[4.5.2, )" />
958+
<BaselinePackageReference Include="System.Memory" Version="[4.5.4, )" />
959959
<BaselinePackageReference Include="System.Numerics.Vectors" Version="[4.5.0, )" />
960-
<BaselinePackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="[4.5.2, )" />
961-
<BaselinePackageReference Include="System.Security.Cryptography.Cng" Version="[4.5.0, )" />
962-
<BaselinePackageReference Include="System.Threading.Tasks.Extensions" Version="[4.5.1, )" />
960+
<BaselinePackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="[4.5.3, )" />
961+
<BaselinePackageReference Include="System.Security.Cryptography.Cng" Version="[4.5.2, )" />
962+
<BaselinePackageReference Include="System.Threading.Tasks.Extensions" Version="[4.5.4, )" />
963963
</ItemGroup>
964964
<!-- Package: Microsoft.AspNetCore.Server.Kestrel.Https-->
965965
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.Kestrel.Https' ">

‎eng/Baseline.xml

Lines changed: 4 additions & 4 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.1.x. Update this list when preparing for a new patch.
55
66
-->
7-
<Baseline Version="2.1.23">
7+
<Baseline Version="2.1.25">
88
<Package Id="dotnet-dev-certs" Version="2.1.1" />
99
<Package Id="dotnet-sql-cache" Version="2.1.1" />
1010
<Package Id="dotnet-user-secrets" Version="2.1.1" />
@@ -35,8 +35,8 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
3535
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="2.1.1" />
3636
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="2.1.1" />
3737
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="2.1.1" />
38-
<Package Id="Microsoft.AspNetCore.DataProtection.AzureKeyVault" Version="2.1.1" />
39-
<Package Id="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="2.1.13" />
38+
<Package Id="Microsoft.AspNetCore.DataProtection.AzureKeyVault" Version="2.1.24" />
39+
<Package Id="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="2.1.24" />
4040
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="2.1.1" />
4141
<Package Id="Microsoft.AspNetCore.DataProtection.Redis" Version="0.4.1" />
4242
<Package Id="Microsoft.AspNetCore.DataProtection.SystemWeb" Version="2.1.1" />
@@ -99,7 +99,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
9999
<Package Id="Microsoft.AspNetCore.Routing" Version="2.1.1" />
100100
<Package Id="Microsoft.AspNetCore.Server.HttpSys" Version="2.1.12" />
101101
<Package Id="Microsoft.AspNetCore.Server.IISIntegration" Version="2.1.7" />
102-
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Core" Version="2.1.7" />
102+
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Core" Version="2.1.25" />
103103
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.1.3" />
104104
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" Version="2.1.3" />
105105
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="2.1.3" />

‎eng/PatchConfig.props

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,4 +88,8 @@ Later on, this will be checked using this condition:
8888
Microsoft.AspNetCore.Server.Kestrel.Core;
8989
</PackagesInPatch>
9090
</PropertyGroup>
91+
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.26' ">
92+
<PackagesInPatch>
93+
</PackagesInPatch>
94+
</PropertyGroup>
9195
</Project>

‎korebuild-lock.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version:2.1.7-build-20201218.2
2-
commithash:26d5fca2ed53577d072f0c7a00c188a2fe826f7f
1+
version:2.1.7-build-20210209.2
2+
commithash:e2b019a5c8d338b060644e2ea5437beea1f5a888

‎modules/EntityFrameworkCore

‎src/AzureIntegration/build/sources.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</RestoreSources>
1111
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
1212
$(RestoreSources);
13-
https://api.nuget.org/v3/index.json;
13+
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json;
1414
</RestoreSources>
1515
</PropertyGroup>
1616
</Project>

‎src/AzureIntegration/test/Microsoft.AspNetCore.AzureAppServices.FunctionalTests/Assets/NuGet.latest.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
<packageSources>
44
<clear />
55
<add key="AspNetCore" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
6-
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
6+
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
77
</packageSources>
88
</configuration>

‎src/Installers/Windows/AspNetCoreModule-Setup/ANCMPackageResolver/ANCMPackageResolver.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<RestoreSources>
1919
$(RestoreSources);
2020
https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
21-
https://api.nuget.org/v3/index.json;
21+
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json;
2222
https://dotnetmygetlegacy.blob.core.windows.net/dotnet-core/index.json;
2323
</RestoreSources>
2424
</PropertyGroup>

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
runtime.native.system.io.compression\4.3.0\.signature.p7s
2+
runtime.native.system.net.http\4.3.0\.signature.p7s
3+
runtime.native.system\4.3.0\.signature.p7s
4+
system.collections.nongeneric\4.3.0\.signature.p7s
5+
system.diagnostics.fileversioninfo\4.3.0\.signature.p7s
6+
system.globalization.extensions\4.3.0\.signature.p7s
7+
system.net.nameresolution\4.3.0\.signature.p7s
8+
system.private.datacontractserialization\4.1.1\.signature.p7s
9+
system.reflection.emit\4.3.0\.signature.p7s
10+
system.runtime.serialization.xml\4.3.0\.signature.p7s
11+
system.security.cryptography.csp\4.3.0\.signature.p7s
12+
system.threading.thread\4.3.0\.signature.p7s
13+
system.threading.threadpool\4.3.0\.signature.p7s
14+
system.xml.xmldocument\4.3.0\.signature.p7s
15+
system.xml.xmlserializer\4.0.11\.signature.p7s

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
runtime.native.system.data.sqlclient.sni\4.4.0\.signature.p7s
2+
system.collections.specialized\4.3.0\.signature.p7s
3+
system.security.claims\4.3.0\.signature.p7s

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
runtime.native.system.io.compression\4.3.0\.signature.p7s
2+
runtime.native.system.net.http\4.3.0\.signature.p7s
3+
runtime.native.system\4.3.0\.signature.p7s
4+
system.collections.nongeneric\4.3.0\.signature.p7s
5+
system.diagnostics.fileversioninfo\4.3.0\.signature.p7s
6+
system.globalization.extensions\4.3.0\.signature.p7s
7+
system.net.nameresolution\4.3.0\.signature.p7s
8+
system.private.datacontractserialization\4.1.1\.signature.p7s
9+
system.reflection.emit\4.3.0\.signature.p7s
10+
system.runtime.serialization.xml\4.3.0\.signature.p7s
11+
system.security.cryptography.csp\4.3.0\.signature.p7s
12+
system.threading.thread\4.3.0\.signature.p7s
13+
system.threading.threadpool\4.3.0\.signature.p7s
14+
system.xml.xmldocument\4.3.0\.signature.p7s
15+
system.xml.xmlserializer\4.0.11\.signature.p7s

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
runtime.native.system.data.sqlclient.sni\4.4.0\.signature.p7s
2+
system.collections.specialized\4.3.0\.signature.p7s
3+
system.security.claims\4.3.0\.signature.p7s

‎src/Templating/build/sources.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</RestoreSources>
1111
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
1212
$(RestoreSources);
13-
https://api.nuget.org/v3/index.json;
13+
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json;
1414
</RestoreSources>
1515
</PropertyGroup>
1616
</Project>

‎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>1</AspNetCoreMinorVersion>
5-
<AspNetCorePatchVersion>24</AspNetCorePatchVersion>
5+
<AspNetCorePatchVersion>26</AspNetCorePatchVersion>
66
<PreReleaseLabel>servicing</PreReleaseLabel>
77
<PreReleaseBrandingLabel>Servicing</PreReleaseBrandingLabel>
88
<BuildNumber Condition="'$(BuildNumber)' == '' OR '$(UsingLocalBuildNumber)' == 'true'">t000</BuildNumber>

0 commit comments

Comments
 (0)