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

Merge branch 'release/2.2'

This commit is contained in:
Nate McMaster 2018-11-02 10:49:11 -07:00
parent b7850f9865 1ab2caa431
commit 50e1e60247
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
6 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@ -70,10 +70,6 @@
path = modules/Identity
url = https://github.com/aspnet/Identity.git
branch = master
[submodule "modules/IISIntegration"]
path = modules/IISIntegration
url = https://github.com/aspnet/IISIntegration.git
branch = master
[submodule "modules/JavaScriptServices"]
path = modules/JavaScriptServices
url = https://github.com/aspnet/JavaScriptServices.git

2
build/CodeSign.props
View File

@ -8,6 +8,8 @@
<FilesToSign Include="System.Interactive.Async.dll" Certificate="$(AssemblySigning3rdPartyCertName)" Container="Microsoft.AspNetCore.App" />
<!-- These files came from the aspnet/Extensions build, but have to be re-signed because we crossgen them. -->
<FilesToSign Include="Microsoft.Extensions.DependencyInjection.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.DependencyInjection.Abstractions.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.DiagnosticAdapter.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.ObjectPool.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.Primitives.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />

2
build/buildorder.props
View File

@ -25,7 +25,7 @@
<RepositoryBuildOrder Include="DataProtection" Order="9" RootPath="$(RepositoryRoot)src\DataProtection\" />
<RepositoryBuildOrder Include="BasicMiddleware" Order="9" />
<RepositoryBuildOrder Include="Antiforgery" Order="10" />
<RepositoryBuildOrder Include="IISIntegration" Order="10" />
<RepositoryBuildOrder Include="IISIntegration" Order="10" RootPath="$(RepositoryRoot)src\IISIntegration\" />
<RepositoryBuildOrder Include="StaticFiles" Order="11" />
<RepositoryBuildOrder Include="ResponseCaching" Order="11" />
<RepositoryBuildOrder Include="Session" Order="11" />

2
build/submodules.props
View File

@ -54,7 +54,7 @@
<Repository Include="HttpClientFactory" />
<Repository Include="HttpSysServer" />
<Repository Include="Identity" />
<Repository Include="IISIntegration" />
<Repository Include="IISIntegration" RootPath="$(RepositoryRoot)src\IISIntegration\" />
<Repository Include="JavaScriptServices" />
<Repository Include="JsonPatch" />
<Repository Include="KestrelHttpServer" />

1
modules/IISIntegration

@ -1 +0,0 @@
Subproject commit 321cfe5c41ddf0006a20e89e89676a435a284c41

2
src/IISIntegration/test/gtest/googletest

@ -1 +1 @@
Subproject commit 879ac092fde0a19e1b3a61b2546b2a422b1528bc
Subproject commit 4e4df226fc197c0dda6e37f5c8c3845ca1e73a49