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

Merge in 'release/2.2' changes

This commit is contained in:
dotnet-bot 2018-11-30 21:40:30 +00:00
parent ebe1bea714 054cfac97e
commit 6faf720363
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/submodules.props
View File

@ -39,6 +39,7 @@
<Repository Include="Scaffolding" PatchPolicy="AlwaysUpdate" /> <Repository Include="Scaffolding" PatchPolicy="AlwaysUpdate" />
<Repository Include="IISIntegration" RootPath="$(RepositoryRoot)src\IISIntegration\" /> <Repository Include="IISIntegration" RootPath="$(RepositoryRoot)src\IISIntegration\" />
<Repository Include="Templating" RootPath="$(RepositoryRoot)src\Templating\" PatchPolicy="AlwaysUpdateAndCascadeVersions" /> <Repository Include="Templating" RootPath="$(RepositoryRoot)src\Templating\" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
<Repository Include="EntityFrameworkCore" />
<!-- Test-only repos --> <!-- Test-only repos -->
<Repository Include="AuthSamples" RootPath="$(RepositoryRoot)src\AuthSamples\" PatchPolicy="AlwaysUpdateAndCascadeVersions" /> <Repository Include="AuthSamples" RootPath="$(RepositoryRoot)src\AuthSamples\" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
@ -52,7 +53,6 @@
<ShippedRepository Include="AzureIntegration" RootPath="$(RepositoryRoot)src\AzureIntegration\" /> <ShippedRepository Include="AzureIntegration" RootPath="$(RepositoryRoot)src\AzureIntegration\" />
<ShippedRepository Include="BasicMiddleware" /> <ShippedRepository Include="BasicMiddleware" />
<ShippedRepository Include="CORS" RootPath="$(RepositoryRoot)src\CORS\" /> <ShippedRepository Include="CORS" RootPath="$(RepositoryRoot)src\CORS\" />
<ShippedRepository Include="EntityFrameworkCore" />
<ShippedRepository Include="HttpSysServer" RootPath="$(RepositoryRoot)src\HttpSysServer\" /> <ShippedRepository Include="HttpSysServer" RootPath="$(RepositoryRoot)src\HttpSysServer\" />
<ShippedRepository Include="Identity" /> <ShippedRepository Include="Identity" />
<ShippedRepository Include="JavaScriptServices" RootPath="$(RepositoryRoot)src\JavaScriptServices\" /> <ShippedRepository Include="JavaScriptServices" RootPath="$(RepositoryRoot)src\JavaScriptServices\" />