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

Split ProjectModel into separate packages (#188)

This commit is contained in:
Nate McMaster 2016-10-10 13:11:31 -07:00 committed by GitHub
parent f7932b57a6
commit 78e35d3c6f
26 changed files with 94 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
DotNetTools.sln
View File

@ -38,10 +38,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{59E02BDF
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "NuGetPackager", "tools\NuGetPackager\NuGetPackager.xproj", "{8B781D87-1FC3-4A34-9089-2BDF6B562B85}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.ProjectModel.Sources", "src\Microsoft.Extensions.ProjectModel.Sources\Microsoft.Extensions.ProjectModel.Sources.xproj", "{99D6CE89-7302-4C3A-83EB-D534C24644D2}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.ProjectModel.Tests", "test\Microsoft.Extensions.ProjectModel.Tests\Microsoft.Extensions.ProjectModel.Tests.xproj", "{1A66A831-4F06-46D9-B483-70A4E75A2F7F}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.ProjectModel.Abstractions.Sources", "src\Microsoft.Extensions.ProjectModel.Abstractions.Sources\Microsoft.Extensions.ProjectModel.Abstractions.Sources.xproj", "{8A97D718-0681-43C5-A70B-535DBBDF4FA1}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.ProjectModel.DotNet.Sources", "src\Microsoft.Extensions.ProjectModel.DotNet.Sources\Microsoft.Extensions.ProjectModel.DotNet.Sources.xproj", "{1F643A36-A1FC-4502-9D03-75837F20E1A4}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.ProjectModel.MsBuild.Sources", "src\Microsoft.Extensions.ProjectModel.MsBuild.Sources\Microsoft.Extensions.ProjectModel.MsBuild.Sources.xproj", "{7362AE32-7753-4E7C-86D0-DCA86AF413FA}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -92,14 +96,22 @@ Global
{8B781D87-1FC3-4A34-9089-2BDF6B562B85}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8B781D87-1FC3-4A34-9089-2BDF6B562B85}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8B781D87-1FC3-4A34-9089-2BDF6B562B85}.Release|Any CPU.Build.0 = Release|Any CPU
{99D6CE89-7302-4C3A-83EB-D534C24644D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{99D6CE89-7302-4C3A-83EB-D534C24644D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{99D6CE89-7302-4C3A-83EB-D534C24644D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{99D6CE89-7302-4C3A-83EB-D534C24644D2}.Release|Any CPU.Build.0 = Release|Any CPU
{1A66A831-4F06-46D9-B483-70A4E75A2F7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1A66A831-4F06-46D9-B483-70A4E75A2F7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1A66A831-4F06-46D9-B483-70A4E75A2F7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1A66A831-4F06-46D9-B483-70A4E75A2F7F}.Release|Any CPU.Build.0 = Release|Any CPU
{8A97D718-0681-43C5-A70B-535DBBDF4FA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8A97D718-0681-43C5-A70B-535DBBDF4FA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8A97D718-0681-43C5-A70B-535DBBDF4FA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8A97D718-0681-43C5-A70B-535DBBDF4FA1}.Release|Any CPU.Build.0 = Release|Any CPU
{1F643A36-A1FC-4502-9D03-75837F20E1A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1F643A36-A1FC-4502-9D03-75837F20E1A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1F643A36-A1FC-4502-9D03-75837F20E1A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1F643A36-A1FC-4502-9D03-75837F20E1A4}.Release|Any CPU.Build.0 = Release|Any CPU
{7362AE32-7753-4E7C-86D0-DCA86AF413FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7362AE32-7753-4E7C-86D0-DCA86AF413FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7362AE32-7753-4E7C-86D0-DCA86AF413FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7362AE32-7753-4E7C-86D0-DCA86AF413FA}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -117,7 +129,9 @@ Global
{8A2E6961-6B12-4A8E-8215-3E7301D52EAC} = {F5B382BC-258F-46E1-AC3D-10E5CCD55134}
{53F3B53D-303A-4DAA-9C38-4F55195FA5B9} = {66517987-2A5A-4330-B130-207039378FD4}
{8B781D87-1FC3-4A34-9089-2BDF6B562B85} = {59E02BDF-98DE-4D64-B576-2D0299D5E052}
{99D6CE89-7302-4C3A-83EB-D534C24644D2} = {66517987-2A5A-4330-B130-207039378FD4}
{1A66A831-4F06-46D9-B483-70A4E75A2F7F} = {F5B382BC-258F-46E1-AC3D-10E5CCD55134}
{8A97D718-0681-43C5-A70B-535DBBDF4FA1} = {66517987-2A5A-4330-B130-207039378FD4}
{1F643A36-A1FC-4502-9D03-75837F20E1A4} = {66517987-2A5A-4330-B130-207039378FD4}
{7362AE32-7753-4E7C-86D0-DCA86AF413FA} = {66517987-2A5A-4330-B130-207039378FD4}
EndGlobalSection
EndGlobal

4
NuGetPackageVerifier.json
View File

@ -33,7 +33,9 @@
"adx-nonshipping": {
"rules": [],
"packages": {
"Microsoft.Extensions.ProjectModel.Sources": {}
"Microsoft.Extensions.ProjectModel.Abstractions.Sources": {},
"Microsoft.Extensions.ProjectModel.DotNet.Sources": {},
"Microsoft.Extensions.ProjectModel.MsBuild.Sources": {}
}
},
"Default": {

7
makefile.shade
View File

@ -22,7 +22,12 @@ k-standard-goals
"-n src/Microsoft.Extensions.Caching.SqlConfig.Tools/Microsoft.Extensions.Caching.SqlConfig.Tools.nuspec " +
"-n src/Microsoft.DotNet.Watcher.Tools/Microsoft.DotNet.Watcher.Tools.nuspec ");
DotnetPack("src/Microsoft.Extensions.ProjectModel.Sources/project.json", BUILD_DIR_LOCAL, E("Configuration"), E("KOREBUILD_DOTNET_PACK_OPTIONS") + " --no-build");
var projectModel = Files.Include("src/Microsoft.Extensions.ProjectModel.*/project.json");
foreach (var proj in projectModel)
{
DotnetPack(proj, BUILD_DIR_LOCAL, E("Configuration"), E("KOREBUILD_DOTNET_PACK_OPTIONS") + " --no-build");
}
foreach (var nupkg in Files.Include(Path.Combine(BUILD_DIR_LOCAL, "*/" + E("Configuration") + "/*.nupkg")))
{
File.Copy(nupkg, Path.Combine(BUILD_DIR_LOCAL, Path.GetFileName(nupkg)), true);

0
src/Microsoft.Extensions.ProjectModel.Sources/IProjectContext.cs → src/Microsoft.Extensions.ProjectModel.Abstractions.Sources/IProjectContext.cs
View File

19
src/Microsoft.Extensions.ProjectModel.Abstractions.Sources/Microsoft.Extensions.ProjectModel.Abstractions.Sources.xproj Normal file
View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0.25420" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.25420</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>8a97d718-0681-43c5-a70b-535dbbdf4fa1</ProjectGuid>
<RootNamespace>Microsoft.Extensions.ProjectModel.Abstractions.Sources</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>

0
src/Microsoft.Extensions.ProjectModel.Sources/Resolution/Dependency.cs → src/Microsoft.Extensions.ProjectModel.Abstractions.Sources/Resolution/Dependency.cs
View File

0
src/Microsoft.Extensions.ProjectModel.Sources/Resolution/DependencyDescription.cs → src/Microsoft.Extensions.ProjectModel.Abstractions.Sources/Resolution/DependencyDescription.cs
View File

0
src/Microsoft.Extensions.ProjectModel.Sources/Resolution/DependencyType.cs → src/Microsoft.Extensions.ProjectModel.Abstractions.Sources/Resolution/DependencyType.cs
View File

0
src/Microsoft.Extensions.ProjectModel.Sources/Resolution/ResolvedReference.cs → src/Microsoft.Extensions.ProjectModel.Abstractions.Sources/Resolution/ResolvedReference.cs
View File

0
src/Microsoft.Extensions.ProjectModel.Sources/project.json → src/Microsoft.Extensions.ProjectModel.Abstractions.Sources/project.json
View File

0
src/Microsoft.Extensions.ProjectModel.Sources/DotNet/DotNetDependencyProvider.cs → src/Microsoft.Extensions.ProjectModel.DotNet.Sources/DotNetDependencyProvider.cs
View File

0
src/Microsoft.Extensions.ProjectModel.Sources/DotNet/DotNetProjectContext.cs → src/Microsoft.Extensions.ProjectModel.DotNet.Sources/DotNetProjectContext.cs
View File

0
src/Microsoft.Extensions.ProjectModel.Sources/DotNet/IncludeContextExtensions.cs → src/Microsoft.Extensions.ProjectModel.DotNet.Sources/IncludeContextExtensions.cs
View File

5
src/Microsoft.Extensions.ProjectModel.Sources/Microsoft.Extensions.ProjectModel.Sources.xproj → src/Microsoft.Extensions.ProjectModel.DotNet.Sources/Microsoft.Extensions.ProjectModel.DotNet.Sources.xproj
View File

@ -6,11 +6,12 @@
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>99d6ce89-7302-4c3a-83eb-d534c24644d2</ProjectGuid>
<RootNamespace>Microsoft.Extensions.ProjectModel</RootNamespace>
<ProjectGuid>1f643a36-a1fc-4502-9d03-75837f20e1a4</ProjectGuid>
<RootNamespace>Microsoft.Extensions.ProjectModel.DotNet.Sources</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>

7
src/Microsoft.Extensions.ProjectModel.DotNet.Sources/project.json Normal file
View File

@ -0,0 +1,7 @@
{
"version": "1.0.0-*",
"shared": "**/*.cs",
"frameworks": {
"netstandard1.0": {}
}
}

0
src/Microsoft.Extensions.ProjectModel.Sources/Internal/DotNetCoreSdk.cs → src/Microsoft.Extensions.ProjectModel.MsBuild.Sources/Internal/DotNetCoreSdk.cs
View File

0
src/Microsoft.Extensions.ProjectModel.Sources/Internal/DotNetCoreSdkResolver.cs → src/Microsoft.Extensions.ProjectModel.MsBuild.Sources/Internal/DotNetCoreSdkResolver.cs
View File

19
src/Microsoft.Extensions.ProjectModel.MsBuild.Sources/Microsoft.Extensions.ProjectModel.MsBuild.Sources.xproj Normal file
View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0.25420" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.25420</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>7362ae32-7753-4e7c-86d0-dca86af413fa</ProjectGuid>
<RootNamespace>Microsoft.Extensions.ProjectModel.MsBuild.Sources</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>

0
src/Microsoft.Extensions.ProjectModel.Sources/MsBuild/MsBuildContext.cs → src/Microsoft.Extensions.ProjectModel.MsBuild.Sources/MsBuildContext.cs
View File

0
src/Microsoft.Extensions.ProjectModel.Sources/MsBuild/MsBuildExtensions.cs → src/Microsoft.Extensions.ProjectModel.MsBuild.Sources/MsBuildExtensions.cs
View File

0
src/Microsoft.Extensions.ProjectModel.Sources/MsBuild/MsBuildProjectContext.cs → src/Microsoft.Extensions.ProjectModel.MsBuild.Sources/MsBuildProjectContext.cs
View File

0
src/Microsoft.Extensions.ProjectModel.Sources/MsBuild/MsBuildProjectContextBuilder.cs → src/Microsoft.Extensions.ProjectModel.MsBuild.Sources/MsBuildProjectContextBuilder.cs
View File

0
src/Microsoft.Extensions.ProjectModel.Sources/MsBuild/MsBuildProjectDependencyProvider.cs → src/Microsoft.Extensions.ProjectModel.MsBuild.Sources/MsBuildProjectDependencyProvider.cs
View File

0
src/Microsoft.Extensions.ProjectModel.Sources/MsBuild/MsBuildProjectFinder.cs → src/Microsoft.Extensions.ProjectModel.MsBuild.Sources/MsBuildProjectFinder.cs
View File

7
src/Microsoft.Extensions.ProjectModel.MsBuild.Sources/project.json Normal file
View File

@ -0,0 +1,7 @@
{
"version": "1.0.0-*",
"shared": "**/*.cs",
"frameworks": {
"netstandard1.0": {}
}
}

10
test/Microsoft.Extensions.ProjectModel.Tests/project.json
View File

@ -12,7 +12,15 @@
"Microsoft.DotNet.ProjectModel": "1.0.0-rc3-003121",
"Microsoft.Build.Runtime": "15.1.298-preview5",
"Microsoft.Extensions.FileProviders.Physical": "1.1.0-*",
"Microsoft.Extensions.ProjectModel.Sources": {
"Microsoft.Extensions.ProjectModel.Abstractions.Sources": {
"type": "build",
"version": "1.0.0-*"
},
"Microsoft.Extensions.ProjectModel.DotNet.Sources": {
"type": "build",
"version": "1.0.0-*"
},
"Microsoft.Extensions.ProjectModel.MsBuild.Sources": {
"type": "build",
"version": "1.0.0-*"
},