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

Merge branch 'release/2.1' into release/2.2

This commit is contained in:
Nate McMaster 2018-10-31 17:25:20 -07:00
parent 954362f344 f2c1eb73a6
commit 4b99a85a5f
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
5 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@ -106,10 +106,6 @@
path = modules/MetaPackages path = modules/MetaPackages
url = https://github.com/aspnet/MetaPackages.git url = https://github.com/aspnet/MetaPackages.git
branch = release/2.2 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"] [submodule "modules/MusicStore"]
path = modules/MusicStore path = modules/MusicStore
url = https://github.com/aspnet/MusicStore.git url = https://github.com/aspnet/MusicStore.git

1
build/buildorder.props
View File

@ -7,7 +7,6 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<RepositoryBuildOrder Include="Microsoft.Data.Sqlite" Order="1" />
<RepositoryBuildOrder Include="DependencyInjection" Order="2" /> <RepositoryBuildOrder Include="DependencyInjection" Order="2" />
<RepositoryBuildOrder Include="FileSystem" Order="2" /> <RepositoryBuildOrder Include="FileSystem" Order="2" />
<RepositoryBuildOrder Include="JsonPatch" Order="2" /> <RepositoryBuildOrder Include="JsonPatch" Order="2" />

1
build/submodules.props
View File

@ -63,7 +63,6 @@
<Repository Include="Localization" /> <Repository Include="Localization" />
<Repository Include="Logging" /> <Repository Include="Logging" />
<Repository Include="MetaPackages" PatchPolicy="CascadeVersions" /> <Repository Include="MetaPackages" PatchPolicy="CascadeVersions" />
<Repository Include="Microsoft.Data.Sqlite" />
<Repository Include="Mvc" /> <Repository Include="Mvc" />
<Repository Include="MvcPrecompilation" /> <Repository Include="MvcPrecompilation" />
<Repository Include="Options" /> <Repository Include="Options" />

2
modules/EntityFrameworkCore

@ -1 +1 @@
Subproject commit 02c9355b90096762400aa0ab9943725a4cfd8d43 Subproject commit 67511a675f7b191a8f6c4863606c01e398cf300d

1
modules/Microsoft.Data.Sqlite

@ -1 +0,0 @@
Subproject commit 789b3fd3e7f5234023a33748d412693f865575a9