diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index c9d8dfddfc08..9effde6fbf51 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,963 +2,993 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 7.0.0 + 8.0.0 - - - 7.0.0 + + + 8.0.0 - - - 7.0.0 + + + 8.0.0 - 7.0.0 - - - - 7.0.0 - - - - - - - - - - - - - - + 8.0.0 + - 7.0.0 + 8.0.0 - 7.0.0 + 8.0.0 - 7.0.0 + 8.0.0 - 7.0.0 + 8.0.0 - 7.0.0 + 8.0.0 - 7.0.0 + 8.0.0 - 7.0.0 + 8.0.0 - 7.0.0 + 8.0.0 - 7.0.0 - - - - 7.0.0 + 8.0.0 - 7.0.0 + 8.0.0 - 7.0.0 + 8.0.0 - 7.0.0 + 8.0.0 - 7.0.0 + 8.0.0 - - + + - 7.0.0 + 8.0.0 - 7.0.0 + 8.0.0 - 7.0.0 + 8.0.0 - - + + - 7.0.0 + 8.0.0 - 7.0.0 + 8.0.0 - - - - + + + + - 7.0.0 + 8.0.0 - - + + - 7.0.0 + 8.0.0 - 7.0.0 + 8.0.0 - - - + + + - 7.0.0 + 8.0.0 - - - + + + - - - - + + + + - - - + + + - 7.0.0 + 8.0.0 - - - + + + - 7.0.0 + 8.0.0 - 7.0.0 + 8.0.0 - - + + - 7.0.0 + 8.0.0 - - - + + + - 7.0.0 + 8.0.0 - 7.0.0 + 8.0.0 - - - + + + - - - 7.0.0 + + + 8.0.0 - - + + - 7.0.0 + 8.0.0 + + + + + + + 8.0.0 - - + + + + + + 8.0.0 + + + + - 7.0.0 + 8.0.0 - - - - - - + + + + + + + - 7.0.0 + 8.0.0 - - - - - - + + + + + + - 7.0.0 + 8.0.0 - - - + + + - 7.0.0 + 8.0.0 - 7.0.0 + 8.0.0 - 7.0.0 + 8.0.0 - - - - - - - + + + + + + + - 7.0.0 + 8.0.0 - - - - + + + + - 7.0.0 + 8.0.0 - - - + + + - - - + + + - - - + + + - - + + + - 7.0.0 + 8.0.0 - 7.0.0 + 8.0.0 - + - - + + - + - 7.0.0 + 8.0.0 - - - - - - + + + + + + - + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - + - 7.0.0 + 8.0.0 - 7.0.0 + 8.0.0 - - - + + + - 7.0.0 + 8.0.0 - - + + - - - + + + - - + + - 7.0.0 + 8.0.0 - - + + - - - + + + - - + + - 7.0.0 + 8.0.0 + + + + + + + 8.0.0 - - + + + + - 7.0.0 + 8.0.0 - - - + + + - 7.0.0 + 8.0.0 - - + + - 7.0.0 + 8.0.0 - - - + + + - - - - + + + + - - - + + + - - - + + + - 7.0.0 + 8.0.0 - - + + - - + + - - + + - 7.0.0 + 8.0.0 - - - + + + - 7.0.0 + 8.0.0 - - - + + + - 7.0.0 + 8.0.0 - + - + - + - + - 7.0.0 + 8.0.0 - 7.0.0 + 8.0.0 - - + + - 7.0.0 + 8.0.0 - - - + + + - 7.0.0 + 8.0.0 - + - + - 7.0.0 + 8.0.0 - - - - + + + + - 7.0.0 + 8.0.0 - + + + + 8.0.0 + + + + + + - 7.0.0 + 8.0.0 - 7.0.0 + 8.0.0 - - + + - - - + + + - - + + - 7.0.0 + 8.0.0 - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - + + + + + + - - - - - + + + + + + - 7.0.0 + 8.0.0 - - + + - + - - - + + + - - - + + + - 7.0.0 + 8.0.0 - + - - + + - + - 7.0.0 + 8.0.0 - - + + - - - + + + - - + + - 7.0.0 + 8.0.0 - - + + - - - + + + - - + + - 7.0.0 + 8.0.0 - - - - - + + + + + - 7.0.0 + 8.0.0 - - - - + + + + - 7.0.0 + 8.0.0 - 7.0.0 + 8.0.0 - - + + - 7.0.0 + 8.0.0 + + + + + + + 8.0.0 - - + + + - 7.0.0 + 8.0.0 - - + + - 7.0.0 + 8.0.0 - 7.0.0 + 8.0.0 - - - 7.0.0 + + + 8.0.0 - - - 7.0.0 - - - - 7.0.0 + + + 8.0.0 - 7.0.0 + 8.0.0 - 7.0.0 + 8.0.0 - 7.0.0 + 8.0.0 - - + + - + - - + + - - + + - 7.0.0 + 8.0.0 - - - - + + + + - - - - - + + + + + - - - - + + + + - 7.0.0 + 8.0.0 - - + + - - - + + + - - + + - 7.0.0 + 8.0.0 - - - - - - - - - - + + + + + + + + + + + - - - - + + + + + - 7.0.0 + 8.0.0 - 7.0.0 + 8.0.0 - - - - + + + + - 7.0.0 + 8.0.0 - 7.0.0 + 8.0.0 - - + + - + - 7.0.0 + 8.0.0 - - + + - 7.0.0 + 8.0.0 - - - + + + - - - - + + + + - - - + + + - 7.0.0 + 8.0.0 - - - + + + - - - - + + + + - - - + + + - 7.0.0 + 8.0.0 - - - - + + + + - - - - - + + + + + - - - - + + + + - 7.0.0 + 8.0.0 - 7.0.0 + 8.0.0 - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + - 7.0.0 + 8.0.0 - 7.0.0 + 8.0.0 - - - + + + - - - + + + - - - + + + - 7.0.0 + 8.0.0 - 7.0.0 + 8.0.0 + + + + + + + 8.0.0 - - + + \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index c015a9264686..a53374025b2a 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,107 +4,110 @@ This file contains a list of all the packages and their versions which were rele Update this list when preparing for a new patch. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/eng/Dependencies.props b/eng/Dependencies.props index c7eb8b903136..6e325e502809 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -143,6 +143,8 @@ and are generated based on the last package release. + + diff --git a/eng/Versions.props b/eng/Versions.props index 70750b01fbf4..f27d2e968538 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -277,12 +277,15 @@ 5.0.17-servicing-22215-7 $(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version) $(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version) - 6.0.22-servicing-23424-15 + 6.0.25-servicing-23523-15 $(MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version) $(MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version) - 7.0.11-servicing-23425-2 + 7.0.14-servicing-23523-16 $(MicrosoftAspNetCoreAzureAppServicesSiteExtension70Version) $(MicrosoftAspNetCoreAzureAppServicesSiteExtension70Version) + 8.0.0-rtm-23531-12 + $(MicrosoftAspNetCoreAzureAppServicesSiteExtension80Version) + $(MicrosoftAspNetCoreAzureAppServicesSiteExtension80Version) 1.10.2 0.9.9 diff --git a/eng/tools/RepoTasks/RepoTasks.csproj b/eng/tools/RepoTasks/RepoTasks.csproj index c7d9207abe84..42c3c13fbc24 100644 --- a/eng/tools/RepoTasks/RepoTasks.csproj +++ b/eng/tools/RepoTasks/RepoTasks.csproj @@ -1,6 +1,6 @@ - net8.0 + $(DefaultNetCoreTargetFramework) $(TargetFrameworks);net472 $(DefineConstants);BUILD_MSI_TASKS false @@ -22,7 +22,7 @@ - + diff --git a/eng/tools/RepoTasks/RepoTasks.tasks b/eng/tools/RepoTasks/RepoTasks.tasks index 4babab0764ef..c5722a9e266d 100644 --- a/eng/tools/RepoTasks/RepoTasks.tasks +++ b/eng/tools/RepoTasks/RepoTasks.tasks @@ -1,6 +1,6 @@ - <_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' == 'core'">net8.0 + <_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' == 'core'">$(DefaultNetCoreTargetFramework) <_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' != 'core'">net472 <_RepoTaskAssembly>$(ArtifactsBinDir)RepoTasks\Release\$(_RepoTaskAssemblyFolder)\RepoTasks.dll diff --git a/src/Servers/HttpSys/perf/Microbenchmarks/Microsoft.AspNetCore.Server.HttpSys.Microbenchmarks.csproj b/src/Servers/HttpSys/perf/Microbenchmarks/Microsoft.AspNetCore.Server.HttpSys.Microbenchmarks.csproj index 7b5bfa5941a2..f564b414cfa2 100644 --- a/src/Servers/HttpSys/perf/Microbenchmarks/Microsoft.AspNetCore.Server.HttpSys.Microbenchmarks.csproj +++ b/src/Servers/HttpSys/perf/Microbenchmarks/Microsoft.AspNetCore.Server.HttpSys.Microbenchmarks.csproj @@ -7,8 +7,6 @@ true false $(DefineConstants);IS_BENCHMARKS - - true diff --git a/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj b/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj index 0d5def2b2bd4..990153fb4ccc 100644 --- a/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj +++ b/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj @@ -38,6 +38,8 @@ + +