diff --git a/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj b/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj index aef9570d56..a5487baba0 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/BindingRedirectSample/AppWithRedirectsAndConfig/AppWithRedirectsAndConfig.csproj b/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsAndConfig/AppWithRedirectsAndConfig.csproj index caa3e334c3..35f2ba2b2c 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 41d5e98eb5..dd8d8b5372 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 3a0dc74db8..e621006e98 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 9223824fb3..f36c1bf2b8 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 399f34fad0..5815b4190a 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 f85cb9afa1..51f727a051 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 5b2be1164e..a7277eb65e 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 5b2be1164e..a7277eb65e 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 4e7f7d2ef6..6e627ad428 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 ad9097b82a..96073b2c70 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 f85cb9afa1..044fe40ef1 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 f79137c35d..09b0759f15 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 ed99bcd130..0464c28160 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 3d8b49b257..949805ccc7 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 2678dce5d8..ebf9b12eef 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 36dff975a2..370bc58732 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/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/Existing.csproj b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/Existing.csproj index 322e07f8d9..2f78a7e027 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/TestProjectWithUnresolvedPlatformDependency/TestProjectWithUnresolvedPlatformDependency.csproj b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/TestProjectWithUnresolvedPlatformDependency.csproj index 7ad98ec113..8904281625 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 2185f85a69..de60f199d4 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 f7037e0c6d..592c7bfcbc 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/ToolWithOutputName/ToolWithOutputName.csproj b/TestAssets/TestPackages/ToolWithOutputName/ToolWithOutputName.csproj index f9f34d42b0..5d5b210a39 100644 --- a/TestAssets/TestPackages/ToolWithOutputName/ToolWithOutputName.csproj +++ b/TestAssets/TestPackages/ToolWithOutputName/ToolWithOutputName.csproj @@ -21,7 +21,7 @@ - 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 2b6b7605d0..065e1246c8 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 @@ -22,7 +22,7 @@ - 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 786671414f..ea55167f3d 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 @@ -25,7 +25,7 @@ - 1.0.1 + 1.0.3 4.0.0-rc3 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 d427fe87fa..181c9268ce 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 @@ -26,7 +26,7 @@ - 1.0.1 + 1.0.3 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 9fca81132a..ab11548e0f 100644 --- a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj +++ b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj @@ -14,7 +14,7 @@ - 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 5035b32cbd..bad9769b4d 100644 --- a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj +++ b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj @@ -15,7 +15,7 @@ - 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 0028c735d7..fcb31219aa 100644 --- a/TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj +++ b/TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj @@ -20,7 +20,7 @@ - 1.0.1 + 1.0.3 diff --git a/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj b/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj index 9faefa5033..1c2ecdf955 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 163a025aab..fe4c0e02c4 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 46a8840d3e..bbfb9be113 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 8d84d8fc17..877cce8707 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 ab0a2179f9..8c58766c2e 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 57c0816abf..a31d879342 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 c7c7862b46..6a76893df4 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 f47b49f65f..9f8bcbb51e 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 411f7c65b0..529d3f399a 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 00619603c6..1125a1669c 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 ab0a2179f9..8c58766c2e 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 c4c0b06627..9713f8d676 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 05d33eae63..ee72a84fac 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 98515b3a13..4997045cca 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 2475962df0..e85446e4e5 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 f28ff34ebe..37b69a72b3 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 0cf4073da5..6ef51aa6dd 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 b1f110869f..a71a9bc5ec 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 09d101d530..05206f4df2 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 66b693fcaf..f6c4514e7a 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 6ac912f3df..a657879c14 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 3dc97e65bd..101cfe3ab4 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 f2616fc788..a9c50ae5c8 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 db545abfe7..6930893a8e 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 46a07e66c9..b474c59bb4 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 66b693fcaf..f6c4514e7a 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 66b693fcaf..f6c4514e7a 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/TestAppDependencyGraph/CsprojLibrary1/CsprojLibrary1.csproj b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/CsprojLibrary1.csproj index 06471fc118..90ed848e59 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 06471fc118..90ed848e59 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 06471fc118..90ed848e59 100644 --- a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/CsprojLibrary3.csproj +++ b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/CsprojLibrary3.csproj @@ -7,8 +7,6 @@ - - diff --git a/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj b/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj index 381245f16b..3657781004 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/App.csproj b/TestAssets/TestProjects/TestAppWithEmptySln/App/App.csproj index 423ceb827f..dbec1b0031 100644 --- a/TestAssets/TestProjects/TestAppWithEmptySln/App/App.csproj +++ b/TestAssets/TestProjects/TestAppWithEmptySln/App/App.csproj @@ -4,16 +4,12 @@ netcoreapp1.0 - - - - - + diff --git a/TestAssets/TestProjects/TestAppWithEmptySln/Lib/Lib.csproj b/TestAssets/TestProjects/TestAppWithEmptySln/Lib/Lib.csproj index f47b49f65f..9f8bcbb51e 100644 --- a/TestAssets/TestProjects/TestAppWithEmptySln/Lib/Lib.csproj +++ b/TestAssets/TestProjects/TestAppWithEmptySln/Lib/Lib.csproj @@ -4,10 +4,6 @@ netstandard1.4 - - - - diff --git a/TestAssets/TestProjects/TestAppWithMultipleSlnFiles/App/App.csproj b/TestAssets/TestProjects/TestAppWithMultipleSlnFiles/App/App.csproj index c1313e3588..5ea4163e5f 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 4ff85ffd3c..f252d79757 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/TestAppWithSlnAndCsprojFiles/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCsprojFiles/App/App.csproj index 423ceb827f..dbec1b0031 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 f47b49f65f..9f8bcbb51e 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/TestAppWithSlnAndCsprojProjectGuidFiles/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCsprojProjectGuidFiles/App/App.csproj index 423ceb827f..dbec1b0031 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 aacaac7522..4a0fd46d54 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/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/App/App.csproj index c1313e3588..5ea4163e5f 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/App/App.csproj +++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/App/App.csproj @@ -5,11 +5,7 @@ - - - - - + diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/Lib/Lib.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/Lib/Lib.csproj index f47b49f65f..9f8bcbb51e 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/Lib/Lib.csproj +++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/Lib/Lib.csproj @@ -4,10 +4,6 @@ netstandard1.4 - - - - diff --git a/TestAssets/TestProjects/TestAppWithSlnAndDuplicateProjectReferences/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndDuplicateProjectReferences/App/App.csproj index 423ceb827f..dbec1b0031 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 f47b49f65f..9f8bcbb51e 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 423ceb827f..27e43f08e0 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 f47b49f65f..9f8bcbb51e 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/TestLibraryWithConfiguration/TestLibraryWithConfiguration.csproj b/TestAssets/TestProjects/TestLibraryWithConfiguration/TestLibraryWithConfiguration.csproj index f922f23b36..4924ce508a 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 9d6dfc1f61..7c765ff51c 100644 --- a/TestAssets/TestProjects/VSTestDesktopAndNetCore/VSTestDesktopAndNetCore.csproj +++ b/TestAssets/TestProjects/VSTestDesktopAndNetCore/VSTestDesktopAndNetCore.csproj @@ -9,13 +9,9 @@ DESKTOP;$(DefineConstants) - - - - - 1.0.1 + 1.0.3 diff --git a/TestAssets/TestProjects/VSTestDotNetCore/VSTestDotNetCore.csproj b/TestAssets/TestProjects/VSTestDotNetCore/VSTestDotNetCore.csproj index b711c874df..97230db7ae 100644 --- a/TestAssets/TestProjects/VSTestDotNetCore/VSTestDotNetCore.csproj +++ b/TestAssets/TestProjects/VSTestDotNetCore/VSTestDotNetCore.csproj @@ -5,13 +5,9 @@ netcoreapp1.0 - - - - - 1.0.1 + 1.0.3 1.0.6-preview diff --git a/TestAssets/TestProjects/VSTestXunitDesktopAndNetCore/VSTestXunitDesktopAndNetCore.csproj b/TestAssets/TestProjects/VSTestXunitDesktopAndNetCore/VSTestXunitDesktopAndNetCore.csproj index 803d5f8772..1795bb8cf9 100644 --- a/TestAssets/TestProjects/VSTestXunitDesktopAndNetCore/VSTestXunitDesktopAndNetCore.csproj +++ b/TestAssets/TestProjects/VSTestXunitDesktopAndNetCore/VSTestXunitDesktopAndNetCore.csproj @@ -1,32 +1,24 @@ - - + Exe net46;netcoreapp1.0 + win7-x86 + win7-x86 DESKTOP;$(DefineConstants) - - - - - 1.0.1 + 1.0.3 - - - - 1.0.0-alpha-20161026-2 - All - + $(CLI_TestPlatform_Version) @@ -37,6 +29,4 @@ 2.2.0-beta4-build1194 - - diff --git a/TestAssets/TestProjects/VSTestXunitDotNetCore/VSTestXunitDotNetCore.csproj b/TestAssets/TestProjects/VSTestXunitDotNetCore/VSTestXunitDotNetCore.csproj index 2bda46e526..491c84b0b8 100644 --- a/TestAssets/TestProjects/VSTestXunitDotNetCore/VSTestXunitDotNetCore.csproj +++ b/TestAssets/TestProjects/VSTestXunitDotNetCore/VSTestXunitDotNetCore.csproj @@ -5,14 +5,9 @@ netcoreapp1.0 - - - - - - 1.0.1 + 1.0.3 $(CLI_TestPlatform_Version) diff --git a/build.proj b/build.proj index e087c34c0d..7dbf63c956 100644 --- a/build.proj +++ b/build.proj @@ -21,12 +21,12 @@ 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.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index 1c092dd2ef..e88d066d2b 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -3,7 +3,7 @@ 15.1.0-preview-000458-02 1.0.0-alpha-20170105-5 - 1.0.0-alpha-20161205-1-154 + 1.0.0-alpha-20170104-1-189 15.0.0-preview-20161227-02 diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj index 1bdc77c259..68e325e780 100644 --- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj +++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj @@ -9,6 +9,13 @@ bin\$(Configuration) $(PackageTargetFallback);portable-net45+win8+wp8+wpa81 + + + + + + + 1.6.0 @@ -43,12 +50,11 @@ $(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/Publishing/AzurePublisher.cs b/build_projects/shared-build-targets-utils/Publishing/AzurePublisher.cs index ff102bf0dd..b9e17e09a7 100644 --- a/build_projects/shared-build-targets-utils/Publishing/AzurePublisher.cs +++ b/build_projects/shared-build-targets-utils/Publishing/AzurePublisher.cs @@ -66,7 +66,7 @@ public string UploadFile(string file, Product product, string version) { string url = CalculateRelativePathForFile(file, product, version); CloudBlockBlob blob = _blobContainer.GetBlockBlobReference(url); - blob.UploadFromFileAsync(file).Wait(); + blob.UploadFromFileAsync(file, FileMode.Open).Wait(); SetBlobPropertiesBasedOnFileType(blob); return url; } diff --git a/build_projects/update-dependencies/update-dependencies.csproj b/build_projects/update-dependencies/update-dependencies.csproj index e84fac8ecc..982b5adb99 100644 --- a/build_projects/update-dependencies/update-dependencies.csproj +++ b/build_projects/update-dependencies/update-dependencies.csproj @@ -11,11 +11,14 @@ - + + + + 1.0.0 diff --git a/run-build.ps1 b/run-build.ps1 index 6e8150c7a7..8b70746ed1 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-004392"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture""" +Invoke-Expression "$dotnetInstallPath -Version ""1.0.0-preview5-004392"" -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 459e550191..553393b83e 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-004392\" --install-dir $DOTNET_INSTALL_DIR --architecture \"$ARCHITECTURE\"" +$dotnetInstallPath --version "1.0.0-preview5-004392" --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/dotnet/DotnetFiles.cs b/src/Microsoft.DotNet.Cli.Utils/DotnetFiles.cs similarity index 100% rename from src/dotnet/DotnetFiles.cs rename to src/Microsoft.DotNet.Cli.Utils/DotnetFiles.cs diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigrateBuildOptionsRule.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigrateBuildOptionsRule.cs index f5e54155ec..bd6e5ad1de 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigrateBuildOptionsRule.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigrateBuildOptionsRule.cs @@ -111,10 +111,10 @@ private AddPropertyTransform[] KeyFileTransforms compilerOptions => compilerOptions.OutputName != null); private IncludeContextTransform CompileFilesTransform => - new IncludeContextTransform("Compile", transformMappings: false); + new IncludeContextTransform("Compile", transformMappings: false, condition: ic => ic != null); private IncludeContextTransform EmbedFilesTransform => - new IncludeContextTransform("EmbeddedResource", transformMappings: false); + new IncludeContextTransform("EmbeddedResource", transformMappings: false, condition: ic => ic != null); private IncludeContextTransform CopyToOutputFilesTransform => new IncludeContextTransform("Content", transformMappings: true) @@ -139,11 +139,11 @@ private AddPropertyTransform[] KeyFileTransforms private Func>CompileFilesTransformExecute => (compilerOptions, projectDirectory, projectType) => - CompileFilesTransform.Transform(GetCompileIncludeContext(compilerOptions, projectDirectory)); + CompileFilesTransform.Transform(compilerOptions.CompileInclude); private Func> EmbedFilesTransformExecute => (compilerOptions, projectDirectory, projectType) => - EmbedFilesTransform.Transform(GetEmbedIncludeContext(compilerOptions, projectDirectory)); + EmbedFilesTransform.Transform(GetEmbedIncludeContext(compilerOptions)); private Func> CopyToOutputFilesTransformExecute => (compilerOptions, projectDirectory, projectType) => @@ -298,12 +298,11 @@ private void PerformConfigurationPropertyAndItemMappings( var configurationOutput = includeContextTransformExecute(configurationCompilerOptions, projectDirectory, projectType); - configurationOutput = RemoveDefaultCompileAndEmbeddedResourceForWebProjects( - configurationOutput, - projectType, - csproj); - transformApplicator.Execute(configurationOutput, itemGroup, mergeExisting: true); + if (configurationOutput != null) + { + transformApplicator.Execute(configurationOutput, itemGroup, mergeExisting: true); + } } } @@ -353,37 +352,15 @@ private void PerformPropertyAndItemMappings( foreach (var includeContextTransformExecute in _includeContextTransformExecutes) { var transform = includeContextTransformExecute(compilerOptions, projectDirectory, projectType); - - transform = RemoveDefaultCompileAndEmbeddedResourceForWebProjects( - transform, - projectType, - csproj); - - transformApplicator.Execute( - transform, - itemGroup, - mergeExisting: true); - } - } - private IEnumerable RemoveDefaultCompileAndEmbeddedResourceForWebProjects( - IEnumerable transform, - ProjectType projectType, - ProjectRootElement csproj) - { - if(projectType == ProjectType.Web) - { - var itemsToRemove = transform.Where(p => - p != null && - p.Include.Contains("**\\*") && - (p.ItemType == "Compile" || p.ItemType == "EmbeddedResource")); - - CleanExistingItems(csproj, new [] {"Compile", "EmbeddedResource"}); - - transform = transform.Where(p => !itemsToRemove.Contains(p)); + if (transform != null) + { + transformApplicator.Execute( + transform, + itemGroup, + mergeExisting: true); + } } - - return transform; } private void CleanExistingProperties(ProjectRootElement csproj) @@ -401,43 +378,11 @@ private void CleanExistingProperties(ProjectRootElement csproj) } } - private void CleanExistingItems(ProjectRootElement csproj, IEnumerable itemsToRemove) - { - foreach (var itemName in itemsToRemove) - { - var items = csproj.Items.Where(i => i.ItemType == itemName); - - foreach (var item in items) - { - item.Parent.RemoveChild(item); - } - } - } - - private IncludeContext GetCompileIncludeContext(CommonCompilerOptions compilerOptions, string projectDirectory) + private IncludeContext GetEmbedIncludeContext(CommonCompilerOptions compilerOptions) { - // Defaults from src/Microsoft.DotNet.ProjectModel/ProjectReader.cs #L596 - return compilerOptions.CompileInclude ?? - new IncludeContext( - projectDirectory, - "compile", - new JObject(), - ProjectFilesCollection.DefaultCompileBuiltInPatterns, - DefaultEmptyExcludeOption); - } - - private IncludeContext GetEmbedIncludeContext(CommonCompilerOptions compilerOptions, string projectDirectory) - { - // Defaults from src/Microsoft.DotNet.ProjectModel/ProjectReader.cs #L602 - var embedIncludeContext = compilerOptions.EmbedInclude ?? - new IncludeContext( - projectDirectory, - "embed", - new JObject(), - ProjectFilesCollection.DefaultResourcesBuiltInPatterns, - DefaultEmptyExcludeOption); + var embedIncludeContext = compilerOptions.EmbedInclude; - embedIncludeContext.BuiltInsExclude.Add("@(EmbeddedResource)"); + embedIncludeContext?.BuiltInsExclude.Add("@(EmbeddedResource)"); return embedIncludeContext; } diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/sdkdefaults.json b/src/Microsoft.DotNet.ProjectJsonMigration/sdkdefaults.json index 6ee921230b..1cf03a483c 100755 --- a/src/Microsoft.DotNet.ProjectJsonMigration/sdkdefaults.json +++ b/src/Microsoft.DotNet.ProjectJsonMigration/sdkdefaults.json @@ -128,7 +128,7 @@ }, { "Name": "DefineConstants", - "Value": "TRACE", + "Value": "RELEASE;TRACE", "Condition": "", "ParentCondition": " '$(Configuration)' == 'Release' " }, diff --git a/src/dotnet-archive/dotnet-archive.csproj b/src/dotnet-archive/dotnet-archive.csproj index 101c64e89c..e14f0a3fab 100644 --- a/src/dotnet-archive/dotnet-archive.csproj +++ b/src/dotnet-archive/dotnet-archive.csproj @@ -14,7 +14,7 @@ - 1.0.1 + 1.0.3 diff --git a/src/dotnet/commands/dotnet-new/CSharp_Console/$projectName$.csproj b/src/dotnet/commands/dotnet-new/CSharp_Console/$projectName$.csproj index f9139840a0..0161faaf78 100755 --- a/src/dotnet/commands/dotnet-new/CSharp_Console/$projectName$.csproj +++ b/src/dotnet/commands/dotnet-new/CSharp_Console/$projectName$.csproj @@ -6,12 +6,7 @@ - - - - - - + diff --git a/src/dotnet/commands/dotnet-new/CSharp_Lib/$projectName$.csproj b/src/dotnet/commands/dotnet-new/CSharp_Lib/$projectName$.csproj index 322e07f8d9..2f78a7e027 100755 --- a/src/dotnet/commands/dotnet-new/CSharp_Lib/$projectName$.csproj +++ b/src/dotnet/commands/dotnet-new/CSharp_Lib/$projectName$.csproj @@ -4,11 +4,6 @@ netstandard1.4 - - - - - diff --git a/src/dotnet/commands/dotnet-new/CSharp_Mstest/$projectName$.csproj b/src/dotnet/commands/dotnet-new/CSharp_Mstest/$projectName$.csproj index b87b9550d6..2882e5f0ac 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Mstest/$projectName$.csproj +++ b/src/dotnet/commands/dotnet-new/CSharp_Mstest/$projectName$.csproj @@ -6,12 +6,7 @@ - - - - - - + diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/$projectName$.csproj b/src/dotnet/commands/dotnet-new/CSharp_Web/$projectName$.csproj index 8aca574b29..034c3490ba 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Web/$projectName$.csproj +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/$projectName$.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/dotnet/commands/dotnet-new/CSharp_Xunittest/$projectName$.csproj b/src/dotnet/commands/dotnet-new/CSharp_Xunittest/$projectName$.csproj index cd806133a2..c84c426cea 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Xunittest/$projectName$.csproj +++ b/src/dotnet/commands/dotnet-new/CSharp_Xunittest/$projectName$.csproj @@ -6,12 +6,7 @@ - - - - - - + diff --git a/src/dotnet/commands/dotnet-new/FSharp_Console/$projectName$.fsproj b/src/dotnet/commands/dotnet-new/FSharp_Console/$projectName$.fsproj index eb5b0c1da4..a564e5fd13 100644 --- a/src/dotnet/commands/dotnet-new/FSharp_Console/$projectName$.fsproj +++ b/src/dotnet/commands/dotnet-new/FSharp_Console/$projectName$.fsproj @@ -4,6 +4,7 @@ Exe netcoreapp1.0 1.0.0-alpha + false @@ -12,7 +13,7 @@ - + All diff --git a/src/dotnet/commands/dotnet-new/FSharp_Lib/$projectName$.fsproj b/src/dotnet/commands/dotnet-new/FSharp_Lib/$projectName$.fsproj index f12243115c..28b8ccebea 100644 --- a/src/dotnet/commands/dotnet-new/FSharp_Lib/$projectName$.fsproj +++ b/src/dotnet/commands/dotnet-new/FSharp_Lib/$projectName$.fsproj @@ -3,6 +3,7 @@ netstandard1.6 1.0.0-alpha + false diff --git a/src/dotnet/commands/dotnet-new/FSharp_Mstest/$projectName$.fsproj b/src/dotnet/commands/dotnet-new/FSharp_Mstest/$projectName$.fsproj index 5b14517c9b..265b668a00 100644 --- a/src/dotnet/commands/dotnet-new/FSharp_Mstest/$projectName$.fsproj +++ b/src/dotnet/commands/dotnet-new/FSharp_Mstest/$projectName$.fsproj @@ -3,6 +3,7 @@ Exe netcoreapp1.0 + false @@ -11,7 +12,7 @@ - + diff --git a/src/dotnet/commands/dotnet-new/FSharp_Web/$projectName$.fsproj b/src/dotnet/commands/dotnet-new/FSharp_Web/$projectName$.fsproj index 797f4f0d9d..622dabb4d2 100644 --- a/src/dotnet/commands/dotnet-new/FSharp_Web/$projectName$.fsproj +++ b/src/dotnet/commands/dotnet-new/FSharp_Web/$projectName$.fsproj @@ -4,6 +4,7 @@ Exe netcoreapp1.0 true + false @@ -27,7 +28,7 @@ - + All diff --git a/src/dotnet/commands/dotnet-new/FSharp_Xunittest/$projectName$.fsproj b/src/dotnet/commands/dotnet-new/FSharp_Xunittest/$projectName$.fsproj index ff3b4ca7d0..35db920345 100644 --- a/src/dotnet/commands/dotnet-new/FSharp_Xunittest/$projectName$.fsproj +++ b/src/dotnet/commands/dotnet-new/FSharp_Xunittest/$projectName$.fsproj @@ -3,6 +3,7 @@ Exe netcoreapp1.0 + false @@ -11,7 +12,7 @@ - + diff --git a/src/dotnet/dotnet.csproj b/src/dotnet/dotnet.csproj index 10339746a9..7654b9a38a 100755 --- a/src/dotnet/dotnet.csproj +++ b/src/dotnet/dotnet.csproj @@ -42,7 +42,7 @@ 2.0.0 - 1.0.1 + 1.0.3 4.0.0 diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 6428cf05ca..92c9405087 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -15,7 +15,7 @@ - 1.0.1 + 1.0.3 $(CLI_MSBuild_Version) diff --git a/src/tool_csc/tool_csc.csproj b/src/tool_csc/tool_csc.csproj index 08fc40508f..8ada39b0ef 100644 --- a/src/tool_csc/tool_csc.csproj +++ b/src/tool_csc/tool_csc.csproj @@ -7,7 +7,7 @@ - 1.0.1 + 1.0.3 2.0.0-beta6-60922-08 diff --git a/src/tool_msbuild/tool_msbuild.csproj b/src/tool_msbuild/tool_msbuild.csproj index 9eeaa366b2..a879226f0c 100644 --- a/src/tool_msbuild/tool_msbuild.csproj +++ b/src/tool_msbuild/tool_msbuild.csproj @@ -7,7 +7,7 @@ - 1.0.1 + 1.0.3 $(CLI_MSBuild_Version) diff --git a/src/tool_nuget/tool_nuget.csproj b/src/tool_nuget/tool_nuget.csproj index fe7a17b19c..36c74b48b2 100644 --- a/src/tool_nuget/tool_nuget.csproj +++ b/src/tool_nuget/tool_nuget.csproj @@ -7,7 +7,7 @@ - 1.0.1 + 1.0.3 4.0.0-rc3 diff --git a/test/ArgumentForwardingTests/ArgumentForwardingTests.csproj b/test/ArgumentForwardingTests/ArgumentForwardingTests.csproj index a59c161ef6..d2471e4071 100644 --- a/test/ArgumentForwardingTests/ArgumentForwardingTests.csproj +++ b/test/ArgumentForwardingTests/ArgumentForwardingTests.csproj @@ -39,7 +39,7 @@ 2.2.0-beta4-build1194 - 1.0.1 + 1.0.3 4.1.1 diff --git a/test/ArgumentsReflector/ArgumentsReflector.csproj b/test/ArgumentsReflector/ArgumentsReflector.csproj index 77d8b33eb3..7921cdee94 100644 --- a/test/ArgumentsReflector/ArgumentsReflector.csproj +++ b/test/ArgumentsReflector/ArgumentsReflector.csproj @@ -19,7 +19,7 @@ - 1.0.1 + 1.0.3 diff --git a/test/EndToEnd/EndToEnd.csproj b/test/EndToEnd/EndToEnd.csproj index 3612761ac3..693653e427 100644 --- a/test/EndToEnd/EndToEnd.csproj +++ b/test/EndToEnd/EndToEnd.csproj @@ -43,7 +43,7 @@ 2.2.0-beta4-build1194 - 1.0.1 + 1.0.3 4.1.1 diff --git a/test/Kestrel.Tests/Kestrel.Tests.csproj b/test/Kestrel.Tests/Kestrel.Tests.csproj index 10b8021a2a..bade7e9cdf 100644 --- a/test/Kestrel.Tests/Kestrel.Tests.csproj +++ b/test/Kestrel.Tests/Kestrel.Tests.csproj @@ -39,7 +39,7 @@ 2.2.0-beta4-build1194 - 1.0.1 + 1.0.3 4.1.1 diff --git a/test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj b/test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj index 2fcc463e68..eeb446deed 100644 --- a/test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj +++ b/test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj @@ -26,7 +26,7 @@ - 1.0.1 + 1.0.3 $(CLI_TestPlatform_Version) diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs index 64cf91492b..26640ab595 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs @@ -282,7 +282,7 @@ public void It_adds_fx_version_as_a_param_when_the_tool_has_the_prefercliruntime result.Should().NotBeNull(); - result.Args.Should().Contain("--fx-version 1.0.1"); + result.Args.Should().Contain("--fx-version 1.0.3"); } [Fact] diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj b/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj index 9f8909a861..041cbf60af 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj @@ -13,7 +13,6 @@ - @@ -52,7 +51,7 @@ 2.2.0-beta4-build1194 - 1.0.1 + 1.0.3 4.0.0 diff --git a/test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj b/test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj index daf0aebd44..f88c05b311 100644 --- a/test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj +++ b/test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj @@ -46,7 +46,7 @@ 2.2.0-beta4-build1194 - 1.0.1 + 1.0.3 4.0.0 diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Microsoft.DotNet.ProjectJsonMigration.Tests.csproj b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Microsoft.DotNet.ProjectJsonMigration.Tests.csproj index 1ab92fd690..9d4ebd0bc8 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Microsoft.DotNet.ProjectJsonMigration.Tests.csproj +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Microsoft.DotNet.ProjectJsonMigration.Tests.csproj @@ -47,7 +47,7 @@ 2.2.0-beta4-build1194 - 1.0.1 + 1.0.3 2.2.0-beta4-build3444 diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateBuildOptions.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateBuildOptions.cs index 193c9fe121..81d245811f 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateBuildOptions.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateBuildOptions.cs @@ -49,18 +49,14 @@ public void SpecifiedDefaultPropertiesAreRemovedWhenTheyExistInTheCsprojTemplate } [Fact] - public void MigratingEmptyBuildOptionsPopulatesOnlyCompileAndEmbeddedResource() + public void MigratingEmptyBuildOptionsGeneratesAnEmptyCSProj() { var mockProj = RunBuildOptionsRuleOnPj(@" { ""buildOptions"": { } }"); - mockProj.Items.Count().Should().Be(2); - mockProj.Items.First(i => i.ItemType == "Compile").Include.Should().Be(@"**\*.cs"); - mockProj.Items.First(i => i.ItemType == "Compile").Exclude.Should().BeEmpty(); - mockProj.Items.First(i => i.ItemType == "EmbeddedResource").Include.Should().Be(@"compiler\resources\**\*;**\*.resx"); - mockProj.Items.First(i => i.ItemType == "EmbeddedResource").Exclude.Should().Be("@(EmbeddedResource)"); + mockProj.Items.Count().Should().Be(0); } [Fact] @@ -84,6 +80,22 @@ public void MigratingWebProjectWithoutCustomSourcesOrResourcesDoesNotEmitCompile mockProj.Items.Count().Should().Be(0); } + [Fact] + public void MigratingConsoleProjectWithoutCustomSourcesOrResourcesDoesNotEmitCompileAndEmbeddedResource() + { + var mockProj = RunBuildOptionsRuleOnPj(@" + { + ""buildOptions"": { + ""emitEntryPoint"": true + }, + ""frameworks"": { + ""netcoreapp1.0"": {} + } + }"); + + mockProj.Items.Count().Should().Be(0); + } + public void MigratingOutputNamePopulatesAssemblyName() { var mockProj = RunBuildOptionsRuleOnPj(@" diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateConfigurations.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateConfigurations.cs index a287d7961f..4c5f5ca7fb 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateConfigurations.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateConfigurations.cs @@ -17,7 +17,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests public class GivenThatIWantToMigrateConfigurations : TestBase { [Fact] - public void Configuration_buildOptions_produce_expected_properties_in_a_group_with_a_condition() + public void ConfigurationBuildOptionsProduceExpectedPropertiesInAGroupWithACondition() { var mockProj = RunConfigurationsRuleOnPj(@" { @@ -40,7 +40,7 @@ public void Configuration_buildOptions_produce_expected_properties_in_a_group_wi } [Fact] - public void Frameworks_buildOptions_produce_expected_properties_in_a_group_with_a_condition() + public void FrameworksBuildOptionsProduceExpectedPropertiesInAGroupWithACondition() { var mockProj = RunConfigurationsRuleOnPj(@" { @@ -63,7 +63,7 @@ public void Frameworks_buildOptions_produce_expected_properties_in_a_group_with_ } [Fact] - public void It_does_not_add_a_define_for_the_framework() + public void ItDoesNotAddADefineForTheFramework() { var mockProj = RunConfigurationsRuleOnPj(@" { @@ -74,11 +74,53 @@ public void It_does_not_add_a_define_for_the_framework() }"); mockProj.Properties.Count( - prop => prop.Name == "DefineConstants" && prop.Value.Contains("NETCOREAPP1_0")).Should().Be(0); + prop => prop.Name == "DefineConstants" && prop.Value.Contains("NETCOREAPP10")).Should().Be(0); } [Fact] - public void Configuration_buildOptions_properties_are_not_written_when_they_overlap_with_buildOptions() + public void ItDoesNotAddADefineForReleaseConfiguration() + { + var mockProj = RunRulesOnPj(@" + { + ""frameworks"": { + ""netcoreapp1.0"": { + } + } + }", + new IMigrationRule[] + { + new AddDefaultsToProjectRule(), + new MigrateConfigurationsRule(), + new RemoveDefaultsFromProjectRule() + }); + + mockProj.Properties.Count( + prop => prop.Name == "DefineConstants" && prop.Value.Contains("Release")).Should().Be(0); + } + + [Fact] + public void ItDoesNotAddADefineForDebugConfiguration() + { + var mockProj = RunRulesOnPj(@" + { + ""frameworks"": { + ""netcoreapp1.0"": { + } + } + }", + new IMigrationRule[] + { + new AddDefaultsToProjectRule(), + new MigrateConfigurationsRule(), + new RemoveDefaultsFromProjectRule() + }); + + mockProj.Properties.Count( + prop => prop.Name == "DefineConstants" && prop.Value.Contains("Debug")).Should().Be(0); + } + + [Fact] + public void ConfigurationBuildOptionsPropertiesAreNotWrittenWhenTheyOverlapWithBuildOptions() { var mockProj = RunConfigurationsAndBuildOptionsRuleOnPj(@" { @@ -108,7 +150,7 @@ public void Configuration_buildOptions_properties_are_not_written_when_they_over } [Fact] - public void Configuration_buildOptions_includes_and_Remove_are_written_when_they_differ_from_base_buildOptions() + public void ConfigurationBuildOptionsIncludesAndRemoveAreWrittenWhenTheyDifferFromBaseBuildOptions() { var mockProj = RunConfigurationsAndBuildOptionsRuleOnPj(@" { @@ -156,7 +198,7 @@ public void Configuration_buildOptions_includes_and_Remove_are_written_when_they } [Fact] - public void Configuration_buildOptions_which_have_different_excludes_than_buildOptions_overwrites() + public void ConfigurationBuildOptionsWhichHaveDifferentExcludesThanBuildOptionsOverwrites() { var mockProj = RunConfigurationsAndBuildOptionsRuleOnPj(@" { @@ -216,7 +258,7 @@ public void Configuration_buildOptions_which_have_different_excludes_than_buildO } [Fact] - public void Configuration_buildOptions_which_have_mappings_to_directory_add_link_metadata_with_item_metadata() + public void ConfigurationBuildOptionsWhichHaveMappingsToDirectoryAddLinkMetadataWithItemMetadata() { var mockProj = RunConfigurationsAndBuildOptionsRuleOnPj(@" { @@ -272,7 +314,7 @@ public void Configuration_buildOptions_which_have_mappings_to_directory_add_link } [Fact] - public void Configuration_buildOptions_which_have_mappings_overlapping_with_includes_in_same_configuration_merged_items_have_Link_metadata() + public void ConfigurationBuildOptionsWhichHaveMappingsOverlappingWithIncludesInSameConfigurationMergedItemsHaveLinkMetadata() { var mockProj = RunConfigurationsAndBuildOptionsRuleOnPj(@" { @@ -340,7 +382,7 @@ public void Configuration_buildOptions_which_have_mappings_overlapping_with_incl } [Fact] - public void Configuration_buildOptions_which_have_mappings_overlapping_with_includes_in_root_buildoptions_has_remove() + public void ConfigurationBuildOptionsWhichHaveMappingsOverlappingWithIncludesInRootBuildoptionsHasRemove() { var mockProj = RunConfigurationsAndBuildOptionsRuleOnPj(@" { @@ -403,7 +445,7 @@ public void Configuration_buildOptions_which_have_mappings_overlapping_with_incl } [Fact] - public void Configuration_buildOptions_which_have_mappings_overlapping_with_includes_in_same_configuration_and_root_buildOptions_have_removes_and_Link_metadata_and_encompassed_items_are_merged() + public void ConfigurationBuildOptionsWhichHaveMappingsOverlappingWithIncludesInSameConfigurationAndRootBuildOptionsHaveRemovesAndLinkMetadataAndEncompassedItemsAreMerged() { var mockProj = RunConfigurationsAndBuildOptionsRuleOnPj(@" { @@ -486,17 +528,25 @@ public void Configuration_buildOptions_which_have_mappings_overlapping_with_incl private ProjectRootElement RunConfigurationsRuleOnPj(string s, string testDirectory = null) { testDirectory = testDirectory ?? Temp.CreateDirectory().Path; - return TemporaryProjectFileRuleRunner.RunRules(new[] {new MigrateConfigurationsRule()}, s, testDirectory); + return RunRulesOnPj(s, new[] { new MigrateConfigurationsRule() }, testDirectory); } private ProjectRootElement RunConfigurationsAndBuildOptionsRuleOnPj(string s, string testDirectory = null) { - testDirectory = testDirectory ?? Temp.CreateDirectory().Path; - return TemporaryProjectFileRuleRunner.RunRules(new IMigrationRule[] + return RunRulesOnPj( + s, + new IMigrationRule[] { new MigrateBuildOptionsRule(), new MigrateConfigurationsRule() - }, s, testDirectory); + }, + testDirectory); + } + + private ProjectRootElement RunRulesOnPj(string s, IMigrationRule[] migrationRules, string testDirectory = null) + { + testDirectory = testDirectory ?? Temp.CreateDirectory().Path; + return TemporaryProjectFileRuleRunner.RunRules(migrationRules, s, testDirectory); } } } diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj index 84ed8512ec..88dd86b904 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj @@ -13,7 +13,6 @@ - diff --git a/test/Performance/Performance.csproj b/test/Performance/Performance.csproj index 86d10b7a48..3c515acba2 100644 --- a/test/Performance/Performance.csproj +++ b/test/Performance/Performance.csproj @@ -39,7 +39,7 @@ 2.2.0-beta4-build1194 - 1.0.1 + 1.0.3 4.1.1 diff --git a/test/crossgen.Tests/crossgen.Tests.csproj b/test/crossgen.Tests/crossgen.Tests.csproj index 4f6f565992..c045618207 100644 --- a/test/crossgen.Tests/crossgen.Tests.csproj +++ b/test/crossgen.Tests/crossgen.Tests.csproj @@ -39,7 +39,7 @@ 2.2.0-beta4-build1194 - 1.0.1 + 1.0.3 2.2.0-beta4-build3444 diff --git a/test/dotnet-add-p2p.Tests/dotnet-add-p2p.Tests.csproj b/test/dotnet-add-p2p.Tests/dotnet-add-p2p.Tests.csproj index 545a42239c..3e87ee3983 100644 --- a/test/dotnet-add-p2p.Tests/dotnet-add-p2p.Tests.csproj +++ b/test/dotnet-add-p2p.Tests/dotnet-add-p2p.Tests.csproj @@ -40,7 +40,7 @@ 2.2.0-beta4-build1194 - 1.0.1 + 1.0.3 4.1.1 diff --git a/test/dotnet-add-proj.Tests/dotnet-add-proj.Tests.csproj b/test/dotnet-add-proj.Tests/dotnet-add-proj.Tests.csproj index c643e2a85c..12e181939e 100644 --- a/test/dotnet-add-proj.Tests/dotnet-add-proj.Tests.csproj +++ b/test/dotnet-add-proj.Tests/dotnet-add-proj.Tests.csproj @@ -27,7 +27,7 @@ 2.2.0-beta4-build1194 - 1.0.1 + 1.0.3 2.2.0-beta4-build3444 diff --git a/test/dotnet-build.Tests/dotnet-build.Tests.csproj b/test/dotnet-build.Tests/dotnet-build.Tests.csproj index a5e1c6cf1e..339bc03323 100644 --- a/test/dotnet-build.Tests/dotnet-build.Tests.csproj +++ b/test/dotnet-build.Tests/dotnet-build.Tests.csproj @@ -41,7 +41,7 @@ 2.2.0-beta4-build1194 - 1.0.1 + 1.0.3 4.1.1 diff --git a/test/dotnet-help.Tests/dotnet-help.Tests.csproj b/test/dotnet-help.Tests/dotnet-help.Tests.csproj index 4a5297ea44..c66e284326 100644 --- a/test/dotnet-help.Tests/dotnet-help.Tests.csproj +++ b/test/dotnet-help.Tests/dotnet-help.Tests.csproj @@ -44,7 +44,7 @@ 2.2.0-beta4-build1194 - 1.0.1 + 1.0.3 $(CLI_MSBuild_Version) diff --git a/test/dotnet-list-p2ps.Tests/dotnet-list-p2ps.Tests.csproj b/test/dotnet-list-p2ps.Tests/dotnet-list-p2ps.Tests.csproj index c1d57e9ce1..7f08643a86 100644 --- a/test/dotnet-list-p2ps.Tests/dotnet-list-p2ps.Tests.csproj +++ b/test/dotnet-list-p2ps.Tests/dotnet-list-p2ps.Tests.csproj @@ -40,7 +40,7 @@ 2.2.0-beta4-build1194 - 1.0.1 + 1.0.3 4.1.1 diff --git a/test/dotnet-list-proj.Tests/dotnet-list-proj.Tests.csproj b/test/dotnet-list-proj.Tests/dotnet-list-proj.Tests.csproj index 85a50f1016..685f022738 100644 --- a/test/dotnet-list-proj.Tests/dotnet-list-proj.Tests.csproj +++ b/test/dotnet-list-proj.Tests/dotnet-list-proj.Tests.csproj @@ -28,7 +28,7 @@ 2.2.0-beta4-build1194 - 1.0.1 + 1.0.3 2.2.0-beta4-build3444 diff --git a/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj b/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj index ecd7d24b4d..b8c4b4ff50 100644 --- a/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj +++ b/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj @@ -51,7 +51,7 @@ 2.2.0-beta4-build1194 - 1.0.1 + 1.0.3 2.2.0-beta4-build3444 diff --git a/test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj b/test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj index 13ee09e884..d3165f9aa6 100644 --- a/test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj +++ b/test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj @@ -52,7 +52,7 @@ 2.2.0-beta4-build1194 - 1.0.1 + 1.0.3 4.1.1 diff --git a/test/dotnet-new.Tests/dotnet-new.Tests.csproj b/test/dotnet-new.Tests/dotnet-new.Tests.csproj index 83a0c7150d..805d1fa894 100644 --- a/test/dotnet-new.Tests/dotnet-new.Tests.csproj +++ b/test/dotnet-new.Tests/dotnet-new.Tests.csproj @@ -52,7 +52,7 @@ 2.2.0-beta4-build1194 - 1.0.1 + 1.0.3 $(CLI_MSBuild_Version) diff --git a/test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj b/test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj index 1f85d86da6..ddc8257aca 100644 --- a/test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj +++ b/test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj @@ -52,7 +52,7 @@ 2.2.0-beta4-build1194 - 1.0.1 + 1.0.3 4.1.1 diff --git a/test/dotnet-pack.Tests/dotnet-pack.Tests.csproj b/test/dotnet-pack.Tests/dotnet-pack.Tests.csproj index c93afadff2..ed70f9f45a 100644 --- a/test/dotnet-pack.Tests/dotnet-pack.Tests.csproj +++ b/test/dotnet-pack.Tests/dotnet-pack.Tests.csproj @@ -43,7 +43,7 @@ 2.2.0-beta4-build1194 - 1.0.1 + 1.0.3 4.1.1 diff --git a/test/dotnet-publish.Tests/dotnet-publish.Tests.csproj b/test/dotnet-publish.Tests/dotnet-publish.Tests.csproj index e4221253c6..0fdafc4a6e 100644 --- a/test/dotnet-publish.Tests/dotnet-publish.Tests.csproj +++ b/test/dotnet-publish.Tests/dotnet-publish.Tests.csproj @@ -45,7 +45,7 @@ 2.2.0-beta4-build1194 - 1.0.1 + 1.0.3 4.1.1 diff --git a/test/dotnet-remove-p2p.Tests/dotnet-remove-p2p.Tests.csproj b/test/dotnet-remove-p2p.Tests/dotnet-remove-p2p.Tests.csproj index 48fc32042b..9384eccbc2 100644 --- a/test/dotnet-remove-p2p.Tests/dotnet-remove-p2p.Tests.csproj +++ b/test/dotnet-remove-p2p.Tests/dotnet-remove-p2p.Tests.csproj @@ -40,7 +40,7 @@ 2.2.0-beta4-build1194 - 1.0.1 + 1.0.3 4.1.1 diff --git a/test/dotnet-remove-proj.Tests/dotnet-remove-proj.Tests.csproj b/test/dotnet-remove-proj.Tests/dotnet-remove-proj.Tests.csproj index dffe716abb..19b7209eca 100644 --- a/test/dotnet-remove-proj.Tests/dotnet-remove-proj.Tests.csproj +++ b/test/dotnet-remove-proj.Tests/dotnet-remove-proj.Tests.csproj @@ -28,7 +28,7 @@ 2.2.0-beta4-build1194 - 1.0.1 + 1.0.3 2.2.0-beta4-build3444 diff --git a/test/dotnet-restore.Tests/dotnet-restore.Tests.csproj b/test/dotnet-restore.Tests/dotnet-restore.Tests.csproj index f03b8b454e..24250de83b 100644 --- a/test/dotnet-restore.Tests/dotnet-restore.Tests.csproj +++ b/test/dotnet-restore.Tests/dotnet-restore.Tests.csproj @@ -52,7 +52,7 @@ 2.2.0-beta4-build1194 - 1.0.1 + 1.0.3 $(CLI_MSBuild_Version) diff --git a/test/dotnet-run.Tests/dotnet-run.Tests.csproj b/test/dotnet-run.Tests/dotnet-run.Tests.csproj index 9226bd1751..1162f74c63 100644 --- a/test/dotnet-run.Tests/dotnet-run.Tests.csproj +++ b/test/dotnet-run.Tests/dotnet-run.Tests.csproj @@ -41,7 +41,7 @@ 2.2.0-beta4-build1194 - 1.0.1 + 1.0.3 4.1.1 diff --git a/test/dotnet-vstest.Tests/VSTestTests.cs b/test/dotnet-vstest.Tests/VSTestTests.cs index 8a9a28eb3e..f6787432ae 100644 --- a/test/dotnet-vstest.Tests/VSTestTests.cs +++ b/test/dotnet-vstest.Tests/VSTestTests.cs @@ -19,12 +19,17 @@ public void TestsFromAGivenContainerShouldRunWithExpectedOutput() var testAppName = "VSTestDotNetCore"; var testRoot = TestAssets.Get(testAppName) .CreateInstance() + .WithSourceFiles() .WithRestoreFiles() - .WithBuildFiles() .Root; var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug"; + new BuildCommand() + .WithWorkingDirectory(testRoot) + .Execute() + .Should().Pass(); + var outputDll = testRoot .GetDirectory("bin", configuration, "netcoreapp1.0") .GetFile($"{testAppName}.dll"); diff --git a/test/dotnet.Tests/dotnet.Tests.csproj b/test/dotnet.Tests/dotnet.Tests.csproj index 662528f18b..0ac5f2a59b 100644 --- a/test/dotnet.Tests/dotnet.Tests.csproj +++ b/test/dotnet.Tests/dotnet.Tests.csproj @@ -63,7 +63,7 @@ 2.2.0-beta4-build1194 - 1.0.1 + 1.0.3 4.1.1 diff --git a/tools/Archiver/Archiver.csproj b/tools/Archiver/Archiver.csproj index 9a0987367d..3d673f7ace 100644 --- a/tools/Archiver/Archiver.csproj +++ b/tools/Archiver/Archiver.csproj @@ -15,7 +15,7 @@ - 1.0.1 + 1.0.3 diff --git a/tools/MigrationDefaultsConstructor/MigrationDefaultsConstructor.csproj b/tools/MigrationDefaultsConstructor/MigrationDefaultsConstructor.csproj index 254e14aaaf..c801a1d119 100644 --- a/tools/MigrationDefaultsConstructor/MigrationDefaultsConstructor.csproj +++ b/tools/MigrationDefaultsConstructor/MigrationDefaultsConstructor.csproj @@ -13,7 +13,7 @@ - 1.0.1 + 1.0.3 $(CLI_MSBuild_Version)