diff --git a/DotNetTools.sln b/DotNetTools.sln
index 44d6a3dac3..d1de4da4d0 100644
--- a/DotNetTools.sln
+++ b/DotNetTools.sln
@@ -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
diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json
index d0e3b370e2..7a340ecaad 100644
--- a/NuGetPackageVerifier.json
+++ b/NuGetPackageVerifier.json
@@ -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": {
diff --git a/makefile.shade b/makefile.shade
index f957f23173..d8d56a527e 100644
--- a/makefile.shade
+++ b/makefile.shade
@@ -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);
diff --git a/src/Microsoft.Extensions.ProjectModel.Sources/IProjectContext.cs b/src/Microsoft.Extensions.ProjectModel.Abstractions.Sources/IProjectContext.cs
similarity index 100%
rename from src/Microsoft.Extensions.ProjectModel.Sources/IProjectContext.cs
rename to src/Microsoft.Extensions.ProjectModel.Abstractions.Sources/IProjectContext.cs
diff --git a/src/Microsoft.Extensions.ProjectModel.Abstractions.Sources/Microsoft.Extensions.ProjectModel.Abstractions.Sources.xproj b/src/Microsoft.Extensions.ProjectModel.Abstractions.Sources/Microsoft.Extensions.ProjectModel.Abstractions.Sources.xproj
new file mode 100644
index 0000000000..3a11d66f5f
--- /dev/null
+++ b/src/Microsoft.Extensions.ProjectModel.Abstractions.Sources/Microsoft.Extensions.ProjectModel.Abstractions.Sources.xproj
@@ -0,0 +1,19 @@
+
+
+
+ 14.0.25420
+ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
+
+
+
+ 8a97d718-0681-43c5-a70b-535dbbdf4fa1
+ Microsoft.Extensions.ProjectModel.Abstractions.Sources
+ .\obj
+ .\bin\
+
+
+
+ 2.0
+
+
+
\ No newline at end of file
diff --git a/src/Microsoft.Extensions.ProjectModel.Sources/Resolution/Dependency.cs b/src/Microsoft.Extensions.ProjectModel.Abstractions.Sources/Resolution/Dependency.cs
similarity index 100%
rename from src/Microsoft.Extensions.ProjectModel.Sources/Resolution/Dependency.cs
rename to src/Microsoft.Extensions.ProjectModel.Abstractions.Sources/Resolution/Dependency.cs
diff --git a/src/Microsoft.Extensions.ProjectModel.Sources/Resolution/DependencyDescription.cs b/src/Microsoft.Extensions.ProjectModel.Abstractions.Sources/Resolution/DependencyDescription.cs
similarity index 100%
rename from src/Microsoft.Extensions.ProjectModel.Sources/Resolution/DependencyDescription.cs
rename to src/Microsoft.Extensions.ProjectModel.Abstractions.Sources/Resolution/DependencyDescription.cs
diff --git a/src/Microsoft.Extensions.ProjectModel.Sources/Resolution/DependencyType.cs b/src/Microsoft.Extensions.ProjectModel.Abstractions.Sources/Resolution/DependencyType.cs
similarity index 100%
rename from src/Microsoft.Extensions.ProjectModel.Sources/Resolution/DependencyType.cs
rename to src/Microsoft.Extensions.ProjectModel.Abstractions.Sources/Resolution/DependencyType.cs
diff --git a/src/Microsoft.Extensions.ProjectModel.Sources/Resolution/ResolvedReference.cs b/src/Microsoft.Extensions.ProjectModel.Abstractions.Sources/Resolution/ResolvedReference.cs
similarity index 100%
rename from src/Microsoft.Extensions.ProjectModel.Sources/Resolution/ResolvedReference.cs
rename to src/Microsoft.Extensions.ProjectModel.Abstractions.Sources/Resolution/ResolvedReference.cs
diff --git a/src/Microsoft.Extensions.ProjectModel.Sources/project.json b/src/Microsoft.Extensions.ProjectModel.Abstractions.Sources/project.json
similarity index 100%
rename from src/Microsoft.Extensions.ProjectModel.Sources/project.json
rename to src/Microsoft.Extensions.ProjectModel.Abstractions.Sources/project.json
diff --git a/src/Microsoft.Extensions.ProjectModel.Sources/DotNet/DotNetDependencyProvider.cs b/src/Microsoft.Extensions.ProjectModel.DotNet.Sources/DotNetDependencyProvider.cs
similarity index 100%
rename from src/Microsoft.Extensions.ProjectModel.Sources/DotNet/DotNetDependencyProvider.cs
rename to src/Microsoft.Extensions.ProjectModel.DotNet.Sources/DotNetDependencyProvider.cs
diff --git a/src/Microsoft.Extensions.ProjectModel.Sources/DotNet/DotNetProjectContext.cs b/src/Microsoft.Extensions.ProjectModel.DotNet.Sources/DotNetProjectContext.cs
similarity index 100%
rename from src/Microsoft.Extensions.ProjectModel.Sources/DotNet/DotNetProjectContext.cs
rename to src/Microsoft.Extensions.ProjectModel.DotNet.Sources/DotNetProjectContext.cs
diff --git a/src/Microsoft.Extensions.ProjectModel.Sources/DotNet/IncludeContextExtensions.cs b/src/Microsoft.Extensions.ProjectModel.DotNet.Sources/IncludeContextExtensions.cs
similarity index 100%
rename from src/Microsoft.Extensions.ProjectModel.Sources/DotNet/IncludeContextExtensions.cs
rename to src/Microsoft.Extensions.ProjectModel.DotNet.Sources/IncludeContextExtensions.cs
diff --git a/src/Microsoft.Extensions.ProjectModel.Sources/Microsoft.Extensions.ProjectModel.Sources.xproj b/src/Microsoft.Extensions.ProjectModel.DotNet.Sources/Microsoft.Extensions.ProjectModel.DotNet.Sources.xproj
similarity index 85%
rename from src/Microsoft.Extensions.ProjectModel.Sources/Microsoft.Extensions.ProjectModel.Sources.xproj
rename to src/Microsoft.Extensions.ProjectModel.DotNet.Sources/Microsoft.Extensions.ProjectModel.DotNet.Sources.xproj
index 772d9c1c91..25df3ea5e1 100644
--- a/src/Microsoft.Extensions.ProjectModel.Sources/Microsoft.Extensions.ProjectModel.Sources.xproj
+++ b/src/Microsoft.Extensions.ProjectModel.DotNet.Sources/Microsoft.Extensions.ProjectModel.DotNet.Sources.xproj
@@ -6,11 +6,12 @@
- 99d6ce89-7302-4c3a-83eb-d534c24644d2
- Microsoft.Extensions.ProjectModel
+ 1f643a36-a1fc-4502-9d03-75837f20e1a4
+ Microsoft.Extensions.ProjectModel.DotNet.Sources
.\obj
.\bin\
+
2.0
diff --git a/src/Microsoft.Extensions.ProjectModel.DotNet.Sources/project.json b/src/Microsoft.Extensions.ProjectModel.DotNet.Sources/project.json
new file mode 100644
index 0000000000..23d8c31849
--- /dev/null
+++ b/src/Microsoft.Extensions.ProjectModel.DotNet.Sources/project.json
@@ -0,0 +1,7 @@
+{
+ "version": "1.0.0-*",
+ "shared": "**/*.cs",
+ "frameworks": {
+ "netstandard1.0": {}
+ }
+}
\ No newline at end of file
diff --git a/src/Microsoft.Extensions.ProjectModel.Sources/Internal/DotNetCoreSdk.cs b/src/Microsoft.Extensions.ProjectModel.MsBuild.Sources/Internal/DotNetCoreSdk.cs
similarity index 100%
rename from src/Microsoft.Extensions.ProjectModel.Sources/Internal/DotNetCoreSdk.cs
rename to src/Microsoft.Extensions.ProjectModel.MsBuild.Sources/Internal/DotNetCoreSdk.cs
diff --git a/src/Microsoft.Extensions.ProjectModel.Sources/Internal/DotNetCoreSdkResolver.cs b/src/Microsoft.Extensions.ProjectModel.MsBuild.Sources/Internal/DotNetCoreSdkResolver.cs
similarity index 100%
rename from src/Microsoft.Extensions.ProjectModel.Sources/Internal/DotNetCoreSdkResolver.cs
rename to src/Microsoft.Extensions.ProjectModel.MsBuild.Sources/Internal/DotNetCoreSdkResolver.cs
diff --git a/src/Microsoft.Extensions.ProjectModel.MsBuild.Sources/Microsoft.Extensions.ProjectModel.MsBuild.Sources.xproj b/src/Microsoft.Extensions.ProjectModel.MsBuild.Sources/Microsoft.Extensions.ProjectModel.MsBuild.Sources.xproj
new file mode 100644
index 0000000000..d7ece4a980
--- /dev/null
+++ b/src/Microsoft.Extensions.ProjectModel.MsBuild.Sources/Microsoft.Extensions.ProjectModel.MsBuild.Sources.xproj
@@ -0,0 +1,19 @@
+
+
+
+ 14.0.25420
+ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
+
+
+
+ 7362ae32-7753-4e7c-86d0-dca86af413fa
+ Microsoft.Extensions.ProjectModel.MsBuild.Sources
+ .\obj
+ .\bin\
+
+
+
+ 2.0
+
+
+
\ No newline at end of file
diff --git a/src/Microsoft.Extensions.ProjectModel.Sources/MsBuild/MsBuildContext.cs b/src/Microsoft.Extensions.ProjectModel.MsBuild.Sources/MsBuildContext.cs
similarity index 100%
rename from src/Microsoft.Extensions.ProjectModel.Sources/MsBuild/MsBuildContext.cs
rename to src/Microsoft.Extensions.ProjectModel.MsBuild.Sources/MsBuildContext.cs
diff --git a/src/Microsoft.Extensions.ProjectModel.Sources/MsBuild/MsBuildExtensions.cs b/src/Microsoft.Extensions.ProjectModel.MsBuild.Sources/MsBuildExtensions.cs
similarity index 100%
rename from src/Microsoft.Extensions.ProjectModel.Sources/MsBuild/MsBuildExtensions.cs
rename to src/Microsoft.Extensions.ProjectModel.MsBuild.Sources/MsBuildExtensions.cs
diff --git a/src/Microsoft.Extensions.ProjectModel.Sources/MsBuild/MsBuildProjectContext.cs b/src/Microsoft.Extensions.ProjectModel.MsBuild.Sources/MsBuildProjectContext.cs
similarity index 100%
rename from src/Microsoft.Extensions.ProjectModel.Sources/MsBuild/MsBuildProjectContext.cs
rename to src/Microsoft.Extensions.ProjectModel.MsBuild.Sources/MsBuildProjectContext.cs
diff --git a/src/Microsoft.Extensions.ProjectModel.Sources/MsBuild/MsBuildProjectContextBuilder.cs b/src/Microsoft.Extensions.ProjectModel.MsBuild.Sources/MsBuildProjectContextBuilder.cs
similarity index 100%
rename from src/Microsoft.Extensions.ProjectModel.Sources/MsBuild/MsBuildProjectContextBuilder.cs
rename to src/Microsoft.Extensions.ProjectModel.MsBuild.Sources/MsBuildProjectContextBuilder.cs
diff --git a/src/Microsoft.Extensions.ProjectModel.Sources/MsBuild/MsBuildProjectDependencyProvider.cs b/src/Microsoft.Extensions.ProjectModel.MsBuild.Sources/MsBuildProjectDependencyProvider.cs
similarity index 100%
rename from src/Microsoft.Extensions.ProjectModel.Sources/MsBuild/MsBuildProjectDependencyProvider.cs
rename to src/Microsoft.Extensions.ProjectModel.MsBuild.Sources/MsBuildProjectDependencyProvider.cs
diff --git a/src/Microsoft.Extensions.ProjectModel.Sources/MsBuild/MsBuildProjectFinder.cs b/src/Microsoft.Extensions.ProjectModel.MsBuild.Sources/MsBuildProjectFinder.cs
similarity index 100%
rename from src/Microsoft.Extensions.ProjectModel.Sources/MsBuild/MsBuildProjectFinder.cs
rename to src/Microsoft.Extensions.ProjectModel.MsBuild.Sources/MsBuildProjectFinder.cs
diff --git a/src/Microsoft.Extensions.ProjectModel.MsBuild.Sources/project.json b/src/Microsoft.Extensions.ProjectModel.MsBuild.Sources/project.json
new file mode 100644
index 0000000000..23d8c31849
--- /dev/null
+++ b/src/Microsoft.Extensions.ProjectModel.MsBuild.Sources/project.json
@@ -0,0 +1,7 @@
+{
+ "version": "1.0.0-*",
+ "shared": "**/*.cs",
+ "frameworks": {
+ "netstandard1.0": {}
+ }
+}
\ No newline at end of file
diff --git a/test/Microsoft.Extensions.ProjectModel.Tests/project.json b/test/Microsoft.Extensions.ProjectModel.Tests/project.json
index 58c314075e..d408f83c23 100644
--- a/test/Microsoft.Extensions.ProjectModel.Tests/project.json
+++ b/test/Microsoft.Extensions.ProjectModel.Tests/project.json
@@ -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-*"
},