diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln
index 031417dd4..6f974fa00 100644
--- a/Microsoft.DotNet.Cli.sln
+++ b/Microsoft.DotNet.Cli.sln
@@ -124,7 +124,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.TestFramew
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "redist", "src\redist\redist.csproj", "{098D9321-1201-4974-A75E-F58EBCD98ACF}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tool_csc", "src\tool_csc\tool_csc.csproj", "{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tool_roslyn", "src\tool_roslyn\tool_roslyn.csproj", "{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tool_msbuild", "src\tool_msbuild\tool_msbuild.csproj", "{D82A3246-9831-4024-A9B2-1932EEF3D56F}"
EndProject
diff --git a/NuGet.Config b/NuGet.Config
index 6e43f2b13..559db7b79 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -3,8 +3,10 @@
+
+
diff --git a/README.md b/README.md
index 5024c3a0d..0293c8b5d 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@ You can download .NET Core as either an installer (MSI, PKG) or a zip (zip, gzip
- .NET Core SDK - .NET Core + CLI tools
> **Note:** please be aware that below installers are the **latest bits**. If you
-> want to install the latest released versions, please check out the [section above](#rtm-and-preview-2-bits).)
+> want to install the latest released versions, please check out the [section above](#download-links).)
| | Version | .NET Core Installer | .NET Core SDK Installer | .NET Core Binaries | .NET Core SDK Binaries |
|----------------------------------|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|:--------------------------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|:-------------------------------------------------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
diff --git a/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj b/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj
index aef9570d5..a5487baba 100644
--- a/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj
+++ b/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj
@@ -5,11 +5,7 @@
$(PackageTargetFallback);portable-net45+win8;dnxcore50
win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64
-
-
-
-
-
+
1.0.0-*
@@ -17,7 +13,7 @@
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/DesktopTestProjects/AutoAddDesktopReferencesDuringMigrate/project.json b/TestAssets/DesktopTestProjects/AutoAddDesktopReferencesDuringMigrate/project.json
index 1720635d6..57931c899 100644
--- a/TestAssets/DesktopTestProjects/AutoAddDesktopReferencesDuringMigrate/project.json
+++ b/TestAssets/DesktopTestProjects/AutoAddDesktopReferencesDuringMigrate/project.json
@@ -4,7 +4,9 @@
"debugType": "portable",
"emitEntryPoint": true
},
- "dependencies": {},
+ "dependencies": {
+ "Newtonsoft.Json": "9.0.1"
+ },
"frameworks": {
"net451": {}
},
diff --git a/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsAndConfig/AppWithRedirectsAndConfig.csproj b/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsAndConfig/AppWithRedirectsAndConfig.csproj
index caa3e334c..35f2ba2b2 100644
--- a/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsAndConfig/AppWithRedirectsAndConfig.csproj
+++ b/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsAndConfig/AppWithRedirectsAndConfig.csproj
@@ -7,10 +7,7 @@
-
-
-
diff --git a/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsNoConfig/AppWithRedirectsNoConfig.csproj b/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsNoConfig/AppWithRedirectsNoConfig.csproj
index 41d5e98eb..dd8d8b537 100644
--- a/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsNoConfig/AppWithRedirectsNoConfig.csproj
+++ b/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsNoConfig/AppWithRedirectsNoConfig.csproj
@@ -7,10 +7,7 @@
-
-
-
diff --git a/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj b/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj
index 3a0dc74db..e621006e9 100644
--- a/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj
+++ b/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj
@@ -4,11 +4,7 @@
Library
$(PackageTargetFallback);portable-net45+win8;dnxcore50;netcoreapp1.0
-
-
-
-
-
+
1.0.0-*
diff --git a/TestAssets/NonRestoredTestProjects/AppWithNonExistingToolDependency/AppWithNonExistingToolDependency.csproj b/TestAssets/NonRestoredTestProjects/AppWithNonExistingToolDependency/AppWithNonExistingToolDependency.csproj
index 9223824fb..f36c1bf2b 100644
--- a/TestAssets/NonRestoredTestProjects/AppWithNonExistingToolDependency/AppWithNonExistingToolDependency.csproj
+++ b/TestAssets/NonRestoredTestProjects/AppWithNonExistingToolDependency/AppWithNonExistingToolDependency.csproj
@@ -6,12 +6,7 @@
-
-
-
-
-
-
+
diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj
index 399f34fad..5815b4190 100644
--- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj
+++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj
@@ -3,13 +3,10 @@
Library
net451;netcoreapp1.0
-
-
-
-
+
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj
index f85cb9afa..51f727a05 100644
--- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj
+++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj
@@ -3,13 +3,10 @@
Library
net451;netcoreapp1.0;netstandard1.4
-
-
-
-
+
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/a.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/a.csproj
index 5b2be1164..a7277eb65 100644
--- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/a.csproj
+++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/a.csproj
@@ -3,13 +3,9 @@
Library
netcoreapp1.0
-
-
-
-
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/b.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/b.csproj
index 5b2be1164..a7277eb65 100644
--- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/b.csproj
+++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/b.csproj
@@ -3,13 +3,9 @@
Library
netcoreapp1.0
-
-
-
-
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj
index 4e7f7d2ef..6e627ad42 100644
--- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj
+++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj
@@ -3,13 +3,9 @@
Library
net452;netcoreapp1.0
-
-
-
-
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net45Lib/Net45Lib.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net45Lib/Net45Lib.csproj
index ad9097b82..96073b2c7 100644
--- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net45Lib/Net45Lib.csproj
+++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net45Lib/Net45Lib.csproj
@@ -3,13 +3,9 @@
Library
net45
-
-
-
-
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.csproj
index f85cb9afa..044fe40ef 100644
--- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.csproj
+++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.csproj
@@ -3,13 +3,9 @@
Library
net451;netcoreapp1.0;netstandard1.4
-
-
-
-
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj
index f79137c35..09b0759f1 100644
--- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj
+++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj
@@ -3,13 +3,9 @@
Library
net451;netcoreapp1.0
-
-
-
-
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj
index ed99bcd13..0464c2816 100644
--- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj
+++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj
@@ -3,13 +3,9 @@
Library
net451;netcoreapp1.0
-
-
-
-
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.csproj
index 3d8b49b25..949805ccc 100644
--- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.csproj
+++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.csproj
@@ -3,13 +3,9 @@
Library
net451;netcoreapp1.0
-
-
-
-
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefCondNonUniform/WithRefCondNonUniform.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefCondNonUniform/WithRefCondNonUniform.csproj
index 2678dce5d..ebf9b12ee 100644
--- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefCondNonUniform/WithRefCondNonUniform.csproj
+++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefCondNonUniform/WithRefCondNonUniform.csproj
@@ -3,13 +3,9 @@
Library
net451;netcoreapp1.0
-
-
-
-
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj
index 36dff975a..370bc5873 100644
--- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj
+++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj
@@ -3,13 +3,9 @@
Library
net451;netcoreapp1.0
-
-
-
-
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/NonRestoredTestProjects/MigrateAppWithMissingDep/MyApp/Program.cs b/TestAssets/NonRestoredTestProjects/MigrateAppWithMissingDep/MyApp/Program.cs
deleted file mode 100644
index a552b21e7..000000000
--- a/TestAssets/NonRestoredTestProjects/MigrateAppWithMissingDep/MyApp/Program.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace ConsoleApplication
-{
- public class Program
- {
- public static void Main(string[] args)
- {
- }
- }
-}
-
diff --git a/TestAssets/NonRestoredTestProjects/MigrateAppWithMissingDep/MyApp/project.json b/TestAssets/NonRestoredTestProjects/MigrateAppWithMissingDep/MyApp/project.json
deleted file mode 100644
index e10324be5..000000000
--- a/TestAssets/NonRestoredTestProjects/MigrateAppWithMissingDep/MyApp/project.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "version": "1.0.0-*",
- "buildOptions": {
- "emitEntryPoint": true
- },
-
- "dependencies": {
- "Microsoft.NETCore.App": {
- "type": "platform",
- "version": "1.0.1"
- },
- "MyLib": "1.0.0-*"
- },
-
- "frameworks": {
- "netcoreapp1.0": {
- "imports": "dnxcore50"
- }
- }
-}
diff --git a/TestAssets/NonRestoredTestProjects/MigrateAppWithMissingDep/MyLib/NotUsedButDoNotRemove.cs b/TestAssets/NonRestoredTestProjects/MigrateAppWithMissingDep/MyLib/NotUsedButDoNotRemove.cs
deleted file mode 100644
index d16e6e2d3..000000000
--- a/TestAssets/NonRestoredTestProjects/MigrateAppWithMissingDep/MyLib/NotUsedButDoNotRemove.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-// This file needs to be here as this error does not repro if the MyLib folder doesn't exist
-// Since git does not keep track of folders and files only, this folder needs to contain any file.
-namespace MyLib
-{
-}
diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefs/TestApp/TestApp.sln b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefs/TestApp/TestApp.sln
index bc8214876..3dc27a305 100644
--- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefs/TestApp/TestApp.sln
+++ b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefs/TestApp/TestApp.sln
@@ -17,12 +17,16 @@ Global
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{0138CB8F-4AA9-4029-A21E-C07C30F425BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0138CB8F-4AA9-4029-A21E-C07C30F425BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {0138CB8F-4AA9-4029-A21E-C07C30F425BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {0138CB8F-4AA9-4029-A21E-C07C30F425BA}.Release|Any CPU.Build.0 = Release|Any CPU
{DC0B35D0-8A36-4B52-8A11-B86739F055D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DC0B35D0-8A36-4B52-8A11-B86739F055D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {0138CB8F-4AA9-4029-A21E-C07C30F425BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {0138CB8F-4AA9-4029-A21E-C07C30F425BA}.Release|Any CPU.Build.0 = Release|Any CPU
{DC0B35D0-8A36-4B52-8A11-B86739F055D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DC0B35D0-8A36-4B52-8A11-B86739F055D2}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F8F96F4A-F10C-4C54-867C-A9EFF55494C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F8F96F4A-F10C-4C54-867C-A9EFF55494C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F8F96F4A-F10C-4C54-867C-A9EFF55494C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F8F96F4A-F10C-4C54-867C-A9EFF55494C8}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefs/TestLibrary/project.json b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefs/TestLibrary/project.json
index bdf53dd6e..032754312 100644
--- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefs/TestLibrary/project.json
+++ b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefs/TestLibrary/project.json
@@ -1,13 +1,6 @@
{
"version": "1.0.0-*",
- "buildOptions": {
- "nowarn": [
- "CS1591"
- ],
- "additionalArguments": [
- "-highentropyva+"
- ]
- },"dependencies": {
+ "dependencies": {
"NETStandard.Library": "1.6.0"
},
"frameworks": {
diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/Existing.csproj b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/Existing.csproj
index 322e07f8d..2f78a7e02 100644
--- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/Existing.csproj
+++ b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/Existing.csproj
@@ -4,11 +4,6 @@
netstandard1.4
-
-
-
-
-
diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/TestApp.sln b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/TestApp.sln
index bc8214876..3dc27a305 100644
--- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/TestApp.sln
+++ b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/TestApp.sln
@@ -17,12 +17,16 @@ Global
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{0138CB8F-4AA9-4029-A21E-C07C30F425BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0138CB8F-4AA9-4029-A21E-C07C30F425BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {0138CB8F-4AA9-4029-A21E-C07C30F425BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {0138CB8F-4AA9-4029-A21E-C07C30F425BA}.Release|Any CPU.Build.0 = Release|Any CPU
{DC0B35D0-8A36-4B52-8A11-B86739F055D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DC0B35D0-8A36-4B52-8A11-B86739F055D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {0138CB8F-4AA9-4029-A21E-C07C30F425BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {0138CB8F-4AA9-4029-A21E-C07C30F425BA}.Release|Any CPU.Build.0 = Release|Any CPU
{DC0B35D0-8A36-4B52-8A11-B86739F055D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DC0B35D0-8A36-4B52-8A11-B86739F055D2}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F8F96F4A-F10C-4C54-867C-A9EFF55494C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F8F96F4A-F10C-4C54-867C-A9EFF55494C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F8F96F4A-F10C-4C54-867C-A9EFF55494C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F8F96F4A-F10C-4C54-867C-A9EFF55494C8}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestLibrary/project.json b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestLibrary/project.json
index bdf53dd6e..032754312 100644
--- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestLibrary/project.json
+++ b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestLibrary/project.json
@@ -1,13 +1,6 @@
{
"version": "1.0.0-*",
- "buildOptions": {
- "nowarn": [
- "CS1591"
- ],
- "additionalArguments": [
- "-highentropyva+"
- ]
- },"dependencies": {
+ "dependencies": {
"NETStandard.Library": "1.6.0"
},
"frameworks": {
diff --git a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/TestProjectWithUnresolvedPlatformDependency.csproj b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/TestProjectWithUnresolvedPlatformDependency.csproj
index 7ad98ec11..890428162 100755
--- a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/TestProjectWithUnresolvedPlatformDependency.csproj
+++ b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/TestProjectWithUnresolvedPlatformDependency.csproj
@@ -4,11 +4,6 @@
Exe
$(PackageTargetFallback);dnxcore50
-
-
-
-
-
1.0.0
diff --git a/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/AppWithDepOnTool/AppWithDepOnTool.csproj b/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/AppWithDepOnTool/AppWithDepOnTool.csproj
index 2185f85a6..de60f199d 100644
--- a/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/AppWithDepOnTool/AppWithDepOnTool.csproj
+++ b/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/AppWithDepOnTool/AppWithDepOnTool.csproj
@@ -7,12 +7,7 @@
-
-
-
-
-
-
+
1.0.0
diff --git a/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/ToolWithRandomPackageName/ToolWithRandomPackageName.csproj b/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/ToolWithRandomPackageName/ToolWithRandomPackageName.csproj
index f7037e0c6..592c7bfcb 100644
--- a/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/ToolWithRandomPackageName/ToolWithRandomPackageName.csproj
+++ b/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/ToolWithRandomPackageName/ToolWithRandomPackageName.csproj
@@ -9,16 +9,13 @@
-
-
-
- true
- lib\$(TargetFramework)
-
+
+ $(ProjectRuntimeConfigFilePath)
+
-
+
diff --git a/TestAssets/TestPackages/PackageWithFakeNativeDep/PackageWithFakeNativeDep.csproj b/TestAssets/TestPackages/PackageWithFakeNativeDep/PackageWithFakeNativeDep.csproj
index 186732e54..6f9d59cfe 100644
--- a/TestAssets/TestPackages/PackageWithFakeNativeDep/PackageWithFakeNativeDep.csproj
+++ b/TestAssets/TestPackages/PackageWithFakeNativeDep/PackageWithFakeNativeDep.csproj
@@ -6,9 +6,6 @@
-
-
-
runtimes/
true
diff --git a/TestAssets/TestPackages/ToolWithOutputName/ToolWithOutputName.csproj b/TestAssets/TestPackages/ToolWithOutputName/ToolWithOutputName.csproj
index f9f34d42b..56cee9233 100644
--- a/TestAssets/TestPackages/ToolWithOutputName/ToolWithOutputName.csproj
+++ b/TestAssets/TestPackages/ToolWithOutputName/ToolWithOutputName.csproj
@@ -7,21 +7,14 @@
-
-
-
-
-
-
-
- true
- lib\$(TargetFramework)
-
+
+ $(ProjectRuntimeConfigFilePath)
+
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj b/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj
index 2b6b7605d..241f2d9ce 100644
--- a/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj
+++ b/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj
@@ -8,21 +8,14 @@
-
-
-
-
-
-
-
- true
- lib\$(TargetFramework)
-
+
+ $(ProjectRuntimeConfigFilePath)
+
- 1.0.1
+ 1.0.3
1.0.1-beta-000933
diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj
index b6d2acb2c..4ca756e18 100644
--- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj
+++ b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj
@@ -12,23 +12,19 @@
-
-
-
-
- true
- lib\$(TargetFramework)
-
+
+ $(ProjectRuntimeConfigFilePath)
+
- 1.0.1
+ 1.0.3
- 4.0.0-rc2
+ 4.0.0-rc3
$(SdkNugetVersion)
diff --git a/TestAssets/TestPackages/dotnet-desktop-and-portable/dotnet-desktop-and-portable.csproj b/TestAssets/TestPackages/dotnet-desktop-and-portable/dotnet-desktop-and-portable.csproj
index d427fe87f..d2e22acd7 100644
--- a/TestAssets/TestPackages/dotnet-desktop-and-portable/dotnet-desktop-and-portable.csproj
+++ b/TestAssets/TestPackages/dotnet-desktop-and-portable/dotnet-desktop-and-portable.csproj
@@ -8,25 +8,14 @@
-
-
-
-
-
-
-
- true
- lib\netcoreapp1.0
-
-
- true
- lib\$(TargetFramework)
-
+
+ $(ProjectRuntimeConfigFilePath)
+
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/TestPackages/dotnet-desktop-binding-redirects/dotnet-desktop-binding-redirects.csproj b/TestAssets/TestPackages/dotnet-desktop-binding-redirects/dotnet-desktop-binding-redirects.csproj
index faac89bed..9830625a4 100644
--- a/TestAssets/TestPackages/dotnet-desktop-binding-redirects/dotnet-desktop-binding-redirects.csproj
+++ b/TestAssets/TestPackages/dotnet-desktop-binding-redirects/dotnet-desktop-binding-redirects.csproj
@@ -8,12 +8,6 @@
true
-
-
-
-
-
-
5.0.0
diff --git a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj
index 9fca81132..b6603c2d8 100644
--- a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj
+++ b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj
@@ -6,15 +6,9 @@
win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64
-
-
-
-
-
-
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj
index 5035b32cb..eaa06bf6e 100644
--- a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj
+++ b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj
@@ -7,15 +7,9 @@
win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64
-
-
-
-
-
-
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj b/TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj
index 0028c735d..b341aac64 100644
--- a/TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj
+++ b/TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj
@@ -6,21 +6,14 @@
-
-
-
-
-
-
-
- true
- lib\$(TargetFramework)
-
+
+ $(ProjectRuntimeConfigFilePath)
+
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj b/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj
index 009fee096..5c2bcc31d 100644
--- a/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj
+++ b/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj
@@ -5,14 +5,10 @@
-
-
-
-
-
- true
- lib\$(TargetFramework)
-
+
+ $(ProjectRuntimeConfigFilePath)
+
+
true
\prefercliruntime
diff --git a/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj b/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj
index 9faefa503..1c2ecdf95 100755
--- a/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj
+++ b/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj
@@ -3,14 +3,10 @@
netcoreapp1.0
Exe
-
-
-
-
-
+
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj b/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj
index 163a025aa..fe4c0e02c 100755
--- a/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj
+++ b/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj
@@ -3,14 +3,10 @@
netcoreapp1.0
Exe
-
-
-
-
-
+
- 1.0.1
+ 1.0.3
1.0.0
diff --git a/TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj b/TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj
index 46a8840d3..bbfb9be11 100755
--- a/TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj
+++ b/TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj
@@ -8,17 +8,13 @@
- 1.0.1
+ 1.0.3
1.0.0
-
-
-
-
-
+
$(DefineConstants);RELEASE;TRACE
true
diff --git a/TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj b/TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj
index 8d84d8fc1..877cce870 100755
--- a/TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj
+++ b/TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj
@@ -3,17 +3,13 @@
netcoreapp1.0
Exe
-
-
-
-
-
+
1.0.0
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj b/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
index ab0a2179f..8c58766c2 100644
--- a/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
+++ b/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
@@ -11,7 +11,7 @@
- 1.0.1
+ 1.0.3
@@ -21,8 +21,4 @@
-
-
-
-
\ No newline at end of file
diff --git a/TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj b/TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj
index 57c0816ab..a31d87934 100755
--- a/TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj
+++ b/TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj
@@ -3,14 +3,10 @@
netcoreapp1.0
Exe
-
-
-
-
-
+
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj b/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj
index c7c7862b4..6a76893df 100755
--- a/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj
+++ b/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj
@@ -7,14 +7,10 @@
false
$(PackageTargetFallback);dnxcore50;portable-net45+win8
-
-
-
-
-
+
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/TestProjects/InvalidSolution/Lib/Lib.csproj b/TestAssets/TestProjects/InvalidSolution/Lib/Lib.csproj
index f47b49f65..9f8bcbb51 100644
--- a/TestAssets/TestProjects/InvalidSolution/Lib/Lib.csproj
+++ b/TestAssets/TestProjects/InvalidSolution/Lib/Lib.csproj
@@ -4,10 +4,6 @@
netstandard1.4
-
-
-
-
diff --git a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/MyLibrary.csproj b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/MyLibrary.csproj
index 411f7c65b..529d3f399 100755
--- a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/MyLibrary.csproj
+++ b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/MyLibrary.csproj
@@ -2,11 +2,7 @@
netstandard1.5
-
-
-
-
-
+
1.6.0
diff --git a/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworks/MSBuildAppWithMultipleFrameworks.csproj b/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworks/MSBuildAppWithMultipleFrameworks.csproj
index 00619603c..1125a1669 100644
--- a/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworks/MSBuildAppWithMultipleFrameworks.csproj
+++ b/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworks/MSBuildAppWithMultipleFrameworks.csproj
@@ -6,12 +6,8 @@
- 1.0.1
+ 1.0.3
-
-
-
-
\ No newline at end of file
diff --git a/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj b/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
index ab0a2179f..8c58766c2 100644
--- a/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
+++ b/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
@@ -11,7 +11,7 @@
- 1.0.1
+ 1.0.3
@@ -21,8 +21,4 @@
-
-
-
-
\ No newline at end of file
diff --git a/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj b/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj
index c4c0b0662..9713f8d67 100644
--- a/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj
+++ b/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj
@@ -5,13 +5,9 @@
win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64
-
-
-
-
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/SingleTargetApp.csproj b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/SingleTargetApp.csproj
index 05d33eae6..ee72a84fa 100755
--- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/SingleTargetApp.csproj
+++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/SingleTargetApp.csproj
@@ -17,7 +17,7 @@
All
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/SingleTargetP0.csproj b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/SingleTargetP0.csproj
index 98515b3a1..4997045cc 100755
--- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/SingleTargetP0.csproj
+++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/SingleTargetP0.csproj
@@ -21,7 +21,7 @@
All
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/SingleTargetP1.csproj b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/SingleTargetP1.csproj
index 2475962df..e85446e4e 100755
--- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/SingleTargetP1.csproj
+++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/SingleTargetP1.csproj
@@ -20,7 +20,7 @@
All
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/SingleTargetP2.csproj b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/SingleTargetP2.csproj
index f28ff34eb..37b69a72b 100755
--- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/SingleTargetP2.csproj
+++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/SingleTargetP2.csproj
@@ -17,7 +17,7 @@
All
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/TwoTargetApp.csproj b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/TwoTargetApp.csproj
index 0cf4073da..6ef51aa6d 100755
--- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/TwoTargetApp.csproj
+++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/TwoTargetApp.csproj
@@ -20,7 +20,7 @@
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/TwoTargetP0.csproj b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/TwoTargetP0.csproj
index b1f110869..a71a9bc5e 100755
--- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/TwoTargetP0.csproj
+++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/TwoTargetP0.csproj
@@ -23,7 +23,7 @@
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/TwoTargetP1.csproj b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/TwoTargetP1.csproj
index 09d101d53..05206f4df 100755
--- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/TwoTargetP1.csproj
+++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/TwoTargetP1.csproj
@@ -22,7 +22,7 @@
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/TwoTargetP2.csproj b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/TwoTargetP2.csproj
index 66b693fca..f6c4514e7 100755
--- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/TwoTargetP2.csproj
+++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/TwoTargetP2.csproj
@@ -19,7 +19,7 @@
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/TwoTargetLargeP0.csproj b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/TwoTargetLargeP0.csproj
index 6ac912f3d..a657879c1 100755
--- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/TwoTargetLargeP0.csproj
+++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/TwoTargetLargeP0.csproj
@@ -23,7 +23,7 @@
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/TwoTargetLargeP1.csproj b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/TwoTargetLargeP1.csproj
index 3dc97e65b..101cfe3ab 100755
--- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/TwoTargetLargeP1.csproj
+++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/TwoTargetLargeP1.csproj
@@ -23,7 +23,7 @@
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/TwoTargetLargeP2.csproj b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/TwoTargetLargeP2.csproj
index f2616fc78..a9c50ae5c 100755
--- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/TwoTargetLargeP2.csproj
+++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/TwoTargetLargeP2.csproj
@@ -23,7 +23,7 @@
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/TwoTargetLargeP3.csproj b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/TwoTargetLargeP3.csproj
index db545abfe..6930893a8 100755
--- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/TwoTargetLargeP3.csproj
+++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/TwoTargetLargeP3.csproj
@@ -22,7 +22,7 @@
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/TwoTargetLargeP4.csproj b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/TwoTargetLargeP4.csproj
index 46a07e66c..b474c59bb 100755
--- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/TwoTargetLargeP4.csproj
+++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/TwoTargetLargeP4.csproj
@@ -23,7 +23,7 @@
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/TwoTargetLargeP5.csproj b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/TwoTargetLargeP5.csproj
index 66b693fca..f6c4514e7 100755
--- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/TwoTargetLargeP5.csproj
+++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/TwoTargetLargeP5.csproj
@@ -19,7 +19,7 @@
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/TwoTargetLargeP6.csproj b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/TwoTargetLargeP6.csproj
index 66b693fca..f6c4514e7 100755
--- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/TwoTargetLargeP6.csproj
+++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/TwoTargetLargeP6.csproj
@@ -19,7 +19,7 @@
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndCSharpProject/App.sln b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndCSharpProject/App.sln
new file mode 100644
index 000000000..5b61df887
--- /dev/null
+++ b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndCSharpProject/App.sln
@@ -0,0 +1,18 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26006.2
+MinimumVisualStudioVersion = 10.0.40219.1
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
+ Release|Any CPU = Release|Any CPU
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndCSharpProject/CSharpProject/App.config b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndCSharpProject/CSharpProject/App.config
new file mode 100644
index 000000000..88fa4027b
--- /dev/null
+++ b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndCSharpProject/CSharpProject/App.config
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndCSharpProject/CSharpProject/CSharpProject.csproj b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndCSharpProject/CSharpProject/CSharpProject.csproj
new file mode 100644
index 000000000..2b11fd5a7
--- /dev/null
+++ b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndCSharpProject/CSharpProject/CSharpProject.csproj
@@ -0,0 +1,52 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {AE23AD01-99E0-446F-A5F6-16ADBDD0D1E5}
+ Exe
+ CSharpProject
+ CSharpProject
+ v4.5.2
+ 512
+ true
+
+
+ AnyCPU
+ true
+ full
+ false
+ bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ AnyCPU
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndCSharpProject/CSharpProject/Program.cs b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndCSharpProject/CSharpProject/Program.cs
new file mode 100644
index 000000000..0760ae741
--- /dev/null
+++ b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndCSharpProject/CSharpProject/Program.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CSharpProject
+{
+ class Program
+ {
+ static void Main(string[] args)
+ {
+ }
+ }
+}
diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndCSharpProject/CSharpProject/Properties/AssemblyInfo.cs b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndCSharpProject/CSharpProject/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..9dc33d763
--- /dev/null
+++ b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndCSharpProject/CSharpProject/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("CSharpProject")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("CSharpProject")]
+[assembly: AssemblyCopyright("Copyright © 2016")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("ae23ad01-99e0-446f-a5f6-16adbdd0d1e5")]
+
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/App.sln b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/App.sln
new file mode 100644
index 000000000..5b61df887
--- /dev/null
+++ b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/App.sln
@@ -0,0 +1,18 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26006.2
+MinimumVisualStudioVersion = 10.0.40219.1
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
+ Release|Any CPU = Release|Any CPU
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/App.config b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/App.config
new file mode 100644
index 000000000..88fa4027b
--- /dev/null
+++ b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/App.config
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/AssemblyInfo.fs b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/AssemblyInfo.fs
new file mode 100644
index 000000000..d8b2c37d6
--- /dev/null
+++ b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/AssemblyInfo.fs
@@ -0,0 +1,41 @@
+namespace FSharpProject.AssemblyInfo
+
+open System.Reflection
+open System.Runtime.CompilerServices
+open System.Runtime.InteropServices
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[]
+
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// []
+[]
+[]
+
+do
+ ()
\ No newline at end of file
diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/FSharpProject.fsproj b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/FSharpProject.fsproj
new file mode 100644
index 000000000..cad8d59ce
--- /dev/null
+++ b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/FSharpProject.fsproj
@@ -0,0 +1,81 @@
+
+
+
+
+ Debug
+ AnyCPU
+ 2.0
+ 52161bb2-18bf-4304-87e7-8d7f0c98ccf3
+ Exe
+ FSharpProject
+ FSharpProject
+ v4.5.2
+ true
+ 4.4.1.0
+ FSharpProject
+
+
+ true
+ full
+ false
+ false
+ bin\$(Configuration)\
+ DEBUG;TRACE
+ 3
+ AnyCPU
+ bin\$(Configuration)\$(AssemblyName).XML
+ true
+
+
+ pdbonly
+ true
+ true
+ bin\$(Configuration)\
+ TRACE
+ 3
+ AnyCPU
+ bin\$(Configuration)\$(AssemblyName).XML
+ true
+
+
+ 11
+
+
+
+
+ $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets
+
+
+
+
+ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets
+
+
+
+
+
+
+
+
+
+
+
+
+
+ True
+
+
+
+
+
+ ..\packages\System.ValueTuple.4.0.0-rc3-24212-01\lib\netstandard1.1\System.ValueTuple.dll
+
+
+
+
diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/Program.fs b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/Program.fs
new file mode 100644
index 000000000..2bcf7f989
--- /dev/null
+++ b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/Program.fs
@@ -0,0 +1,7 @@
+// Learn more about F# at http://fsharp.org
+// See the 'F# Tutorial' project for more help.
+
+[]
+let main argv =
+ printfn "%A" argv
+ 0 // return an integer exit code
diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/packages.config b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/packages.config
new file mode 100644
index 000000000..2688d2baf
--- /dev/null
+++ b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/packages.config
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndUnknownProject/App.sln b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndUnknownProject/App.sln
new file mode 100644
index 000000000..5b61df887
--- /dev/null
+++ b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndUnknownProject/App.sln
@@ -0,0 +1,18 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26006.2
+MinimumVisualStudioVersion = 10.0.40219.1
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
+ Release|Any CPU = Release|Any CPU
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndUnknownProject/UnknownProject/UnknownProject.unknownproj b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndUnknownProject/UnknownProject/UnknownProject.unknownproj
new file mode 100644
index 000000000..8b39c56a6
--- /dev/null
+++ b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndUnknownProject/UnknownProject/UnknownProject.unknownproj
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndUnknownProjectWithMultipleProjectTypeGuids/App.sln b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndUnknownProjectWithMultipleProjectTypeGuids/App.sln
new file mode 100644
index 000000000..5b61df887
--- /dev/null
+++ b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndUnknownProjectWithMultipleProjectTypeGuids/App.sln
@@ -0,0 +1,18 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26006.2
+MinimumVisualStudioVersion = 10.0.40219.1
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
+ Release|Any CPU = Release|Any CPU
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndUnknownProjectWithMultipleProjectTypeGuids/UnknownProject/UnknownProject.unknownproj b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndUnknownProjectWithMultipleProjectTypeGuids/UnknownProject/UnknownProject.unknownproj
new file mode 100644
index 000000000..c5e694360
--- /dev/null
+++ b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndUnknownProjectWithMultipleProjectTypeGuids/UnknownProject/UnknownProject.unknownproj
@@ -0,0 +1,6 @@
+
+
+
+ {20E2F8CC-55AA-4705-B10F-7ABA6F107ECE};{130159A9-F047-44B3-88CF-0CF7F02ED50F}
+
+
diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndUnknownProjectWithSingleProjectTypeGuid/App.sln b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndUnknownProjectWithSingleProjectTypeGuid/App.sln
new file mode 100644
index 000000000..5b61df887
--- /dev/null
+++ b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndUnknownProjectWithSingleProjectTypeGuid/App.sln
@@ -0,0 +1,18 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26006.2
+MinimumVisualStudioVersion = 10.0.40219.1
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
+ Release|Any CPU = Release|Any CPU
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndUnknownProjectWithSingleProjectTypeGuid/UnknownProject/UnknownProject.unknownproj b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndUnknownProjectWithSingleProjectTypeGuid/UnknownProject/UnknownProject.unknownproj
new file mode 100644
index 000000000..2615598f1
--- /dev/null
+++ b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndUnknownProjectWithSingleProjectTypeGuid/UnknownProject/UnknownProject.unknownproj
@@ -0,0 +1,6 @@
+
+
+
+ {130159A9-F047-44B3-88CF-0CF7F02ED50F}
+
+
diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndVBProject/App.sln b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndVBProject/App.sln
new file mode 100644
index 000000000..5b61df887
--- /dev/null
+++ b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndVBProject/App.sln
@@ -0,0 +1,18 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26006.2
+MinimumVisualStudioVersion = 10.0.40219.1
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
+ Release|Any CPU = Release|Any CPU
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndVBProject/VBProject/App.config b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndVBProject/VBProject/App.config
new file mode 100644
index 000000000..88fa4027b
--- /dev/null
+++ b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndVBProject/VBProject/App.config
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndVBProject/VBProject/Module1.vb b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndVBProject/VBProject/Module1.vb
new file mode 100644
index 000000000..5d7e3a343
--- /dev/null
+++ b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndVBProject/VBProject/Module1.vb
@@ -0,0 +1,7 @@
+Module Module1
+
+ Sub Main()
+
+ End Sub
+
+End Module
diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndVBProject/VBProject/My Project/Application.Designer.vb b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndVBProject/VBProject/My Project/Application.Designer.vb
new file mode 100644
index 000000000..88dd01c78
--- /dev/null
+++ b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndVBProject/VBProject/My Project/Application.Designer.vb
@@ -0,0 +1,13 @@
+'------------------------------------------------------------------------------
+'
+' This code was generated by a tool.
+' Runtime Version:4.0.30319.42000
+'
+' Changes to this file may cause incorrect behavior and will be lost if
+' the code is regenerated.
+'
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+
diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndVBProject/VBProject/My Project/Application.myapp b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndVBProject/VBProject/My Project/Application.myapp
new file mode 100644
index 000000000..e62f1a533
--- /dev/null
+++ b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndVBProject/VBProject/My Project/Application.myapp
@@ -0,0 +1,10 @@
+
+
+ false
+ false
+ 0
+ true
+ 0
+ 2
+ true
+
diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndVBProject/VBProject/My Project/AssemblyInfo.vb b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndVBProject/VBProject/My Project/AssemblyInfo.vb
new file mode 100644
index 000000000..e06141688
--- /dev/null
+++ b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndVBProject/VBProject/My Project/AssemblyInfo.vb
@@ -0,0 +1,35 @@
+Imports System
+Imports System.Reflection
+Imports System.Runtime.InteropServices
+
+' General Information about an assembly is controlled through the following
+' set of attributes. Change these attribute values to modify the information
+' associated with an assembly.
+
+' Review the values of the assembly attributes
+
+
+
+
+
+
+
+
+
+
+'The following GUID is for the ID of the typelib if this project is exposed to COM
+
+
+' Version information for an assembly consists of the following four values:
+'
+' Major Version
+' Minor Version
+' Build Number
+' Revision
+'
+' You can specify all the values or you can default the Build and Revision Numbers
+' by using the '*' as shown below:
+'
+
+
+
diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndVBProject/VBProject/My Project/Resources.Designer.vb b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndVBProject/VBProject/My Project/Resources.Designer.vb
new file mode 100644
index 000000000..7b5d7f7fb
--- /dev/null
+++ b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndVBProject/VBProject/My Project/Resources.Designer.vb
@@ -0,0 +1,62 @@
+'------------------------------------------------------------------------------
+'
+' This code was generated by a tool.
+' Runtime Version:4.0.30319.42000
+'
+' Changes to this file may cause incorrect behavior and will be lost if
+' the code is regenerated.
+'
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+
+
+Namespace My.Resources
+
+ 'This class was auto-generated by the StronglyTypedResourceBuilder
+ 'class via a tool like ResGen or Visual Studio.
+ 'To add or remove a member, edit your .ResX file then rerun ResGen
+ 'with the /str option, or rebuild your VS project.
+ '''
+ ''' A strongly-typed resource class, for looking up localized strings, etc.
+ '''
+ _
+ Friend Module Resources
+
+ Private resourceMan As Global.System.Resources.ResourceManager
+
+ Private resourceCulture As Global.System.Globalization.CultureInfo
+
+ '''
+ ''' Returns the cached ResourceManager instance used by this class.
+ '''
+ _
+ Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
+ Get
+ If Object.ReferenceEquals(resourceMan, Nothing) Then
+ Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("VBProject.Resources", GetType(Resources).Assembly)
+ resourceMan = temp
+ End If
+ Return resourceMan
+ End Get
+ End Property
+
+ '''
+ ''' Overrides the current thread's CurrentUICulture property for all
+ ''' resource lookups using this strongly typed resource class.
+ '''
+ _
+ Friend Property Culture() As Global.System.Globalization.CultureInfo
+ Get
+ Return resourceCulture
+ End Get
+ Set(ByVal value As Global.System.Globalization.CultureInfo)
+ resourceCulture = value
+ End Set
+ End Property
+ End Module
+End Namespace
diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndVBProject/VBProject/My Project/Resources.resx b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndVBProject/VBProject/My Project/Resources.resx
new file mode 100644
index 000000000..af7dbebba
--- /dev/null
+++ b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndVBProject/VBProject/My Project/Resources.resx
@@ -0,0 +1,117 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndVBProject/VBProject/My Project/Settings.Designer.vb b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndVBProject/VBProject/My Project/Settings.Designer.vb
new file mode 100644
index 000000000..40d08710c
--- /dev/null
+++ b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndVBProject/VBProject/My Project/Settings.Designer.vb
@@ -0,0 +1,73 @@
+'------------------------------------------------------------------------------
+'
+' This code was generated by a tool.
+' Runtime Version:4.0.30319.42000
+'
+' Changes to this file may cause incorrect behavior and will be lost if
+' the code is regenerated.
+'
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+
+
+Namespace My
+
+ _
+ Partial Friend NotInheritable Class MySettings
+ Inherits Global.System.Configuration.ApplicationSettingsBase
+
+ Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings), MySettings)
+
+#Region "My.Settings Auto-Save Functionality"
+#If _MyType = "WindowsForms" Then
+ Private Shared addedHandler As Boolean
+
+ Private Shared addedHandlerLockObject As New Object
+
+ _
+ Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs)
+ If My.Application.SaveMySettingsOnExit Then
+ My.Settings.Save()
+ End If
+ End Sub
+#End If
+#End Region
+
+ Public Shared ReadOnly Property [Default]() As MySettings
+ Get
+
+#If _MyType = "WindowsForms" Then
+ If Not addedHandler Then
+ SyncLock addedHandlerLockObject
+ If Not addedHandler Then
+ AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings
+ addedHandler = True
+ End If
+ End SyncLock
+ End If
+#End If
+ Return defaultInstance
+ End Get
+ End Property
+ End Class
+End Namespace
+
+Namespace My
+
+ _
+ Friend Module MySettingsProperty
+
+ _
+ Friend ReadOnly Property Settings() As Global.VBProject.My.MySettings
+ Get
+ Return Global.VBProject.My.MySettings.Default
+ End Get
+ End Property
+ End Module
+End Namespace
diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndVBProject/VBProject/My Project/Settings.settings b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndVBProject/VBProject/My Project/Settings.settings
new file mode 100644
index 000000000..85b890b3c
--- /dev/null
+++ b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndVBProject/VBProject/My Project/Settings.settings
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndVBProject/VBProject/VBProject.vbproj b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndVBProject/VBProject/VBProject.vbproj
new file mode 100644
index 000000000..e383214a4
--- /dev/null
+++ b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndVBProject/VBProject/VBProject.vbproj
@@ -0,0 +1,109 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {399CECC0-BEAD-436F-9D5F-BB50EBD683DF}
+ Exe
+ VBProject.Module1
+ VBProject
+ VBProject
+ 512
+ Console
+ v4.5.2
+ true
+
+
+ AnyCPU
+ true
+ full
+ true
+ true
+ bin\Debug\
+ VBProject.xml
+ 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022
+
+
+ AnyCPU
+ pdbonly
+ false
+ true
+ true
+ bin\Release\
+ VBProject.xml
+ 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022
+
+
+ On
+
+
+ Binary
+
+
+ Off
+
+
+ On
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ True
+ Application.myapp
+
+
+ True
+ True
+ Resources.resx
+
+
+ True
+ Settings.settings
+ True
+
+
+
+
+ VbMyResourcesResXFileCodeGenerator
+ Resources.Designer.vb
+ My.Resources
+ Designer
+
+
+
+
+ MyApplicationCodeGenerator
+ Application.Designer.vb
+
+
+ SettingsSingleFileGenerator
+ My
+ Settings.Designer.vb
+
+
+
+
+
diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/CsprojLibrary1.csproj b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/CsprojLibrary1.csproj
index 06471fc11..90ed848e5 100644
--- a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/CsprojLibrary1.csproj
+++ b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/CsprojLibrary1.csproj
@@ -7,8 +7,6 @@
-
-
diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/CsprojLibrary2.csproj b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/CsprojLibrary2.csproj
index 06471fc11..90ed848e5 100644
--- a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/CsprojLibrary2.csproj
+++ b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/CsprojLibrary2.csproj
@@ -7,8 +7,6 @@
-
-
diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/CsprojLibrary3.csproj b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/CsprojLibrary3.csproj
index 06471fc11..90ed848e5 100644
--- a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/CsprojLibrary3.csproj
+++ b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/CsprojLibrary3.csproj
@@ -7,8 +7,6 @@
-
-
diff --git a/TestAssets/NonRestoredTestProjects/MigrateAppWithMissingDep/.noautobuild b/TestAssets/TestProjects/TestAppMultipleFrameworksNoRuntimes/.noautobuild
similarity index 100%
rename from TestAssets/NonRestoredTestProjects/MigrateAppWithMissingDep/.noautobuild
rename to TestAssets/TestProjects/TestAppMultipleFrameworksNoRuntimes/.noautobuild
diff --git a/TestAssets/TestProjects/TestAppMultipleFrameworksNoRuntimes/Program.cs b/TestAssets/TestProjects/TestAppMultipleFrameworksNoRuntimes/Program.cs
new file mode 100644
index 000000000..bb536dcc4
--- /dev/null
+++ b/TestAssets/TestProjects/TestAppMultipleFrameworksNoRuntimes/Program.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Xml;
+
+namespace ConsoleApplication
+{
+ public class Program
+ {
+ public static void Main()
+ {
+ Console.WriteLine("Hello World!");
+#if NET20 || NET35 || NET45 || NET461
+ // Force XmlDocument to be used
+ var doc = new XmlDocument();
+#endif
+ }
+ }
+}
diff --git a/TestAssets/TestProjects/TestAppMultipleFrameworksNoRuntimes/project.json b/TestAssets/TestProjects/TestAppMultipleFrameworksNoRuntimes/project.json
new file mode 100644
index 000000000..4779b862d
--- /dev/null
+++ b/TestAssets/TestProjects/TestAppMultipleFrameworksNoRuntimes/project.json
@@ -0,0 +1,22 @@
+{
+ "version": "1.0.0-*",
+ "buildOptions": {
+ "emitEntryPoint": true
+ },
+ "dependencies": {},
+ "frameworks": {
+ "net461": {
+ "frameworkAssemblies": {
+ "System.Xml": {}
+ }
+ },
+ "netcoreapp1.0": {
+ "dependencies": {
+ "Microsoft.NetCore.App": {
+ "version": "1.0.3",
+ "type": "platform"
+ }
+ }
+ }
+ }
+}
diff --git a/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj b/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj
index 381245f16..365778100 100755
--- a/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj
+++ b/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj
@@ -3,14 +3,9 @@
netcoreapp1.0
Exe
-
-
-
-
-
- 1.0.1
+ 1.0.3
diff --git a/TestAssets/TestProjects/TestAppWithEmptySln/App.sln b/TestAssets/TestProjects/TestAppWithEmptySln/App.sln
new file mode 100644
index 000000000..8eca25366
--- /dev/null
+++ b/TestAssets/TestProjects/TestAppWithEmptySln/App.sln
@@ -0,0 +1,5 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26006.2
+MinimumVisualStudioVersion = 10.0.40219.1
diff --git a/TestAssets/TestProjects/TestAppWithEmptySln/App/App.csproj b/TestAssets/TestProjects/TestAppWithEmptySln/App/App.csproj
new file mode 100644
index 000000000..dbec1b003
--- /dev/null
+++ b/TestAssets/TestProjects/TestAppWithEmptySln/App/App.csproj
@@ -0,0 +1,15 @@
+
+
+ Exe
+ netcoreapp1.0
+
+
+
+
+
+
+
+
+
+
+
diff --git a/TestAssets/TestProjects/TestAppWithEmptySln/App/Program.cs b/TestAssets/TestProjects/TestAppWithEmptySln/App/Program.cs
new file mode 100644
index 000000000..abb853a4a
--- /dev/null
+++ b/TestAssets/TestProjects/TestAppWithEmptySln/App/Program.cs
@@ -0,0 +1,10 @@
+using System;
+
+class Program
+{
+ static void Main(string[] args)
+ {
+ Console.WriteLine("Hello from the main app");
+ Console.WriteLine(Lib.Library.GetMessage());
+ }
+}
diff --git a/TestAssets/TestProjects/TestAppWithEmptySln/Lib/Lib.csproj b/TestAssets/TestProjects/TestAppWithEmptySln/Lib/Lib.csproj
new file mode 100644
index 000000000..9f8bcbb51
--- /dev/null
+++ b/TestAssets/TestProjects/TestAppWithEmptySln/Lib/Lib.csproj
@@ -0,0 +1,11 @@
+
+
+
+ netstandard1.4
+
+
+
+
+
+
+
diff --git a/TestAssets/TestProjects/TestAppWithEmptySln/Lib/Library.cs b/TestAssets/TestProjects/TestAppWithEmptySln/Lib/Library.cs
new file mode 100644
index 000000000..205c42a01
--- /dev/null
+++ b/TestAssets/TestProjects/TestAppWithEmptySln/Lib/Library.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace Lib
+{
+ public class Library
+ {
+ public static string GetMessage()
+ {
+ return "Message from Lib";
+ }
+ }
+}
diff --git a/TestAssets/TestProjects/TestAppWithMultipleFrameworksAndRuntimes/project.json b/TestAssets/TestProjects/TestAppWithMultipleFrameworksAndRuntimes/project.json
index 0fca6f2a3..352eedd80 100644
--- a/TestAssets/TestProjects/TestAppWithMultipleFrameworksAndRuntimes/project.json
+++ b/TestAssets/TestProjects/TestAppWithMultipleFrameworksAndRuntimes/project.json
@@ -27,7 +27,7 @@
},
"netcoreapp1.0": {
"dependencies": {
- "Microsoft.NetCore.App": "1.0.1"
+ "Microsoft.NetCore.App": "1.0.3"
}
}
},
diff --git a/TestAssets/NonRestoredTestProjects/MigrateAppWithMissingDep/MyApp/.noautobuild b/TestAssets/TestProjects/TestAppWithMultipleFullFrameworksOnly/.noautobuild
similarity index 100%
rename from TestAssets/NonRestoredTestProjects/MigrateAppWithMissingDep/MyApp/.noautobuild
rename to TestAssets/TestProjects/TestAppWithMultipleFullFrameworksOnly/.noautobuild
diff --git a/TestAssets/TestProjects/TestAppWithMultipleFullFrameworksOnly/Program.cs b/TestAssets/TestProjects/TestAppWithMultipleFullFrameworksOnly/Program.cs
new file mode 100644
index 000000000..bb536dcc4
--- /dev/null
+++ b/TestAssets/TestProjects/TestAppWithMultipleFullFrameworksOnly/Program.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Xml;
+
+namespace ConsoleApplication
+{
+ public class Program
+ {
+ public static void Main()
+ {
+ Console.WriteLine("Hello World!");
+#if NET20 || NET35 || NET45 || NET461
+ // Force XmlDocument to be used
+ var doc = new XmlDocument();
+#endif
+ }
+ }
+}
diff --git a/TestAssets/TestProjects/TestAppWithMultipleFullFrameworksOnly/project.json b/TestAssets/TestProjects/TestAppWithMultipleFullFrameworksOnly/project.json
new file mode 100644
index 000000000..6324ec95a
--- /dev/null
+++ b/TestAssets/TestProjects/TestAppWithMultipleFullFrameworksOnly/project.json
@@ -0,0 +1,29 @@
+{
+ "version": "1.0.0-*",
+ "buildOptions": {
+ "emitEntryPoint": true
+ },
+ "dependencies": {},
+ "frameworks": {
+ "net20": {
+ "frameworkAssemblies": {
+ "System.Xml": {}
+ }
+ },
+ "net35": {
+ "frameworkAssemblies": {
+ "System.Xml": {}
+ }
+ },
+ "net40": {
+ "frameworkAssemblies": {
+ "System.Xml": {}
+ }
+ },
+ "net461": {
+ "frameworkAssemblies": {
+ "System.Xml": {}
+ }
+ }
+ }
+}
diff --git a/TestAssets/TestProjects/TestAppWithMultipleSlnFiles/App/App.csproj b/TestAssets/TestProjects/TestAppWithMultipleSlnFiles/App/App.csproj
index c1313e358..5ea4163e5 100644
--- a/TestAssets/TestProjects/TestAppWithMultipleSlnFiles/App/App.csproj
+++ b/TestAssets/TestProjects/TestAppWithMultipleSlnFiles/App/App.csproj
@@ -5,11 +5,7 @@
-
-
-
-
-
+
diff --git a/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj b/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj
index 4ff85ffd3..f252d7975 100644
--- a/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj
+++ b/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj
@@ -4,13 +4,9 @@
netcoreapp1.0
-
-
-
-
- 1.0.1
+ 1.0.3
1.0.0
diff --git a/TestAssets/TestProjects/TestAppWithSln/Program.cs b/TestAssets/TestProjects/TestAppWithSln/Program.cs
deleted file mode 100644
index 51233cffa..000000000
--- a/TestAssets/TestProjects/TestAppWithSln/Program.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-
-namespace ConsoleApplication
-{
- public class Program
- {
- public static void Main(string[] args)
- {
- Console.WriteLine("Hello World!");
- }
- }
-}
diff --git a/TestAssets/TestProjects/TestAppWithSln/TestAppWithSln.sln b/TestAssets/TestProjects/TestAppWithSln/TestAppWithSln.sln
deleted file mode 100644
index e6b587e50..000000000
--- a/TestAssets/TestProjects/TestAppWithSln/TestAppWithSln.sln
+++ /dev/null
@@ -1,22 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TestAppWithSln", "TestAppWithSln.xproj", "{0138CB8F-4AA9-4029-A21E-C07C30F425BA}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {0138CB8F-4AA9-4029-A21E-C07C30F425BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {0138CB8F-4AA9-4029-A21E-C07C30F425BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {0138CB8F-4AA9-4029-A21E-C07C30F425BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {0138CB8F-4AA9-4029-A21E-C07C30F425BA}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/TestAssets/TestProjects/TestAppWithSln/TestAppWithSln.xproj b/TestAssets/TestProjects/TestAppWithSln/TestAppWithSln.xproj
deleted file mode 100644
index 53f0c8b7a..000000000
--- a/TestAssets/TestProjects/TestAppWithSln/TestAppWithSln.xproj
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- 14.0.23107
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- 0138cb8f-4aa9-4029-a21e-c07c30f425ba
- TestAppWithContents
- ..\..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\..\artifacts\
-
-
- 2.0
-
-
-
\ No newline at end of file
diff --git a/TestAssets/TestProjects/TestAppWithSln/project.json b/TestAssets/TestProjects/TestAppWithSln/project.json
deleted file mode 100644
index 5f8329deb..000000000
--- a/TestAssets/TestProjects/TestAppWithSln/project.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "version": "1.0.0-*",
- "buildOptions": {
- "emitEntryPoint": true
- },
- "dependencies": {
- "Microsoft.NETCore.App": "1.0.1"
- },
- "frameworks": {
- "netcoreapp1.0": {}
- },
- "runtimes": {
- "win7-x64": {},
- "win7-x86": {},
- "osx.10.10-x64": {},
- "osx.10.11-x64": {},
- "ubuntu.14.04-x64": {},
- "ubuntu.16.04-x64": {},
- "centos.7-x64": {},
- "rhel.7.2-x64": {},
- "debian.8-x64": {},
- "fedora.23-x64": {},
- "opensuse.13.2-x64": {}
- }
-}
\ No newline at end of file
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojFiles/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCsprojFiles/App/App.csproj
index 423ceb827..dbec1b003 100644
--- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojFiles/App/App.csproj
+++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojFiles/App/App.csproj
@@ -4,16 +4,12 @@
netcoreapp1.0
-
-
-
-
-
+
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojFiles/Lib/Lib.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCsprojFiles/Lib/Lib.csproj
index f47b49f65..9f8bcbb51 100644
--- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojFiles/Lib/Lib.csproj
+++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojFiles/Lib/Lib.csproj
@@ -4,10 +4,6 @@
netstandard1.4
-
-
-
-
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDir/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDir/App.csproj
new file mode 100644
index 000000000..ee225988e
--- /dev/null
+++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDir/App.csproj
@@ -0,0 +1,15 @@
+
+
+ Exe
+ netcoreapp1.0
+
+
+
+
+
+
+
+
+
+
+
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDir/App.sln b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDir/App.sln
new file mode 100644
index 000000000..7bd8cded0
--- /dev/null
+++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDir/App.sln
@@ -0,0 +1,34 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26006.2
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "App", "App.csproj", "{7072A694-548F-4CAE-A58F-12D257D5F486}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
+ Release|Any CPU = Release|Any CPU
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|x64.ActiveCfg = Debug|x64
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|x64.Build.0 = Debug|x64
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|x86.ActiveCfg = Debug|x86
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|x86.Build.0 = Debug|x86
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Release|x64.ActiveCfg = Release|x64
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Release|x64.Build.0 = Release|x64
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Release|x86.ActiveCfg = Release|x86
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Release|x86.Build.0 = Release|x86
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDir/Program.cs b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDir/Program.cs
new file mode 100644
index 000000000..abb853a4a
--- /dev/null
+++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDir/Program.cs
@@ -0,0 +1,10 @@
+using System;
+
+class Program
+{
+ static void Main(string[] args)
+ {
+ Console.WriteLine("Hello from the main app");
+ Console.WriteLine(Lib.Library.GetMessage());
+ }
+}
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDir/src/Lib/Lib.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDir/src/Lib/Lib.csproj
new file mode 100644
index 000000000..aacaac752
--- /dev/null
+++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDir/src/Lib/Lib.csproj
@@ -0,0 +1,16 @@
+
+
+
+ netstandard1.4
+ {84A45D44-B677-492D-A6DA-B3A71135AB8E}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDir/src/Lib/Library.cs b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDir/src/Lib/Library.cs
new file mode 100644
index 000000000..205c42a01
--- /dev/null
+++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDir/src/Lib/Library.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace Lib
+{
+ public class Library
+ {
+ public static string GetMessage()
+ {
+ return "Message from Lib";
+ }
+ }
+}
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/App.csproj
new file mode 100644
index 000000000..7b66a1185
--- /dev/null
+++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/App.csproj
@@ -0,0 +1,9 @@
+
+
+ Exe
+ netcoreapp1.0
+
+
+
+
+
\ No newline at end of file
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/App.sln b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/App.sln
new file mode 100644
index 000000000..b00300a34
--- /dev/null
+++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/App.sln
@@ -0,0 +1,62 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26006.2
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "App", "App.csproj", "{7072A694-548F-4CAE-A58F-12D257D5F486}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7B86CE74-F620-4B32-99FE-82D40F8D6BF2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lib", "Lib", "{EAB71280-AF32-4531-8703-43CDBA261AA3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lib", "src\Lib\Lib.csproj", "{84A45D44-B677-492D-A6DA-B3A71135AB8E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NotLastProjInSrc", "NotLastProjInSrc", "{1C5EE322-7073-4298-A077-B7816B1CE15F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NotLastProjInSrc", "src\NotLastProjInSrc\NotLastProjInSrc.csproj", "{96E9FA7D-FE59-4866-AE1E-F9EC2BB2FC67}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
+ Release|Any CPU = Release|Any CPU
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|x64.ActiveCfg = Debug|x64
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|x64.Build.0 = Debug|x64
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|x86.ActiveCfg = Debug|x86
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|x86.Build.0 = Debug|x86
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Release|x64.ActiveCfg = Release|x64
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Release|x64.Build.0 = Release|x64
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Release|x86.ActiveCfg = Release|x86
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Release|x86.Build.0 = Release|x86
+ {84A45D44-B677-492D-A6DA-B3A71135AB8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {84A45D44-B677-492D-A6DA-B3A71135AB8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {84A45D44-B677-492D-A6DA-B3A71135AB8E}.Debug|x64.ActiveCfg = Debug|x64
+ {84A45D44-B677-492D-A6DA-B3A71135AB8E}.Debug|x64.Build.0 = Debug|x64
+ {84A45D44-B677-492D-A6DA-B3A71135AB8E}.Debug|x86.ActiveCfg = Debug|x86
+ {84A45D44-B677-492D-A6DA-B3A71135AB8E}.Debug|x86.Build.0 = Debug|x86
+ {84A45D44-B677-492D-A6DA-B3A71135AB8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {84A45D44-B677-492D-A6DA-B3A71135AB8E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {84A45D44-B677-492D-A6DA-B3A71135AB8E}.Release|x64.ActiveCfg = Release|x64
+ {84A45D44-B677-492D-A6DA-B3A71135AB8E}.Release|x64.Build.0 = Release|x64
+ {84A45D44-B677-492D-A6DA-B3A71135AB8E}.Release|x86.ActiveCfg = Release|x86
+ {84A45D44-B677-492D-A6DA-B3A71135AB8E}.Release|x86.Build.0 = Release|x86
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(NestedProjects) = preSolution
+ {EAB71280-AF32-4531-8703-43CDBA261AA3} = {7B86CE74-F620-4B32-99FE-82D40F8D6BF2}
+ {84A45D44-B677-492D-A6DA-B3A71135AB8E} = {EAB71280-AF32-4531-8703-43CDBA261AA3}
+ {1C5EE322-7073-4298-A077-B7816B1CE15F} = {7B86CE74-F620-4B32-99FE-82D40F8D6BF2}
+ {96E9FA7D-FE59-4866-AE1E-F9EC2BB2FC67} = {1C5EE322-7073-4298-A077-B7816B1CE15F}
+ EndGlobalSection
+EndGlobal
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/Program.cs b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/Program.cs
new file mode 100644
index 000000000..abb853a4a
--- /dev/null
+++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/Program.cs
@@ -0,0 +1,10 @@
+using System;
+
+class Program
+{
+ static void Main(string[] args)
+ {
+ Console.WriteLine("Hello from the main app");
+ Console.WriteLine(Lib.Library.GetMessage());
+ }
+}
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/src/Lib/Lib.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/src/Lib/Lib.csproj
new file mode 100644
index 000000000..aacaac752
--- /dev/null
+++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/src/Lib/Lib.csproj
@@ -0,0 +1,16 @@
+
+
+
+ netstandard1.4
+ {84A45D44-B677-492D-A6DA-B3A71135AB8E}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/src/Lib/Library.cs b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/src/Lib/Library.cs
new file mode 100644
index 000000000..205c42a01
--- /dev/null
+++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/src/Lib/Library.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace Lib
+{
+ public class Library
+ {
+ public static string GetMessage()
+ {
+ return "Message from Lib";
+ }
+ }
+}
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojProjectGuidFiles/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCsprojProjectGuidFiles/App/App.csproj
index 423ceb827..dbec1b003 100644
--- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojProjectGuidFiles/App/App.csproj
+++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojProjectGuidFiles/App/App.csproj
@@ -4,16 +4,12 @@
netcoreapp1.0
-
-
-
-
-
+
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojProjectGuidFiles/Lib/Lib.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCsprojProjectGuidFiles/Lib/Lib.csproj
index aacaac752..4a0fd46d5 100644
--- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojProjectGuidFiles/Lib/Lib.csproj
+++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojProjectGuidFiles/Lib/Lib.csproj
@@ -5,10 +5,6 @@
{84A45D44-B677-492D-A6DA-B3A71135AB8E}
-
-
-
-
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/App.sln b/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/App.sln
new file mode 100644
index 000000000..6af5ab783
--- /dev/null
+++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/App.sln
@@ -0,0 +1,45 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26006.2
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "App", "App\App.csproj", "{7072A694-548F-4CAE-A58F-12D257D5F486}"
+EndProject
+Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "Lib", "Lib\Lib.csproj", "{21D9159F-60E6-4F65-BC6B-D01B71B15FFC}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
+ Release|Any CPU = Release|Any CPU
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|x64.ActiveCfg = Debug|x64
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|x64.Build.0 = Debug|x64
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|x86.ActiveCfg = Debug|x86
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|x86.Build.0 = Debug|x86
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Release|x64.ActiveCfg = Release|x64
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Release|x64.Build.0 = Release|x64
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Release|x86.ActiveCfg = Release|x86
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Release|x86.Build.0 = Release|x86
+ {21D9159F-60E6-4F65-BC6B-D01B71B15FFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {21D9159F-60E6-4F65-BC6B-D01B71B15FFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {21D9159F-60E6-4F65-BC6B-D01B71B15FFC}.Debug|x64.ActiveCfg = Debug|x64
+ {21D9159F-60E6-4F65-BC6B-D01B71B15FFC}.Debug|x64.Build.0 = Debug|x64
+ {21D9159F-60E6-4F65-BC6B-D01B71B15FFC}.Debug|x86.ActiveCfg = Debug|x86
+ {21D9159F-60E6-4F65-BC6B-D01B71B15FFC}.Debug|x86.Build.0 = Debug|x86
+ {21D9159F-60E6-4F65-BC6B-D01B71B15FFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {21D9159F-60E6-4F65-BC6B-D01B71B15FFC}.Release|Any CPU.Build.0 = Release|Any CPU
+ {21D9159F-60E6-4F65-BC6B-D01B71B15FFC}.Release|x64.ActiveCfg = Release|x64
+ {21D9159F-60E6-4F65-BC6B-D01B71B15FFC}.Release|x64.Build.0 = Release|x64
+ {21D9159F-60E6-4F65-BC6B-D01B71B15FFC}.Release|x86.ActiveCfg = Release|x86
+ {21D9159F-60E6-4F65-BC6B-D01B71B15FFC}.Release|x86.Build.0 = Release|x86
+ EndGlobalSection
+EndGlobal
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/App/App.csproj
new file mode 100644
index 000000000..5ea4163e5
--- /dev/null
+++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/App/App.csproj
@@ -0,0 +1,11 @@
+
+
+ Exe
+ netcoreapp1.0
+
+
+
+
+
+
+
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/App/Program.cs b/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/App/Program.cs
new file mode 100644
index 000000000..acdf5839d
--- /dev/null
+++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/App/Program.cs
@@ -0,0 +1,9 @@
+using System;
+
+class Program
+{
+ static void Main(string[] args)
+ {
+ Console.WriteLine("Hello from the main app");
+ }
+}
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/Lib/Lib.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/Lib/Lib.csproj
new file mode 100644
index 000000000..9f8bcbb51
--- /dev/null
+++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/Lib/Lib.csproj
@@ -0,0 +1,11 @@
+
+
+
+ netstandard1.4
+
+
+
+
+
+
+
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/Lib/Library.cs b/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/Lib/Library.cs
new file mode 100644
index 000000000..205c42a01
--- /dev/null
+++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/Lib/Library.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace Lib
+{
+ public class Library
+ {
+ public static string GetMessage()
+ {
+ return "Message from Lib";
+ }
+ }
+}
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndDuplicateProjectReferences/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndDuplicateProjectReferences/App/App.csproj
index 423ceb827..dbec1b003 100644
--- a/TestAssets/TestProjects/TestAppWithSlnAndDuplicateProjectReferences/App/App.csproj
+++ b/TestAssets/TestProjects/TestAppWithSlnAndDuplicateProjectReferences/App/App.csproj
@@ -4,16 +4,12 @@
netcoreapp1.0
-
-
-
-
-
+
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndDuplicateProjectReferences/Lib/Lib.csproj b/TestAssets/TestProjects/TestAppWithSlnAndDuplicateProjectReferences/Lib/Lib.csproj
index f47b49f65..9f8bcbb51 100644
--- a/TestAssets/TestProjects/TestAppWithSlnAndDuplicateProjectReferences/Lib/Lib.csproj
+++ b/TestAssets/TestProjects/TestAppWithSlnAndDuplicateProjectReferences/Lib/Lib.csproj
@@ -4,10 +4,6 @@
netstandard1.4
-
-
-
-
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferences/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferences/App/App.csproj
index 423ceb827..27e43f08e 100644
--- a/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferences/App/App.csproj
+++ b/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferences/App/App.csproj
@@ -13,7 +13,7 @@
-
+
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferences/Lib/Lib.csproj b/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferences/Lib/Lib.csproj
index f47b49f65..9f8bcbb51 100644
--- a/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferences/Lib/Lib.csproj
+++ b/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferences/Lib/Lib.csproj
@@ -4,10 +4,6 @@
netstandard1.4
-
-
-
-
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndLastCsprojInSubDirToRemove/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndLastCsprojInSubDirToRemove/App.csproj
new file mode 100644
index 000000000..ce2fa0a6b
--- /dev/null
+++ b/TestAssets/TestProjects/TestAppWithSlnAndLastCsprojInSubDirToRemove/App.csproj
@@ -0,0 +1,10 @@
+
+
+ Exe
+ netcoreapp1.0
+
+
+
+
+
+
\ No newline at end of file
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndLastCsprojInSubDirToRemove/App.sln b/TestAssets/TestProjects/TestAppWithSlnAndLastCsprojInSubDirToRemove/App.sln
new file mode 100644
index 000000000..ac77ad340
--- /dev/null
+++ b/TestAssets/TestProjects/TestAppWithSlnAndLastCsprojInSubDirToRemove/App.sln
@@ -0,0 +1,53 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26006.2
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "App", "App.csproj", "{7072A694-548F-4CAE-A58F-12D257D5F486}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7B86CE74-F620-4B32-99FE-82D40F8D6BF2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lib", "Lib", "{EAB71280-AF32-4531-8703-43CDBA261AA3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lib", "src\Lib\Lib.csproj", "{84A45D44-B677-492D-A6DA-B3A71135AB8E}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
+ Release|Any CPU = Release|Any CPU
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|x64.ActiveCfg = Debug|x64
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|x64.Build.0 = Debug|x64
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|x86.ActiveCfg = Debug|x86
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|x86.Build.0 = Debug|x86
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Release|x64.ActiveCfg = Release|x64
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Release|x64.Build.0 = Release|x64
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Release|x86.ActiveCfg = Release|x86
+ {7072A694-548F-4CAE-A58F-12D257D5F486}.Release|x86.Build.0 = Release|x86
+ {84A45D44-B677-492D-A6DA-B3A71135AB8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {84A45D44-B677-492D-A6DA-B3A71135AB8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {84A45D44-B677-492D-A6DA-B3A71135AB8E}.Debug|x64.ActiveCfg = Debug|x64
+ {84A45D44-B677-492D-A6DA-B3A71135AB8E}.Debug|x64.Build.0 = Debug|x64
+ {84A45D44-B677-492D-A6DA-B3A71135AB8E}.Debug|x86.ActiveCfg = Debug|x86
+ {84A45D44-B677-492D-A6DA-B3A71135AB8E}.Debug|x86.Build.0 = Debug|x86
+ {84A45D44-B677-492D-A6DA-B3A71135AB8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {84A45D44-B677-492D-A6DA-B3A71135AB8E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {84A45D44-B677-492D-A6DA-B3A71135AB8E}.Release|x64.ActiveCfg = Release|x64
+ {84A45D44-B677-492D-A6DA-B3A71135AB8E}.Release|x64.Build.0 = Release|x64
+ {84A45D44-B677-492D-A6DA-B3A71135AB8E}.Release|x86.ActiveCfg = Release|x86
+ {84A45D44-B677-492D-A6DA-B3A71135AB8E}.Release|x86.Build.0 = Release|x86
+ EndGlobalSection
+ GlobalSection(NestedProjects) = preSolution
+ {EAB71280-AF32-4531-8703-43CDBA261AA3} = {7B86CE74-F620-4B32-99FE-82D40F8D6BF2}
+ {84A45D44-B677-492D-A6DA-B3A71135AB8E} = {EAB71280-AF32-4531-8703-43CDBA261AA3}
+ EndGlobalSection
+EndGlobal
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndLastCsprojInSubDirToRemove/Program.cs b/TestAssets/TestProjects/TestAppWithSlnAndLastCsprojInSubDirToRemove/Program.cs
new file mode 100644
index 000000000..abb853a4a
--- /dev/null
+++ b/TestAssets/TestProjects/TestAppWithSlnAndLastCsprojInSubDirToRemove/Program.cs
@@ -0,0 +1,10 @@
+using System;
+
+class Program
+{
+ static void Main(string[] args)
+ {
+ Console.WriteLine("Hello from the main app");
+ Console.WriteLine(Lib.Library.GetMessage());
+ }
+}
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndLastCsprojInSubDirToRemove/src/Lib/Lib.csproj b/TestAssets/TestProjects/TestAppWithSlnAndLastCsprojInSubDirToRemove/src/Lib/Lib.csproj
new file mode 100644
index 000000000..aacaac752
--- /dev/null
+++ b/TestAssets/TestProjects/TestAppWithSlnAndLastCsprojInSubDirToRemove/src/Lib/Lib.csproj
@@ -0,0 +1,16 @@
+
+
+
+ netstandard1.4
+ {84A45D44-B677-492D-A6DA-B3A71135AB8E}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/TestAssets/TestProjects/TestAppWithSlnAndLastCsprojInSubDirToRemove/src/Lib/Library.cs b/TestAssets/TestProjects/TestAppWithSlnAndLastCsprojInSubDirToRemove/src/Lib/Library.cs
new file mode 100644
index 000000000..205c42a01
--- /dev/null
+++ b/TestAssets/TestProjects/TestAppWithSlnAndLastCsprojInSubDirToRemove/src/Lib/Library.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace Lib
+{
+ public class Library
+ {
+ public static string GetMessage()
+ {
+ return "Message from Lib";
+ }
+ }
+}
diff --git a/TestAssets/TestProjects/TestLibraryWithConfiguration/TestLibraryWithConfiguration.csproj b/TestAssets/TestProjects/TestLibraryWithConfiguration/TestLibraryWithConfiguration.csproj
index f922f23b3..4924ce508 100755
--- a/TestAssets/TestProjects/TestLibraryWithConfiguration/TestLibraryWithConfiguration.csproj
+++ b/TestAssets/TestProjects/TestLibraryWithConfiguration/TestLibraryWithConfiguration.csproj
@@ -4,11 +4,7 @@
$(NoWarn);CS1591
true
-
-
-
-
-
+
1.6.0
diff --git a/TestAssets/TestProjects/VSTestDesktopAndNetCore/VSTestDesktopAndNetCore.csproj b/TestAssets/TestProjects/VSTestDesktopAndNetCore/VSTestDesktopAndNetCore.csproj
index 0ec85f7b2..7c765ff51 100644
--- a/TestAssets/TestProjects/VSTestDesktopAndNetCore/VSTestDesktopAndNetCore.csproj
+++ b/TestAssets/TestProjects/VSTestDesktopAndNetCore/VSTestDesktopAndNetCore.csproj
@@ -1,4 +1,5 @@
+
Exe
net46;netcoreapp1.0
@@ -8,13 +9,9 @@
DESKTOP;$(DefineConstants)
-
-
-
-
- 1.0.1
+ 1.0.3
@@ -26,7 +23,7 @@
1.1.5-preview
- 15.0.0-preview-20161123-03
+ $(CLI_TestPlatform_Version)
\ No newline at end of file
diff --git a/TestAssets/TestProjects/VSTestDotNetCore/VSTestDotNetCore.csproj b/TestAssets/TestProjects/VSTestDotNetCore/VSTestDotNetCore.csproj
index 21bcde1bf..97230db7a 100644
--- a/TestAssets/TestProjects/VSTestDotNetCore/VSTestDotNetCore.csproj
+++ b/TestAssets/TestProjects/VSTestDotNetCore/VSTestDotNetCore.csproj
@@ -1,16 +1,13 @@
+
Exe
netcoreapp1.0
-
-
-
-
- 1.0.1
+ 1.0.3
1.0.6-preview
@@ -19,7 +16,7 @@
1.1.5-preview
- 15.0.0-preview-20161123-03
+ $(CLI_TestPlatform_Version)
\ No newline at end of file
diff --git a/TestAssets/TestProjects/VSTestXunitDesktopAndNetCore/VSTestXunitDesktopAndNetCore.csproj b/TestAssets/TestProjects/VSTestXunitDesktopAndNetCore/VSTestXunitDesktopAndNetCore.csproj
index cc3cdedd5..1795bb8cf 100644
--- a/TestAssets/TestProjects/VSTestXunitDesktopAndNetCore/VSTestXunitDesktopAndNetCore.csproj
+++ b/TestAssets/TestProjects/VSTestXunitDesktopAndNetCore/VSTestXunitDesktopAndNetCore.csproj
@@ -1,34 +1,26 @@
-
-
+
Exe
net46;netcoreapp1.0
+ win7-x86
+ win7-x86
DESKTOP;$(DefineConstants)
-
-
-
-
- 1.0.1
+ 1.0.3
-
-
-
- 1.0.0-alpha-20161026-2
- All
-
+
- 15.0.0-preview-20161123-03
+ $(CLI_TestPlatform_Version)
2.2.0-beta4-build3444
@@ -37,6 +29,4 @@
2.2.0-beta4-build1194
-
-
diff --git a/TestAssets/TestProjects/VSTestXunitDotNetCore/VSTestXunitDotNetCore.csproj b/TestAssets/TestProjects/VSTestXunitDotNetCore/VSTestXunitDotNetCore.csproj
index ffd096563..491c84b0b 100644
--- a/TestAssets/TestProjects/VSTestXunitDotNetCore/VSTestXunitDotNetCore.csproj
+++ b/TestAssets/TestProjects/VSTestXunitDotNetCore/VSTestXunitDotNetCore.csproj
@@ -1,20 +1,16 @@
+
Exe
netcoreapp1.0
-
-
-
-
-
- 1.0.1
+ 1.0.3
- 15.0.0-preview-20161123-03
+ $(CLI_TestPlatform_Version)
2.2.0-beta4-build3444
diff --git a/build.proj b/build.proj
index e087c34c0..8e9fd472e 100644
--- a/build.proj
+++ b/build.proj
@@ -1,5 +1,6 @@
+
@@ -15,18 +16,15 @@
Prepare;Compile;Test;Package;Publish
Debug
- $(MSBuildThisFileDirectory)
- $(RepoRoot)/build_projects/dotnet-cli-build/bin/dotnet-cli-build
- $(CLIBuildFileName).dll
preview
Microsoft.NETCore.App
- 1.0.1
+ 1.0.3
1.0.1
1.0.1
- 1.0.4
- 1.0.4
+ 1.0.5
+ 1.0.5
.exe
diff --git a/build/Microsoft.DotNet.Cli.BundledSdks.props b/build/Microsoft.DotNet.Cli.BundledSdks.props
index 6b5abffdb..baab92a0b 100644
--- a/build/Microsoft.DotNet.Cli.BundledSdks.props
+++ b/build/Microsoft.DotNet.Cli.BundledSdks.props
@@ -2,7 +2,7 @@
-
+
diff --git a/build/Microsoft.DotNet.Cli.BundledTemplates.proj b/build/Microsoft.DotNet.Cli.BundledTemplates.proj
new file mode 100644
index 000000000..0efbc908d
--- /dev/null
+++ b/build/Microsoft.DotNet.Cli.BundledTemplates.proj
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(NuGetPackagesDir)/$(TemplatePackageName.ToLower())/$(TemplatePackageVersion.ToLower())
+
+
+
diff --git a/build/Microsoft.DotNet.Cli.BundledTemplates.props b/build/Microsoft.DotNet.Cli.BundledTemplates.props
new file mode 100644
index 000000000..9280486a0
--- /dev/null
+++ b/build/Microsoft.DotNet.Cli.BundledTemplates.props
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/build/Microsoft.DotNet.Cli.Compile.targets b/build/Microsoft.DotNet.Cli.Compile.targets
index bf8d939ce..908d2ae94 100644
--- a/build/Microsoft.DotNet.Cli.Compile.targets
+++ b/build/Microsoft.DotNet.Cli.Compile.targets
@@ -10,15 +10,15 @@
-
-
-
+
+
@@ -98,18 +98,25 @@
-
+
-
+
+ Output="$(SdkOutputDirectory)"
+ Configuration="$(Configuration)"
+ VersionSuffix="$(CommitCount)"
+ ProjectPath="$(SrcDirectory)/redist/redist.csproj"
+ MSBuildArgs="/p:GenerateRuntimeConfigurationFiles=true" />
+
+
+
@@ -141,13 +148,6 @@
SectionName="runtimeTargets"
AssetPath="$(BinaryToCorehostifyRelDir)/%(AssetsToRemoveFromDeps.Identity).exe" />
-
-
-
-
-
@@ -264,4 +264,25 @@
Projects="@(SdksToBundle)">
+
+
+
+
+
+ CLIBuildDll=$(CLIBuildDll);
+ NuGetPackagesDir=$(NuGetPackagesDir);
+ TemplateLayoutDirectory=$(SdkOutputDirectory)/Templates;
+ TemplatePackageName=%(BundledTemplate.Identity);
+ TemplatePackageVersion=%(BundledTemplate.Version);
+ Stage0Directory=$(Stage0Directory)
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props
index c008e9517..324f65dfe 100644
--- a/build/Microsoft.DotNet.Cli.DependencyVersions.props
+++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props
@@ -1,8 +1,11 @@
- 15.1.0-preview-000458-02
- 1.0.0-alpha-20161221-2
- 1.0.0-alpha-20161205-1-154
+ 15.1.0-preview-000509-03
+ 2.0.0-rc3-61212-03
+ 1.0.0-alpha-20170105-5
+ 1.0.0-alpha-20170106-1-203
+ 15.0.0-preview-20170106-08
+ 1.0.0-beta1-20170106-79
diff --git a/build/Microsoft.DotNet.Cli.Monikers.props b/build/Microsoft.DotNet.Cli.Monikers.props
index 77e685831..f017176a0 100644
--- a/build/Microsoft.DotNet.Cli.Monikers.props
+++ b/build/Microsoft.DotNet.Cli.Monikers.props
@@ -1,10 +1,14 @@
- Microsoft .NET Core 1.0.1 - SDK Preview 5
- Microsoft .NET Core 1.0.1 - Runtime
- Microsoft .NET Core 1.0.0 - Host
- Microsoft .NET Core 1.0.0 - Host FX Resolver
+ Microsoft .NET Core 1.0.3 - SDK Preview 5
+ Microsoft .NET Core 1.0.3 - Runtime
+ Microsoft .NET Core 1.0.1 - Host
+ Microsoft .NET Core 1.0.1 - Host FX Resolver
+
+ Microsoft .NET Core 1.1.0 - Runtime
+ Microsoft .NET Core 1.1.0 - Host
+ Microsoft .NET Core 1.1.0 - Host FX Resolver
Microsoft.NETCore.App
diff --git a/build/Microsoft.DotNet.Cli.Prepare.targets b/build/Microsoft.DotNet.Cli.Prepare.targets
index 0dae5ea99..b7b34b8a3 100644
--- a/build/Microsoft.DotNet.Cli.Prepare.targets
+++ b/build/Microsoft.DotNet.Cli.Prepare.targets
@@ -3,6 +3,7 @@
+
-
-
-
- $(NUGET_PACKAGES)
- $(RepoRoot)/.nuget/packages
-
@@ -69,6 +64,10 @@
+
+
+
+
$(BaseOutputDirectory)/$(VersionBadgeMoniker)_$(Configuration)_version_badge.svg
$(NugetVersion)
@@ -120,16 +119,37 @@
dotnet-$(ProductMonikerRid).$(SharedFrameworkVersion)$(ArchiveExtension)
+
+
+ release/1.1.0
+ 1.1.0
+ 1.1.0
+ 1.1.0
+
+
+ dotnet-host-$(ProductMonikerRid).$(AdditionalSharedHostVersion)$(InstallerExtension)
+ $(PackagesDirectory)/$(AdditionalDownloadedSharedHostInstallerFileName)
+
+ dotnet-hostfxr-$(ProductMonikerRid).$(AdditionalHostFxrVersion)$(InstallerExtension)
+ $(PackagesDirectory)/$(AdditionalDownloadedHostFxrInstallerFileName)
+
+ dotnet-sharedframework-$(ProductMonikerRid).$(AdditionalSharedFrameworkVersion)$(InstallerExtension)
+ $(PackagesDirectory)/$(AdditionalDownloadedSharedFrameworkInstallerFileName)
+
+ dotnet-$(ProductMonikerRid).$(AdditionalSharedFrameworkVersion)$(ArchiveExtension)
+
+
+
- https://dotnetcli.azureedge.net/dotnet/$(CoreSetupChannel)
- $(CoreSetupBlobRootUrl)/Binaries/$(SharedFrameworkVersion)
- $(CoreSetupBlobRootUrl)/Installers
-
+ https://dotnetcli.azureedge.net/dotnet/
+ $(CoreSetupBlobRootUrl)$(CoreSetupChannel)
+ $(CoreSetupBlobRootUrlWithChannel)/Binaries/$(SharedFrameworkVersion)
+ $(CoreSetupBlobRootUrlWithChannel)/Installers
$(IntermediateDirectory)/coreSetupDownload/$(SharedFrameworkVersion)
$(CoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive
@@ -163,11 +183,57 @@
+
+
+
+ $(CoreSetupBlobRootUrl)$(AdditionalCoreSetupChannel)
+ $(AdditionalCoreSetupBlobRootUrlWithChannel)/Binaries/$(AdditionalSharedFrameworkVersion)
+ $(AdditionalCoreSetupBlobRootUrlWithChannel)/Installers
+ $(IntermediateDirectory)/coreSetupDownload/$(AdditionalSharedFrameworkVersion)
+ $(AdditionalCoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive
+
+
+
+ <_DownloadAndExtractItem Include="AdditionalCombinedSharedHostAndFrameworkArchive"
+ Condition="!Exists('$(AdditionalCombinedSharedHostAndFrameworkArchive)')">
+ $(AdditionalSharedFrameworkArchiveBlobRootUrl)/$(AdditionalCombinedFrameworkHostCompressedFileName)
+ $(AdditionalCombinedSharedHostAndFrameworkArchive)
+ $(SharedFrameworkPublishDirectory)
+
+ False
+
+
+ <_DownloadAndExtractItem Include="AdditionalDownloadedSharedFrameworkInstallerFile"
+ Condition="!Exists('$(AdditionalDownloadedSharedFrameworkInstallerFile)') And '$(InstallerExtension)' != ''">
+ $(AdditionalCoreSetupInstallerBlobRootUrl)/$(AdditionalSharedFrameworkVersion)/$(AdditionalDownloadedSharedFrameworkInstallerFileName)
+ $(AdditionalDownloadedSharedFrameworkInstallerFile)
+
+
+
+ <_DownloadAndExtractItem Include="AdditionalDownloadedSharedHostInstallerFile"
+ Condition="!Exists('$(AdditionalDownloadedSharedHostInstallerFile)') And '$(InstallerExtension)' != ''">
+ $(AdditionalCoreSetupInstallerBlobRootUrl)/$(AdditionalSharedHostVersion)/$(AdditionalDownloadedSharedHostInstallerFileName)
+ $(AdditionalDownloadedSharedHostInstallerFile)
+
+
+
+ <_DownloadAndExtractItem Include="AdditionalDownloadedHostFxrInstallerFile"
+ Condition="!Exists('$(AdditionalDownloadedHostFxrInstallerFile)') And '$(InstallerExtension)' != ''">
+ $(AdditionalCoreSetupInstallerBlobRootUrl)/$(AdditionalHostFxrVersion)/$(AdditionalDownloadedHostFxrInstallerFileName)
+ $(AdditionalDownloadedHostFxrInstallerFile)
+
+
+
+
+ %(_DownloadAndExtractItem.OverwriteDestination)
+ True
+
+
@@ -175,12 +241,12 @@
+ OverwriteDestination="$(OverwriteExtractionDestination)" />
+ OverwriteDestination="$(OverwriteExtractionDestination)" />
-
diff --git a/build/Microsoft.DotNet.Cli.Publish.targets b/build/Microsoft.DotNet.Cli.Publish.targets
index a05512cf4..66b3d84d3 100644
--- a/build/Microsoft.DotNet.Cli.Publish.targets
+++ b/build/Microsoft.DotNet.Cli.Publish.targets
@@ -28,8 +28,10 @@
Sdk
$(ARTIFACT_STORAGE_CONTAINER)
+ dotnet
$(ARTIFACT_STORAGE_KEY)
$(ARTIFACT_STORAGE_ACCOUNT)
+ dotnetcli
https://$(ArtifactCloudDropAccountName).blob.core.windows.net/$(ArtifactContainerName)
$(CHECKSUM_STORAGE_CONTAINER)
$(CHECKSUM_STORAGE_KEY)
diff --git a/build/Microsoft.DotNet.Cli.tasks b/build/Microsoft.DotNet.Cli.tasks
index 8463bc1a0..49553a226 100644
--- a/build/Microsoft.DotNet.Cli.tasks
+++ b/build/Microsoft.DotNet.Cli.tasks
@@ -19,6 +19,7 @@
+
diff --git a/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets b/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets
index fe8ee5889..54e67a46e 100644
--- a/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets
+++ b/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets
@@ -21,7 +21,7 @@
- $(CoreSetupChannel)/Binaries/$(SharedFrameworkVersion)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('\' ,'/'))
+ $(NugetPackagesArchiveRelativeBlobUrl)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('\' ,'/'))
@@ -43,30 +43,51 @@
ContinueOnError="WarnAndContinue" />
+
+ false
+
+
-
- true
-
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+ TemplateType="Web"
+ WorkingDirectory="$(NuGetPackagesArchiveProject)/Web" />
+ WorkingDirectory="$(NuGetPackagesArchiveProject)/Web" />
+
+
+
+
@@ -81,15 +102,16 @@
+ DependsOnTargets="Prepare;SetupStage;SetupAzureBlobInformation">
- nuGetPackagesArchive.$(SharedFrameworkVersion).lzma
+ nuGetPackagesArchive.$(NuGetPackagesArchiveVersion).lzma
$(IntermediateDirectory)/NuGetPackagesArchiveProject
$(IntermediateDirectory)/NuGetPackagesArchiveFolder
$(ToolsOutputDirectory)/Archiver.dll
$(IntermediateDirectory)/$(NugetPackagesArchiveName)
$(Stage2Directory)/sdk/$(SdkVersion)/nuGetPackagesArchive.lzma
- $(SharedFrameworkArchiveBlobRootUrl)/$(NugetPackagesArchiveName)
+ $(Product)/NuGetPackagesArchives
+ $(DotnetBlobRootUrl)/$(NugetPackagesArchiveRelativeBlobUrl)/$(NugetPackagesArchiveName)
\ No newline at end of file
diff --git a/build/package/Microsoft.DotNet.Cli.Installer.DEB.proj b/build/package/Microsoft.DotNet.Cli.Installer.DEB.proj
index 40f82c63b..a42b627e7 100644
--- a/build/package/Microsoft.DotNet.Cli.Installer.DEB.proj
+++ b/build/package/Microsoft.DotNet.Cli.Installer.DEB.proj
@@ -74,6 +74,10 @@
+
+
+
+
@@ -89,6 +93,11 @@
+
+
+
+
+
@@ -100,6 +109,10 @@
+
+
+
+
diff --git a/build/package/Microsoft.DotNet.Cli.Installer.DEB.targets b/build/package/Microsoft.DotNet.Cli.Installer.DEB.targets
index ea518a6c3..d3d11daf0 100644
--- a/build/package/Microsoft.DotNet.Cli.Installer.DEB.targets
+++ b/build/package/Microsoft.DotNet.Cli.Installer.DEB.targets
@@ -42,6 +42,13 @@
dotnet-hostfxr-$(HostFxrDebianPackageVersion)
$(HostFxrDebianPackageName.ToLower())
dotnet-host
+
+ $(AdditionalSharedFrameworkVersion)
+ dotnet-sharedframework-$(SharedFrameworkName)-$(AdditionalSharedFxDebianPackageVersion)
+ $(AdditionalSharedFxDebianPackageName.ToLower())
+ $(AdditionalHostFxrVersion)
+ dotnet-hostfxr-$(AdditionalHostFxrDebianPackageVersion)
+ $(AdditionalHostFxrDebianPackageName.ToLower())
@@ -86,14 +93,8 @@
$(SharedFxDebianPackageName)
-
- $(SharedFrameworkName)
-
-
- $(SharedFrameworkVersion)
-
-
- $(SharedFrameworkBrandName)
+
+ $(AdditionalSharedFxDebianPackageName)
$(SdkVersion)
diff --git a/build/package/Microsoft.DotNet.Cli.Installer.MSI.targets b/build/package/Microsoft.DotNet.Cli.Installer.MSI.targets
index e1f6ba617..b0c1a17a4 100644
--- a/build/package/Microsoft.DotNet.Cli.Installer.MSI.targets
+++ b/build/package/Microsoft.DotNet.Cli.Installer.MSI.targets
@@ -111,6 +111,9 @@
'$(DownloadedSharedFrameworkInstallerFile)'
'$(DownloadedHostFxrInstallerFile)'
'$(DownloadedSharedHostInstallerFile)'
+ '$(AdditionalDownloadedSharedFrameworkInstallerFile)'
+ '$(AdditionalDownloadedHostFxrInstallerFile)'
+ '$(AdditionalDownloadedSharedHostInstallerFile)'
'$(CombinedFrameworkSdkHostInstallerFile)'
'$(WixRoot)'
'$(SdkBrandName)'
diff --git a/build/package/Microsoft.DotNet.Cli.Installer.PKG.targets b/build/package/Microsoft.DotNet.Cli.Installer.PKG.targets
index 8e4ffd67d..22416f080 100644
--- a/build/package/Microsoft.DotNet.Cli.Installer.PKG.targets
+++ b/build/package/Microsoft.DotNet.Cli.Installer.PKG.targets
@@ -9,12 +9,16 @@
$(InstallerOutputDirectory)/$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(BundleExtension)
- com.microsoft.dotnet.sharedhost.component.osx.x64
- com.microsoft.dotnet.hostfxr.component.osx.x64
+ com.microsoft.dotnet.sharedhost.$(SharedHostVersion).component.osx.x64
+ com.microsoft.dotnet.hostfxr.$(HostFxrVersion).component.osx.x64
com.microsoft.dotnet.sharedframework.$(SharedFrameworkNugetName).$(SharedFrameworkVersion).component.osx.x64
com.microsoft.dotnet.dev.$(SdkVersion).component.osx.x64
com.microsoft.dotnet.dev.$(SdkVersion).osx.x64
+ com.microsoft.dotnet.sharedhost.$(AdditionalSharedHostVersion).component.osx.x64
+ com.microsoft.dotnet.hostfxr.$(AdditionalHostFxrVersion).component.osx.x64
+ com.microsoft.dotnet.sharedframework.$(SharedFrameworkNugetName).$(AdditionalSharedFrameworkVersion).component.osx.x64
+
/usr/local/share/dotnet
$(RepoRoot)/packaging/osx/clisdk
@@ -28,6 +32,10 @@
$(PkgIntermediateDirectory)/$(SharedFrameworkComponentId).pkg
$(PkgIntermediateDirectory)/$(SharedHostComponentId).pkg
$(PkgIntermediateDirectory)/$(HostFxrComponentId).pkg
+
+ $(PkgIntermediateDirectory)/$(AdditionalSharedFrameworkComponentId).pkg
+ $(PkgIntermediateDirectory)/$(AdditionalSharedHostComponentId).pkg
+ $(PkgIntermediateDirectory)/$(AdditionalHostFxrComponentId).pkg
@@ -40,6 +48,15 @@
$(HostFxrComponentId)
+
+ $(AdditionalSharedFrameworkComponentId)
+
+
+ $(AdditionalSharedHostComponentId)
+
+
+ $(AdditionalHostFxrComponentId)
+
$(SdkComponentId)
@@ -58,6 +75,15 @@
$(HostFxrBrandName)
+
+ $(AdditionalSharedFrameworkBrandName)
+
+
+ $(AdditionalSharedHostBrandName)
+
+
+ $(AdditionalHostFxrBrandName)
+
@@ -75,6 +101,10 @@
+
+
+
+
@@ -103,11 +133,17 @@
SourceFiles="$(SdkInstallerFile);
$(DownloadedSharedFrameworkInstallerFile);
$(DownloadedHostFxrInstallerFile);
- $(DownloadedSharedHostInstallerFile);"
+ $(DownloadedSharedHostInstallerFile);
+ $(AdditionalDownloadedSharedFrameworkInstallerFile);
+ $(AdditionalDownloadedHostFxrInstallerFile);
+ $(AdditionalDownloadedSharedHostInstallerFile);"
DestinationFiles="$(SdkPkgIntermediatePath);
$(SharedFrameworkPkgIntermediatePath);
$(HostFxrPkgIntermediatePath);
- $(SharedHostPkgIntermediatePath);" />
+ $(SharedHostPkgIntermediatePath);
+ $(AdditionalSharedFrameworkPkgIntermediatePath);
+ $(AdditionalHostFxrPkgIntermediatePath);
+ $(AdditionalSharedHostPkgIntermediatePath);" />
+
+
+
+ Library
+ netcoreapp1.0
+ false
+
+
+
+
+ $(TemplatePackageVersion)
+
+
+
+
+
diff --git a/build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj b/build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj
index 393e9a839..23da68d2b 100644
--- a/build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj
+++ b/build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj
@@ -9,12 +9,6 @@
$(PackageTargetFallback);dnxcore50
-
-
-
-
-
-
1.6.0
diff --git a/build_projects/dotnet-cli-build/DotNetNew.cs b/build_projects/dotnet-cli-build/DotNetNew.cs
index 1d87963f3..ed09ce8ee 100644
--- a/build_projects/dotnet-cli-build/DotNetNew.cs
+++ b/build_projects/dotnet-cli-build/DotNetNew.cs
@@ -12,7 +12,19 @@ namespace Microsoft.DotNet.Cli.Build
protected override string Args
{
- get { return $""; }
+ get { return $"{GetTemplateType()}"; }
+ }
+
+ public string TemplateType { get; set; }
+
+ private string GetTemplateType()
+ {
+ if (!string.IsNullOrEmpty(TemplateType))
+ {
+ return $"--type {TemplateType}";
+ }
+
+ return null;
}
}
}
diff --git a/build_projects/dotnet-cli-build/DotNetPublish.cs b/build_projects/dotnet-cli-build/DotNetPublish.cs
index ed01ac543..8fbb88cbc 100644
--- a/build_projects/dotnet-cli-build/DotNetPublish.cs
+++ b/build_projects/dotnet-cli-build/DotNetPublish.cs
@@ -77,7 +77,7 @@ namespace Microsoft.DotNet.Cli.Build
{
if (!string.IsNullOrEmpty(MSBuildArgs))
{
- return $"-- {MSBuildArgs}";
+ return $"{MSBuildArgs}";
}
return null;
diff --git a/build_projects/dotnet-cli-build/GenerateNuGetPackagesArchiveVersion.cs b/build_projects/dotnet-cli-build/GenerateNuGetPackagesArchiveVersion.cs
new file mode 100644
index 000000000..fffa5213e
--- /dev/null
+++ b/build_projects/dotnet-cli-build/GenerateNuGetPackagesArchiveVersion.cs
@@ -0,0 +1,85 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.Build.Construction;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+using System;
+using System.IO;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
+
+namespace Microsoft.DotNet.Cli.Build
+{
+ public class GenerateNuGetPackagesArchiveVersion : Task
+ {
+ public GenerateNuGetPackagesArchiveVersion()
+ {
+ }
+
+ [Required]
+ public string RepoRoot { get; set; }
+
+ [Output]
+ public String Version { get; set; }
+
+ private static string[] s_TemplatesToArchive = new string[]
+ {
+ "CSharp_Web",
+ "CSharp_Web1.1",
+ };
+
+ public override bool Execute()
+ {
+ var dataToHash = string.Empty;
+
+ foreach (string templateToArchive in s_TemplatesToArchive)
+ {
+ var templatePath = Path.Combine(
+ RepoRoot,
+ "src",
+ "dotnet",
+ "commands",
+ "dotnet-new",
+ templateToArchive,
+ "$projectName$.csproj");
+
+ var rootElement = ProjectRootElement.Open(templatePath);
+ var packageRefs = rootElement.Items.Where(i => i.ItemType == "PackageReference").ToList();
+
+ foreach (var packageRef in packageRefs)
+ {
+ dataToHash += $"{packageRef.Include},";
+ if (packageRef.HasMetadata)
+ {
+ foreach (var metadata in packageRef.Metadata)
+ {
+ dataToHash += $"{metadata.Name}={metadata.Value};";
+ }
+ }
+ }
+ }
+
+ Log.LogMessage($"NuGet Packages Archive Data To Hash: '{dataToHash}'");
+
+ var sha256 = SHA256.Create();
+ var hashBytes = sha256.ComputeHash(Encoding.Unicode.GetBytes(dataToHash));
+ Version = GetHashString(hashBytes);
+
+ Log.LogMessage($"NuGet Packages Archive Version: '{Version}'");
+
+ return true;
+ }
+
+ private string GetHashString(byte[] hashBytes)
+ {
+ StringBuilder builder = new StringBuilder(hashBytes.Length * 2);
+ foreach (var b in hashBytes)
+ {
+ builder.AppendFormat("{0:x2}", b);
+ }
+ return builder.ToString();
+ }
+ }
+}
diff --git a/build_projects/dotnet-cli-build/TarGzFileExtractToDirectory.cs b/build_projects/dotnet-cli-build/TarGzFileExtractToDirectory.cs
index b2575a22e..f5d70b9a7 100644
--- a/build_projects/dotnet-cli-build/TarGzFileExtractToDirectory.cs
+++ b/build_projects/dotnet-cli-build/TarGzFileExtractToDirectory.cs
@@ -42,12 +42,6 @@ namespace Microsoft.DotNet.Build.Tasks
Log.LogMessage(MessageImportance.Low, "'{0}' already exists, trying to delete before unzipping...", DestinationDirectory);
Directory.Delete(DestinationDirectory, recursive: true);
}
- else
- {
- Log.LogWarning("'{0}' already exists. Did you forget to set '{1}' to true?", DestinationDirectory, nameof(OverwriteDestination));
-
- retVal = false;
- }
}
if (!File.Exists(SourceArchive))
diff --git a/build_projects/dotnet-cli-build/ZipFileExtractToDirectory.cs b/build_projects/dotnet-cli-build/ZipFileExtractToDirectory.cs
index a17baf99a..aa78823f9 100644
--- a/build_projects/dotnet-cli-build/ZipFileExtractToDirectory.cs
+++ b/build_projects/dotnet-cli-build/ZipFileExtractToDirectory.cs
@@ -25,7 +25,7 @@ namespace Microsoft.DotNet.Build.Tasks
public string DestinationDirectory { get; set; }
///
- /// Indicates if the destination archive should be overwritten if it already exists.
+ /// Indicates if the destination directory should be cleaned if it already exists.
///
public bool OverwriteDestination { get; set; }
@@ -40,17 +40,37 @@ namespace Microsoft.DotNet.Build.Tasks
Log.LogMessage(MessageImportance.Low, "'{0}' already exists, trying to delete before unzipping...", DestinationDirectory);
Directory.Delete(DestinationDirectory, recursive: true);
}
- else
- {
- Log.LogWarning("'{0}' already exists. Did you forget to set '{1}' to true?", DestinationDirectory, nameof(OverwriteDestination));
- }
}
Log.LogMessage(MessageImportance.High, "Decompressing '{0}' into '{1}'...", SourceArchive, DestinationDirectory);
if (!Directory.Exists(Path.GetDirectoryName(DestinationDirectory)))
Directory.CreateDirectory(Path.GetDirectoryName(DestinationDirectory));
- ZipFile.ExtractToDirectory(SourceArchive, DestinationDirectory);
+ // match tar default behavior to overwrite by default
+ // Replace this code with ZipFile.ExtractToDirectory when https://github.com/dotnet/corefx/pull/14806 is available
+ using (ZipArchive archive = ZipFile.Open(SourceArchive, ZipArchiveMode.Read))
+ {
+ DirectoryInfo di = Directory.CreateDirectory(DestinationDirectory);
+ string destinationDirectoryFullPath = di.FullName;
+
+ foreach (ZipArchiveEntry entry in archive.Entries)
+ {
+ string fileDestinationPath = Path.GetFullPath(Path.Combine(destinationDirectoryFullPath, entry.FullName));
+
+ if (Path.GetFileName(fileDestinationPath).Length == 0)
+ {
+ // If it is a directory:
+ Directory.CreateDirectory(fileDestinationPath);
+ }
+ else
+ {
+ // If it is a file:
+ // Create containing directory:
+ Directory.CreateDirectory(Path.GetDirectoryName(fileDestinationPath));
+ entry.ExtractToFile(fileDestinationPath, overwrite: true);
+ }
+ }
+ }
}
catch (Exception e)
{
diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj
index c8babacb2..8e5ec2d2f 100644
--- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj
+++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj
@@ -1,14 +1,17 @@
-
+
-
Build scripts for dotnet-cli
1.0.0
netcoreapp1.0
true
bin\$(Configuration)
- $(PackageTargetFallback);portable-net45+win8+wp8+wpa81
+ $(PackageTargetFallback);portable-net45+win8+wp8+wpa81
+
+
+
+
1.6.0
@@ -16,6 +19,9 @@
1.0.4
+
+ $(CLI_MSBuild_Version)
+
4.0.1
@@ -35,17 +41,18 @@
7.2.1
- 4.0.0-rc2
+ 4.0.0-rc3
$(CLI_MSBuild_Version)
+
+
+ $(CLI_MSBuild_Version)
+
1.0.1-beta-000933
-
-
-
-
\ No newline at end of file
diff --git a/build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj b/build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj
index 407bffc0a..e714a0b50 100644
--- a/build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj
+++ b/build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj
@@ -8,12 +8,6 @@
$(PackageTargetFallback);dnxcore50;portable-net45+win8
-
-
-
-
-
-
@@ -34,11 +28,14 @@
4.1.1
+
+ 4.0.0
+
4.0.11
- 6.2.2-preview
+ 7.2.1
1.0.1-beta-000933
diff --git a/build_projects/update-dependencies/update-dependencies.csproj b/build_projects/update-dependencies/update-dependencies.csproj
index e84fac8ec..42c4d52f2 100644
--- a/build_projects/update-dependencies/update-dependencies.csproj
+++ b/build_projects/update-dependencies/update-dependencies.csproj
@@ -10,10 +10,7 @@
-
-
-
-
+
diff --git a/dir.props b/dir.props
index 442e1ef65..d0c1fdfa8 100644
--- a/dir.props
+++ b/dir.props
@@ -1,3 +1,16 @@
-
\ No newline at end of file
+
+
+
+ $(MSBuildThisFileDirectory)
+
+ $(NUGET_PACKAGES)
+ $(RepoRoot)/.nuget/packages
+
+ $(RepoRoot)/build_projects/dotnet-cli-build/bin/dotnet-cli-build.dll
+
+ true
+
+
+
diff --git a/dir.tasks b/dir.tasks
new file mode 100644
index 000000000..aa5f6731b
--- /dev/null
+++ b/dir.tasks
@@ -0,0 +1,3 @@
+
+
+
diff --git a/packaging/deb/dotnet-debian_config.json b/packaging/deb/dotnet-debian_config.json
index 3a33544df..8aa795ffd 100644
--- a/packaging/deb/dotnet-debian_config.json
+++ b/packaging/deb/dotnet-debian_config.json
@@ -29,6 +29,7 @@
},
"debian_dependencies":{
- "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%" : {}
+ "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%" : {},
+ "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME_ADDITIONAL%" : {}
}
}
diff --git a/packaging/osx/clisdk/Distribution-Template b/packaging/osx/clisdk/Distribution-Template
index d70c70cc4..82550f6f1 100644
--- a/packaging/osx/clisdk/Distribution-Template
+++ b/packaging/osx/clisdk/Distribution-Template
@@ -17,6 +17,9 @@
+
+
+
@@ -28,11 +31,23 @@
+
+
+
+
+
+
+
+
+
{SharedFxComponentId}.pkg
{HostFxrComponentId}.pkg
{SharedHostComponentId}.pkg
+ {AdditionalSharedFxComponentId}.pkg
+ {AdditionalHostFxrComponentId}.pkg
+ {AdditionalSharedHostComponentId}.pkg
{CLISdkComponentId}.pkg
diff --git a/packaging/windows/clisdk/bundle.wxs b/packaging/windows/clisdk/bundle.wxs
index 1ab894dd5..e4a4fd084 100644
--- a/packaging/windows/clisdk/bundle.wxs
+++ b/packaging/windows/clisdk/bundle.wxs
@@ -55,6 +55,15 @@
+
+
+
+
+
+
+
+
+
diff --git a/packaging/windows/clisdk/generatebundle.ps1 b/packaging/windows/clisdk/generatebundle.ps1
index c0a32947f..baeeb5281 100644
--- a/packaging/windows/clisdk/generatebundle.ps1
+++ b/packaging/windows/clisdk/generatebundle.ps1
@@ -6,6 +6,9 @@ param(
[Parameter(Mandatory=$true)][string]$SharedFxMSIFile,
[Parameter(Mandatory=$true)][string]$HostFxrMSIFile,
[Parameter(Mandatory=$true)][string]$SharedHostMSIFile,
+ [Parameter(Mandatory=$true)][string]$AdditionalSharedFxMSIFile,
+ [Parameter(Mandatory=$true)][string]$AdditionalHostFxrMSIFile,
+ [Parameter(Mandatory=$true)][string]$AdditionalSharedHostMSIFile,
[Parameter(Mandatory=$true)][string]$DotnetBundleOutput,
[Parameter(Mandatory=$true)][string]$WixRoot,
[Parameter(Mandatory=$true)][string]$ProductMoniker,
@@ -39,6 +42,9 @@ function RunCandleForBundle
-dSharedFXMsiSourcePath="$SharedFxMSIFile" `
-dHostFXRMsiSourcePath="$HostFxrMSIFile" `
-dSharedHostMsiSourcePath="$SharedHostMSIFile" `
+ -dAdditionalSharedFXMsiSourcePath="$AdditionalSharedFxMSIFile" `
+ -dAdditionalHostFXRMsiSourcePath="$AdditionalHostFxrMSIFile" `
+ -dAdditionalSharedHostMsiSourcePath="$AdditionalSharedHostMSIFile" `
-arch "$Architecture" `
-ext WixBalExtension.dll `
-ext WixUtilExtension.dll `
diff --git a/run-build.ps1 b/run-build.ps1
index 6e8150c7a..3e16346ce 100644
--- a/run-build.ps1
+++ b/run-build.ps1
@@ -103,8 +103,8 @@ if ($LastExitCode -ne 0)
# install the post-PJnistic stage0
$dotnetInstallPath = Join-Path $toolsLocalPath "dotnet-install.ps1"
-Write-Host "$dotnetInstallPath -Version ""latest"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
-Invoke-Expression "$dotnetInstallPath -Version ""latest"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
+Write-Host "$dotnetInstallPath -Version ""1.0.0-preview5-004422"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
+Invoke-Expression "$dotnetInstallPath -Version ""1.0.0-preview5-004422"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
if ($LastExitCode -ne 0)
{
Write-Output "The .NET CLI installation failed with exit code $LastExitCode"
diff --git a/run-build.sh b/run-build.sh
index 459e55019..399099364 100755
--- a/run-build.sh
+++ b/run-build.sh
@@ -163,8 +163,8 @@ if [ $? != 0 ]; then
fi
# now execute the script
-echo "installing CLI: $dotnetInstallPath --version \"latest\" --install-dir $DOTNET_INSTALL_DIR --architecture \"$ARCHITECTURE\""
-$dotnetInstallPath --version "latest" --install-dir $DOTNET_INSTALL_DIR --architecture "$ARCHITECTURE"
+echo "installing CLI: $dotnetInstallPath --version \"1.0.0-preview5-004422\" --install-dir $DOTNET_INSTALL_DIR --architecture \"$ARCHITECTURE\""
+$dotnetInstallPath --version "1.0.0-preview5-004422" --install-dir $DOTNET_INSTALL_DIR --architecture "$ARCHITECTURE"
if [ $? != 0 ]; then
echo "run-build: Error: Boot-strapping post-PJ stage0 with exit code $?." >&2
exit $?
diff --git a/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj b/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj
index 743950fc5..90c84d19a 100644
--- a/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj
+++ b/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj
@@ -9,9 +9,6 @@
true
true
-
-
-
1.6.0
diff --git a/src/Microsoft.DotNet.Cli.Sln.Internal/LocalizableStrings.cs b/src/Microsoft.DotNet.Cli.Sln.Internal/LocalizableStrings.cs
index 24e940b70..3e696ecde 100644
--- a/src/Microsoft.DotNet.Cli.Sln.Internal/LocalizableStrings.cs
+++ b/src/Microsoft.DotNet.Cli.Sln.Internal/LocalizableStrings.cs
@@ -2,6 +2,14 @@
{
internal class LocalizableStrings
{
+ // {0} is the line number
+ // {1} is the error message details
+ public const string ErrorMessageFormatString = "Invalid format in line {0}: {1}";
+
+ public const string ProjectParsingErrorFormatString = "Project section is missing '{0}' when parsing the line starting at position {1}";
+
+ public const string InvalidPropertySetFormatString = "Property set is missing '{0}'";
+
public const string GlobalSectionMoreThanOnceError = "Global section specified more than once";
public const string GlobalSectionNotClosedError = "Global section not closed";
diff --git a/src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj b/src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj
index 056887e81..368c98b3a 100644
--- a/src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj
+++ b/src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj
@@ -12,10 +12,6 @@
true
-
-
-
-
diff --git a/src/Microsoft.DotNet.Cli.Sln.Internal/ProjectTypeGuids.cs b/src/Microsoft.DotNet.Cli.Sln.Internal/ProjectTypeGuids.cs
index 71d7798df..547e93eef 100644
--- a/src/Microsoft.DotNet.Cli.Sln.Internal/ProjectTypeGuids.cs
+++ b/src/Microsoft.DotNet.Cli.Sln.Internal/ProjectTypeGuids.cs
@@ -5,7 +5,7 @@ namespace Microsoft.DotNet.Cli.Sln.Internal
{
public static class ProjectTypeGuids
{
- public const string CPSProjectTypeGuid = "{13B669BE-BB05-4DDF-9536-439F39A36129}";
public const string CSharpProjectTypeGuid = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}";
+ public const string SolutionFolderGuid = "{2150E333-8FDC-42A3-9474-1A3956D46DE8}";
}
}
diff --git a/src/Microsoft.DotNet.Cli.Sln.Internal/SlnFile.cs b/src/Microsoft.DotNet.Cli.Sln.Internal/SlnFile.cs
index 937b4ffce..7eda0d91e 100644
--- a/src/Microsoft.DotNet.Cli.Sln.Internal/SlnFile.cs
+++ b/src/Microsoft.DotNet.Cli.Sln.Internal/SlnFile.cs
@@ -120,6 +120,8 @@ namespace Microsoft.DotNet.Cli.Sln.Internal
private void Read(TextReader reader)
{
+ const string HeaderPrefix = "Microsoft Visual Studio Solution File, Format Version ";
+
string line;
int curLineNum = 0;
bool globalFound = false;
@@ -129,14 +131,16 @@ namespace Microsoft.DotNet.Cli.Sln.Internal
{
curLineNum++;
line = line.Trim();
- if (line.StartsWith("Microsoft Visual Studio Solution File", StringComparison.Ordinal))
+ if (line.StartsWith(HeaderPrefix, StringComparison.Ordinal))
{
- int i = line.LastIndexOf(' ');
- if (i == -1)
+ if (line.Length <= HeaderPrefix.Length)
{
- throw new InvalidSolutionFormatException(curLineNum);
+ throw new InvalidSolutionFormatException(
+ curLineNum,
+ LocalizableStrings.FileHeaderMissingError);
}
- FormatVersion = line.Substring(i + 1);
+
+ FormatVersion = line.Substring(HeaderPrefix.Length);
_prefixBlankLines = curLineNum - 1;
}
if (line.StartsWith("# ", StringComparison.Ordinal))
@@ -157,7 +161,9 @@ namespace Microsoft.DotNet.Cli.Sln.Internal
{
if (globalFound)
{
- throw new InvalidSolutionFormatException(curLineNum, LocalizableStrings.GlobalSectionMoreThanOnceError);
+ throw new InvalidSolutionFormatException(
+ curLineNum,
+ LocalizableStrings.GlobalSectionMoreThanOnceError);
}
globalFound = true;
while ((line = reader.ReadLine()) != null)
@@ -181,7 +187,9 @@ namespace Microsoft.DotNet.Cli.Sln.Internal
}
if (line == null)
{
- throw new InvalidSolutionFormatException(curLineNum, LocalizableStrings.GlobalSectionNotClosedError);
+ throw new InvalidSolutionFormatException(
+ curLineNum,
+ LocalizableStrings.GlobalSectionNotClosedError);
}
}
else if (line.IndexOf('=') != -1)
@@ -191,7 +199,9 @@ namespace Microsoft.DotNet.Cli.Sln.Internal
}
if (FormatVersion == null)
{
- throw new InvalidSolutionFormatException(curLineNum, LocalizableStrings.FileHeaderMissingError);
+ throw new InvalidSolutionFormatException(
+ curLineNum,
+ LocalizableStrings.FileHeaderMissingError);
}
}
@@ -331,15 +341,20 @@ namespace Microsoft.DotNet.Cli.Sln.Internal
}
}
- throw new InvalidSolutionFormatException(curLineNum, LocalizableStrings.ProjectSectionNotClosedError);
+ throw new InvalidSolutionFormatException(
+ curLineNum,
+ LocalizableStrings.ProjectSectionNotClosedError);
}
private void FindNext(int ln, string line, ref int i, char c)
{
+ var inputIndex = i;
i = line.IndexOf(c, i);
if (i == -1)
{
- throw new InvalidSolutionFormatException(ln);
+ throw new InvalidSolutionFormatException(
+ ln,
+ string.Format(LocalizableStrings.ProjectParsingErrorFormatString, c, inputIndex));
}
}
@@ -481,7 +496,9 @@ namespace Microsoft.DotNet.Cli.Sln.Internal
{
return SlnSectionType.PostProcess;
}
- throw new InvalidSolutionFormatException(curLineNum, String.Format(LocalizableStrings.InvalidSectionTypeError, s));
+ throw new InvalidSolutionFormatException(
+ curLineNum,
+ String.Format(LocalizableStrings.InvalidSectionTypeError, s));
}
private string FromSectionType(bool isProjectSection, SlnSectionType type)
@@ -502,13 +519,17 @@ namespace Microsoft.DotNet.Cli.Sln.Internal
int k = line.IndexOf('(');
if (k == -1)
{
- throw new InvalidSolutionFormatException(curLineNum, LocalizableStrings.SectionIdMissingError);
+ throw new InvalidSolutionFormatException(
+ curLineNum,
+ LocalizableStrings.SectionIdMissingError);
}
var tag = line.Substring(0, k).Trim();
var k2 = line.IndexOf(')', k);
if (k2 == -1)
{
- throw new InvalidSolutionFormatException(curLineNum);
+ throw new InvalidSolutionFormatException(
+ curLineNum,
+ LocalizableStrings.SectionIdMissingError);
}
Id = line.Substring(k + 1, k2 - k - 1);
@@ -531,7 +552,9 @@ namespace Microsoft.DotNet.Cli.Sln.Internal
}
if (line == null)
{
- throw new InvalidSolutionFormatException(curLineNum, LocalizableStrings.ClosingSectionTagNotFoundError);
+ throw new InvalidSolutionFormatException(
+ curLineNum,
+ LocalizableStrings.ClosingSectionTagNotFoundError);
}
}
@@ -550,7 +573,9 @@ namespace Microsoft.DotNet.Cli.Sln.Internal
var i = line.IndexOf('.');
if (i == -1)
{
- throw new InvalidSolutionFormatException(_baseIndex + n);
+ throw new InvalidSolutionFormatException(
+ _baseIndex + n,
+ string.Format(LocalizableStrings.InvalidPropertySetFormatString, '.'));
}
var id = line.Substring(0, i);
if (curSet == null || id != curSet.Id)
@@ -1139,14 +1164,10 @@ namespace Microsoft.DotNet.Cli.Sln.Internal
}
}
- class InvalidSolutionFormatException : Exception
+ public class InvalidSolutionFormatException : Exception
{
- public InvalidSolutionFormatException(int line) : base("Invalid format in line " + line)
- {
- }
-
- public InvalidSolutionFormatException(int line, string msg)
- : base("Invalid format in line " + line + ": " + msg)
+ public InvalidSolutionFormatException(int line, string details)
+ : base(string.Format(LocalizableStrings.ErrorMessageFormatString, line, details))
{
}
}
diff --git a/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.cs.xlf b/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.cs.xlf
index f2ae043a3..4824f0306 100644
--- a/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.cs.xlf
+++ b/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.cs.xlf
@@ -5,37 +5,52 @@
Global section specified more than once
- Global section specified more than once
-
+ Několikrát zadaný globální oddíl
+
Global section not closed
- Global section not closed
-
+ Neuzavřený globální oddíl
+
Project section not closed
- Project section not closed
-
+ Neuzavřený oddíl projektu
+
Invalid section type: {0}
- Invalid section type: {0}
-
+ Neplatný typ oddílu: {0}
+
Section id missing
- Section id missing
-
+ Chybí ID oddílu
+
Closing section tag not found
- Closing section tag not found
+ Nenalezena koncová značka oddílu
+
+
+
+ Invalid format in line {0}: {1}
+ Invalid format in line {0}: {1}
+
+
+
+ Project section is missing '{0}' when parsing the line starting at position {1}
+ Project section is missing '{0}' when parsing the line starting at position {1}
+
+
+
+ Property set is missing '{0}'
+ Property set is missing '{0}'