diff --git a/build/dependencies.props b/build/dependencies.props index 0bca2823bfc56beffeb7715d047899dcce90e4df..39d1a507a2fc95b24a5403a13de1ed74bd70839e 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -2,25 +2,22 @@ <!-- These package versions may be overridden or updated by automation. --> <PropertyGroup Label="Package Versions: Auto" Condition=" '$(DotNetPackageVersionPropsPath)' == '' "> <!-- MicrosoftNETCoreApp22PackageVersion is assigned at the bottom so it can automatically pick up MicrosoftNETCoreAppPackageVersion in an orchestrated build. --> - <MicrosoftNETCoreAppPackageVersion>2.2.4</MicrosoftNETCoreAppPackageVersion> - <MicrosoftNETCoreDotNetAppHostPackageVersion>2.2.4</MicrosoftNETCoreDotNetAppHostPackageVersion> - <MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>2.2.0</MicrosoftExtensionsLoggingAzureAppServicesPackageVersion> - <MicrosoftExtensionsDiagnosticsHealthChecksPackageVersion>2.2.0</MicrosoftExtensionsDiagnosticsHealthChecksPackageVersion> - <SystemDataSqlClientPackageVersion>4.6.0</SystemDataSqlClientPackageVersion> - </PropertyGroup> - - <PropertyGroup> - <MicrosoftEntityFrameworkCoreInMemoryPackageVersion>2.2.0</MicrosoftEntityFrameworkCoreInMemoryPackageVersion> - <MicrosoftEntityFrameworkCorePackageVersion>2.2.0</MicrosoftEntityFrameworkCorePackageVersion> - <MicrosoftEntityFrameworkCoreRelationalPackageVersion>2.2.0</MicrosoftEntityFrameworkCoreRelationalPackageVersion> - <MicrosoftEntityFrameworkCoreSqlitePackageVersion>2.2.0</MicrosoftEntityFrameworkCoreSqlitePackageVersion> - <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>2.2.0</MicrosoftEntityFrameworkCoreSqlServerPackageVersion> - <MicrosoftEntityFrameworkCoreToolsPackageVersion>2.2.0</MicrosoftEntityFrameworkCoreToolsPackageVersion> + <MicrosoftNETCoreAppPackageVersion>2.2.5</MicrosoftNETCoreAppPackageVersion> + <MicrosoftNETCoreDotNetAppHostPackageVersion>2.2.5</MicrosoftNETCoreDotNetAppHostPackageVersion> </PropertyGroup> <Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" /> <Import Project="dependencies.folderbuilds.props" Condition=" '$(IsUniverseBuild)' != 'true' AND '$(DotNetPackageVersionPropsPath)' == ''" /> + <PropertyGroup> + <MicrosoftEntityFrameworkCoreInMemoryPackageVersion>2.2.4</MicrosoftEntityFrameworkCoreInMemoryPackageVersion> + <MicrosoftEntityFrameworkCorePackageVersion>2.2.4</MicrosoftEntityFrameworkCorePackageVersion> + <MicrosoftEntityFrameworkCoreRelationalPackageVersion>2.2.4</MicrosoftEntityFrameworkCoreRelationalPackageVersion> + <MicrosoftEntityFrameworkCoreSqlitePackageVersion>2.2.4</MicrosoftEntityFrameworkCoreSqlitePackageVersion> + <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>2.2.4</MicrosoftEntityFrameworkCoreSqlServerPackageVersion> + <MicrosoftEntityFrameworkCoreToolsPackageVersion>2.2.4</MicrosoftEntityFrameworkCoreToolsPackageVersion> + </PropertyGroup> + <PropertyGroup> <!-- Assign this variable last because it may be updated from DotNetPackageVersionPropsPath as MicrosoftNETCoreAppPackageVersion. --> <MicrosoftNETCoreApp22PackageVersion Condition="'$(MicrosoftNETCoreAppPackageVersion)' != ''">$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreApp22PackageVersion> @@ -64,6 +61,7 @@ <MicrosoftExtensionsDependencyInjectionSpecificationTestsPackageVersion>2.2.0</MicrosoftExtensionsDependencyInjectionSpecificationTestsPackageVersion> <MicrosoftExtensionsDiagnosticAdapterPackageVersion>2.2.0</MicrosoftExtensionsDiagnosticAdapterPackageVersion> <MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsPackageVersion>2.2.0</MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsPackageVersion> + <MicrosoftExtensionsDiagnosticsHealthChecksPackageVersion>2.2.5</MicrosoftExtensionsDiagnosticsHealthChecksPackageVersion> <MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>2.2.0</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion> <MicrosoftExtensionsFileProvidersCompositePackageVersion>2.2.0</MicrosoftExtensionsFileProvidersCompositePackageVersion> <MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>2.2.0</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion> @@ -76,6 +74,7 @@ <MicrosoftExtensionsLocalizationAbstractionsPackageVersion>2.2.0</MicrosoftExtensionsLocalizationAbstractionsPackageVersion> <MicrosoftExtensionsLocalizationPackageVersion>2.2.0</MicrosoftExtensionsLocalizationPackageVersion> <MicrosoftExtensionsLoggingAbstractionsPackageVersion>2.2.0</MicrosoftExtensionsLoggingAbstractionsPackageVersion> + <MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>2.2.5</MicrosoftExtensionsLoggingAzureAppServicesPackageVersion> <MicrosoftExtensionsLoggingConfigurationPackageVersion>2.2.0</MicrosoftExtensionsLoggingConfigurationPackageVersion> <MicrosoftExtensionsLoggingConsolePackageVersion>2.2.0</MicrosoftExtensionsLoggingConsolePackageVersion> <MicrosoftExtensionsLoggingDebugPackageVersion>2.2.0</MicrosoftExtensionsLoggingDebugPackageVersion> @@ -220,18 +219,19 @@ <SystemBuffersPackageVersion>4.5.0</SystemBuffersPackageVersion> <SystemCollectionsImmutablePackageVersion>1.5.0</SystemCollectionsImmutablePackageVersion> <SystemComponentModelAnnotationsPackageVersion>4.5.0</SystemComponentModelAnnotationsPackageVersion> + <SystemDataSqlClientPackageVersion>4.6.1</SystemDataSqlClientPackageVersion> <SystemDiagnosticsDiagnosticSourcePackageVersion>4.5.0</SystemDiagnosticsDiagnosticSourcePackageVersion> <SystemDiagnosticsEventLogPackageVersion>4.5.0</SystemDiagnosticsEventLogPackageVersion> <SystemIdentityModelTokensJwtPackageVersion>5.3.0</SystemIdentityModelTokensJwtPackageVersion> <SystemInteractiveAsyncPackageVersion>3.2.0</SystemInteractiveAsyncPackageVersion> <SystemIOPipelinesPackageVersion>4.5.3</SystemIOPipelinesPackageVersion> - <SystemMemoryPackageVersion>4.5.1</SystemMemoryPackageVersion> + <SystemMemoryPackageVersion>4.5.3</SystemMemoryPackageVersion> <SystemNetHttpPackageVersion>4.3.4</SystemNetHttpPackageVersion> <SystemNetHttpWinHttpHandlerPackageVersion>4.5.3</SystemNetHttpWinHttpHandlerPackageVersion> <SystemNumericsVectorsPackageVersion>4.5.0</SystemNumericsVectorsPackageVersion> <SystemReactiveLinqPackageVersion>3.1.1</SystemReactiveLinqPackageVersion> <SystemReflectionEmitPackageVersion>4.3.0</SystemReflectionEmitPackageVersion> - <SystemRuntimeCompilerServicesUnsafePackageVersion>4.5.1</SystemRuntimeCompilerServicesUnsafePackageVersion> + <SystemRuntimeCompilerServicesUnsafePackageVersion>4.5.2</SystemRuntimeCompilerServicesUnsafePackageVersion> <SystemReflectionMetadataPackageVersion>1.6.0</SystemReflectionMetadataPackageVersion> <SystemRuntimeInteropServicesRuntimeInformationPackageVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationPackageVersion> <SystemSecurityCryptographyCngPackageVersion>4.5.0</SystemSecurityCryptographyCngPackageVersion> diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 5e3125dab491cad5e63b8445084d377ad70372f2..62cc7a685405616fc4a4273895874bfcf71af025 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,7 +2,7 @@ <Project> <PropertyGroup> <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects> - <AspNetCoreBaselineVersion>2.2.4</AspNetCoreBaselineVersion> + <AspNetCoreBaselineVersion>2.2.5</AspNetCoreBaselineVersion> </PropertyGroup> <!-- Package: dotnet-dev-certs--> <PropertyGroup Condition=" '$(PackageId)' == 'dotnet-dev-certs' "> @@ -77,11 +77,12 @@ </ItemGroup> <!-- Package: Microsoft.AspNetCore.AspNetCoreModule--> <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AspNetCoreModule' "> - <BaselinePackageVersion>2.2.1</BaselinePackageVersion> + <BaselinePackageVersion>2.2.5</BaselinePackageVersion> </PropertyGroup> + <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AspNetCoreModule' AND '$(TargetFramework)' == 'netcoreapp2.2' " /> <!-- Package: Microsoft.AspNetCore.AspNetCoreModuleV2--> <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AspNetCoreModuleV2' "> - <BaselinePackageVersion>2.2.4</BaselinePackageVersion> + <BaselinePackageVersion>2.2.5</BaselinePackageVersion> </PropertyGroup> <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AspNetCoreModuleV2' AND '$(TargetFramework)' == 'netcoreapp2.2' " /> <!-- Package: Microsoft.AspNetCore.Authentication.Abstractions--> @@ -221,27 +222,27 @@ </ItemGroup> <!-- Package: Microsoft.AspNetCore.AzureAppServices.HostingStartup--> <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServices.HostingStartup' "> - <BaselinePackageVersion>2.2.2</BaselinePackageVersion> + <BaselinePackageVersion>2.2.5</BaselinePackageVersion> </PropertyGroup> <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServices.HostingStartup' AND '$(TargetFramework)' == 'net461' "> - <BaselinePackageReference Include="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="[2.2.0, )" /> - <BaselinePackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[2.2.0, )" /> + <BaselinePackageReference Include="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="[2.2.5, )" /> + <BaselinePackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[2.2.4, )" /> </ItemGroup> <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServices.HostingStartup' AND '$(TargetFramework)' == 'netcoreapp2.0' "> - <BaselinePackageReference Include="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="[2.2.0, )" /> - <BaselinePackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[2.2.0, )" /> + <BaselinePackageReference Include="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="[2.2.5, )" /> + <BaselinePackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[2.2.4, )" /> </ItemGroup> <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServices.HostingStartup' AND '$(TargetFramework)' == 'netcoreapp2.1' "> - <BaselinePackageReference Include="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="[2.2.0, )" /> - <BaselinePackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[2.2.0, )" /> + <BaselinePackageReference Include="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="[2.2.5, )" /> + <BaselinePackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[2.2.4, )" /> </ItemGroup> <!-- Package: Microsoft.AspNetCore.AzureAppServicesIntegration--> <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServicesIntegration' "> - <BaselinePackageVersion>2.2.2</BaselinePackageVersion> + <BaselinePackageVersion>2.2.5</BaselinePackageVersion> </PropertyGroup> <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServicesIntegration' AND '$(TargetFramework)' == 'netstandard2.0' "> <BaselinePackageReference Include="Microsoft.AspNetCore.Hosting" Version="[2.2.0, )" /> - <BaselinePackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="[2.2.0, )" /> + <BaselinePackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="[2.2.5, )" /> </ItemGroup> <!-- Package: Microsoft.AspNetCore.Connections.Abstractions--> <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Connections.Abstractions' "> @@ -326,11 +327,11 @@ </ItemGroup> <!-- Package: Microsoft.AspNetCore.DataProtection.StackExchangeRedis--> <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.StackExchangeRedis' "> - <BaselinePackageVersion>2.2.0</BaselinePackageVersion> + <BaselinePackageVersion>2.2.5</BaselinePackageVersion> </PropertyGroup> <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.StackExchangeRedis' AND '$(TargetFramework)' == 'netstandard2.0' "> <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[2.2.0, )" /> - <BaselinePackageReference Include="StackExchange.Redis" Version="[2.0.513, )" /> + <BaselinePackageReference Include="StackExchange.Redis" Version="[2.0.593, )" /> </ItemGroup> <!-- Package: Microsoft.AspNetCore.DataProtection.SystemWeb--> <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.SystemWeb' "> @@ -581,14 +582,14 @@ </ItemGroup> <!-- Package: Microsoft.AspNetCore.Identity.UI--> <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.UI' "> - <BaselinePackageVersion>2.2.0</BaselinePackageVersion> + <BaselinePackageVersion>2.2.5</BaselinePackageVersion> </PropertyGroup> <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.UI' AND '$(TargetFramework)' == 'netstandard2.0' "> <BaselinePackageReference Include="Microsoft.AspNetCore.Identity" Version="[2.2.0, )" /> - <BaselinePackageReference Include="Microsoft.Extensions.Identity.Stores" Version="[2.2.0, )" /> <BaselinePackageReference Include="Microsoft.AspNetCore.Mvc" Version="[2.2.0, )" /> <BaselinePackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="[2.2.0, )" /> <BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="[2.2.0, )" /> + <BaselinePackageReference Include="Microsoft.Extensions.Identity.Stores" Version="[2.2.0, )" /> </ItemGroup> <!-- Package: Microsoft.AspNetCore.Identity--> <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity' "> @@ -657,7 +658,7 @@ </ItemGroup> <!-- Package: Microsoft.AspNetCore.Mvc.Core--> <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Core' "> - <BaselinePackageVersion>2.2.2</BaselinePackageVersion> + <BaselinePackageVersion>2.2.5</BaselinePackageVersion> </PropertyGroup> <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Core' AND '$(TargetFramework)' == 'netstandard2.0' "> <BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="[2.2.0, )" /> @@ -767,7 +768,7 @@ </ItemGroup> <!-- Package: Microsoft.AspNetCore.Mvc.RazorPages--> <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.RazorPages' "> - <BaselinePackageVersion>2.2.0</BaselinePackageVersion> + <BaselinePackageVersion>2.2.5</BaselinePackageVersion> </PropertyGroup> <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.RazorPages' AND '$(TargetFramework)' == 'netstandard2.0' "> <BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.Razor" Version="[2.2.0, )" /> @@ -1149,19 +1150,19 @@ </ItemGroup> <!-- Package: Microsoft.AspNetCore.SignalR.Protocols.MessagePack--> <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Protocols.MessagePack' "> - <BaselinePackageVersion>1.1.0</BaselinePackageVersion> + <BaselinePackageVersion>1.1.5</BaselinePackageVersion> </PropertyGroup> <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Protocols.MessagePack' AND '$(TargetFramework)' == 'netstandard2.0' "> + <BaselinePackageReference Include="MessagePack" Version="[1.7.3.7, )" /> <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[1.1.0, )" /> - <BaselinePackageReference Include="MessagePack" Version="[1.7.3.4, )" /> </ItemGroup> <!-- Package: Microsoft.AspNetCore.SignalR.Redis--> <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Redis' "> - <BaselinePackageVersion>1.1.0</BaselinePackageVersion> + <BaselinePackageVersion>1.1.5</BaselinePackageVersion> </PropertyGroup> <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Redis' AND '$(TargetFramework)' == 'netstandard2.0' "> + <BaselinePackageReference Include="MessagePack" Version="[1.7.3.7, )" /> <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Core" Version="[1.1.0, )" /> - <BaselinePackageReference Include="MessagePack" Version="[1.7.3.4, )" /> <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.2.0, )" /> <BaselinePackageReference Include="StackExchange.Redis.StrongName" Version="[1.2.6, )" /> </ItemGroup> @@ -1185,13 +1186,13 @@ </ItemGroup> <!-- Package: Microsoft.AspNetCore.SignalR.StackExchangeRedis--> <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.StackExchangeRedis' "> - <BaselinePackageVersion>1.1.0</BaselinePackageVersion> + <BaselinePackageVersion>1.1.5</BaselinePackageVersion> </PropertyGroup> <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.StackExchangeRedis' AND '$(TargetFramework)' == 'netstandard2.0' "> + <BaselinePackageReference Include="MessagePack" Version="[1.7.3.7, )" /> <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Core" Version="[1.1.0, )" /> - <BaselinePackageReference Include="MessagePack" Version="[1.7.3.4, )" /> <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.2.0, )" /> - <BaselinePackageReference Include="StackExchange.Redis" Version="[2.0.513, )" /> + <BaselinePackageReference Include="StackExchange.Redis" Version="[2.0.593, )" /> </ItemGroup> <!-- Package: Microsoft.AspNetCore.SignalR--> <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR' "> diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 2e4369b27264f0bc8b28ebc3e14215a3d32bf95b..cc802678a3c381062ec01e5e3190789213dc728a 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,7 +4,7 @@ This file contains a list of all the packages and their versions which were rele build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch. --> -<Baseline Version="2.2.4"> +<Baseline Version="2.2.5"> <Package Id="dotnet-dev-certs" Version="2.2.0" /> <Package Id="dotnet-sql-cache" Version="2.2.0" /> <Package Id="dotnet-user-secrets" Version="2.2.0" /> @@ -12,8 +12,8 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch. <Package Id="Microsoft.AspNetCore.Antiforgery" Version="2.2.0" /> <Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="2.2.0-preview-35687" /> <Package Id="Microsoft.AspNetCore.ApplicationInsights.HostingStartup" Version="2.2.0" /> - <Package Id="Microsoft.AspNetCore.AspNetCoreModule" Version="2.2.1" /> - <Package Id="Microsoft.AspNetCore.AspNetCoreModuleV2" Version="2.2.4" /> + <Package Id="Microsoft.AspNetCore.AspNetCoreModule" Version="2.2.5" /> + <Package Id="Microsoft.AspNetCore.AspNetCoreModuleV2" Version="2.2.5" /> <Package Id="Microsoft.AspNetCore.Authentication.Abstractions" Version="2.2.0" /> <Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="2.2.0" /> <Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="2.2.0" /> @@ -30,8 +30,8 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch. <Package Id="Microsoft.AspNetCore.Authentication" Version="2.2.0" /> <Package Id="Microsoft.AspNetCore.Authorization.Policy" Version="2.2.0" /> <Package Id="Microsoft.AspNetCore.Authorization" Version="2.2.0" /> - <Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="2.2.2" /> - <Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="2.2.2" /> + <Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="2.2.5" /> + <Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="2.2.5" /> <Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="2.2.0" /> <Package Id="Microsoft.AspNetCore.CookiePolicy" Version="2.2.0" /> <Package Id="Microsoft.AspNetCore.Cors" Version="2.2.0" /> @@ -42,7 +42,7 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch. <Package Id="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="2.2.0" /> <Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="2.2.0" /> <Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="2.2.0" /> - <Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="2.2.0" /> + <Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="2.2.5" /> <Package Id="Microsoft.AspNetCore.DataProtection.SystemWeb" Version="2.2.0" /> <Package Id="Microsoft.AspNetCore.DataProtection" Version="2.2.0" /> <Package Id="Microsoft.AspNetCore.Diagnostics.Abstractions" Version="2.2.0" /> @@ -66,7 +66,7 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch. <Package Id="Microsoft.AspNetCore.HttpsPolicy" Version="2.2.0" /> <Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.2.0" /> <Package Id="Microsoft.AspNetCore.Identity.Specification.Tests" Version="2.2.0" /> - <Package Id="Microsoft.AspNetCore.Identity.UI" Version="2.2.0" /> + <Package Id="Microsoft.AspNetCore.Identity.UI" Version="2.2.5" /> <Package Id="Microsoft.AspNetCore.Identity" Version="2.2.0" /> <Package Id="Microsoft.AspNetCore.JsonPatch" Version="2.2.0" /> <Package Id="Microsoft.AspNetCore.Localization.Routing" Version="2.2.0" /> @@ -75,7 +75,7 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch. <Package Id="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.2.0" /> <Package Id="Microsoft.AspNetCore.Mvc.Analyzers" Version="2.2.0" /> <Package Id="Microsoft.AspNetCore.Mvc.ApiExplorer" Version="2.2.0" /> - <Package Id="Microsoft.AspNetCore.Mvc.Core" Version="2.2.2" /> + <Package Id="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" /> <Package Id="Microsoft.AspNetCore.Mvc.Cors" Version="2.2.0" /> <Package Id="Microsoft.AspNetCore.Mvc.DataAnnotations" Version="2.2.0" /> <Package Id="Microsoft.AspNetCore.Mvc.Formatters.Json" Version="2.2.0" /> @@ -84,7 +84,7 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch. <Package Id="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="2.2.0" /> <Package Id="Microsoft.AspNetCore.Mvc.Razor" Version="2.2.0" /> <Package Id="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Version="2.2.0" /> - <Package Id="Microsoft.AspNetCore.Mvc.RazorPages" Version="2.2.0" /> + <Package Id="Microsoft.AspNetCore.Mvc.RazorPages" Version="2.2.5" /> <Package Id="Microsoft.AspNetCore.Mvc.TagHelpers" Version="2.2.0" /> <Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="2.2.0" /> <Package Id="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.2.0" /> @@ -117,10 +117,10 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch. <Package Id="Microsoft.AspNetCore.SignalR.Common" Version="1.1.0" /> <Package Id="Microsoft.AspNetCore.SignalR.Core" Version="1.1.0" /> <Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="1.1.0" /> - <Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="1.1.0" /> - <Package Id="Microsoft.AspNetCore.SignalR.Redis" Version="1.1.0" /> + <Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="1.1.5" /> + <Package Id="Microsoft.AspNetCore.SignalR.Redis" Version="1.1.5" /> <Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="1.1.0" /> - <Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="1.1.0" /> + <Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="1.1.5" /> <Package Id="Microsoft.AspNetCore.SignalR" Version="1.1.0" /> <Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="2.2.0" /> <Package Id="Microsoft.AspNetCore.SpaServices" Version="2.2.0" /> diff --git a/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.2.5.txt b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.2.5.txt new file mode 100644 index 0000000000000000000000000000000000000000..8b137891791fe96927ad78e64b0aad7bded08bdc --- /dev/null +++ b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.2.5.txt @@ -0,0 +1 @@ + diff --git a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.2.5.txt b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.2.5.txt new file mode 100644 index 0000000000000000000000000000000000000000..8b137891791fe96927ad78e64b0aad7bded08bdc --- /dev/null +++ b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.2.5.txt @@ -0,0 +1 @@ + diff --git a/src/PackageArchive/ZipManifestGenerator/UpdateBaselines.ps1 b/src/PackageArchive/ZipManifestGenerator/UpdateBaselines.ps1 index 9e0481e40e18559a5dbe5b19ca9e0cc2d49566ed..e0d210054db632ab6083904d3c102bbd6856417e 100644 --- a/src/PackageArchive/ZipManifestGenerator/UpdateBaselines.ps1 +++ b/src/PackageArchive/ZipManifestGenerator/UpdateBaselines.ps1 @@ -5,7 +5,7 @@ Push-Location $PSScriptRoot try { [xml]$versionProps = Get-Content "$PSScriptRoot/../../../version.props" - $LastVersion = "$($versionProps.Project.PropertyGroup.AspNetCoreMajorVersion).$($versionProps.Project.PropertyGroup.AspNetCoreMinorVersion).$($versionProps.Project.PropertyGroup.AspNetCorePatchVersion - 1)" + $LastVersion = "$($versionProps.Project.PropertyGroup.AspNetCoreMajorVersion).$($versionProps.Project.PropertyGroup.AspNetCoreMinorVersion | select -first 1).$($versionProps.Project.PropertyGroup.AspNetCorePatchVersion - 1)" $manifestUrl = "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/product/cli/release/$LastVersion/build.xml" $buildXml = Invoke-RestMethod -Method GET $manifestUrl $feedUrl = $buildXml.OrchestratedBuild.Endpoint.Url diff --git a/version.props b/version.props index 5aa246be58496e116e613c6df28df3a9939213b7..f5ceabf9563b5da1bb80f2c8b1e618c95374e607 100644 --- a/version.props +++ b/version.props @@ -2,7 +2,7 @@ <PropertyGroup> <AspNetCoreMajorVersion>2</AspNetCoreMajorVersion> <AspNetCoreMinorVersion>2</AspNetCoreMinorVersion> - <AspNetCorePatchVersion>5</AspNetCorePatchVersion> + <AspNetCorePatchVersion>6</AspNetCorePatchVersion> <PreReleaseLabel>servicing</PreReleaseLabel> <PreReleaseBrandingLabel></PreReleaseBrandingLabel> <BuildNumber Condition="'$(BuildNumber)' == '' OR '$(UsingLocalBuildNumber)' == 'true'">$([System.DateTime]::Now.ToString('yyMMdd'))-99</BuildNumber>