diff --git a/build/repo.props b/build/repo.props index a5c52bca3f45941609b97c4af00bbf495021eb02..4e16abff0d7f80e684ed6c84df304e096cca4ce7 100644 --- a/build/repo.props +++ b/build/repo.props @@ -18,7 +18,7 @@ <SignCheckExclusionsFile>$(RepositoryRoot)eng\signcheck.exclusions.txt</SignCheckExclusionsFile> <SharedSourcesFolder>$(RepositoryRoot)src\Shared\</SharedSourcesFolder> <SharedFxArchitecture Condition="'$(SharedFxArchitecture)' == ''">$(SharedFxRid.Substring($([MSBuild]::Add($(SharedFxRid.LastIndexOf('-')), 1))))</SharedFxArchitecture> - <BuildSiteExtensions>false</BuildSiteExtensions> + <BuildSiteExtensions Condition=" '$(VersionPrefix)' == '2.2.5' " >true</BuildSiteExtensions> <BuildSiteExtensions Condition="'$(BuildSiteExtensions)' == 'true' AND '$(OS)' != 'Windows_NT'">false</BuildSiteExtensions> </PropertyGroup> diff --git a/eng/Dependencies.props b/eng/Dependencies.props index 8d72e7e4952f8a27be4eed7ec72dd967888754b3..5607313caac832bcc66bd671422f603a4a62c8ed 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -60,6 +60,7 @@ and are generated based on the last package release. <LatestPackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="$(MicrosoftExtensionsLocalizationAbstractionsPackageVersion)" /> <LatestPackageReference Include="Microsoft.Extensions.Localization" Version="$(MicrosoftExtensionsLocalizationPackageVersion)" /> <LatestPackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)" /> + <LatestPackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="$(MicrosoftExtensionsLoggingAzureAppServicesPackageVersion)" /> <LatestPackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="$(MicrosoftExtensionsLoggingConfigurationPackageVersion)" /> <LatestPackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" /> <LatestPackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" /> diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props index c911a11dda2e2a76417b16c98465e061b6a32fa7..aed998699431ecf6b227cff9b19c3962ae8a21e6 100644 --- a/eng/PatchConfig.props +++ b/eng/PatchConfig.props @@ -56,6 +56,9 @@ Later on, this will be checked using this condition: java:signalr; Microsoft.AspNetCore.Mvc.Core; Microsoft.AspNetCore.Mvc.RazorPages; + Microsoft.AspNetCore.AzureAppServicesIntegration; + Microsoft.AspNetCore.AzureAppServices.HostingStartup; + Microsoft.AspNetCore.AzureAppServices.SiteExtension; </PackagesInPatch> </PropertyGroup> diff --git a/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj b/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj index 2bd0da75c008da533dca02ccb5af56939817ead1..4fe7d680bcbc189b3572c9c47cdb335458cade5c 100644 --- a/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj +++ b/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj @@ -7,6 +7,7 @@ <TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net461</TargetFrameworks> <GenerateDocumentationFile>true</GenerateDocumentationFile> <PackageTags>aspnetcore;azure;appservices</PackageTags> + <UseProjectReferences>true</UseProjectReferences> </PropertyGroup> <ItemGroup> diff --git a/src/Azure/AzureAppServicesIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj b/src/Azure/AzureAppServicesIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj index 444f87a42e4a49af0c8362da19d196a727274d98..d32f3222100465772d47c4bb79334fbbe0088113 100644 --- a/src/Azure/AzureAppServicesIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj +++ b/src/Azure/AzureAppServicesIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj @@ -7,6 +7,7 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <GenerateDocumentationFile>true</GenerateDocumentationFile> <PackageTags>aspnetcore;azure;appservices</PackageTags> + <UseLatestPackageReferences>true</UseLatestPackageReferences> </PropertyGroup> <ItemGroup> diff --git a/src/SiteExtensions/LoggingAggregate/build.cmd b/src/SiteExtensions/LoggingAggregate/build.cmd index a7be401f7d2a32336911c11a612c3dada467a366..fa089e174495e22a492f5f2eb1197b6670e3199f 100644 --- a/src/SiteExtensions/LoggingAggregate/build.cmd +++ b/src/SiteExtensions/LoggingAggregate/build.cmd @@ -1,3 +1,3 @@ @ECHO OFF -SET RepoRoot="%~dp0..\..\.." -%RepoRoot%\build.cmd -LockFile %RepoRoot%\korebuild-lock.txt -Path %~dp0 %* +SET RepoRoot=%~dp0..\..\.. +%RepoRoot%\build.cmd -LockFile %RepoRoot%\korebuild-lock.txt -projects %~dp0**\*.*proj %*