From 40c34f891a81aced59f25c1953b40b6d11f4c1d1 Mon Sep 17 00:00:00 2001 From: seancpeters Date: Thu, 3 Nov 2016 22:12:33 -0700 Subject: [PATCH] Updating the Microsoft.Net.Sdk & Microsoft.Net.Sdk.Web versions (#4585) * Updating the Microsoft.Net.Sdk & Microsoft.Net.Sdk.Web versions * Fixed merge conflicts. Had to re-update the Sdk version in one place. * re-migrate dotnet.dll * Revert Performance Test Projects * Fix test test * Add missing WithRuntime * Disable failing test test --- .../AppWithProjTool2Fx/App.csproj | 2 +- .../LibWithProjTool2Fx/Lib.csproj | 2 +- ...ectWithUnresolvedPlatformDependency.csproj | 2 +- .../AppWithDepOnToolWithOutputName.csproj | 2 +- .../AppWithDirectAndToolDep.csproj | 2 +- .../AppWithDirectDep/AppWithDirectDep.csproj | 2 +- .../AppWithDirectDepWithOutputName.csproj | 2 +- ...ldAppWithMultipleFrameworksAndTools.csproj | 2 +- .../AppWithToolDependency.csproj | 2 +- .../DependencyContextFromTool.csproj | 2 +- .../MyLibrary.csproj | 2 +- .../MSBuildAppWithMultipleFrameworks.csproj | 2 +- ...ldAppWithMultipleFrameworksAndTools.csproj | 2 +- .../MSBuildTestApp/MSBuildTestApp.csproj | 2 +- .../CsprojLibrary1/CsprojLibrary1.csproj | 2 +- .../CsprojLibrary1/project.json | 2 +- .../CsprojLibrary2/CsprojLibrary2.csproj | 2 +- .../CsprojLibrary2/project.json | 2 +- .../CsprojLibrary3/CsprojLibrary3.csproj | 2 +- .../CsprojLibrary3/project.json | 2 +- .../TestAppSimple/TestAppSimple.csproj | 2 +- .../TestAppWithProjDepTool.csproj | 2 +- .../TestLibraryWithConfiguration.csproj | 2 +- .../VSTestDesktopAndNetCore.csproj | 2 +- .../VSTestDotNetCore/VSTestDotNetCore.csproj | 2 +- .../dotnet-cli-build/dotnet-cli-build.csproj | 2 +- .../Microsoft.DotNet.Archive.csproj | 2 +- .../Microsoft.DotNet.Cli.Utils.csproj | 2 +- .../Microsoft.DotNet.Configurer.csproj | 2 +- ...crosoft.DotNet.InternalAbstractions.csproj | 2 +- ...crosoft.DotNet.ProjectJsonMigration.csproj | 2 +- .../Microsoft.DotNet.TestFramework.csproj | 2 +- src/dotnet-archive/dotnet-archive.csproj | 2 +- .../CSharp_Console/$projectName$.csproj | 2 +- .../CSharp_Lib/$projectName$.csproj | 2 +- .../CSharp_Mstest/$projectName$.csproj | 2 +- .../CSharp_Web/$projectName$.csproj | 2 +- .../CSharp_Xunittest/$projectName$.csproj | 2 +- src/dotnet/dotnet.csproj | 26 ++++++++---- src/dotnet/project.json | 17 +++----- src/redist/redist.csproj | 2 +- src/tool_csc/tool_csc.csproj | 2 +- src/tool_msbuild/tool_msbuild.csproj | 2 +- src/tool_nuget/tool_nuget.csproj | 2 +- .../Commands/DotnetTestCommand.cs | 23 +++++++++- ...ildsAndRunsTestFromCsprojForMultipleTFM.cs | 42 +++++++++---------- tools/Archiver/Archiver.csproj | 2 +- .../MigrationDefaultsConstructor.csproj | 2 +- 48 files changed, 107 insertions(+), 89 deletions(-) mode change 100644 => 100755 src/dotnet/dotnet.csproj diff --git a/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj b/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj index f3d14e2f3..fb8b0c55c 100644 --- a/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj +++ b/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj @@ -14,7 +14,7 @@ - 1.0.0-alpha-20161029-1 + 1.0.0-alpha-20161102-2 All diff --git a/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj b/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj index a20781af5..caf26c4cd 100644 --- a/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj +++ b/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj @@ -13,7 +13,7 @@ - 1.0.0-alpha-20161029-1 + 1.0.0-alpha-20161102-2 All diff --git a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/TestProjectWithUnresolvedPlatformDependency.csproj b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/TestProjectWithUnresolvedPlatformDependency.csproj index 753ce3b5a..d68cfd7d0 100755 --- a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/TestProjectWithUnresolvedPlatformDependency.csproj +++ b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/TestProjectWithUnresolvedPlatformDependency.csproj @@ -13,7 +13,7 @@ - 1.0.0-alpha-20161029-1 + 1.0.0-alpha-20161102-2 All diff --git a/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj b/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj index 43f7a3f89..a3166a05e 100755 --- a/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj +++ b/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj @@ -12,7 +12,7 @@ - 1.0.0-alpha-20161029-1 + 1.0.0-alpha-20161102-2 All diff --git a/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj b/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj index 28d0d536b..92baa2eb6 100755 --- a/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj +++ b/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj @@ -12,7 +12,7 @@ - 1.0.0-alpha-20161029-1 + 1.0.0-alpha-20161102-2 All diff --git a/TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj b/TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj index d56778ff1..9e85c61af 100755 --- a/TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj +++ b/TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj @@ -21,7 +21,7 @@ - 1.0.0-alpha-20161029-1 + 1.0.0-alpha-20161102-2 All diff --git a/TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj b/TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj index 3dfa82c90..af53f2b3f 100755 --- a/TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj +++ b/TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj @@ -12,7 +12,7 @@ - 1.0.0-alpha-20161029-1 + 1.0.0-alpha-20161102-2 All diff --git a/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj b/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj index 5dc85d343..35a9da8d8 100644 --- a/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj +++ b/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj @@ -9,7 +9,7 @@ - 1.0.0-alpha-20161029-1 + 1.0.0-alpha-20161102-2 All diff --git a/TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj b/TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj index 721b9712e..a572bde47 100755 --- a/TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj +++ b/TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj @@ -12,7 +12,7 @@ - 1.0.0-alpha-20161029-1 + 1.0.0-alpha-20161102-2 All diff --git a/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj b/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj index b6e9522d6..93b4fc085 100755 --- a/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj +++ b/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj @@ -14,7 +14,7 @@ - 1.0.0-alpha-20161029-1 + 1.0.0-alpha-20161102-2 All diff --git a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/MyLibrary.csproj b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/MyLibrary.csproj index 871825f1c..62c8d1283 100755 --- a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/MyLibrary.csproj +++ b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/MyLibrary.csproj @@ -11,7 +11,7 @@ - 1.0.0-alpha-20161029-1 + 1.0.0-alpha-20161102-2 All diff --git a/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworks/MSBuildAppWithMultipleFrameworks.csproj b/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworks/MSBuildAppWithMultipleFrameworks.csproj index a8887e874..4b0ede9b9 100644 --- a/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworks/MSBuildAppWithMultipleFrameworks.csproj +++ b/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworks/MSBuildAppWithMultipleFrameworks.csproj @@ -9,7 +9,7 @@ - 1.0.0-alpha-20161029-1 + 1.0.0-alpha-20161102-2 All diff --git a/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj b/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj index 5dc85d343..35a9da8d8 100644 --- a/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj +++ b/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj @@ -9,7 +9,7 @@ - 1.0.0-alpha-20161029-1 + 1.0.0-alpha-20161102-2 All diff --git a/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj b/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj index 5d222791c..c23184de3 100644 --- a/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj +++ b/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj @@ -16,7 +16,7 @@ 1.0.1 - 1.0.0-alpha-20161029-1 + 1.0.0-alpha-20161102-2 All diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/CsprojLibrary1.csproj b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/CsprojLibrary1.csproj index 556860038..a162d14f8 100644 --- a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/CsprojLibrary1.csproj +++ b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/CsprojLibrary1.csproj @@ -14,7 +14,7 @@ - 1.0.0-alpha-20161029-1 + 1.0.0-alpha-20161102-2 All diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/project.json b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/project.json index 20613dfc1..2e1f9187e 100644 --- a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/project.json +++ b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/project.json @@ -3,7 +3,7 @@ "frameworks": { "netstandard1.5": { "dependencies": { - "Microsoft.NET.Sdk": "1.0.0-alpha-20161029-1", + "Microsoft.NET.Sdk": "1.0.0-alpha-20161102-2", "NETStandard.Library": "1.6.0" } } diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/CsprojLibrary2.csproj b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/CsprojLibrary2.csproj index 556860038..a162d14f8 100644 --- a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/CsprojLibrary2.csproj +++ b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/CsprojLibrary2.csproj @@ -14,7 +14,7 @@ - 1.0.0-alpha-20161029-1 + 1.0.0-alpha-20161102-2 All diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/project.json b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/project.json index 20613dfc1..2e1f9187e 100644 --- a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/project.json +++ b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/project.json @@ -3,7 +3,7 @@ "frameworks": { "netstandard1.5": { "dependencies": { - "Microsoft.NET.Sdk": "1.0.0-alpha-20161029-1", + "Microsoft.NET.Sdk": "1.0.0-alpha-20161102-2", "NETStandard.Library": "1.6.0" } } diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/CsprojLibrary3.csproj b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/CsprojLibrary3.csproj index 556860038..a162d14f8 100644 --- a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/CsprojLibrary3.csproj +++ b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/CsprojLibrary3.csproj @@ -14,7 +14,7 @@ - 1.0.0-alpha-20161029-1 + 1.0.0-alpha-20161102-2 All diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/project.json b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/project.json index 20613dfc1..2e1f9187e 100644 --- a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/project.json +++ b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/project.json @@ -3,7 +3,7 @@ "frameworks": { "netstandard1.5": { "dependencies": { - "Microsoft.NET.Sdk": "1.0.0-alpha-20161029-1", + "Microsoft.NET.Sdk": "1.0.0-alpha-20161102-2", "NETStandard.Library": "1.6.0" } } diff --git a/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj b/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj index dc34e6004..b9e110f9b 100755 --- a/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj +++ b/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj @@ -12,7 +12,7 @@ - 1.0.0-alpha-20161029-1 + 1.0.0-alpha-20161102-2 All diff --git a/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj b/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj index 8a056988a..e558a21e0 100644 --- a/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj +++ b/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj @@ -15,7 +15,7 @@ 1.0.1 - 1.0.0-alpha-20161029-1 + 1.0.0-alpha-20161102-2 All diff --git a/TestAssets/TestProjects/TestLibraryWithConfiguration/TestLibraryWithConfiguration.csproj b/TestAssets/TestProjects/TestLibraryWithConfiguration/TestLibraryWithConfiguration.csproj index 3e748a942..81fbddda7 100755 --- a/TestAssets/TestProjects/TestLibraryWithConfiguration/TestLibraryWithConfiguration.csproj +++ b/TestAssets/TestProjects/TestLibraryWithConfiguration/TestLibraryWithConfiguration.csproj @@ -14,7 +14,7 @@ - 1.0.0-alpha-20161029-1 + 1.0.0-alpha-20161102-2 All diff --git a/TestAssets/TestProjects/VSTestDesktopAndNetCore/VSTestDesktopAndNetCore.csproj b/TestAssets/TestProjects/VSTestDesktopAndNetCore/VSTestDesktopAndNetCore.csproj index 94314c1d8..e37ec7304 100644 --- a/TestAssets/TestProjects/VSTestDesktopAndNetCore/VSTestDesktopAndNetCore.csproj +++ b/TestAssets/TestProjects/VSTestDesktopAndNetCore/VSTestDesktopAndNetCore.csproj @@ -22,7 +22,7 @@ - 1.0.0-alpha-20161026-2 + 1.0.0-alpha-20161102-2 All diff --git a/TestAssets/TestProjects/VSTestDotNetCore/VSTestDotNetCore.csproj b/TestAssets/TestProjects/VSTestDotNetCore/VSTestDotNetCore.csproj index b0f9dc3d9..96d4a69c6 100644 --- a/TestAssets/TestProjects/VSTestDotNetCore/VSTestDotNetCore.csproj +++ b/TestAssets/TestProjects/VSTestDotNetCore/VSTestDotNetCore.csproj @@ -15,7 +15,7 @@ 1.0.1 - 1.0.0-alpha-20161029-1 + 1.0.0-alpha-20161102-2 All diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj index 6b7d36c8b..7471a645c 100644 --- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj +++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj @@ -43,7 +43,7 @@ 1.0.1-beta-000933 - 1.0.0-alpha-20161029-1 + 1.0.0-alpha-20161102-2 All diff --git a/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj b/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj index b7b4e3c8e..d1d369edf 100644 --- a/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj +++ b/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj @@ -13,7 +13,7 @@ - 1.0.0-alpha-20161026-2 + 1.0.0-alpha-20161102-2 All diff --git a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj index 96f04b591..d948009f0 100644 --- a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj +++ b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj @@ -14,7 +14,7 @@ - 1.0.0-alpha-20161026-2 + 1.0.0-alpha-20161102-2 All diff --git a/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj b/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj index 18f8085c7..78f7c267c 100644 --- a/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj +++ b/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj @@ -21,7 +21,7 @@ - 1.0.0-alpha-20161026-2 + 1.0.0-alpha-20161102-2 All diff --git a/src/Microsoft.DotNet.InternalAbstractions/Microsoft.DotNet.InternalAbstractions.csproj b/src/Microsoft.DotNet.InternalAbstractions/Microsoft.DotNet.InternalAbstractions.csproj index 066aa915c..169e8d8cf 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/Microsoft.DotNet.InternalAbstractions.csproj +++ b/src/Microsoft.DotNet.InternalAbstractions/Microsoft.DotNet.InternalAbstractions.csproj @@ -20,7 +20,7 @@ 1.6.0 - 1.0.0-alpha-20161026-2 + 1.0.0-alpha-20161102-2 All diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj index b910bfa3e..db1a63da0 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj @@ -17,7 +17,7 @@ - 1.0.0-alpha-20161026-2 + 1.0.0-alpha-20161102-2 All diff --git a/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj b/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj index 75ad67727..035db8a87 100644 --- a/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj +++ b/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj @@ -17,7 +17,7 @@ - 1.0.0-alpha-20161026-2 + 1.0.0-alpha-20161102-2 All diff --git a/src/dotnet-archive/dotnet-archive.csproj b/src/dotnet-archive/dotnet-archive.csproj index 200c3285d..9777e0ec3 100644 --- a/src/dotnet-archive/dotnet-archive.csproj +++ b/src/dotnet-archive/dotnet-archive.csproj @@ -13,7 +13,7 @@ - 1.0.0-alpha-20161026-2 + 1.0.0-alpha-20161102-2 All diff --git a/src/dotnet/commands/dotnet-new/CSharp_Console/$projectName$.csproj b/src/dotnet/commands/dotnet-new/CSharp_Console/$projectName$.csproj index c82874b90..c068b8a13 100755 --- a/src/dotnet/commands/dotnet-new/CSharp_Console/$projectName$.csproj +++ b/src/dotnet/commands/dotnet-new/CSharp_Console/$projectName$.csproj @@ -16,7 +16,7 @@ 1.0.1 - 1.0.0-alpha-20161029-1 + 1.0.0-alpha-20161102-2 All diff --git a/src/dotnet/commands/dotnet-new/CSharp_Lib/$projectName$.csproj b/src/dotnet/commands/dotnet-new/CSharp_Lib/$projectName$.csproj index a8c6f3bbb..28831340e 100755 --- a/src/dotnet/commands/dotnet-new/CSharp_Lib/$projectName$.csproj +++ b/src/dotnet/commands/dotnet-new/CSharp_Lib/$projectName$.csproj @@ -15,7 +15,7 @@ 1.6 - 1.0.0-alpha-20161029-1 + 1.0.0-alpha-20161102-2 All diff --git a/src/dotnet/commands/dotnet-new/CSharp_Mstest/$projectName$.csproj b/src/dotnet/commands/dotnet-new/CSharp_Mstest/$projectName$.csproj index 5562e106f..29b4af4dd 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Mstest/$projectName$.csproj +++ b/src/dotnet/commands/dotnet-new/CSharp_Mstest/$projectName$.csproj @@ -16,7 +16,7 @@ 1.0.1 - 1.0.0-alpha-20161029-1 + 1.0.0-alpha-20161102-1 All diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/$projectName$.csproj b/src/dotnet/commands/dotnet-new/CSharp_Web/$projectName$.csproj index 1b7f27442..7b0b6b502 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Web/$projectName$.csproj +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/$projectName$.csproj @@ -17,7 +17,7 @@ 1.0.1 - 1.0.0-alpha-20161029-1 + 1.0.0-alpha-20161102-2-100 1.0.0 diff --git a/src/dotnet/commands/dotnet-new/CSharp_Xunittest/$projectName$.csproj b/src/dotnet/commands/dotnet-new/CSharp_Xunittest/$projectName$.csproj index 8884e6a87..560e73d66 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Xunittest/$projectName$.csproj +++ b/src/dotnet/commands/dotnet-new/CSharp_Xunittest/$projectName$.csproj @@ -16,7 +16,7 @@ 1.0.1 - 1.0.0-alpha-20161029-1 + 1.0.0-alpha-20161102-2 All diff --git a/src/dotnet/dotnet.csproj b/src/dotnet/dotnet.csproj old mode 100644 new mode 100755 index 899212f98..744923fee --- a/src/dotnet/dotnet.csproj +++ b/src/dotnet/dotnet.csproj @@ -1,27 +1,34 @@  + 1.0.0-preview3 netcoreapp1.0 + dotnet Exe ../../tools/Key.snk true true $(PackageTargetFallback);dnxcore50;netstandardapp1.5;portable-net45+win8;portable-net45+wp80+win8+wpa81+dnxcore50 + - - + + + + - - - - + + + + + + - 1.0.0-alpha-20161026-2 + 1.0.0-alpha-20161102-2 All @@ -71,11 +78,14 @@ 1.0.1-beta-000933 + $(DefineConstants);NETCOREAPP1_0 + $(DefineConstants);RELEASE + - \ No newline at end of file + diff --git a/src/dotnet/project.json b/src/dotnet/project.json index 7e96851b5..f2ca7a993 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -7,26 +7,19 @@ "include": [ "commands/dotnet-new/CSharp_Console.zip", "commands/dotnet-new/CSharp_Lib.zip", - "commands/dotnet-new/CSharp_MSBuild.zip", - "commands/dotnet-new/CSharp_xunittest.zip", + "commands/dotnet-new/CSharp_Mstest.zip", "commands/dotnet-new/CSharp_Web.zip", - "commands/dotnet-new/CSharp_nunittest.zip", - "commands/dotnet-new/FSharp_Console.zip", - "commands/dotnet-new/FSharp_Lib.zip", - "commands/dotnet-new/CSharp_Mstest.zip" + "commands/dotnet-new/CSharp_Xunittest.zip" ] }, "compile": { "exclude": [ "commands/dotnet-new/CSharp_Console/**", - "commands/dotnet-new/FSharp_Console/**", - "commands/dotnet-new/CSharp_Web/**", "commands/dotnet-new/CSharp_Lib/**", - "commands/dotnet-new/CSharp_MSBuild/**", - "commands/dotnet-new/FSharp_Lib/**", - "commands/dotnet-new/CSharp_xunittest/**", - "commands/dotnet-new/CSharp_nunittest/**", "commands/dotnet-new/CSharp_Mstest/**", + "commands/dotnet-new/CSharp_Web/**", + "commands/dotnet-new/CSharp_Xunittest/**" + ] } }, diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 7bdd3cdb1..ae99e22b2 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -14,7 +14,7 @@ - 1.0.0-alpha-20161026-2 + 1.0.0-alpha-20161102-2 All diff --git a/src/tool_csc/tool_csc.csproj b/src/tool_csc/tool_csc.csproj index bf4f8383e..5b14428f4 100644 --- a/src/tool_csc/tool_csc.csproj +++ b/src/tool_csc/tool_csc.csproj @@ -7,7 +7,7 @@ - 1.0.0-alpha-20161026-2 + 1.0.0-alpha-20161102-2 All diff --git a/src/tool_msbuild/tool_msbuild.csproj b/src/tool_msbuild/tool_msbuild.csproj index ef0b48e7b..0ab29e7a5 100644 --- a/src/tool_msbuild/tool_msbuild.csproj +++ b/src/tool_msbuild/tool_msbuild.csproj @@ -7,7 +7,7 @@ - 1.0.0-alpha-20161026-2 + 1.0.0-alpha-20161102-2 All diff --git a/src/tool_nuget/tool_nuget.csproj b/src/tool_nuget/tool_nuget.csproj index e61f1f20c..3b408837e 100644 --- a/src/tool_nuget/tool_nuget.csproj +++ b/src/tool_nuget/tool_nuget.csproj @@ -6,7 +6,7 @@ - 1.0.0-alpha-20161026-2 + 1.0.0-alpha-20161102-2 All diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/DotnetTestCommand.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/DotnetTestCommand.cs index 45492fa11..8b67d2d6e 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/DotnetTestCommand.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/DotnetTestCommand.cs @@ -7,20 +7,39 @@ namespace Microsoft.DotNet.Tools.Test.Utilities { public class DotnetTestCommand : TestCommand { + private string _runtime; + public DotnetTestCommand() : base("dotnet") { } public override CommandResult Execute(string args = "") { - args = $"test {args}"; + args = $"test {GetRuntime()} {args}"; return base.Execute(args); } public override CommandResult ExecuteWithCapturedOutput(string args = "") { - args = $"test {args}"; + args = $"test {GetRuntime()} {args}"; return base.ExecuteWithCapturedOutput(args); } + + public DotnetTestCommand WithRuntime(string runtime) + { + _runtime = runtime; + + return this; + } + + private string GetRuntime() + { + if (_runtime == null) + { + return null; + } + + return $"/p:RuntimeIdentifier={_runtime}"; + } } } diff --git a/test/dotnet-test.Tests/GivenDotnetTest3BuildsAndRunsTestFromCsprojForMultipleTFM.cs b/test/dotnet-test.Tests/GivenDotnetTest3BuildsAndRunsTestFromCsprojForMultipleTFM.cs index 3ef4dc3af..fe34143a3 100644 --- a/test/dotnet-test.Tests/GivenDotnetTest3BuildsAndRunsTestFromCsprojForMultipleTFM.cs +++ b/test/dotnet-test.Tests/GivenDotnetTest3BuildsAndRunsTestFromCsprojForMultipleTFM.cs @@ -12,37 +12,33 @@ namespace Microsoft.DotNet.Cli.Test.Tests { public class GivenDotnetTest3BuildsAndRunsTestFromCsprojForMultipleTFM : TestBase { - // project targeting net46 will not run in non windows machine. - [WindowsOnlyFact] + [WindowsOnlyFact(Skip="https://github.com/dotnet/cli/issues/4616")] public void MStestMultiTFM() { - // Copy VSTestDesktopAndNetCore project in output directory of project dotnet-test.Tests - string testAppName = "VSTestDesktopAndNetCore"; - TestInstance testInstance = TestAssetsManager.CreateTestInstance(testAppName); + var testProjectDirectory = TestAssets.Get("VSTestDesktopAndNetCore") + .CreateInstance() + .WithSourceFiles() + .WithNuGetConfig(new RepoDirectoriesProvider().TestPackages) + .Root; + + var runtime = DotnetLegacyRuntimeIdentifiers.InferLegacyRestoreRuntimeIdentifier(); - string testProjectDirectory = testInstance.TestRoot; - - // Restore project VSTestDesktopAndNetCore new RestoreCommand() .WithWorkingDirectory(testProjectDirectory) + .WithRuntime(runtime) .Execute() - .Should() - .Pass(); + .Should().Pass(); - // Call test - CommandResult result = new DotnetTestCommand() - .WithWorkingDirectory(testProjectDirectory) - .ExecuteWithCapturedOutput(); + var result = new DotnetTestCommand() + .WithWorkingDirectory(testProjectDirectory) + .WithRuntime(runtime) + .ExecuteWithCapturedOutput(); - - // Verify - // for target framework net46 - result.StdOut.Should().Contain("Total tests: 3. Passed: 2. Failed: 1. Skipped: 0."); - result.StdOut.Should().Contain("Passed TestNamespace.VSTestTests.VSTestPassTestDesktop"); - - // for target framework netcoreapp1.0 - result.StdOut.Should().Contain("Total tests: 3. Passed: 1. Failed: 2. Skipped: 0."); - result.StdOut.Should().Contain("Failed TestNamespace.VSTestTests.VSTestFailTestNetCoreApp"); + result.StdOut + .Should().Contain("Total tests: 3. Passed: 2. Failed: 1. Skipped: 0.", "because .NET 4.6 tests will pass") + .And.Contain("Passed TestNamespace.VSTestTests.VSTestPassTestDesktop", "because .NET 4.6 tests will pass") + .And.Contain("Total tests: 3. Passed: 1. Failed: 2. Skipped: 0.", "because netcoreapp1.0 tests will fail") + .And.Contain("Failed TestNamespace.VSTestTests.VSTestFailTestNetCoreApp", "because netcoreapp1.0 tests will fail"); } [WindowsOnlyFact] diff --git a/tools/Archiver/Archiver.csproj b/tools/Archiver/Archiver.csproj index de70d3c06..75b53486a 100644 --- a/tools/Archiver/Archiver.csproj +++ b/tools/Archiver/Archiver.csproj @@ -14,7 +14,7 @@ - 1.0.0-alpha-20161026-2 + 1.0.0-alpha-20161102-2 All diff --git a/tools/MigrationDefaultsConstructor/MigrationDefaultsConstructor.csproj b/tools/MigrationDefaultsConstructor/MigrationDefaultsConstructor.csproj index a5aacc921..a735ba235 100644 --- a/tools/MigrationDefaultsConstructor/MigrationDefaultsConstructor.csproj +++ b/tools/MigrationDefaultsConstructor/MigrationDefaultsConstructor.csproj @@ -20,7 +20,7 @@ - 1.0.0-alpha-20161026-2 + 1.0.0-alpha-20161102-2 All