From d93b207485f678b3a6f5a0f2318c5dfbb0b9cbcd Mon Sep 17 00:00:00 2001
From: BrennanConroy <brecon@microsoft.com>
Date: Mon, 15 Apr 2019 22:21:27 -0700
Subject: [PATCH] Add Site Extension to patch (#9336)
- make build.cmd work
- update build/repo.props
Co-Authored-By: BrennanConroy <brecon@microsoft.com>
---
build/repo.props | 2 +-
eng/Dependencies.props | 1 +
eng/PatchConfig.props | 3 +++
...icrosoft.AspNetCore.AzureAppServices.HostingStartup.csproj | 1 +
.../Microsoft.AspNetCore.AzureAppServicesIntegration.csproj | 1 +
src/SiteExtensions/LoggingAggregate/build.cmd | 4 ++--
6 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/build/repo.props b/build/repo.props
index a5c52bca3f4..4e16abff0d7 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 8d72e7e4952..5607313caac 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 c911a11dda2..aed99869943 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 2bd0da75c00..4fe7d680bcb 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 444f87a42e4..d32f3222100 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 a7be401f7d2..fa089e17449 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 %*
--
GitLab