Merge in 'release/2.1' changes

This commit is contained in:
dotnet-bot 2018-11-20 05:04:32 +00:00
commit f9b2257fbf
2 changed files with 2 additions and 2 deletions

View File

@ -36,6 +36,6 @@
<RepositoryBuildOrder Include="MusicStore" Order="16" RootPath="$(RepositoryRoot)src\MusicStore\" /> <RepositoryBuildOrder Include="MusicStore" Order="16" RootPath="$(RepositoryRoot)src\MusicStore\" />
<RepositoryBuildOrder Include="SignalR" Order="16" /> <RepositoryBuildOrder Include="SignalR" Order="16" />
<RepositoryBuildOrder Include="AuthSamples" Order="16" RootPath="$(RepositoryRoot)src\AuthSamples\" /> <RepositoryBuildOrder Include="AuthSamples" Order="16" RootPath="$(RepositoryRoot)src\AuthSamples\" />
<RepositoryBuildOrder Include="Templating" Order="17" RootPath="$(RepositoryRoot)src\templating\" /> <RepositoryBuildOrder Include="templating" Order="17" RootPath="$(RepositoryRoot)src\templating\" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@ -39,7 +39,7 @@
<Repository Include="IISIntegration" RootPath="$(RepositoryRoot)src\IISIntegration\" /> <Repository Include="IISIntegration" RootPath="$(RepositoryRoot)src\IISIntegration\" />
<Repository Include="MetaPackages" PatchPolicy="CascadeVersions" /> <Repository Include="MetaPackages" PatchPolicy="CascadeVersions" />
<Repository Include="Scaffolding" PatchPolicy="AlwaysUpdate" /> <Repository Include="Scaffolding" PatchPolicy="AlwaysUpdate" />
<Repository Include="Templating" PatchPolicy="AlwaysUpdateAndCascadeVersions" RootPath="$(RepositoryRoot)src\templating\" /> <Repository Include="templating" PatchPolicy="AlwaysUpdateAndCascadeVersions" RootPath="$(RepositoryRoot)src\templating\" />
<!-- Test-only repos --> <!-- Test-only repos -->
<Repository Include="AuthSamples" PatchPolicy="AlwaysUpdateAndCascadeVersions" RootPath="$(RepositoryRoot)src\AuthSamples\" /> <Repository Include="AuthSamples" PatchPolicy="AlwaysUpdateAndCascadeVersions" RootPath="$(RepositoryRoot)src\AuthSamples\" />