From 93651da836541a977de69e1b88395ff97a5a64eb Mon Sep 17 00:00:00 2001 From: Abhitej Anoop John Bandi Date: Wed, 25 Jan 2017 19:44:50 +0530 Subject: [PATCH 01/29] Updating the MSTest nugets with the ones shipping in VS for desktop and UWP scenarios. --- .../commands/dotnet-new/CSharp_Mstest/$projectName$.csproj | 4 ++-- .../commands/dotnet-new/FSharp_Mstest/$projectName$.fsproj | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dotnet/commands/dotnet-new/CSharp_Mstest/$projectName$.csproj b/src/dotnet/commands/dotnet-new/CSharp_Mstest/$projectName$.csproj index 051122114..229580c09 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Mstest/$projectName$.csproj +++ b/src/dotnet/commands/dotnet-new/CSharp_Mstest/$projectName$.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/src/dotnet/commands/dotnet-new/FSharp_Mstest/$projectName$.fsproj b/src/dotnet/commands/dotnet-new/FSharp_Mstest/$projectName$.fsproj index ec090fa88..fbccc158c 100644 --- a/src/dotnet/commands/dotnet-new/FSharp_Mstest/$projectName$.fsproj +++ b/src/dotnet/commands/dotnet-new/FSharp_Mstest/$projectName$.fsproj @@ -14,8 +14,8 @@ - - + + From 6af164854337fa693871674fde33f38618589733 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 25 Jan 2017 10:33:38 -0800 Subject: [PATCH 02/29] Bumping the SDK version to 1.0.0-alpha-20170123-1. --- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index b7ebc8f54..b993b35a2 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -3,7 +3,7 @@ 15.1.0-preview-000523-01 2.0.0-rc3-61212-03 - 1.0.0-alpha-20170117-4 + 1.0.0-alpha-20170123-1 4.0.0-rc3 1.0.0-alpha-20170120-3-249 15.0.0-preview-20170123-02 From 85ec8a6f2c56f6e0f3d7bde7807162ae36f2559b Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 25 Jan 2017 23:48:31 -0800 Subject: [PATCH 03/29] Fixing our solution tests so that they go back to building the solution. Seems to work now, at least on OSX. Also, made a change to update solution to update any solutions in the folder where dotnet migrate is executed. --- .../TestApp/src/subdir/subdir.csproj | 6 -- .../TestApp/TestAssets/TestAsset/Program.cs | 4 +- .../ProjectDependencyFinder.cs | 2 +- .../TestAssetInstance.cs | 9 +++ .../commands/dotnet-migrate/MigrateCommand.cs | 39 ++++++++---- .../Rules/PackageDependenciesTestBase.cs | 4 +- .../TemporaryProjectFileRuleRunner.cs | 10 +++ .../GivenThatIWantToMigrateSolutions.cs | 61 +++++++++++++++++-- .../GivenThatIWantToMigrateTestApps.cs | 23 +++++++ 9 files changed, 132 insertions(+), 26 deletions(-) diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/src/subdir/subdir.csproj b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/src/subdir/subdir.csproj index cec816e3f..731464ac2 100644 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/src/subdir/subdir.csproj +++ b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/src/subdir/subdir.csproj @@ -8,12 +8,6 @@ F8F96F4A-F10C-4C54-867C-A9EFF55494C8 - - - - - - 1.6.0 diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefs/TestApp/TestAssets/TestAsset/Program.cs b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefs/TestApp/TestAssets/TestAsset/Program.cs index c56978bf5..2906f8bbf 100644 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefs/TestApp/TestAssets/TestAsset/Program.cs +++ b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefs/TestApp/TestAssets/TestAsset/Program.cs @@ -2,9 +2,9 @@ using System; namespace App.Tests { - public class Program + public class TestAssetProgram { - public static void Main(string[] args) + public static void TestAssetMain(string[] args) { Console.WriteLine("Hello World!"); } diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/ProjectDependencyFinder.cs b/src/Microsoft.DotNet.ProjectJsonMigration/ProjectDependencyFinder.cs index 380a9a435..d8332258a 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/ProjectDependencyFinder.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/ProjectDependencyFinder.cs @@ -314,7 +314,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration } foreach (var projectDirectory in - Enumerable.Repeat(directory, 1).Union(directory.GetDirectories())) + Enumerable.Repeat(directory, 1).Union(directory.GetDirectories("*", SearchOption.AllDirectories))) { AddIfProjectExists(projects, projectDirectory); } diff --git a/src/Microsoft.DotNet.TestFramework/TestAssetInstance.cs b/src/Microsoft.DotNet.TestFramework/TestAssetInstance.cs index ea942eb65..3fc98f0a4 100644 --- a/src/Microsoft.DotNet.TestFramework/TestAssetInstance.cs +++ b/src/Microsoft.DotNet.TestFramework/TestAssetInstance.cs @@ -104,6 +104,15 @@ namespace Microsoft.DotNet.TestFramework return this; } + public TestAssetInstance WithEmptyGlobalJson() + { + var file = Root.Parent.GetFile("global.json"); + + File.WriteAllText(file.FullName, @"{}"); + + return this; + } + private void CopyFiles(IEnumerable filesToCopy) { foreach (var file in filesToCopy) diff --git a/src/dotnet/commands/dotnet-migrate/MigrateCommand.cs b/src/dotnet/commands/dotnet-migrate/MigrateCommand.cs index b50aca8d1..ea66ed320 100644 --- a/src/dotnet/commands/dotnet-migrate/MigrateCommand.cs +++ b/src/dotnet/commands/dotnet-migrate/MigrateCommand.cs @@ -103,7 +103,24 @@ namespace Microsoft.DotNet.Tools.Migrate private void UpdateSolutionFile(MigrationReport migrationReport) { - if (_slnFile == null) + if(_slnFile != null) + { + UpdateSolutionFile(migrationReport, _slnFile); + } + else + { + foreach (var slnPath in _workspaceDirectory.EnumerateFiles("*.sln")) + { + var slnFile = SlnFile.Read(slnPath.FullName); + + UpdateSolutionFile(migrationReport, slnFile); + } + } + } + + private void UpdateSolutionFile(MigrationReport migrationReport, SlnFile slnFile) + { + if (slnFile == null) { return; } @@ -115,7 +132,7 @@ namespace Microsoft.DotNet.Tools.Migrate var csprojFilesToAdd = new HashSet(); - var slnPathWithTrailingSlash = PathUtility.EnsureTrailingSlash(_slnFile.BaseDirectory); + var slnPathWithTrailingSlash = PathUtility.EnsureTrailingSlash(slnFile.BaseDirectory); foreach (var report in migrationReport.ProjectMigrationReports) { var reportPathWithTrailingSlash = PathUtility.EnsureTrailingSlash(report.ProjectDirectory); @@ -124,7 +141,7 @@ namespace Microsoft.DotNet.Tools.Migrate reportPathWithTrailingSlash); var xprojPath = Path.Combine(relativeReportPath, report.ProjectName + ".xproj"); - var xprojProjectsReferencedBySolution = _slnFile.Projects.Where(p => p.FilePath == xprojPath); + var xprojProjectsReferencedBySolution = slnFile.Projects.Where(p => p.FilePath == xprojPath); var migratedProjectName = report.ProjectName + ".csproj"; if (xprojProjectsReferencedBySolution.Count() == 1) @@ -138,7 +155,7 @@ namespace Microsoft.DotNet.Tools.Migrate else { var csprojPath = Path.Combine(relativeReportPath, migratedProjectName); - var solutionContainsCsprojPriorToMigration = _slnFile.Projects + var solutionContainsCsprojPriorToMigration = slnFile.Projects .Where(p => p.FilePath == csprojPath) .Any(); @@ -155,20 +172,20 @@ namespace Microsoft.DotNet.Tools.Migrate } Version version; - if (!Version.TryParse(_slnFile.VisualStudioVersion, out version) || version.Major < 15) + if (!Version.TryParse(slnFile.VisualStudioVersion, out version) || version.Major < 15) { - _slnFile.ProductDescription = ProductDescription; - _slnFile.VisualStudioVersion = VisualStudioVersion; - _slnFile.MinimumVisualStudioVersion = MinimumVisualStudioVersion; + slnFile.ProductDescription = ProductDescription; + slnFile.VisualStudioVersion = VisualStudioVersion; + slnFile.MinimumVisualStudioVersion = MinimumVisualStudioVersion; } - RemoveReferencesToMigratedFiles(_slnFile); + RemoveReferencesToMigratedFiles(slnFile); - _slnFile.Write(); + slnFile.Write(); foreach (var csprojFile in csprojFilesToAdd) { - AddProject(_slnFile.FullPath, csprojFile); + AddProject(slnFile.FullPath, csprojFile); } } diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/PackageDependenciesTestBase.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/PackageDependenciesTestBase.cs index e0eb3a99e..6df9528cb 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/PackageDependenciesTestBase.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/PackageDependenciesTestBase.cs @@ -48,7 +48,9 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests protected ProjectRootElement RunPackageDependenciesRuleOnPj(string s, string testDirectory = null) { - testDirectory = testDirectory ?? Temp.CreateDirectory().Path; + testDirectory = + testDirectory ?? + Temp.CreateDirectory().DirectoryInfo.CreateSubdirectory("project").FullName; return TemporaryProjectFileRuleRunner.RunRules(new IMigrationRule[] { new MigratePackageDependenciesAndToolsRule() diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/TemporaryProjectFileRuleRunner.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/TemporaryProjectFileRuleRunner.cs index f574e26a6..e2aed119b 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/TemporaryProjectFileRuleRunner.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/TemporaryProjectFileRuleRunner.cs @@ -3,7 +3,9 @@ using System.Linq; using Microsoft.Build.Construction; using Microsoft.DotNet.ProjectJsonMigration.Rules; using Microsoft.DotNet.Internal.ProjectModel; +using Microsoft.DotNet.TestFramework; using NuGet.Frameworks; +using System.IO; namespace Microsoft.DotNet.ProjectJsonMigration.Tests { @@ -23,6 +25,14 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests string projectDirectory, string json) { + + var globalJson = Path.Combine(new DirectoryInfo(projectDirectory).Parent.FullName, "global.json"); + if (!File.Exists(globalJson)) + { + var file = new FileInfo(globalJson); + File.WriteAllText(file.FullName, @"{}"); + } + var testPj = new ProjectJsonBuilder(null) .FromStringBase(json) .SaveToDisk(projectDirectory); diff --git a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs index cbfa8ba50..622f0b27f 100644 --- a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs +++ b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs @@ -28,6 +28,7 @@ namespace Microsoft.DotNet.Migration.Tests .GetProjectJson(TestAssetKinds.NonRestoredTestProjects, projectName) .CreateInstance(identifier: projectName) .WithSourceFiles() + .WithEmptyGlobalJson() .Root; var solutionRelPath = "TestApp.sln"; @@ -58,6 +59,7 @@ namespace Microsoft.DotNet.Migration.Tests .GetProjectJson(TestAssetKinds.NonRestoredTestProjects, "PJAppWithSlnAndXprojRefs") .CreateInstance() .WithSourceFiles() + .WithEmptyGlobalJson() .Root; var solutionRelPath = Path.Combine("TestApp", "TestApp.sln"); @@ -103,6 +105,7 @@ namespace Microsoft.DotNet.Migration.Tests .GetProjectJson("NonRestoredTestProjects", "PJAppWithSlnAndOneAlreadyMigratedCsproj") .CreateInstance() .WithSourceFiles() + .WithEmptyGlobalJson() .Root; var solutionRelPath = Path.Combine("TestApp", "TestApp.sln"); @@ -136,6 +139,7 @@ namespace Microsoft.DotNet.Migration.Tests .GetProjectJson(TestAssetKinds.NonRestoredTestProjects, "PJAppWithSlnAndOneAlreadyMigratedCsproj") .CreateInstance() .WithSourceFiles() + .WithEmptyGlobalJson() .Root; var solutionRelPath = Path.Combine("TestApp", "TestApp.sln"); @@ -184,12 +188,60 @@ namespace Microsoft.DotNet.Migration.Tests } } + [Fact] + public void ItMigratesSolutionInTheFolderWhenWeRunMigrationInThatFolder() + { + var projectDirectory = TestAssets + .Get("NonRestoredTestProjects", "PJAppWithSlnAndXprojRefs") + .CreateInstance() + .WithSourceFiles() + .WithEmptyGlobalJson() + .Root; + + var workingDirectory = new DirectoryInfo(Path.Combine(projectDirectory.FullName, "TestApp")); + var solutionRelPath = Path.Combine("TestApp", "TestApp.sln"); + + new DotnetCommand() + .WithWorkingDirectory(workingDirectory) + .Execute($"migrate") + .Should().Pass(); + + SlnFile slnFile = SlnFile.Read(Path.Combine(projectDirectory.FullName, solutionRelPath)); + + var nonSolutionFolderProjects = slnFile.Projects + .Where(p => p.TypeGuid != ProjectTypeGuids.SolutionFolderGuid); + + nonSolutionFolderProjects.Count().Should().Be(4); + + var slnProject = nonSolutionFolderProjects.Where((p) => p.Name == "TestApp").Single(); + slnProject.TypeGuid.Should().Be(ProjectTypeGuids.CSharpProjectTypeGuid); + slnProject.FilePath.Should().Be("TestApp.csproj"); + + slnProject = nonSolutionFolderProjects.Where((p) => p.Name == "TestLibrary").Single(); + slnProject.TypeGuid.Should().Be(ProjectTypeGuids.CSharpProjectTypeGuid); + slnProject.FilePath.Should().Be(Path.Combine("..", "TestLibrary", "TestLibrary.csproj")); + + slnProject = nonSolutionFolderProjects.Where((p) => p.Name == "subdir").Single(); + slnProject.FilePath.Should().Be(Path.Combine("src", "subdir", "subdir.csproj")); + + new DotnetCommand() + .WithWorkingDirectory(projectDirectory) + .Execute($"restore \"{solutionRelPath}\"") + .Should().Pass(); + + new DotnetCommand() + .WithWorkingDirectory(projectDirectory) + .Execute($"build \"{solutionRelPath}\"") + .Should().Pass(); + } + private void MigrateAndBuild(string groupName, string projectName, [CallerMemberName] string callingMethod = "", string identifier = "") { var projectDirectory = TestAssets .Get(groupName, projectName) .CreateInstance(callingMethod: callingMethod, identifier: identifier) .WithSourceFiles() + .WithEmptyGlobalJson() .Root; var solutionRelPath = Path.Combine("TestApp", "TestApp.sln"); @@ -204,11 +256,10 @@ namespace Microsoft.DotNet.Migration.Tests .Execute($"restore \"{solutionRelPath}\"") .Should().Pass(); - //ISSUE: https://github.com/dotnet/cli/issues/5205 - //new DotnetCommand() - // .WithWorkingDirectory(projectDirectory) - // .Execute($"build \"{solutionRelPath}\"") - // .Should().Pass(); + new DotnetCommand() + .WithWorkingDirectory(projectDirectory) + .Execute($"build \"{solutionRelPath}\"") + .Should().Pass(); SlnFile slnFile = SlnFile.Read(Path.Combine(projectDirectory.FullName, solutionRelPath)); diff --git a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs index c569c6cc6..434065c55 100644 --- a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs +++ b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs @@ -34,6 +34,7 @@ namespace Microsoft.DotNet.Migration.Tests .CreateInstance(identifier: projectName) .WithSourceFiles() .WithRestoreFiles() + .WithEmptyGlobalJson() .Root; CleanBinObj(projectDirectory); @@ -68,6 +69,7 @@ namespace Microsoft.DotNet.Migration.Tests .CreateInstance(identifier: projectName) .WithSourceFiles() .WithRestoreFiles() + .WithEmptyGlobalJson() .Root; CleanBinObj(projectDirectory); @@ -87,6 +89,7 @@ namespace Microsoft.DotNet.Migration.Tests .CreateInstance() .WithSourceFiles() .WithRestoreFiles() + .WithEmptyGlobalJson() .Root; CleanBinObj(projectDirectory); @@ -115,6 +118,7 @@ namespace Microsoft.DotNet.Migration.Tests .GetProjectJson("ProjectJsonConsoleTemplate") .CreateInstance() .WithSourceFiles() + .WithEmptyGlobalJson() .Root; var outputComparisonData = GetComparisonData(projectDirectory); @@ -140,6 +144,7 @@ namespace Microsoft.DotNet.Migration.Tests .CreateInstance() .WithSourceFiles() .WithRestoreFiles() + .WithEmptyGlobalJson() .Root; var globalDirectory = projectDirectory.Parent; @@ -168,6 +173,7 @@ namespace Microsoft.DotNet.Migration.Tests .GetProjectJson(projectName) .CreateInstance() .WithSourceFiles() + .WithEmptyGlobalJson() .Root; File.Copy("NuGet.tempaspnetpatch.config", projectDirectory.GetFile("NuGet.Config").FullName); @@ -185,6 +191,7 @@ namespace Microsoft.DotNet.Migration.Tests .GetProjectJson("AppWithPackageNamedAfterFolder") .CreateInstance() .WithSourceFiles() + .WithEmptyGlobalJson() .Root; var appProject = solutionDirectory @@ -209,6 +216,7 @@ namespace Microsoft.DotNet.Migration.Tests .GetProjectJson("TestAppDependencyGraph") .CreateInstance() .WithSourceFiles() + .WithEmptyGlobalJson() .Root; MigrateProject(projectDirectory.GetDirectory(dependencyProject).FullName); @@ -224,6 +232,7 @@ namespace Microsoft.DotNet.Migration.Tests .CreateInstance() .WithSourceFiles() .WithRestoreFiles() + .WithEmptyGlobalJson() .Root; var globalDirectory = projectDirectory.Parent; @@ -245,6 +254,7 @@ namespace Microsoft.DotNet.Migration.Tests .CreateInstance(identifier: projectName) .WithSourceFiles() .WithRestoreFiles() + .WithEmptyGlobalJson() .Root; var outputComparisonData = BuildProjectJsonMigrateBuildMSBuild(projectDirectory, projectName); @@ -270,6 +280,7 @@ namespace Microsoft.DotNet.Migration.Tests .CreateInstance(identifier: projectName) .WithSourceFiles() .WithRestoreFiles() + .WithEmptyGlobalJson() .Root; var outputComparisonData = BuildProjectJsonMigrateBuildMSBuild(projectDirectory, projectName); @@ -296,6 +307,7 @@ namespace Microsoft.DotNet.Migration.Tests .CreateInstance(identifier: projectName) .WithSourceFiles() .WithRestoreFiles() + .WithEmptyGlobalJson() .Root; var outputComparisonData = BuildProjectJsonMigrateBuildMSBuild( @@ -326,6 +338,7 @@ namespace Microsoft.DotNet.Migration.Tests .GetProjectJson("TestAppDependencyGraph") .CreateInstance(identifier: $"{projectName}.RefsTest") .WithSourceFiles() + .WithEmptyGlobalJson() .Root; MigrateProject(new [] { projectDirectory.GetDirectory(projectName).FullName }); @@ -347,6 +360,7 @@ namespace Microsoft.DotNet.Migration.Tests .GetProjectJson("TestAppDependencyGraph") .CreateInstance($"{projectName}.SkipRefsTest") .WithSourceFiles() + .WithEmptyGlobalJson() .Root; MigrateProject(new [] { projectDirectory.GetDirectory(projectName).FullName, "--skip-project-references" }); @@ -363,6 +377,7 @@ namespace Microsoft.DotNet.Migration.Tests .GetProjectJson("TestAppDependencyGraph") .CreateInstance(callingMethod: $"MigrateDirectory.SkipRefs.{skipRefs}") .WithSourceFiles() + .WithEmptyGlobalJson() .Root; if (skipRefs) @@ -386,6 +401,7 @@ namespace Microsoft.DotNet.Migration.Tests .GetProjectJson("TestAppDependencyGraph") .CreateInstance() .WithSourceFiles() + .WithEmptyGlobalJson() .Root; var project = projectDirectory @@ -408,6 +424,7 @@ namespace Microsoft.DotNet.Migration.Tests .CreateInstance() .WithSourceFiles() .WithRestoreFiles() + .WithEmptyGlobalJson() .Root; var projectDirectory = assetsDir.GetDirectory("ProjectF"); @@ -443,6 +460,7 @@ namespace Microsoft.DotNet.Migration.Tests .CreateInstance(identifier: projectNameSuffix) .WithSourceFiles() .WithRestoreFiles() + .WithEmptyGlobalJson() .Root; var projectName = $"Project{projectNameSuffix}"; @@ -532,6 +550,7 @@ namespace Microsoft.DotNet.Migration.Tests .CreateInstance() .WithSourceFiles() .WithRestoreFiles() + .WithEmptyGlobalJson() .Root; CleanBinObj(projectDirectory); @@ -551,6 +570,7 @@ namespace Microsoft.DotNet.Migration.Tests .CreateInstance() .WithSourceFiles() .WithRestoreFiles() + .WithEmptyGlobalJson() .Root; CleanBinObj(projectDirectory); @@ -570,6 +590,7 @@ namespace Microsoft.DotNet.Migration.Tests .GetProjectJson("TestAppDependencyGraph") .CreateInstance() .WithSourceFiles() + .WithEmptyGlobalJson() .Root; var projectDirectory = solutionDirectory.GetDirectory(projectName); @@ -594,6 +615,7 @@ namespace Microsoft.DotNet.Migration.Tests .CreateInstance() .WithSourceFiles() .WithRestoreFiles() + .WithEmptyGlobalJson() .Root; var expectedCsprojPath = projectDirectory.GetFile($"{projectName}.csproj"); @@ -634,6 +656,7 @@ namespace Microsoft.DotNet.Migration.Tests .GetProjectJson(projectName) .CreateInstance(identifier: projectName) .WithSourceFiles() + .WithEmptyGlobalJson() .Root; MigrateProject(projectDirectory.FullName); From 537d78d2a6acea835878b2345dc9e29742374b6f Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Thu, 26 Jan 2017 10:06:31 -0800 Subject: [PATCH 04/29] Fixing test failures. One of them, is a known issue that still reproes intermittently. The other was some left over code that was causing problems. --- ...enThatIWantToMigratePackageDependencies.cs | 45 ------------------- .../Rules/PackageDependenciesTestBase.cs | 7 ++- .../GivenThatIWantToMigrateSolutions.cs | 18 ++++---- 3 files changed, 15 insertions(+), 55 deletions(-) diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePackageDependencies.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePackageDependencies.cs index 3067b567a..755abacde 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePackageDependencies.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePackageDependencies.cs @@ -435,50 +435,5 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests mockProj.Items.Should().ContainSingle( i => (i.Include == "NETStandard.Library" && i.ItemType == "PackageReference")); } - - new private void EmitsPackageReferences(ProjectRootElement mockProj, params Tuple[] packageSpecs) - { - foreach (var packageSpec in packageSpecs) - { - var packageName = packageSpec.Item1; - var packageVersion = packageSpec.Item2; - var packageTFM = packageSpec.Item3; - - var items = mockProj.Items - .Where(i => i.ItemType == "PackageReference") - .Where(i => string.IsNullOrEmpty(packageTFM) || i.ConditionChain().Any(c => c.Contains(packageTFM))) - .Where(i => i.Include == packageName) - .Where(i => i.GetMetadataWithName("Version").Value == packageVersion && - i.GetMetadataWithName("Version").ExpressedAsAttribute); - - items.Should().HaveCount(1); - } - } - - new private void EmitsToolReferences(ProjectRootElement mockProj, params Tuple[] toolSpecs) - { - foreach (var toolSpec in toolSpecs) - { - var packageName = toolSpec.Item1; - var packageVersion = toolSpec.Item2; - - var items = mockProj.Items - .Where(i => i.ItemType == "DotNetCliToolReference") - .Where(i => i.Include == packageName) - .Where(i => i.GetMetadataWithName("Version").Value == packageVersion && - i.GetMetadataWithName("Version").ExpressedAsAttribute); - - items.Should().HaveCount(1); - } - } - - new private ProjectRootElement RunPackageDependenciesRuleOnPj(string s, string testDirectory = null) - { - testDirectory = testDirectory ?? Temp.CreateDirectory().Path; - return TemporaryProjectFileRuleRunner.RunRules(new IMigrationRule[] - { - new MigratePackageDependenciesAndToolsRule() - }, s, testDirectory); - } } } \ No newline at end of file diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/PackageDependenciesTestBase.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/PackageDependenciesTestBase.cs index 6df9528cb..9a5526646 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/PackageDependenciesTestBase.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/PackageDependenciesTestBase.cs @@ -24,7 +24,8 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests .Where(i => i.ItemType == "PackageReference") .Where(i => string.IsNullOrEmpty(packageTFM) || i.ConditionChain().Any(c => c.Contains(packageTFM))) .Where(i => i.Include == packageName) - .Where(i => i.GetMetadataWithName("Version").Value == packageVersion); + .Where(i => i.GetMetadataWithName("Version").Value == packageVersion && + i.GetMetadataWithName("Version").ExpressedAsAttribute); items.Should().HaveCount(1); } @@ -40,7 +41,8 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests var items = mockProj.Items .Where(i => i.ItemType == "DotNetCliToolReference") .Where(i => i.Include == packageName) - .Where(i => i.GetMetadataWithName("Version").Value == packageVersion); + .Where(i => i.GetMetadataWithName("Version").Value == packageVersion && + i.GetMetadataWithName("Version").ExpressedAsAttribute); items.Should().HaveCount(1); } @@ -51,6 +53,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests testDirectory = testDirectory ?? Temp.CreateDirectory().DirectoryInfo.CreateSubdirectory("project").FullName; + return TemporaryProjectFileRuleRunner.RunRules(new IMigrationRule[] { new MigratePackageDependenciesAndToolsRule() diff --git a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs index 622f0b27f..330baa6e0 100644 --- a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs +++ b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs @@ -229,10 +229,11 @@ namespace Microsoft.DotNet.Migration.Tests .Execute($"restore \"{solutionRelPath}\"") .Should().Pass(); - new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .Execute($"build \"{solutionRelPath}\"") - .Should().Pass(); + //ISSUE: https://github.com/dotnet/cli/issues/5205 + //new DotnetCommand() + // .WithWorkingDirectory(projectDirectory) + // .Execute($"build \"{solutionRelPath}\"") + // .Should().Pass(); } private void MigrateAndBuild(string groupName, string projectName, [CallerMemberName] string callingMethod = "", string identifier = "") @@ -256,10 +257,11 @@ namespace Microsoft.DotNet.Migration.Tests .Execute($"restore \"{solutionRelPath}\"") .Should().Pass(); - new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .Execute($"build \"{solutionRelPath}\"") - .Should().Pass(); + //ISSUE: https://github.com/dotnet/cli/issues/5205 + //new DotnetCommand() + // .WithWorkingDirectory(projectDirectory) + // .Execute($"build \"{solutionRelPath}\"") + // .Should().Pass(); SlnFile slnFile = SlnFile.Read(Path.Combine(projectDirectory.FullName, solutionRelPath)); From 40c0c41cde38c5694991fbad7ada192311fcba8c Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Thu, 26 Jan 2017 12:40:29 -0800 Subject: [PATCH 05/29] Handling a potential race condition when writing global.json during migration. --- .../TemporaryProjectFileRuleRunner.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/TemporaryProjectFileRuleRunner.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/TemporaryProjectFileRuleRunner.cs index e2aed119b..e8b7484ed 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/TemporaryProjectFileRuleRunner.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/TemporaryProjectFileRuleRunner.cs @@ -30,7 +30,14 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests if (!File.Exists(globalJson)) { var file = new FileInfo(globalJson); - File.WriteAllText(file.FullName, @"{}"); + try + { + File.WriteAllText(file.FullName, @"{}"); + } + catch (IOException) + { + //this means there is someone else writing to the file already. So, just ignore it. + } } var testPj = new ProjectJsonBuilder(null) From 0073fc85342049fc97a746cfd21926996e3ecefb Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Wed, 4 Jan 2017 15:27:41 -0600 Subject: [PATCH 06/29] Update CLI to run on netcoreapp1.1. --- build.proj | 14 +++++----- build/Microsoft.DotNet.Cli.Compile.targets | 22 +++++++++++---- .../Microsoft.DotNet.Cli.LzmaArchive.targets | 4 +-- .../dotnet-cli-build/dotnet-cli-build.csproj | 6 ++--- ...crosoft.DotNet.ProjectJsonMigration.csproj | 1 + src/dotnet-archive/dotnet-archive.csproj | 4 +-- src/dotnet/dotnet.csproj | 27 ++++++++++--------- src/redist/redist.csproj | 8 +++--- src/tool_msbuild/tool_msbuild.csproj | 4 +-- src/tool_nuget/tool_nuget.csproj | 4 +-- .../ArgumentsReflector.csproj | 11 ++++++-- .../dotnet-add-reference.Tests.csproj | 6 ++--- tools/Archiver/Archiver.csproj | 4 +-- .../MigrationDefaultsConstructor.csproj | 6 ++--- 14 files changed, 71 insertions(+), 50 deletions(-) diff --git a/build.proj b/build.proj index 8e9fd472e..b03807f06 100644 --- a/build.proj +++ b/build.proj @@ -17,14 +17,14 @@ Debug - preview + release/1.1.0 Microsoft.NETCore.App - 1.0.3 - 1.0.1 - 1.0.1 + 1.1.0 + 1.1.0 + 1.1.0 - 1.0.5 - 1.0.5 + 1.1.0 + 1.1.0 .exe @@ -54,7 +54,7 @@ DependsOnTargets="MSBuildWorkaroundTarget; RestoreDotnetCliBuildFramework"> - diff --git a/build/Microsoft.DotNet.Cli.Compile.targets b/build/Microsoft.DotNet.Cli.Compile.targets index 9718ecf7d..286b07814 100644 --- a/build/Microsoft.DotNet.Cli.Compile.targets +++ b/build/Microsoft.DotNet.Cli.Compile.targets @@ -81,10 +81,16 @@ - - - - + + + + + + + + + + @@ -146,7 +152,11 @@ + AssetPath="$(BinaryToCorehostifyRelDir)/%(RuntimeTargetsAssetsToRemoveFromDeps.Identity).exe" /> + + @@ -160,7 +170,9 @@ + + - - + Build scripts for dotnet-cli 1.0.0 - netcoreapp1.0 + netcoreapp1.1 true bin\$(Configuration) - $(PackageTargetFallback);portable-net45+win8+wp8+wpa81 + $(PackageTargetFallback);portable-net45+win8+wp8+wpa81 @@ -17,7 +17,7 @@ 1.6.0 - 1.0.4 + 1.1.0 $(CLI_MSBuild_Version) diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj index 06346c987..1b96e6ef4 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj @@ -4,6 +4,7 @@ $(CliVersionPrefix) netcoreapp1.0 + netcoreapp1.1 true ../../tools/Key.snk true diff --git a/src/dotnet-archive/dotnet-archive.csproj b/src/dotnet-archive/dotnet-archive.csproj index 1b6c8e41c..3bf1aba42 100644 --- a/src/dotnet-archive/dotnet-archive.csproj +++ b/src/dotnet-archive/dotnet-archive.csproj @@ -2,7 +2,7 @@ - netcoreapp1.0 + netcoreapp1.1 Exe @@ -13,7 +13,7 @@ - 1.0.3 + 1.1.0 diff --git a/src/dotnet/dotnet.csproj b/src/dotnet/dotnet.csproj index c2f1a9fad..6d262e0c4 100755 --- a/src/dotnet/dotnet.csproj +++ b/src/dotnet/dotnet.csproj @@ -3,13 +3,14 @@ $(CliVersionPrefix) - netcoreapp1.0 + 1.0.0-preview5 + netcoreapp1.1 dotnet Exe ../../tools/Key.snk true true - $(PackageTargetFallback);dotnet5.4 + $(PackageTargetFallback);dotnet5.4 @@ -32,44 +33,44 @@ 9.0.1 - 4.0.1 + 4.3.0 - 4.0.0 + 4.3.0 2.0.0 - 1.0.3 + 1.1.0 - 4.0.0 + 4.3.0 - 4.0.0 + 4.3.0 - 4.0.0 + 4.3.0 - 4.1.1 + 4.3.0 - 4.1.1 + 4.3.0 - 4.1.0 + 4.3.0 - 4.0.0 + 4.3.0 Analyzers;Build;ContentFiles;Native;Runtime $(CLI_MSBuild_Version) - 1.0.1-beta-000933 + 1.1.0 diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 02884fadb..1682bddfc 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -3,13 +3,13 @@ $(CliVersionPrefix) - netcoreapp1.0 + netcoreapp1.1 true - $(PackageTargetFallback);dotnet5.4 + $(PackageTargetFallback);dotnet5.4 - 1.0.3 + 1.1.0 $(CLI_MSBuild_Version) @@ -24,7 +24,7 @@ $(CLI_TestPlatform_Version) - + diff --git a/src/tool_msbuild/tool_msbuild.csproj b/src/tool_msbuild/tool_msbuild.csproj index 40082b920..006bbeec2 100644 --- a/src/tool_msbuild/tool_msbuild.csproj +++ b/src/tool_msbuild/tool_msbuild.csproj @@ -3,11 +3,11 @@ $(CliVersionPrefix) - netcoreapp1.0 + netcoreapp1.1 - 1.0.3 + 1.1.0 $(CLI_MSBuild_Version) diff --git a/src/tool_nuget/tool_nuget.csproj b/src/tool_nuget/tool_nuget.csproj index a9163b695..163953ae9 100644 --- a/src/tool_nuget/tool_nuget.csproj +++ b/src/tool_nuget/tool_nuget.csproj @@ -3,11 +3,11 @@ $(CliVersionPrefix) - netcoreapp1.0 + netcoreapp1.1 - 1.0.3 + 1.1.0 $(CLI_NuGet_Version) diff --git a/test/ArgumentsReflector/ArgumentsReflector.csproj b/test/ArgumentsReflector/ArgumentsReflector.csproj index 18b1c199a..75dc7fa7c 100644 --- a/test/ArgumentsReflector/ArgumentsReflector.csproj +++ b/test/ArgumentsReflector/ArgumentsReflector.csproj @@ -2,9 +2,10 @@ - netcoreapp1.0 ArgumentsReflector Exe + 1.0.0-preview5 + netcoreapp1.1 @@ -16,7 +17,13 @@ - 1.0.3 + 1.1.0 + + + 2.0.0-beta6-60922-08 + + + 2.0.0-beta6-60922-08 diff --git a/test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj b/test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj index 09141e8e2..c87f94caa 100644 --- a/test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj +++ b/test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj @@ -2,7 +2,7 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet-add-reference.Tests $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -36,10 +36,10 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 - 4.1.1 + 4.3.0 2.2.0-beta4-build3444 diff --git a/tools/Archiver/Archiver.csproj b/tools/Archiver/Archiver.csproj index 3d673f7ac..a1d99b659 100644 --- a/tools/Archiver/Archiver.csproj +++ b/tools/Archiver/Archiver.csproj @@ -2,7 +2,7 @@ - netcoreapp1.0 + netcoreapp1.1 Exe win7-x64;win7-x86;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;osx.10.10-x64;rhel.7-x64 @@ -15,7 +15,7 @@ - 1.0.3 + 1.1.0 diff --git a/tools/MigrationDefaultsConstructor/MigrationDefaultsConstructor.csproj b/tools/MigrationDefaultsConstructor/MigrationDefaultsConstructor.csproj index c801a1d11..db5f74418 100644 --- a/tools/MigrationDefaultsConstructor/MigrationDefaultsConstructor.csproj +++ b/tools/MigrationDefaultsConstructor/MigrationDefaultsConstructor.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 portable Exe - $(PackageTargetFallback);dnxcore50;portable-net45+win8 + $(PackageTargetFallback);dnxcore50;portable-net45+win8 @@ -13,7 +13,7 @@ - 1.0.3 + 1.1.0 $(CLI_MSBuild_Version) From cfb4cc3cb90d38e4534b030ae0c6c95e2fd0779f Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Wed, 4 Jan 2017 17:57:17 -0600 Subject: [PATCH 07/29] Update tests to netcoreapp1.1. --- .../ArgumentForwardingTests.csproj | 8 +-- .../ArgumentsReflector.csproj | 1 + test/EndToEnd/EndToEnd.csproj | 10 ++-- ...osoft.DotNet.Cli.Sln.Internal.Tests.csproj | 6 +- .../Microsoft.DotNet.Cli.Utils.Tests.csproj | 12 ++-- ...crosoft.DotNet.Configurer.UnitTests.csproj | 8 +-- ...t.DotNet.ProjectJsonMigration.Tests.csproj | 6 +- ...rosoft.DotNet.Tools.Tests.Utilities.csproj | 9 ++- .../Msbuild.Tests.Utilities.csproj | 6 +- test/Performance/Performance.csproj | 55 +++++++++++++++++++ test/crossgen.Tests/crossgen.Tests.csproj | 6 +- .../dotnet-add-reference.Tests.csproj | 2 +- .../dotnet-build.Tests.csproj | 8 +-- .../dotnet-help.Tests.csproj | 6 +- .../dotnet-list-reference.Tests.csproj | 8 +-- .../dotnet-migrate.Tests.csproj | 6 +- .../dotnet-msbuild.Tests.csproj | 6 +- test/dotnet-new.Tests/dotnet-new.Tests.csproj | 6 +- .../dotnet-nuget.UnitTests.csproj | 8 +-- .../dotnet-pack.Tests.csproj | 10 ++-- .../dotnet-publish.Tests.csproj | 8 +-- .../dotnet-remove-reference.Tests.csproj | 8 +-- .../dotnet-restore.Tests.csproj | 6 +- test/dotnet-run.Tests/dotnet-run.Tests.csproj | 8 +-- .../dotnet-sln-add.Tests.csproj | 6 +- .../dotnet-sln-list.Tests.csproj | 6 +- .../dotnet-sln-remove.Tests.csproj | 6 +- .../dotnet-test.Tests.csproj | 8 +-- .../dotnet-vstest.Tests.csproj | 8 +-- test/dotnet.Tests/dotnet.Tests.csproj | 8 +-- .../msbuild.IntegrationTests.csproj | 6 +- 31 files changed, 163 insertions(+), 102 deletions(-) create mode 100644 test/Performance/Performance.csproj diff --git a/test/ArgumentForwardingTests/ArgumentForwardingTests.csproj b/test/ArgumentForwardingTests/ArgumentForwardingTests.csproj index 75377303e..4e2f32f87 100644 --- a/test/ArgumentForwardingTests/ArgumentForwardingTests.csproj +++ b/test/ArgumentForwardingTests/ArgumentForwardingTests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 ArgumentForwardingTests Exe - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -33,10 +33,10 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 - 4.1.1 + 4.3.0 2.2.0-beta4-build3444 diff --git a/test/ArgumentsReflector/ArgumentsReflector.csproj b/test/ArgumentsReflector/ArgumentsReflector.csproj index 75dc7fa7c..55412d462 100644 --- a/test/ArgumentsReflector/ArgumentsReflector.csproj +++ b/test/ArgumentsReflector/ArgumentsReflector.csproj @@ -2,6 +2,7 @@ + netcoreapp1.1 ArgumentsReflector Exe 1.0.0-preview5 diff --git a/test/EndToEnd/EndToEnd.csproj b/test/EndToEnd/EndToEnd.csproj index 5949bf3bc..07404de4c 100644 --- a/test/EndToEnd/EndToEnd.csproj +++ b/test/EndToEnd/EndToEnd.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 EndToEnd Exe - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -40,10 +40,10 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 - 4.1.1 + 4.3.0 2.2.0-beta4-build3444 @@ -52,7 +52,7 @@ 1.0.0-prerelease-00206 - 1.0.1-beta-000933 + 1.1.0 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 6b5dc5ebd..63f5bd5f6 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 @@ -2,13 +2,13 @@ - netcoreapp1.0 + netcoreapp1.1 true Microsoft.DotNet.Cli.Sln.Internal.Tests ../../tools/test_key.snk true true - $(PackageTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 @@ -21,7 +21,7 @@ - 1.0.3 + 1.1.0 $(CLI_TestPlatform_Version) 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 479ce5be6..94cf89cb9 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 @@ -2,13 +2,13 @@ - netcoreapp1.0 + netcoreapp1.1 Microsoft.DotNet.Cli.Utils.Tests Exe ../../tools/Key.snk true true - $(PackageTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 @@ -48,13 +48,13 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 - 4.0.0 + 4.3.0 - 4.1.1 + 4.3.0 $(CLI_NuGet_Version) @@ -75,7 +75,7 @@ 2.2.0-beta4-build3444 - 1.0.1-beta-000933 + 1.1.0 $(CLI_MSBuild_Version) 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 f4d56da4e..153ac9573 100644 --- a/test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj +++ b/test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj @@ -2,13 +2,13 @@ - netcoreapp1.0 + netcoreapp1.1 true Microsoft.DotNet.Configurer.UnitTests ../../tools/Key.snk true true - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -40,10 +40,10 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 - 4.0.0 + 4.3.0 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 9732db55b..1a25cb12b 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Microsoft.DotNet.ProjectJsonMigration.Tests.csproj +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Microsoft.DotNet.ProjectJsonMigration.Tests.csproj @@ -2,13 +2,13 @@ - netcoreapp1.0 + netcoreapp1.1 true Microsoft.DotNet.ProjectJsonMigration.Tests ../../tools/test_key.snk true true - $(PackageTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 @@ -44,7 +44,7 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 2.2.0-beta4-build3444 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 32a322248..cce894eb7 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 @@ -3,13 +3,13 @@ Microsoft.DotNet.Tools.Tests.Utilities Class Library - netcoreapp1.0 + netcoreapp1.1 true Microsoft.DotNet.Tools.Tests.Utilities ../../tools/Key.snk true true - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -22,6 +22,11 @@ 4.0.0 + + 1.1.0 + + + 4.3.0 2.2.0-beta4-build3444 diff --git a/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj b/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj index 9982648ea..5f97d4ee8 100644 --- a/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj +++ b/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true Msbuild.Tests.Utilities - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -31,7 +31,7 @@ 1.6.0 - 4.1.1 + 4.3.0 4.0.0 diff --git a/test/Performance/Performance.csproj b/test/Performance/Performance.csproj new file mode 100644 index 000000000..7c295a2be --- /dev/null +++ b/test/Performance/Performance.csproj @@ -0,0 +1,55 @@ + + + + + netcoreapp1.1 + true + Performance + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + + + + + + + true + + + true + + + + + + true + + + + + + 15.0.0-preview-20161024-02 + + + 2.2.0-beta4-build1194 + + + 1.1.0 + + + 4.3.0 + + + 2.2.0-beta4-build3444 + + + 1.0.0-prerelease-00206 + + + 1.0.0-alpha-build0028 + + + + + $(DefineConstants);RELEASE + + diff --git a/test/crossgen.Tests/crossgen.Tests.csproj b/test/crossgen.Tests/crossgen.Tests.csproj index 657fc9dbc..a0db0879b 100644 --- a/test/crossgen.Tests/crossgen.Tests.csproj +++ b/test/crossgen.Tests/crossgen.Tests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true crossgen.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -33,7 +33,7 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 2.2.0-beta4-build3444 diff --git a/test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj b/test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj index c87f94caa..d7072a465 100644 --- a/test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj +++ b/test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj @@ -5,7 +5,7 @@ netcoreapp1.1 true dotnet-add-reference.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-build.Tests/dotnet-build.Tests.csproj b/test/dotnet-build.Tests/dotnet-build.Tests.csproj index 3efad2804..3512d696c 100644 --- a/test/dotnet-build.Tests/dotnet-build.Tests.csproj +++ b/test/dotnet-build.Tests/dotnet-build.Tests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet-build.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -35,10 +35,10 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 - 4.1.1 + 4.3.0 2.2.0-beta4-build3444 diff --git a/test/dotnet-help.Tests/dotnet-help.Tests.csproj b/test/dotnet-help.Tests/dotnet-help.Tests.csproj index a9b94fe86..0b2aea8f7 100644 --- a/test/dotnet-help.Tests/dotnet-help.Tests.csproj +++ b/test/dotnet-help.Tests/dotnet-help.Tests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet-help.Tests - $(PackageTargetFallback);dnxcore50;portable-net45+win8 + $(PackageTargetFallback);dnxcore50;portable-net45+win8 @@ -40,7 +40,7 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 $(CLI_MSBuild_Version) diff --git a/test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj b/test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj index e3c8454f4..aa2ce2968 100644 --- a/test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj +++ b/test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet-list-reference.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -36,10 +36,10 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 - 4.1.1 + 4.3.0 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 3dc1cb000..152ae6f53 100644 --- a/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj +++ b/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet-migrate.Tests - $(PackageTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 @@ -48,7 +48,7 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 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 7907fe5be..cefa0c05a 100644 --- a/test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj +++ b/test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet-msbuild.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -46,7 +46,7 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 4.1.1 diff --git a/test/dotnet-new.Tests/dotnet-new.Tests.csproj b/test/dotnet-new.Tests/dotnet-new.Tests.csproj index 30e772e67..320d596e4 100644 --- a/test/dotnet-new.Tests/dotnet-new.Tests.csproj +++ b/test/dotnet-new.Tests/dotnet-new.Tests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet-new.Tests - $(PackageTargetFallback);dnxcore50;portable-net45+win8 + $(PackageTargetFallback);dnxcore50;portable-net45+win8 @@ -46,7 +46,7 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 $(CLI_MSBuild_Version) diff --git a/test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj b/test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj index 70805d0f3..d556f90eb 100644 --- a/test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj +++ b/test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet-nuget.UnitTests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -46,10 +46,10 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 - 4.1.1 + 4.3.0 2.2.0-beta4-build3444 diff --git a/test/dotnet-pack.Tests/dotnet-pack.Tests.csproj b/test/dotnet-pack.Tests/dotnet-pack.Tests.csproj index e0b97e719..721b9ff49 100644 --- a/test/dotnet-pack.Tests/dotnet-pack.Tests.csproj +++ b/test/dotnet-pack.Tests/dotnet-pack.Tests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet-pack.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -40,13 +40,13 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 - 4.1.1 + 4.3.0 - 4.0.1 + 4.3.0 2.2.0-beta4-build3444 diff --git a/test/dotnet-publish.Tests/dotnet-publish.Tests.csproj b/test/dotnet-publish.Tests/dotnet-publish.Tests.csproj index fc1d3fad8..8605aeeb5 100644 --- a/test/dotnet-publish.Tests/dotnet-publish.Tests.csproj +++ b/test/dotnet-publish.Tests/dotnet-publish.Tests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet-publish.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -42,10 +42,10 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 - 4.1.1 + 4.3.0 2.2.0-beta4-build3444 diff --git a/test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj b/test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj index c03c7c6ae..f05420652 100644 --- a/test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj +++ b/test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet-remove-reference.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -36,10 +36,10 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 - 4.1.1 + 4.3.0 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 0adf2a9de..84bfcdb51 100644 --- a/test/dotnet-restore.Tests/dotnet-restore.Tests.csproj +++ b/test/dotnet-restore.Tests/dotnet-restore.Tests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet-restore.Tests - $(PackageTargetFallback);dnxcore50;portable-net45+win8 + $(PackageTargetFallback);dnxcore50;portable-net45+win8 @@ -46,7 +46,7 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 $(CLI_MSBuild_Version) diff --git a/test/dotnet-run.Tests/dotnet-run.Tests.csproj b/test/dotnet-run.Tests/dotnet-run.Tests.csproj index 6fa3f48be..444bb0a5e 100644 --- a/test/dotnet-run.Tests/dotnet-run.Tests.csproj +++ b/test/dotnet-run.Tests/dotnet-run.Tests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet-run.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -35,10 +35,10 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 - 4.1.1 + 4.3.0 2.2.0-beta4-build3444 diff --git a/test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj b/test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj index 08a73c20e..29025c38a 100644 --- a/test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj +++ b/test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet-sln-add.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -24,7 +24,7 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 2.2.0-beta4-build3444 diff --git a/test/dotnet-sln-list.Tests/dotnet-sln-list.Tests.csproj b/test/dotnet-sln-list.Tests/dotnet-sln-list.Tests.csproj index 9c5727e68..6dc24ff30 100644 --- a/test/dotnet-sln-list.Tests/dotnet-sln-list.Tests.csproj +++ b/test/dotnet-sln-list.Tests/dotnet-sln-list.Tests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet-sln-list.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -24,7 +24,7 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 2.2.0-beta4-build3444 diff --git a/test/dotnet-sln-remove.Tests/dotnet-sln-remove.Tests.csproj b/test/dotnet-sln-remove.Tests/dotnet-sln-remove.Tests.csproj index 50a6d2592..5e062c352 100644 --- a/test/dotnet-sln-remove.Tests/dotnet-sln-remove.Tests.csproj +++ b/test/dotnet-sln-remove.Tests/dotnet-sln-remove.Tests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet-sln-remove.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -24,7 +24,7 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 2.2.0-beta4-build3444 diff --git a/test/dotnet-test.Tests/dotnet-test.Tests.csproj b/test/dotnet-test.Tests/dotnet-test.Tests.csproj index 443a67a9d..8dab1f739 100644 --- a/test/dotnet-test.Tests/dotnet-test.Tests.csproj +++ b/test/dotnet-test.Tests/dotnet-test.Tests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet-test.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -35,10 +35,10 @@ 2.2.0-beta4-build1194 - 1.0.0 + 1.1.0 - 4.1.1 + 4.3.0 2.2.0-beta4-build3444 diff --git a/test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj b/test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj index c0ce2eef3..bd7740760 100644 --- a/test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj +++ b/test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet-vstest.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -35,10 +35,10 @@ 2.2.0-beta4-build1194 - 1.0.0 + 1.1.0 - 4.1.1 + 4.3.0 2.2.0-beta4-build3444 diff --git a/test/dotnet.Tests/dotnet.Tests.csproj b/test/dotnet.Tests/dotnet.Tests.csproj index c0861efb2..157669f2c 100644 --- a/test/dotnet.Tests/dotnet.Tests.csproj +++ b/test/dotnet.Tests/dotnet.Tests.csproj @@ -2,13 +2,13 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet.Tests ../../tools/Key.snk true true - $(PackageTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 @@ -60,10 +60,10 @@ 2.2.0-beta4-build1194 - 1.0.3 + 1.1.0 - 4.1.1 + 4.3.0 2.2.0-beta4-build3444 diff --git a/test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj b/test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj index 30faccc85..f0fb54f4b 100644 --- a/test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj +++ b/test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true msbuild.IntegrationTests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -35,7 +35,7 @@ 2.2.0-beta4-build1194 - 1.0.0 + 1.1.0 2.2.0-beta4-build3444 From d55be626a9a989a327c44c689b896bc0dd2ed82b Mon Sep 17 00:00:00 2001 From: jonsequitur Date: Fri, 20 Jan 2017 18:30:10 -0800 Subject: [PATCH 08/29] netcoreapp1.1 fixes --- .../dotnet-desktop-and-portable.csproj | 8 ++++---- .../v1/dotnet-hello/dotnet-hello.csproj | 4 ++-- .../v2/dotnet-hello/dotnet-hello.csproj | 4 ++-- build/Microsoft.DotNet.Cli.Compile.targets | 5 ++++- ...rosoft.DotNet.Cli.DependencyVersions.props | 2 +- build/Microsoft.DotNet.Cli.Monikers.props | 4 ++-- build/Microsoft.DotNet.Cli.Prepare.targets | 4 ++-- build/Microsoft.DotNet.Cli.Test.targets | 1 + .../Microsoft.DotNet.Cli.Crossgen.targets | 2 +- build/test/TestPackageProjects.targets | 6 +++--- .../Microsoft.DotNet.Cli.Utils.csproj | 2 +- ...crosoft.DotNet.ProjectJsonMigration.csproj | 1 - src/dotnet/dotnet.csproj | 3 +-- src/redist/redist.csproj | 2 +- src/tool_roslyn/tool_roslyn.csproj | 20 +++++++++++-------- .../ArgumentForwardingTests.csproj | 2 +- .../ArgumentsReflector.csproj | 5 ++--- ...osoft.DotNet.Cli.Sln.Internal.Tests.csproj | 2 +- .../Microsoft.DotNet.Cli.Utils.Tests.csproj | 2 +- ...crosoft.DotNet.Configurer.UnitTests.csproj | 2 +- ...t.DotNet.ProjectJsonMigration.Tests.csproj | 2 +- ...rosoft.DotNet.Tools.Tests.Utilities.csproj | 2 +- .../Msbuild.Tests.Utilities.csproj | 2 +- .../binding-redirects.Tests.csproj | 2 +- test/crossgen.Tests/crossgen.Tests.csproj | 2 +- .../dotnet-build.Tests.csproj | 2 +- .../dotnet-migrate.Tests.csproj | 2 +- .../dotnet-msbuild.Tests.csproj | 2 +- test/dotnet-new.Tests/dotnet-new.Tests.csproj | 2 +- .../dotnet-nuget.UnitTests.csproj | 2 +- .../dotnet-pack.Tests.csproj | 2 +- .../dotnet-publish.Tests.csproj | 2 +- .../dotnet-restore.Tests.csproj | 4 ++-- test/dotnet-run.Tests/dotnet-run.Tests.csproj | 2 +- .../dotnet-test.Tests.csproj | 2 +- .../dotnet-vstest.Tests.csproj | 2 +- test/dotnet.Tests/dotnet.Tests.csproj | 4 ++-- .../msbuild.IntegrationTests.csproj | 2 +- .../MigrationDefaultsConstructor.csproj | 2 +- 39 files changed, 64 insertions(+), 59 deletions(-) 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 8a1e7d530..c9c1f8639 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 @@ -1,21 +1,21 @@  1.0.0-rc - netcoreapp1.0;net451 + netcoreapp1.1;net451 dotnet-desktop-and-portable Exe win7-x64;win7-x86;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;osx.10.10-x64;rhel.7-x64 - + $(ProjectRuntimeConfigFilePath) - + - 1.0.3 + 1.1.0 diff --git a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj index b6603c2d8..c1ec38777 100644 --- a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj +++ b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj @@ -1,6 +1,6 @@  - netcoreapp1.0 + netcoreapp1.1 dotnet-hello Exe 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 @@ -8,7 +8,7 @@ - 1.0.3 + 1.1.0 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 eaa06bf6e..510f6a431 100644 --- a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj +++ b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj @@ -1,7 +1,7 @@  2.0.0 - netcoreapp1.0 + netcoreapp1.1 dotnet-hello Exe 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 @@ -9,7 +9,7 @@ - 1.0.3 + 1.1.0 diff --git a/build/Microsoft.DotNet.Cli.Compile.targets b/build/Microsoft.DotNet.Cli.Compile.targets index 286b07814..4c2de2f11 100644 --- a/build/Microsoft.DotNet.Cli.Compile.targets +++ b/build/Microsoft.DotNet.Cli.Compile.targets @@ -104,7 +104,10 @@ - + diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index b7ebc8f54..1570ba4ae 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -2,7 +2,7 @@ 15.1.0-preview-000523-01 - 2.0.0-rc3-61212-03 + 2.0.0-rc4-61319-08 1.0.0-alpha-20170117-4 4.0.0-rc3 1.0.0-alpha-20170120-3-249 diff --git a/build/Microsoft.DotNet.Cli.Monikers.props b/build/Microsoft.DotNet.Cli.Monikers.props index 7a8439645..10981406b 100644 --- a/build/Microsoft.DotNet.Cli.Monikers.props +++ b/build/Microsoft.DotNet.Cli.Monikers.props @@ -3,8 +3,8 @@ Microsoft .NET Core 1.0.3 - SDK RC 4 Microsoft .NET Core 1.0.3 - Runtime - Microsoft .NET Core 1.0.1 - Host - Microsoft .NET Core 1.0.1 - Host FX Resolver + Microsoft .NET Core 1.1.0 - Host + Microsoft .NET Core 1.1.0 - Host FX Resolver Microsoft .NET Core 1.1.0 - Runtime Microsoft .NET Core 1.1.0 - Host diff --git a/build/Microsoft.DotNet.Cli.Prepare.targets b/build/Microsoft.DotNet.Cli.Prepare.targets index 28589ed70..cfaaf670f 100644 --- a/build/Microsoft.DotNet.Cli.Prepare.targets +++ b/build/Microsoft.DotNet.Cli.Prepare.targets @@ -121,8 +121,8 @@ - release/1.1.0 - 1.1.0 + preview + 1.0.3 1.1.0 1.1.0 diff --git a/build/Microsoft.DotNet.Cli.Test.targets b/build/Microsoft.DotNet.Cli.Test.targets index 59ec2aae9..c4671a824 100644 --- a/build/Microsoft.DotNet.Cli.Test.targets +++ b/build/Microsoft.DotNet.Cli.Test.targets @@ -40,6 +40,7 @@ TestResultXmlDir=$(TestResultXmlDir); ToolPath=$(Stage0Directory); WorkingDirectory=$([System.IO.Directory]::GetParent(%(TestProjects.Identity))) + ToolPath=$(Stage2Directory); diff --git a/build/crossgen/Microsoft.DotNet.Cli.Crossgen.targets b/build/crossgen/Microsoft.DotNet.Cli.Crossgen.targets index a38f3d2cc..45316f23d 100644 --- a/build/crossgen/Microsoft.DotNet.Cli.Crossgen.targets +++ b/build/crossgen/Microsoft.DotNet.Cli.Crossgen.targets @@ -8,9 +8,9 @@ osx.10.10-x64 rhel.7-x64 + runtime.$(CoreCLRRid).microsoft.netcore.runtime.coreclr runtime.$(CoreCLRRid).microsoft.netcore.runtime.coreclr runtime.$(CoreCLRRid).microsoft.netcore.jit - runtime.$(CoreCLRRid).microsoft.netcore.runtime.coreclr $(NuGetPackagesDir)/$(CoreCLRPackageName)/$(CoreCLRVersion)/runtimes/$(CoreCLRRid)/lib/netstandard1.0 $(NuGetPackagesDir)/$(CrossGenPackageName)/$(CoreCLRVersion)/tools/crossgen$(ExeExtension) diff --git a/build/test/TestPackageProjects.targets b/build/test/TestPackageProjects.targets index e09a73bdb..4f1903640 100644 --- a/build/test/TestPackageProjects.targets +++ b/build/test/TestPackageProjects.targets @@ -129,7 +129,7 @@ 1.0.0-rc- rc-$(TestPackageBuildVersionSuffix) True - net451;netcoreapp1.0 + net451;netcoreapp1.1 $(CoreCLRRid) 1.0.0 True - netcoreapp1.0 + netcoreapp1.1 dotnet-hello @@ -163,7 +163,7 @@ 2.0.0 True - netcoreapp1.0 + netcoreapp1.1 dotnet-portable 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 382259d99..53f8615de 100644 --- a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj +++ b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj @@ -15,7 +15,7 @@ 1.0.1-beta-000933 - 1.0.1-beta-000933 + 1.1.0 $(CLI_NuGet_Version) diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj index 1b96e6ef4..2704bff36 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj @@ -3,7 +3,6 @@ $(CliVersionPrefix) - netcoreapp1.0 netcoreapp1.1 true ../../tools/Key.snk diff --git a/src/dotnet/dotnet.csproj b/src/dotnet/dotnet.csproj index 6d262e0c4..915e1a36b 100755 --- a/src/dotnet/dotnet.csproj +++ b/src/dotnet/dotnet.csproj @@ -3,14 +3,13 @@ $(CliVersionPrefix) - 1.0.0-preview5 netcoreapp1.1 dotnet Exe ../../tools/Key.snk true true - $(PackageTargetFallback);dotnet5.4 + $(PackageTargetFallback);dotnet5.4 diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 1682bddfc..c74807583 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -5,7 +5,7 @@ $(CliVersionPrefix) netcoreapp1.1 true - $(PackageTargetFallback);dotnet5.4 + $(PackageTargetFallback);dotnet5.4 diff --git a/src/tool_roslyn/tool_roslyn.csproj b/src/tool_roslyn/tool_roslyn.csproj index 3f52caad6..d02092146 100644 --- a/src/tool_roslyn/tool_roslyn.csproj +++ b/src/tool_roslyn/tool_roslyn.csproj @@ -4,15 +4,15 @@ $(CliVersionPrefix) - netcoreapp1.0 + netcoreapp1.1 true - + - + @@ -37,14 +37,18 @@ AfterTargets="Publish" BeforeTargets="RemoveFilesAfterPublish"> - - + + + - + SectionName="%(AssetsToRemoveFromDeps.SectionName)" + AssetPath="%(AssetsToRemoveFromDeps.Identity)" /> + 2.2.0-beta4-build3444 - 1.0.1-beta-000933 + 1.1.0 diff --git a/test/ArgumentsReflector/ArgumentsReflector.csproj b/test/ArgumentsReflector/ArgumentsReflector.csproj index 55412d462..85e00819d 100644 --- a/test/ArgumentsReflector/ArgumentsReflector.csproj +++ b/test/ArgumentsReflector/ArgumentsReflector.csproj @@ -5,7 +5,6 @@ netcoreapp1.1 ArgumentsReflector Exe - 1.0.0-preview5 netcoreapp1.1 @@ -21,10 +20,10 @@ 1.1.0 - 2.0.0-beta6-60922-08 + $(CLI_Roslyn_Version) - 2.0.0-beta6-60922-08 + $(CLI_Roslyn_Version) 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 63f5bd5f6..504b25c7b 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 @@ -8,7 +8,7 @@ ../../tools/test_key.snk true true - $(PackageTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 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 94cf89cb9..9e1e3201d 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 @@ -8,7 +8,7 @@ ../../tools/Key.snk true true - $(PackageTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 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 153ac9573..4db883334 100644 --- a/test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj +++ b/test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj @@ -8,7 +8,7 @@ ../../tools/Key.snk true true - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 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 1a25cb12b..3adb8f19b 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Microsoft.DotNet.ProjectJsonMigration.Tests.csproj +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Microsoft.DotNet.ProjectJsonMigration.Tests.csproj @@ -8,7 +8,7 @@ ../../tools/test_key.snk true true - $(PackageTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 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 cce894eb7..bcb1c3c23 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 @@ -32,7 +32,7 @@ 2.2.0-beta4-build3444 - 1.0.1-beta-000933 + 1.1.0 diff --git a/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj b/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj index 5f97d4ee8..f06f2124f 100644 --- a/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj +++ b/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj @@ -5,7 +5,7 @@ netcoreapp1.1 true Msbuild.Tests.Utilities - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/binding-redirects.Tests/binding-redirects.Tests.csproj b/test/binding-redirects.Tests/binding-redirects.Tests.csproj index 9b619c83f..38e7ea4f1 100644 --- a/test/binding-redirects.Tests/binding-redirects.Tests.csproj +++ b/test/binding-redirects.Tests/binding-redirects.Tests.csproj @@ -17,6 +17,6 @@ - + diff --git a/test/crossgen.Tests/crossgen.Tests.csproj b/test/crossgen.Tests/crossgen.Tests.csproj index a0db0879b..c5d314cde 100644 --- a/test/crossgen.Tests/crossgen.Tests.csproj +++ b/test/crossgen.Tests/crossgen.Tests.csproj @@ -5,7 +5,7 @@ netcoreapp1.1 true crossgen.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-build.Tests/dotnet-build.Tests.csproj b/test/dotnet-build.Tests/dotnet-build.Tests.csproj index 3512d696c..10a181763 100644 --- a/test/dotnet-build.Tests/dotnet-build.Tests.csproj +++ b/test/dotnet-build.Tests/dotnet-build.Tests.csproj @@ -5,7 +5,7 @@ netcoreapp1.1 true dotnet-build.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj b/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj index 152ae6f53..3455a4855 100644 --- a/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj +++ b/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj @@ -5,7 +5,7 @@ netcoreapp1.1 true dotnet-migrate.Tests - $(PackageTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj b/test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj index cefa0c05a..a601acd01 100644 --- a/test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj +++ b/test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj @@ -5,7 +5,7 @@ netcoreapp1.1 true dotnet-msbuild.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-new.Tests/dotnet-new.Tests.csproj b/test/dotnet-new.Tests/dotnet-new.Tests.csproj index 320d596e4..fc811a75c 100644 --- a/test/dotnet-new.Tests/dotnet-new.Tests.csproj +++ b/test/dotnet-new.Tests/dotnet-new.Tests.csproj @@ -5,7 +5,7 @@ netcoreapp1.1 true dotnet-new.Tests - $(PackageTargetFallback);dnxcore50;portable-net45+win8 + $(PackageTargetFallback);dnxcore50;portable-net45+win8 diff --git a/test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj b/test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj index d556f90eb..b67766466 100644 --- a/test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj +++ b/test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj @@ -5,7 +5,7 @@ netcoreapp1.1 true dotnet-nuget.UnitTests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-pack.Tests/dotnet-pack.Tests.csproj b/test/dotnet-pack.Tests/dotnet-pack.Tests.csproj index 721b9ff49..b6d0698e3 100644 --- a/test/dotnet-pack.Tests/dotnet-pack.Tests.csproj +++ b/test/dotnet-pack.Tests/dotnet-pack.Tests.csproj @@ -5,7 +5,7 @@ netcoreapp1.1 true dotnet-pack.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-publish.Tests/dotnet-publish.Tests.csproj b/test/dotnet-publish.Tests/dotnet-publish.Tests.csproj index 8605aeeb5..23daaa675 100644 --- a/test/dotnet-publish.Tests/dotnet-publish.Tests.csproj +++ b/test/dotnet-publish.Tests/dotnet-publish.Tests.csproj @@ -5,7 +5,7 @@ netcoreapp1.1 true dotnet-publish.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-restore.Tests/dotnet-restore.Tests.csproj b/test/dotnet-restore.Tests/dotnet-restore.Tests.csproj index 84bfcdb51..cf55f7b8b 100644 --- a/test/dotnet-restore.Tests/dotnet-restore.Tests.csproj +++ b/test/dotnet-restore.Tests/dotnet-restore.Tests.csproj @@ -5,7 +5,7 @@ netcoreapp1.1 true dotnet-restore.Tests - $(PackageTargetFallback);dnxcore50;portable-net45+win8 + $(PackageTargetFallback);dnxcore50;portable-net45+win8 @@ -55,7 +55,7 @@ 2.2.0-beta4-build3444 - 1.0.1-beta-000933 + 1.1.0 4.0.0 diff --git a/test/dotnet-run.Tests/dotnet-run.Tests.csproj b/test/dotnet-run.Tests/dotnet-run.Tests.csproj index 444bb0a5e..4b3dece00 100644 --- a/test/dotnet-run.Tests/dotnet-run.Tests.csproj +++ b/test/dotnet-run.Tests/dotnet-run.Tests.csproj @@ -5,7 +5,7 @@ netcoreapp1.1 true dotnet-run.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-test.Tests/dotnet-test.Tests.csproj b/test/dotnet-test.Tests/dotnet-test.Tests.csproj index 8dab1f739..aa68a2b2b 100644 --- a/test/dotnet-test.Tests/dotnet-test.Tests.csproj +++ b/test/dotnet-test.Tests/dotnet-test.Tests.csproj @@ -5,7 +5,7 @@ netcoreapp1.1 true dotnet-test.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj b/test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj index bd7740760..99ab8dfcc 100644 --- a/test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj +++ b/test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj @@ -5,7 +5,7 @@ netcoreapp1.1 true dotnet-vstest.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet.Tests/dotnet.Tests.csproj b/test/dotnet.Tests/dotnet.Tests.csproj index 157669f2c..afde5c00a 100644 --- a/test/dotnet.Tests/dotnet.Tests.csproj +++ b/test/dotnet.Tests/dotnet.Tests.csproj @@ -8,7 +8,7 @@ ../../tools/Key.snk true true - $(PackageTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 @@ -72,7 +72,7 @@ 1.0.0-prerelease-00206 - 1.0.1-beta-000933 + 1.1.0 diff --git a/test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj b/test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj index f0fb54f4b..c6adb0cd5 100644 --- a/test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj +++ b/test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj @@ -5,7 +5,7 @@ netcoreapp1.1 true msbuild.IntegrationTests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/tools/MigrationDefaultsConstructor/MigrationDefaultsConstructor.csproj b/tools/MigrationDefaultsConstructor/MigrationDefaultsConstructor.csproj index db5f74418..090b114cd 100644 --- a/tools/MigrationDefaultsConstructor/MigrationDefaultsConstructor.csproj +++ b/tools/MigrationDefaultsConstructor/MigrationDefaultsConstructor.csproj @@ -5,7 +5,7 @@ netcoreapp1.1 portable Exe - $(PackageTargetFallback);dnxcore50;portable-net45+win8 + $(PackageTargetFallback);dnxcore50;portable-net45+win8 From 927f0b6dc52a26503429a9eb5001357ef9dbfd6b Mon Sep 17 00:00:00 2001 From: jonsequitur Date: Sun, 22 Jan 2017 18:18:36 -0800 Subject: [PATCH 09/29] rebase fix --- .../Microsoft.DotNet.Tools.Tests.Utilities.csproj | 1 + 1 file changed, 1 insertion(+) 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 bcb1c3c23..44d281ef5 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 @@ -22,6 +22,7 @@ 4.0.0 + 1.1.0 From 9824fa945bae07ca38d7ec449389293ebec76438 Mon Sep 17 00:00:00 2001 From: jonsequitur Date: Mon, 23 Jan 2017 11:51:17 -0800 Subject: [PATCH 10/29] FluentAssertions 4.18.0 --- .../Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj | 2 +- .../Microsoft.DotNet.Configurer.UnitTests.csproj | 2 +- .../Microsoft.DotNet.ProjectJsonMigration.Tests.csproj | 2 +- .../Microsoft.DotNet.Tools.Tests.Utilities.csproj | 2 +- test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj | 2 +- .../dotnet-list-reference.Tests.csproj | 2 +- test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj | 2 +- .../dotnet-remove-reference.Tests.csproj | 2 +- test/dotnet-restore.Tests/dotnet-restore.Tests.csproj | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) 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 504b25c7b..339fbd222 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 @@ -33,7 +33,7 @@ 2.2.0-beta4-build1194 - 4.0.0 + 4.18.0 \ No newline at end of file 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 4db883334..793b249b9 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 @@ 4.3.0 - 4.0.0 + 4.18.0 4.4.0-beta8 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 3adb8f19b..0b76dd001 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Microsoft.DotNet.ProjectJsonMigration.Tests.csproj +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Microsoft.DotNet.ProjectJsonMigration.Tests.csproj @@ -50,7 +50,7 @@ 2.2.0-beta4-build3444 - 4.0.0 + 4.18.0 4.4.0-beta8 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 44d281ef5..3f4dfe997 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 @@ -21,7 +21,7 @@ 1.6.0 - 4.0.0 + 4.18.0 1.1.0 diff --git a/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj b/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj index f06f2124f..91dbcc61a 100644 --- a/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj +++ b/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj @@ -34,7 +34,7 @@ 4.3.0 - 4.0.0 + 4.18.0 2.2.0-beta4-build3444 diff --git a/test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj b/test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj index aa2ce2968..4fbc41e22 100644 --- a/test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj +++ b/test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj @@ -45,7 +45,7 @@ 2.2.0-beta4-build3444 - 4.0.0 + 4.18.0 diff --git a/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj b/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj index 3455a4855..64e43d38a 100644 --- a/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj +++ b/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj @@ -54,7 +54,7 @@ 2.2.0-beta4-build3444 - 4.0.0 + 4.18.0 4.4.0-beta8 diff --git a/test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj b/test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj index f05420652..a339974dd 100644 --- a/test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj +++ b/test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj @@ -48,7 +48,7 @@ $(CLI_MSBuild_Version) - 4.0.0 + 4.18.0 diff --git a/test/dotnet-restore.Tests/dotnet-restore.Tests.csproj b/test/dotnet-restore.Tests/dotnet-restore.Tests.csproj index cf55f7b8b..2cc814fb5 100644 --- a/test/dotnet-restore.Tests/dotnet-restore.Tests.csproj +++ b/test/dotnet-restore.Tests/dotnet-restore.Tests.csproj @@ -58,7 +58,7 @@ 1.1.0 - 4.0.0 + 4.18.0 From 0c809923847fe216daed711a4d78c1a96dad0f39 Mon Sep 17 00:00:00 2001 From: jonsequitur Date: Mon, 23 Jan 2017 11:51:30 -0800 Subject: [PATCH 11/29] move additional tests to netcoreapp1.1 --- .../AppWithDirectDep/AppWithDirectDep.csproj | 4 ++-- build/Microsoft.DotNet.Cli.Test.targets | 2 +- .../GivenAProjectToolsCommandResolver.cs | 2 +- .../binding-redirects.Tests.csproj | 6 +++--- .../dotnet-add-package.Tests.csproj | 4 ++-- test/dotnet.Tests/PackagedCommandTests.cs | 1 - .../1.0.0-rc4-004536/osx.10.11-x64/dotnet | Bin 64 -> 0 bytes 7 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 test/dotnet.Tests/¬/.dotnet/optimizationdata/1.0.0-rc4-004536/osx.10.11-x64/dotnet diff --git a/TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj b/TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj index bbfb9be11..1f2bc2278 100755 --- a/TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj +++ b/TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj @@ -1,14 +1,14 @@  1.0.0 - netcoreapp1.0 + netcoreapp1.1 AppWithDirectDep Exe false - 1.0.3 + 1.1.0 1.0.0 diff --git a/build/Microsoft.DotNet.Cli.Test.targets b/build/Microsoft.DotNet.Cli.Test.targets index c4671a824..3193bf2c2 100644 --- a/build/Microsoft.DotNet.Cli.Test.targets +++ b/build/Microsoft.DotNet.Cli.Test.targets @@ -38,7 +38,7 @@ EnvironmentVariables=$(RunTestEnvironmentVariables); TestProject=%(TestProjects.Identity); TestResultXmlDir=$(TestResultXmlDir); - ToolPath=$(Stage0Directory); + ToolPath=$(Stage2Directory); WorkingDirectory=$([System.IO.Directory]::GetParent(%(TestProjects.Identity))) ToolPath=$(Stage2Directory); diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs index 26640ab59..be5c756b6 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs @@ -282,7 +282,7 @@ namespace Microsoft.DotNet.Tests result.Should().NotBeNull(); - result.Args.Should().Contain("--fx-version 1.0.3"); + result.Args.Should().Contain("--fx-version 1.1.0"); } [Fact] diff --git a/test/binding-redirects.Tests/binding-redirects.Tests.csproj b/test/binding-redirects.Tests/binding-redirects.Tests.csproj index 38e7ea4f1..5e1b681d2 100644 --- a/test/binding-redirects.Tests/binding-redirects.Tests.csproj +++ b/test/binding-redirects.Tests/binding-redirects.Tests.csproj @@ -2,10 +2,10 @@ - netcoreapp1.0 + netcoreapp1.1 true binding-redirects.Tests - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -13,7 +13,7 @@ - + diff --git a/test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj b/test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj index 6a052db05..63c5eff1c 100644 --- a/test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj +++ b/test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj @@ -2,7 +2,7 @@ - netcoreapp1.0 + netcoreapp1.1 true dotnet-add-package.Tests $(PackageTargetFallback);dotnet5.4;portable-net451+win8 @@ -17,7 +17,7 @@ - + diff --git a/test/dotnet.Tests/PackagedCommandTests.cs b/test/dotnet.Tests/PackagedCommandTests.cs index b08cc2eeb..d1f8b0c93 100644 --- a/test/dotnet.Tests/PackagedCommandTests.cs +++ b/test/dotnet.Tests/PackagedCommandTests.cs @@ -267,7 +267,6 @@ namespace Microsoft.DotNet.Tests new BuildCommand() .WithWorkingDirectory(testInstance.Root) - .WithFramework(NuGet.Frameworks.FrameworkConstants.CommonFrameworks.NetCoreApp10) .Execute() .Should().Pass(); diff --git a/test/dotnet.Tests/¬/.dotnet/optimizationdata/1.0.0-rc4-004536/osx.10.11-x64/dotnet b/test/dotnet.Tests/¬/.dotnet/optimizationdata/1.0.0-rc4-004536/osx.10.11-x64/dotnet deleted file mode 100644 index 30393cb6d3d0ac546f8ec8c1021af9d891103b72..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 64 PcmZ=@U|>vTARhn#C@BD^ From 3cba07288d31072b646801e13c00f400a6cf01a0 Mon Sep 17 00:00:00 2001 From: jonsequitur Date: Mon, 23 Jan 2017 12:14:46 -0800 Subject: [PATCH 12/29] remove redundant ToolPath setting --- build/Microsoft.DotNet.Cli.Test.targets | 1 - 1 file changed, 1 deletion(-) diff --git a/build/Microsoft.DotNet.Cli.Test.targets b/build/Microsoft.DotNet.Cli.Test.targets index 3193bf2c2..cdd2c2ca3 100644 --- a/build/Microsoft.DotNet.Cli.Test.targets +++ b/build/Microsoft.DotNet.Cli.Test.targets @@ -40,7 +40,6 @@ TestResultXmlDir=$(TestResultXmlDir); ToolPath=$(Stage2Directory); WorkingDirectory=$([System.IO.Directory]::GetParent(%(TestProjects.Identity))) - ToolPath=$(Stage2Directory); From 573c4efea53c911be3be299d2075c9a28cab997e Mon Sep 17 00:00:00 2001 From: jonsequitur Date: Tue, 24 Jan 2017 14:10:45 -0800 Subject: [PATCH 13/29] test fixes --- .../AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj | 4 ++-- .../GivenThatIWantANewAppWithSpecifiedType.cs | 3 ++- .../New3/GivenThatIWantANewAppWithSpecifiedType.cs | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj b/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj index fe4c0e02c..9c9243987 100755 --- a/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj +++ b/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj @@ -1,12 +1,12 @@  - netcoreapp1.0 + netcoreapp1.1 Exe - 1.0.3 + 1.1.0 1.0.0 diff --git a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs index 80aed33d3..00621c34a 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs @@ -41,7 +41,8 @@ namespace Microsoft.DotNet.New.Tests if (useNuGetConfigForAspNet) { - File.Copy("NuGet.tempaspnetpatch.config", Path.Combine(rootPath, "NuGet.Config")); + var configFile = new FileInfo(Path.Combine(rootPath,"..","..","..","..","NuGet.tempaspnetpatch.config")); + File.Copy(configFile.FullName, Path.Combine(rootPath, "NuGet.Config")); } new TestCommand("dotnet") diff --git a/test/dotnet-new.Tests/New3/GivenThatIWantANewAppWithSpecifiedType.cs b/test/dotnet-new.Tests/New3/GivenThatIWantANewAppWithSpecifiedType.cs index b61565d83..f89bca7cd 100644 --- a/test/dotnet-new.Tests/New3/GivenThatIWantANewAppWithSpecifiedType.cs +++ b/test/dotnet-new.Tests/New3/GivenThatIWantANewAppWithSpecifiedType.cs @@ -38,7 +38,8 @@ namespace Microsoft.DotNet.New3.Tests if (useNuGetConfigForAspNet) { - File.Copy("NuGet.tempaspnetpatch.config", Path.Combine(rootPath, "NuGet.Config")); + var configFile = new FileInfo(Path.Combine(rootPath,"..","..","..","..","NuGet.tempaspnetpatch.config")); + File.Copy(configFile.FullName, Path.Combine(rootPath, "NuGet.Config")); } string globalJsonPath = Path.Combine(rootPath, "global.json"); From bed3d974d6a5c0465f7e226c836eab9234f242da Mon Sep 17 00:00:00 2001 From: jonsequitur Date: Tue, 24 Jan 2017 15:21:10 -0800 Subject: [PATCH 14/29] add netcoreapp1.1 to Ubuntu installer --- build/package/Microsoft.DotNet.Cli.Installer.DEB.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/package/Microsoft.DotNet.Cli.Installer.DEB.targets b/build/package/Microsoft.DotNet.Cli.Installer.DEB.targets index d3d11daf0..ca94cf99f 100644 --- a/build/package/Microsoft.DotNet.Cli.Installer.DEB.targets +++ b/build/package/Microsoft.DotNet.Cli.Installer.DEB.targets @@ -15,7 +15,7 @@ - + From cc30bdde8a2078fa1ca0554e5ec234c58283b5d2 Mon Sep 17 00:00:00 2001 From: Piotr Puszkiewicz Date: Wed, 25 Jan 2017 11:43:07 -0800 Subject: [PATCH 15/29] Make Deb tests test Deb --- build/Microsoft.DotNet.Cli.Prepare.targets | 4 ++-- .../Microsoft.DotNet.Cli.Installer.DEB.proj | 20 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build/Microsoft.DotNet.Cli.Prepare.targets b/build/Microsoft.DotNet.Cli.Prepare.targets index cfaaf670f..b48f41697 100644 --- a/build/Microsoft.DotNet.Cli.Prepare.targets +++ b/build/Microsoft.DotNet.Cli.Prepare.targets @@ -123,8 +123,8 @@ preview 1.0.3 - 1.1.0 - 1.1.0 + 1.0.1 + 1.0.1 dotnet-host-$(ProductMonikerRid).$(AdditionalSharedHostVersion)$(InstallerExtension) diff --git a/build/package/Microsoft.DotNet.Cli.Installer.DEB.proj b/build/package/Microsoft.DotNet.Cli.Installer.DEB.proj index 0be24d98c..b1b375a98 100644 --- a/build/package/Microsoft.DotNet.Cli.Installer.DEB.proj +++ b/build/package/Microsoft.DotNet.Cli.Installer.DEB.proj @@ -90,23 +90,23 @@ Outputs="$(DebianTestResultsXmlFile)" > - - - - + + + + - - - + + + From 25e33956847dc7f28469aeaa4f89657d1a7a460a Mon Sep 17 00:00:00 2001 From: jonsequitur Date: Wed, 25 Jan 2017 14:47:22 -0800 Subject: [PATCH 16/29] dotnet-desktop-and-portable.csproj to netcoreapp1.0 --- .../dotnet-desktop-and-portable.csproj | 8 ++++---- build/test/TestPackageProjects.targets | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) 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 c9c1f8639..8a1e7d530 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 @@ -1,21 +1,21 @@  1.0.0-rc - netcoreapp1.1;net451 + netcoreapp1.0;net451 dotnet-desktop-and-portable Exe win7-x64;win7-x86;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;osx.10.10-x64;rhel.7-x64 - + $(ProjectRuntimeConfigFilePath) - + - 1.1.0 + 1.0.3 diff --git a/build/test/TestPackageProjects.targets b/build/test/TestPackageProjects.targets index 4f1903640..1419922c7 100644 --- a/build/test/TestPackageProjects.targets +++ b/build/test/TestPackageProjects.targets @@ -129,7 +129,7 @@ 1.0.0-rc- rc-$(TestPackageBuildVersionSuffix) True - net451;netcoreapp1.1 + net451;netcoreapp1.0 $(CoreCLRRid) Date: Wed, 25 Jan 2017 15:11:17 -0800 Subject: [PATCH 17/29] dotnet-desktop-and-portable.csproj to netcoreapp1.1 --- .../dotnet-desktop-and-portable.csproj | 8 ++++---- build/test/TestPackageProjects.targets | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) 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 8a1e7d530..c9c1f8639 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 @@ -1,21 +1,21 @@  1.0.0-rc - netcoreapp1.0;net451 + netcoreapp1.1;net451 dotnet-desktop-and-portable Exe win7-x64;win7-x86;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;osx.10.10-x64;rhel.7-x64 - + $(ProjectRuntimeConfigFilePath) - + - 1.0.3 + 1.1.0 diff --git a/build/test/TestPackageProjects.targets b/build/test/TestPackageProjects.targets index 1419922c7..4f1903640 100644 --- a/build/test/TestPackageProjects.targets +++ b/build/test/TestPackageProjects.targets @@ -129,7 +129,7 @@ 1.0.0-rc- rc-$(TestPackageBuildVersionSuffix) True - net451;netcoreapp1.0 + net451;netcoreapp1.1 $(CoreCLRRid) Date: Wed, 25 Jan 2017 16:28:35 -0800 Subject: [PATCH 18/29] only build desktop-and-portable TestPackage on Windows --- build/Microsoft.DotNet.Cli.Test.targets | 10 ++-------- build/test/TestPackageProjects.targets | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/build/Microsoft.DotNet.Cli.Test.targets b/build/Microsoft.DotNet.Cli.Test.targets index cdd2c2ca3..1d0944290 100644 --- a/build/Microsoft.DotNet.Cli.Test.targets +++ b/build/Microsoft.DotNet.Cli.Test.targets @@ -100,15 +100,9 @@ Source="$(TestPackagesDir)" ConfigFile="$(RepoRoot)\NuGet.Config" ProjectPath="%(TestPackageProject.ProjectPath)" /> - - - + - True netcoreapp1.0 - + dotnet-desktop-and-portable dotnet-desktop-and-portable.csproj True From 4985804ba2403e4d4ed5b97f7d7c175866bb0ac8 Mon Sep 17 00:00:00 2001 From: jonsequitur Date: Wed, 25 Jan 2017 17:03:39 -0800 Subject: [PATCH 19/29] update Roslyn to 2.0.0-rc4-61325-08 --- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index 1570ba4ae..16437ac5e 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -2,7 +2,7 @@ 15.1.0-preview-000523-01 - 2.0.0-rc4-61319-08 + 2.0.0-rc4-61325-08 1.0.0-alpha-20170117-4 4.0.0-rc3 1.0.0-alpha-20170120-3-249 From e089f8753eb62787582e29924d4126ba44440622 Mon Sep 17 00:00:00 2001 From: Piotr Puszkiewicz Date: Thu, 26 Jan 2017 00:23:51 -0800 Subject: [PATCH 20/29] Account for NuGet/Home#4404 --- build/test/TestPackageProjects.targets | 2 +- dir.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/test/TestPackageProjects.targets b/build/test/TestPackageProjects.targets index 9d0fa652f..19e4d93ce 100644 --- a/build/test/TestPackageProjects.targets +++ b/build/test/TestPackageProjects.targets @@ -133,7 +133,7 @@ $(CoreCLRRid) + Condition=" '$(IsDesktopAvailable)' == 'True' "> dotnet-desktop-binding-redirects dotnet-desktop-binding-redirects.csproj True diff --git a/dir.props b/dir.props index 425b5d385..0c8714f22 100644 --- a/dir.props +++ b/dir.props @@ -13,6 +13,6 @@ true - 1.0.0-rc4 + 1.0.0 From e0f46f9de4d3f1451a7de045f7a0504735b8b1cc Mon Sep 17 00:00:00 2001 From: Piotr Puszkiewicz Date: Thu, 26 Jan 2017 00:40:16 -0800 Subject: [PATCH 21/29] add missing suffix component --- build/Microsoft.DotNet.Cli.Compile.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/Microsoft.DotNet.Cli.Compile.targets b/build/Microsoft.DotNet.Cli.Compile.targets index 4c2de2f11..b0785a0f7 100644 --- a/build/Microsoft.DotNet.Cli.Compile.targets +++ b/build/Microsoft.DotNet.Cli.Compile.targets @@ -116,7 +116,7 @@ @@ -124,7 +124,7 @@ From add5f725735c0ee237b3578dc01612aa1fcab5e0 Mon Sep 17 00:00:00 2001 From: Piotr Puszkiewicz Date: Thu, 26 Jan 2017 01:32:28 -0800 Subject: [PATCH 22/29] Simplify desktop test packaging --- .../dotnet-desktop-and-portable.csproj | 6 +++--- build/Microsoft.DotNet.Cli.Test.targets | 5 +---- build/test/TestPackageProjects.targets | 18 ++++-------------- 3 files changed, 8 insertions(+), 21 deletions(-) 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 c9c1f8639..7b2f17431 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 @@ -1,7 +1,7 @@  1.0.0-rc - netcoreapp1.1;net451 + netcoreapp1.0;net451 dotnet-desktop-and-portable Exe win7-x64;win7-x86;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;osx.10.10-x64;rhel.7-x64 @@ -13,9 +13,9 @@ - + - 1.1.0 + 1.0.3 diff --git a/build/Microsoft.DotNet.Cli.Test.targets b/build/Microsoft.DotNet.Cli.Test.targets index 1d0944290..ecb4b15b5 100644 --- a/build/Microsoft.DotNet.Cli.Test.targets +++ b/build/Microsoft.DotNet.Cli.Test.targets @@ -90,10 +90,7 @@ Outputs="%(TestPackageProject.PackOutputs)"> - %(TestPackageProject.Framework) - true - /p:TargetFramework=$(Framework) - /p:RuntimeIdentifier=%(TestPackageProject.PackRuntime) + /p:RuntimeIdentifier=%(TestPackageProject.PackRuntime) $(CliVersionPrefix)- rc4-$(TestPackageBuildVersionSuffix) False - netstandard1.5 Microsoft.DotNet.InternalAbstractions @@ -88,9 +87,9 @@ 2.0.0-beta- beta-$(TestPackageBuildVersionSuffix) False - netstandard1.3 - + PackageWithFakeNativeDep PackageWithFakeNativeDep.csproj False @@ -98,7 +97,6 @@ 1.0.0 True - net45 $(CoreCLRRid) @@ -109,7 +107,6 @@ 1.0.0-rc- rc-$(TestPackageBuildVersionSuffix) True - netcoreapp1.0 dotnet-dependency-tool-invoker @@ -119,9 +116,9 @@ 1.0.0-rc- rc-$(TestPackageBuildVersionSuffix) True - netcoreapp1.0 - + dotnet-desktop-and-portable dotnet-desktop-and-portable.csproj True @@ -129,7 +126,6 @@ 1.0.0-rc- rc-$(TestPackageBuildVersionSuffix) True - net451;netcoreapp1.1 $(CoreCLRRid) 1.0.0-rc- rc-$(TestPackageBuildVersionSuffix) True - net451 $(CoreCLRRid) @@ -153,7 +148,6 @@ 1.0.0 True - netcoreapp1.1 dotnet-hello @@ -163,7 +157,6 @@ 2.0.0 True - netcoreapp1.1 dotnet-portable @@ -173,7 +166,6 @@ 1.0.0 True - netcoreapp1.0 dotnet-prefercliruntime @@ -183,7 +175,6 @@ 1.0.0 True - netcoreapp1.0 dotnet-tool-with-output-name @@ -194,7 +185,6 @@ 1.0.0 True - netcoreapp1.0 From 473e28c26b1a3779e727be4cd1c4445c52fb8f7b Mon Sep 17 00:00:00 2001 From: jonsequitur Date: Thu, 26 Jan 2017 08:41:46 -0800 Subject: [PATCH 23/29] remove tool_csc cleanup --- build/Microsoft.DotNet.Cli.Compile.targets | 2 -- 1 file changed, 2 deletions(-) diff --git a/build/Microsoft.DotNet.Cli.Compile.targets b/build/Microsoft.DotNet.Cli.Compile.targets index b0785a0f7..effb2348c 100644 --- a/build/Microsoft.DotNet.Cli.Compile.targets +++ b/build/Microsoft.DotNet.Cli.Compile.targets @@ -88,7 +88,6 @@ - @@ -173,7 +172,6 @@ - From d63e0dd74a7791cfe94e2bce2c925b5d92eda52d Mon Sep 17 00:00:00 2001 From: jonsequitur Date: Thu, 26 Jan 2017 10:56:30 -0800 Subject: [PATCH 24/29] reduce abstraction in building test packages --- build/Microsoft.DotNet.Cli.Test.targets | 13 ++-- build/test/TestPackageProjects.targets | 83 ++++++------------------- 2 files changed, 22 insertions(+), 74 deletions(-) diff --git a/build/Microsoft.DotNet.Cli.Test.targets b/build/Microsoft.DotNet.Cli.Test.targets index ecb4b15b5..f34762796 100644 --- a/build/Microsoft.DotNet.Cli.Test.targets +++ b/build/Microsoft.DotNet.Cli.Test.targets @@ -85,15 +85,9 @@ + DependsOnTargets="SetupTestPackageProjectData;"> - - /p:RuntimeIdentifier=%(TestPackageProject.PackRuntime) - - - @@ -103,6 +97,7 @@ ProjectPath="%(TestPackageProject.ProjectPath)" ToolPath="$(Stage0Directory)" VersionSuffix="%(TestPackageProject.VersionSuffix)" - MsbuildArgs="$(DotNetPackMsbuildArgs) /p:SdkNuGetVersion=$(SdkNugetVersion)" /> + MsbuildArgs="%(TestPackageProject.MsbuildArgs) /p:SdkNuGetVersion=$(SdkNugetVersion)" /> + diff --git a/build/test/TestPackageProjects.targets b/build/test/TestPackageProjects.targets index f53fec5ef..a8c6c0bea 100644 --- a/build/test/TestPackageProjects.targets +++ b/build/test/TestPackageProjects.targets @@ -1,76 +1,23 @@ + DependsOnTargets="SetupTestPackageProjectFrameworks"> - - %(Name) - - - - %(BuildOutputs) - $(TestPackagesDir)%(NuPkgName).%(VersionPrefix)%(VersionSuffix).nupkg - - - - - - - - %(TestPackageProject.OutputPath)%(TestPackageProject.Name).dll - - - %(TestPackageProjectFrameworks.Identity) - - + DependsOnTargets="SetupTestPackageProjectBaseData"> - - $(CurrentBuildFramework) - $(CoreCLRRid) - %(OutputPath)$(CurrentBuildFramework)/ + - - - %(BaseTestPackageProject.ProjectPath) - - - - - @(__TestPackageProjectInputs) - - - - - - - <__TestPackageProjectInputs Include="%(BaseTestPackageProject.BuildInputIncludeFilter)" - Exclude="%(BaseTestPackageProject.BuildInputExcludeFilter)"> - %(BaseTestPackageProject.ProjectPath) - - - - - + Microsoft.DotNet.Cli.Utils Microsoft.DotNet.Cli.Utils.csproj True @@ -78,6 +25,18 @@ $(CliVersionPrefix)- rc4-$(TestPackageBuildVersionSuffix) False + /p:RuntimeIdentifier=$(CoreCLRRid) + + + Microsoft.DotNet.Cli.Utils + Microsoft.DotNet.Cli.Utils.csproj + True + True + $(CliVersionPrefix)- + rc4-$(TestPackageBuildVersionSuffix) + False + /p:TargetFramework=netstandard1.5 Microsoft.DotNet.InternalAbstractions @@ -187,10 +146,6 @@ True - - - - $(RepoRoot)%(Identity)/ $(TestPackagesBuildDir)%(Identity)/bin/$(Configuration)/ @@ -198,8 +153,6 @@ %(ProjectDir)%(ProjectName) - %(ProjectDir)**/*.* - %(ProjectDir)bin/**/*.*;%(ProjectDir)obj/**/*.* @@ -209,4 +162,4 @@ %(Name) - \ No newline at end of file + From a14195f76dde7f10af21a19b9389621c4224814a Mon Sep 17 00:00:00 2001 From: jonsequitur Date: Thu, 26 Jan 2017 11:47:06 -0800 Subject: [PATCH 25/29] hoist task batching to target batching --- build/Microsoft.DotNet.Cli.Test.targets | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/Microsoft.DotNet.Cli.Test.targets b/build/Microsoft.DotNet.Cli.Test.targets index f34762796..d7d4c28bd 100644 --- a/build/Microsoft.DotNet.Cli.Test.targets +++ b/build/Microsoft.DotNet.Cli.Test.targets @@ -85,7 +85,8 @@ + DependsOnTargets="SetupTestPackageProjectData;" + Outputs="%(TestPackageProject.Identity)"> Date: Thu, 26 Jan 2017 12:44:14 -0800 Subject: [PATCH 26/29] remove rid for Microsoft.DotNet.Cli.Utils test package build --- build/test/TestPackageProjects.targets | 1 - 1 file changed, 1 deletion(-) diff --git a/build/test/TestPackageProjects.targets b/build/test/TestPackageProjects.targets index a8c6c0bea..fe05bfb1c 100644 --- a/build/test/TestPackageProjects.targets +++ b/build/test/TestPackageProjects.targets @@ -25,7 +25,6 @@ $(CliVersionPrefix)- rc4-$(TestPackageBuildVersionSuffix) False - /p:RuntimeIdentifier=$(CoreCLRRid) From 090c8e2e092cb23f37460fa552b1e3e58bf07e26 Mon Sep 17 00:00:00 2001 From: jonsequitur Date: Thu, 26 Jan 2017 13:18:24 -0800 Subject: [PATCH 27/29] hoist CoreCLRRid definition to Prepare.targets --- build/Microsoft.DotNet.Cli.Prepare.targets | 4 ++++ build/crossgen/Microsoft.DotNet.Cli.Crossgen.targets | 5 ----- build/test/TestPackageProjects.targets | 6 +++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/build/Microsoft.DotNet.Cli.Prepare.targets b/build/Microsoft.DotNet.Cli.Prepare.targets index b48f41697..84b8ac3fc 100644 --- a/build/Microsoft.DotNet.Cli.Prepare.targets +++ b/build/Microsoft.DotNet.Cli.Prepare.targets @@ -43,6 +43,10 @@ $(BaseOutputDirectory)/intermediate $(BaseOutputDirectory)/packages $(IntermediateDirectory)/sharedFrameworkPublish + $(Rid) + win7-$(Architecture) + osx.10.10-x64 + rhel.7-x64 diff --git a/build/crossgen/Microsoft.DotNet.Cli.Crossgen.targets b/build/crossgen/Microsoft.DotNet.Cli.Crossgen.targets index 45316f23d..3d2b29310 100644 --- a/build/crossgen/Microsoft.DotNet.Cli.Crossgen.targets +++ b/build/crossgen/Microsoft.DotNet.Cli.Crossgen.targets @@ -3,11 +3,6 @@ - $(Rid) - win7-$(Architecture) - osx.10.10-x64 - rhel.7-x64 - runtime.$(CoreCLRRid).microsoft.netcore.runtime.coreclr runtime.$(CoreCLRRid).microsoft.netcore.runtime.coreclr runtime.$(CoreCLRRid).microsoft.netcore.jit diff --git a/build/test/TestPackageProjects.targets b/build/test/TestPackageProjects.targets index fe05bfb1c..a12580b82 100644 --- a/build/test/TestPackageProjects.targets +++ b/build/test/TestPackageProjects.targets @@ -55,7 +55,7 @@ 1.0.0 True - $(CoreCLRRid) + /p:RuntimeIdentifier=$(CoreCLRRid) dotnet-dependency-context-test @@ -84,7 +84,7 @@ 1.0.0-rc- rc-$(TestPackageBuildVersionSuffix) True - $(CoreCLRRid) + /p:RuntimeIdentifier=$(CoreCLRRid) @@ -96,7 +96,7 @@ 1.0.0-rc- rc-$(TestPackageBuildVersionSuffix) True - $(CoreCLRRid) + /p:RuntimeIdentifier=$(CoreCLRRid) dotnet-hello From 8a79abe4c954e46f638f5af6240f3116436a8f47 Mon Sep 17 00:00:00 2001 From: jonsequitur Date: Thu, 26 Jan 2017 14:33:49 -0800 Subject: [PATCH 28/29] fix conditional --- .../dotnet-desktop-and-portable.csproj | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) 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 7b2f17431..11e93e15a 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 @@ -1,13 +1,13 @@ - + 1.0.0-rc netcoreapp1.0;net451 dotnet-desktop-and-portable Exe - win7-x64;win7-x86;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;osx.10.10-x64;rhel.7-x64 + win7-x64;win7-x86 - + $(ProjectRuntimeConfigFilePath) @@ -23,8 +23,4 @@ - - - $(DefineConstants);RELEASE - From b4b4fa64feed0763c94f470b2761d24917078003 Mon Sep 17 00:00:00 2001 From: Piotr Puszkiewicz Date: Thu, 26 Jan 2017 17:04:50 -0800 Subject: [PATCH 29/29] Bump MSBuild to 15.1.0-preview-000539-01 --- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index 16437ac5e..826c4da6c 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -1,7 +1,7 @@ - 15.1.0-preview-000523-01 + 15.1.0-preview-000539-01 2.0.0-rc4-61325-08 1.0.0-alpha-20170117-4 4.0.0-rc3