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

Merge branch 'release/2.1' into merge

This commit is contained in:
Doug Bunting 2019-02-01 14:49:05 -08:00
parent c1a756c575 bb8c6fcd46
commit 2ff4dd5b7e
No known key found for this signature in database
GPG Key ID: 4F7A35FC67E693A9
5 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@ -2,10 +2,6 @@
path = modules/EntityFrameworkCore path = modules/EntityFrameworkCore
url = https://github.com/aspnet/EntityFrameworkCore.git url = https://github.com/aspnet/EntityFrameworkCore.git
branch = release/2.2 branch = release/2.2
[submodule "modules/Scaffolding"]
path = modules/Scaffolding
url = https://github.com/aspnet/Scaffolding.git
branch = release/2.2
[submodule "googletest"] [submodule "googletest"]
path = src/submodules/googletest path = src/submodules/googletest
url = https://github.com/google/googletest url = https://github.com/google/googletest

9
build/artifacts.props
View File

@ -13,7 +13,6 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<PackageArtifact Include="dotnet-aspnet-codegenerator" Category="ship" />
<PackageArtifact Include="dotnet-dev-certs" Category="ship" /> <PackageArtifact Include="dotnet-dev-certs" Category="ship" />
<PackageArtifact Include="dotnet-ef" Category="ship" /> <PackageArtifact Include="dotnet-ef" Category="ship" />
<PackageArtifact Include="dotnet-sql-cache" Category="ship" /> <PackageArtifact Include="dotnet-sql-cache" Category="ship" />
@ -177,14 +176,6 @@
<PackageArtifact Include="Microsoft.Net.Http.Headers" Category="ship" /> <PackageArtifact Include="Microsoft.Net.Http.Headers" Category="ship" />
<PackageArtifact Include="Microsoft.NET.Sdk.Razor" Category="ship" /> <PackageArtifact Include="Microsoft.NET.Sdk.Razor" Category="ship" />
<PackageArtifact Include="Microsoft.Owin.Security.Interop" Category="noship" /> <PackageArtifact Include="Microsoft.Owin.Security.Interop" Category="noship" />
<PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration.Contracts" Category="ship" />
<PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration.Core" Category="ship" />
<PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Category="ship" />
<PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration.EntityFrameworkCore" Category="ship" />
<PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration.Templating" Category="ship" />
<PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration.Utils" Category="ship" />
<PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration" Category="ship" />
<PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGenerators.Mvc" Category="ship" />
<PackageArtifact Include="Internal.WebHostBuilderFactory.Sources" Category="noship"/> <PackageArtifact Include="Internal.WebHostBuilderFactory.Sources" Category="noship"/>
</ItemGroup> </ItemGroup>

1
build/buildorder.props
View File

@ -8,7 +8,6 @@
<ItemGroup> <ItemGroup>
<RepositoryBuildOrder Include="EntityFrameworkCore" Order="8" /> <RepositoryBuildOrder Include="EntityFrameworkCore" Order="8" />
<RepositoryBuildOrder Include="Scaffolding" Order="15" />
<RepositoryBuildOrder Include="Templating" Order="17" RootPath="$(RepositoryRoot)src\Templating\" /> <RepositoryBuildOrder Include="Templating" Order="17" RootPath="$(RepositoryRoot)src\Templating\" />
</ItemGroup> </ItemGroup>
</Project> </Project>

1
build/submodules.props
View File

@ -36,7 +36,6 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Repository Include="Scaffolding" PatchPolicy="AlwaysUpdate" />
<Repository Include="Templating" RootPath="$(RepositoryRoot)src\Templating\" PatchPolicy="AlwaysUpdateAndCascadeVersions" /> <Repository Include="Templating" RootPath="$(RepositoryRoot)src\Templating\" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
<Repository Include="EntityFrameworkCore" /> <Repository Include="EntityFrameworkCore" />
</ItemGroup> </ItemGroup>

1
modules/Scaffolding

@ -1 +0,0 @@
Subproject commit 8295c4b56c125d3f536020618a49c6a16017ca25