Merge branch 'release/2.1' into release/2.2
This commit is contained in:
commit
4b99a85a5f
|
|
@ -106,10 +106,6 @@
|
|||
path = modules/MetaPackages
|
||||
url = https://github.com/aspnet/MetaPackages.git
|
||||
branch = release/2.2
|
||||
[submodule "modules/Microsoft.Data.Sqlite"]
|
||||
path = modules/Microsoft.Data.Sqlite
|
||||
url = https://github.com/aspnet/Microsoft.Data.Sqlite.git
|
||||
branch = release/2.2
|
||||
[submodule "modules/MusicStore"]
|
||||
path = modules/MusicStore
|
||||
url = https://github.com/aspnet/MusicStore.git
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
</ItemDefinitionGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<RepositoryBuildOrder Include="Microsoft.Data.Sqlite" Order="1" />
|
||||
<RepositoryBuildOrder Include="DependencyInjection" Order="2" />
|
||||
<RepositoryBuildOrder Include="FileSystem" Order="2" />
|
||||
<RepositoryBuildOrder Include="JsonPatch" Order="2" />
|
||||
|
|
|
|||
|
|
@ -63,7 +63,6 @@
|
|||
<Repository Include="Localization" />
|
||||
<Repository Include="Logging" />
|
||||
<Repository Include="MetaPackages" PatchPolicy="CascadeVersions" />
|
||||
<Repository Include="Microsoft.Data.Sqlite" />
|
||||
<Repository Include="Mvc" />
|
||||
<Repository Include="MvcPrecompilation" />
|
||||
<Repository Include="Options" />
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 02c9355b90096762400aa0ab9943725a4cfd8d43
|
||||
Subproject commit 67511a675f7b191a8f6c4863606c01e398cf300d
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 789b3fd3e7f5234023a33748d412693f865575a9
|
||||
Loading…
Reference in New Issue