huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add Site Extension to patch (#9336) 

- make build.cmd work
- update build/repo.props

Co-Authored-By: BrennanConroy <brecon@microsoft.com>
This commit is contained in:
BrennanConroy 2019-04-15 22:21:27 -07:00 committed by Doug Bunting
parent d004cf0f14
commit d93b207485
6 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/repo.props
View File

@ -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>

1
eng/Dependencies.props
View File

@ -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)" />

3
eng/PatchConfig.props
View File

@ -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>

1
src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj
View File

@ -7,6 +7,7 @@
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net461</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;azure;appservices</PackageTags>
<UseProjectReferences>true</UseProjectReferences>
</PropertyGroup>
<ItemGroup>

1
src/Azure/AzureAppServicesIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj
View File

@ -7,6 +7,7 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;azure;appservices</PackageTags>
<UseLatestPackageReferences>true</UseLatestPackageReferences>
</PropertyGroup>
<ItemGroup>

4
src/SiteExtensions/LoggingAggregate/build.cmd
View File

@ -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 %*