From ecd6c47d2e0ed9003c1e6f8888520cb8b5cab3ab Mon Sep 17 00:00:00 2001 From: faahmad Date: Thu, 10 Aug 2017 18:55:06 +0530 Subject: [PATCH 01/20] Insert new bits of TPv2 and enable blame data collector --- build/DependencyVersions.props | 2 +- src/dotnet/commands/dotnet-test/LocalizableStrings.resx | 3 +++ src/dotnet/commands/dotnet-test/TestCommandParser.cs | 5 +++++ .../commands/dotnet-test/xlf/LocalizableStrings.cs.xlf | 5 +++++ .../commands/dotnet-test/xlf/LocalizableStrings.de.xlf | 5 +++++ .../commands/dotnet-test/xlf/LocalizableStrings.es.xlf | 5 +++++ .../commands/dotnet-test/xlf/LocalizableStrings.fr.xlf | 5 +++++ .../commands/dotnet-test/xlf/LocalizableStrings.it.xlf | 5 +++++ .../commands/dotnet-test/xlf/LocalizableStrings.ja.xlf | 5 +++++ .../commands/dotnet-test/xlf/LocalizableStrings.ko.xlf | 5 +++++ .../commands/dotnet-test/xlf/LocalizableStrings.pl.xlf | 5 +++++ .../commands/dotnet-test/xlf/LocalizableStrings.pt-BR.xlf | 5 +++++ .../commands/dotnet-test/xlf/LocalizableStrings.ru.xlf | 5 +++++ .../commands/dotnet-test/xlf/LocalizableStrings.tr.xlf | 5 +++++ .../commands/dotnet-test/xlf/LocalizableStrings.zh-Hans.xlf | 5 +++++ .../commands/dotnet-test/xlf/LocalizableStrings.zh-Hant.xlf | 5 +++++ 16 files changed, 74 insertions(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index d9c63f699..a7cd25433 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -18,7 +18,7 @@ 4.3.0-rtm-4382 2.0.0-preview3-25514-04 2.0.0-rel-20170629-588 - 15.3.0-preview-20170703-02 + 15.5.0-preview-20170810-02 $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) diff --git a/src/dotnet/commands/dotnet-test/LocalizableStrings.resx b/src/dotnet/commands/dotnet-test/LocalizableStrings.resx index 1ff6b6d07..4db3d6ab0 100644 --- a/src/dotnet/commands/dotnet-test/LocalizableStrings.resx +++ b/src/dotnet/commands/dotnet-test/LocalizableStrings.resx @@ -216,4 +216,7 @@ RunSettings arguments: Enables data collector for the test run. More info here : https://aka.ms/vstest-collect + + Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash. It creates an output file in the current directory as "Sequence.xml", that captures the order of execution of test before the crash. + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-test/TestCommandParser.cs b/src/dotnet/commands/dotnet-test/TestCommandParser.cs index 5afd91272..d6dc05df8 100644 --- a/src/dotnet/commands/dotnet-test/TestCommandParser.cs +++ b/src/dotnet/commands/dotnet-test/TestCommandParser.cs @@ -85,6 +85,11 @@ namespace Microsoft.DotNet.Cli Accept.OneOrMoreArguments() .With(name: LocalizableStrings.cmdCollectFriendlyName) .ForwardAsSingle(o => $"/p:VSTestCollect=\"{string.Join(";", o.Arguments)}\"")), + Create.Option( + "--blame", + LocalizableStrings.CmdBlameDescription, + Accept.NoArguments() + .ForwardAsSingle(o => "/p:VSTestBlame=true")), CommonOptions.NoRestoreOption(), CommonOptions.VerbosityOption()); diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.cs.xlf index f5d414b52..3d313ed12 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.cs.xlf @@ -173,6 +173,11 @@ Argumenty RunSettings: Další informace: https://aka.ms/vstest-collect + + Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash. It creates an output file in the current directory as "Sequence.xml", that captures the order of execution of test before the crash. + Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash. It creates an output file in the current directory as "Sequence.xml", that captures the order of execution of test before the crash. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.de.xlf index ee42ac82e..662801e5b 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.de.xlf @@ -173,6 +173,11 @@ RunSettings-Argumente: Weitere Informationen finden Sie hier: https://aka.ms/vstest-collect + + Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash. It creates an output file in the current directory as "Sequence.xml", that captures the order of execution of test before the crash. + Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash. It creates an output file in the current directory as "Sequence.xml", that captures the order of execution of test before the crash. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.es.xlf index d50458ccc..5daacd2b4 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.es.xlf @@ -173,6 +173,11 @@ Argumentos RunSettings: Más información aquí: https://aka.ms/vstest-collect + + Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash. It creates an output file in the current directory as "Sequence.xml", that captures the order of execution of test before the crash. + Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash. It creates an output file in the current directory as "Sequence.xml", that captures the order of execution of test before the crash. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.fr.xlf index 488c2a39a..13913536f 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.fr.xlf @@ -173,6 +173,11 @@ Arguments de RunSettings : Plus d'informations ici : https://aka.ms/vstest-collect + + Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash. It creates an output file in the current directory as "Sequence.xml", that captures the order of execution of test before the crash. + Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash. It creates an output file in the current directory as "Sequence.xml", that captures the order of execution of test before the crash. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.it.xlf index 6baa3d8a9..3e7113037 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.it.xlf @@ -173,6 +173,11 @@ Argomenti di RunSettings: Per altre informazioni, vedere: https://aka.ms/vstest-collect + + Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash. It creates an output file in the current directory as "Sequence.xml", that captures the order of execution of test before the crash. + Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash. It creates an output file in the current directory as "Sequence.xml", that captures the order of execution of test before the crash. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ja.xlf index 18139bb2a..cb17442f9 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ja.xlf @@ -173,6 +173,11 @@ RunSettings 引数: 詳細情報: https://aka.ms/vstest-collect + + Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash. It creates an output file in the current directory as "Sequence.xml", that captures the order of execution of test before the crash. + Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash. It creates an output file in the current directory as "Sequence.xml", that captures the order of execution of test before the crash. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ko.xlf index 76e80193b..ac9d10cb2 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ko.xlf @@ -173,6 +173,11 @@ RunSettings 인수: 자세한 정보: https://aka.ms/vstest-collect + + Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash. It creates an output file in the current directory as "Sequence.xml", that captures the order of execution of test before the crash. + Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash. It creates an output file in the current directory as "Sequence.xml", that captures the order of execution of test before the crash. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pl.xlf index eb78cae41..89d2f356a 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pl.xlf @@ -173,6 +173,11 @@ Argumenty RunSettings: Więcej informacji można znaleźć tutaj: https://aka.ms/vstest-collect + + Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash. It creates an output file in the current directory as "Sequence.xml", that captures the order of execution of test before the crash. + Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash. It creates an output file in the current directory as "Sequence.xml", that captures the order of execution of test before the crash. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pt-BR.xlf index 24ab9fbb7..3ad0fa088 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pt-BR.xlf @@ -173,6 +173,11 @@ Argumentos RunSettings: Mais informações aqui: https://aka.ms/vstest-collect + + Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash. It creates an output file in the current directory as "Sequence.xml", that captures the order of execution of test before the crash. + Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash. It creates an output file in the current directory as "Sequence.xml", that captures the order of execution of test before the crash. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ru.xlf index 977af9974..68eb5f947 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ru.xlf @@ -173,6 +173,11 @@ RunSettings arguments: Дополнительные сведения: https://aka.ms/vstest-collect + + Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash. It creates an output file in the current directory as "Sequence.xml", that captures the order of execution of test before the crash. + Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash. It creates an output file in the current directory as "Sequence.xml", that captures the order of execution of test before the crash. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.tr.xlf index a6d961ac2..5d1193455 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.tr.xlf @@ -173,6 +173,11 @@ RunSettings bağımsız değişkenleri: Daha fazla bilgi için bkz. https://aka.ms/vstest-collect + + Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash. It creates an output file in the current directory as "Sequence.xml", that captures the order of execution of test before the crash. + Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash. It creates an output file in the current directory as "Sequence.xml", that captures the order of execution of test before the crash. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hans.xlf index 0f365ad49..e0f8c0208 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hans.xlf @@ -173,6 +173,11 @@ RunSettings 参数: 有关详细信息，请访问: https://aka.ms/vstest-collect + + Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash. It creates an output file in the current directory as "Sequence.xml", that captures the order of execution of test before the crash. + Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash. It creates an output file in the current directory as "Sequence.xml", that captures the order of execution of test before the crash. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hant.xlf index e3af79f81..990275355 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hant.xlf @@ -173,6 +173,11 @@ RunSettings 引數: 如需詳細資訊，請參閱: https://aka.ms/vstest-collect + + Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash. It creates an output file in the current directory as "Sequence.xml", that captures the order of execution of test before the crash. + Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash. It creates an output file in the current directory as "Sequence.xml", that captures the order of execution of test before the crash. + + \ No newline at end of file From be31443adf83004acd803fa83c635c35946448d7 Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Thu, 10 Aug 2017 23:56:43 -0700 Subject: [PATCH 02/20] Fix dotnet/templating#1206 --- build/DependencyVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index d7186931f..1799aeb6b 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -22,9 +22,9 @@ $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) - 1.0.0-beta2-20170719-291 - 1.0.0-beta2-20170803-303 - 1.0.0-beta2-20170803-303 + 1.0.0-beta2-20170810-304 + 1.0.0-beta2-20170810-304 + 1.0.0-beta2-20170810-304 2.0.0 2.0.0 0.1.1-alpha-167 From 2c8ea8263a2f795ef3f055edb9ebd1a868f14980 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Mon, 14 Aug 2017 14:18:39 -0500 Subject: [PATCH 03/20] Skip versions repo publish if auth not defined (cherry picked from commit b4c1a809b883927e6103569feb8c4ac976d6131f) --- build/publish/FinishBuild.targets | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/publish/FinishBuild.targets b/build/publish/FinishBuild.targets index 2ec12d1d3..dfb224431 100644 --- a/build/publish/FinishBuild.targets +++ b/build/publish/FinishBuild.targets @@ -34,6 +34,7 @@ + GitHubPassword="$(GITHUB_PASSWORD)" + Condition=" '$(GITHUB_PASSWORD)' != '' " /> From 8c5e955252f93f54e239e5f1c978700b97fc21c1 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 14 Aug 2017 18:05:04 -0700 Subject: [PATCH 04/20] Fix dotnet-install script when latest version file for channel is returned as application/octet-stream --- scripts/obtain/dotnet-install.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/obtain/dotnet-install.ps1 b/scripts/obtain/dotnet-install.ps1 index 93d964540..427995b86 100644 --- a/scripts/obtain/dotnet-install.ps1 +++ b/scripts/obtain/dotnet-install.ps1 @@ -232,7 +232,7 @@ function Get-Latest-Version-Info([string]$AzureFeed, [string]$Channel, [bool]$Co $StringContent = $Response.Content.ReadAsStringAsync().Result switch ($Response.Content.Headers.ContentType) { - { ($_ -eq "application/octet-stream") } { $VersionText = [Text.Encoding]::UTF8.GetString($StringContent) } + { ($_ -eq "application/octet-stream") } { $VersionText = $StringContent } { ($_ -eq "text/plain") } { $VersionText = $StringContent } { ($_ -eq "text/plain; charset=UTF-8") } { $VersionText = $StringContent } default { throw "``$Response.Content.Headers.ContentType`` is an unknown .version file content type." } From 1a9bf33c3a8b272fef52b060f122dccd82f3edd2 Mon Sep 17 00:00:00 2001 From: Vijay Ramakrishnan Date: Mon, 14 Aug 2017 19:09:26 -0700 Subject: [PATCH 05/20] Updating the websdk to 2.0.0-rel-20170815-630 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index d7186931f..b9463db9e 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -17,7 +17,7 @@ 4.3.0-rtm-4382 2.0.0-preview3-25514-04 - 2.0.0-rel-20170629-588 + 2.0.0-rel-20170815-630 15.3.0-preview-20170628-02 $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) From f1fbd6bdd8d443388449317eaf95db233e532bd8 Mon Sep 17 00:00:00 2001 From: Kevin Jones Date: Tue, 15 Aug 2017 09:50:38 -0400 Subject: [PATCH 06/20] Remove --targets from usage. --- run-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-build.sh b/run-build.sh index 547c30444..dd011e544 100755 --- a/run-build.sh +++ b/run-build.sh @@ -108,7 +108,7 @@ while [[ $# > 0 ]]; do args=( "${args[@]/$1}" ) ;; --help) - echo "Usage: $0 [--configuration ] [--targets ] [--skip-prereqs] [--nopackage] [--docker ] [--help]" + echo "Usage: $0 [--configuration ] [--skip-prereqs] [--nopackage] [--docker ] [--help]" echo "" echo "Options:" echo " --configuration Build the specified Configuration (Debug or Release, default: Debug)" From 27a6569ae0349435ed921cd63ea8f2cd4b815eee Mon Sep 17 00:00:00 2001 From: Rick Anderson Date: Thu, 17 Aug 2017 16:19:03 -0400 Subject: [PATCH 07/20] Update README.md (#7217) --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 0220c75b7..bcd0a2710 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Looking for V1 of the .NET Core tooling? If you are looking for the v1.0.1 release of the .NET Core tools (CLI, MSBuild and the new csproj), head over to https://dot.net/core and download! -> **Note:** the release/2.0.0 branch of the CLI repo is based on the upcoming v2 of .NET Core and is considered pre-release. For production-level usage, please use the +> **Note:** the release/2.0.0 branch of the CLI repo is based on the upcoming v2 of .NET Core and is considered pre-release. For production-level usage, use the > v1 of the tools. Found an issue? @@ -57,12 +57,12 @@ Build Status Installers and Binaries ----------------------- -You can download .NET Core SDK as either an installer (MSI, PKG) or a zip (zip, tar.gz). .NET Core SDK contains both the .NET Core runtime and CLI tools. +You can download the .NET Core SDK as either an installer (MSI, PKG) or a zip (zip, tar.gz). The .NET Core SDK contains both the .NET Core runtime and CLI tools. -In order to download just the .NET Core runtime without the SDK, please visit https://github.com/dotnet/core-setup#daily-builds. +To download the .NET Core runtime **without** the SDK, visit https://github.com/dotnet/core-setup#daily-builds. -> **Note:** please be aware that below installers are the **latest bits**. If you -> want to install the latest released versions, please check out the [section above](#looking-for-v1-of-the-net-core-tooling). +> **Note:** Be aware that the following installers are the **latest bits**. If you +> want to install the latest released versions, check out the [preceding section](#looking-for-v1-of-the-net-core-tooling). @@ -211,7 +211,7 @@ Compiling to IL is done using: This will drop an IL assembly in `./bin/[configuration]/[framework]/[binary name]` that you can run using `dotnet bin/[configuration]/[framework]/[binaryname.dll]`. -For more details, please refer to the [documentation](https://aka.ms/dotnet-cli-docs). +For more details, refer to the [documentation](https://aka.ms/dotnet-cli-docs). Building from source -------------------- @@ -223,7 +223,7 @@ Read over the [contributing guidelines](CONTRIBUTING.md) and [developer document Questions & Comments -------------------- -For any and all feedback, please use the Issues on this repository. +For all feedback, use the Issues on this repository. License ------- From 5ae335b5929db811488ef7ebf3231546c9462cf6 Mon Sep 17 00:00:00 2001 From: Mikkel Nylander Bundgaard Date: Tue, 8 Aug 2017 01:06:30 +0200 Subject: [PATCH 08/20] Only open help page for commands with DocLink The help-command now handles commands without a DocLink in the same manner as unknown commands. Fixes #7065 --- src/dotnet/commands/dotnet-help/HelpCommand.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/dotnet/commands/dotnet-help/HelpCommand.cs b/src/dotnet/commands/dotnet-help/HelpCommand.cs index 799ba9314..2398e11b1 100644 --- a/src/dotnet/commands/dotnet-help/HelpCommand.cs +++ b/src/dotnet/commands/dotnet-help/HelpCommand.cs @@ -102,7 +102,8 @@ namespace Microsoft.DotNet.Tools.Help { if (BuiltInCommandsCatalog.Commands.TryGetValue( _appliedOption.Arguments.Single(), - out BuiltInCommandMetadata builtIn)) + out BuiltInCommandMetadata builtIn) && + !string.IsNullOrEmpty(builtIn.DocLink)) { var process = ConfigureProcess(builtIn.DocLink); process.Start(); From 44d25ae3af946785d5997f6d13e41946e13ddce9 Mon Sep 17 00:00:00 2001 From: Mikkel Nylander Bundgaard Date: Mon, 14 Aug 2017 23:32:49 +0200 Subject: [PATCH 09/20] Add test for commands without doclink --- .../GivenThatIWantToShowHelpForDotnetCommand.cs | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs b/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs index 8b66299d9..b4aacb067 100644 --- a/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs +++ b/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs @@ -89,6 +89,19 @@ runtime-options: cmd.StdOut.Should().ContainVisuallySameFragmentIfNotLocalized(HelpText); } + [Theory] + [InlineData("complete")] + [InlineData("parse")] + public void WhenCommandWithoutDocLinkIsPassedToDotnetHelpItPrintsError(string command) + { + var cmd = new DotnetCommand() + .ExecuteWithCapturedOutput($"help {command}"); + + cmd.Should().Fail(); + cmd.StdErr.Should().Contain(string.Format(Tools.Help.LocalizableStrings.CommandDoesNotExist, command)); + cmd.StdOut.Should().ContainVisuallySameFragmentIfNotLocalized(HelpText); + } + [WindowsOnlyFact] public void WhenRunOnWindowsDotnetHelpCommandShouldContainProperProcessInformation() { From 4598d7b2c2ea6530c0d1daf1380c325b4d1b4e41 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Thu, 17 Aug 2017 19:50:17 -0700 Subject: [PATCH 10/20] Update to SDK with a maximum version for .NET Core of 2.1 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 7d57b0fa6..94e87774f 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ - 2.1.0-preview1-20170816-1 + 2.1.0-preview1-20170818-1 $(CLI_NETSDK_Version) 4.4.0-preview1-4365 From be6fc8836f6e4ba130d3d241118bd558b077173b Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Thu, 17 Aug 2017 22:55:43 -0700 Subject: [PATCH 11/20] Update to 2.1 runtime --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 7d57b0fa6..8b7acb68e 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.0.0 + 2.1.0-preview2-25615-02 15.3.409 2.3.2-beta1-61921-05 2.3.0-pre-20170727-1 From c00afe9588263f01d8d355030618348e5d50a17b Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Thu, 17 Aug 2017 23:07:28 -0700 Subject: [PATCH 12/20] Retarget tests to netcoreapp2.1 --- TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj | 4 ++-- TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj | 2 +- .../MultiTFMXunitProject/XUnitProject/XUnitProject.csproj | 2 +- .../MultiTFMTestApp/MultiTFMTestApp.csproj | 2 +- .../AppDependingOnOtherAsTool.csproj | 2 +- .../AppWithNonExistingToolDependency.csproj | 2 +- .../DotnetAddP2PProjects/Broken/Broken.csproj | 2 +- .../DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj | 4 ++-- .../DotnetAddP2PProjects/Lib/Lib.csproj | 4 ++-- .../DotnetAddP2PProjects/MoreThanOne/a.csproj | 2 +- .../DotnetAddP2PProjects/MoreThanOne/b.csproj | 2 +- .../Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj | 4 ++-- .../DotnetAddP2PProjects/ValidRef/ValidRef.csproj | 2 +- .../DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj | 2 +- .../WithExistingRefCondOnItem.csproj | 2 +- .../WithExistingRefCondWhitespaces.csproj | 2 +- .../WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj | 2 +- .../PJHalfMigrated/src/ProjectA/ProjectA.csproj | 2 +- .../TestProjectWithUnresolvedPlatformDependency.csproj | 4 ++-- .../AppWithDepOnTool/AppWithDepOnTool.csproj | 2 +- .../ToolWithRandomPackageName.csproj | 2 +- .../TestPackages/ToolWithOutputName/ToolWithOutputName.csproj | 2 +- .../dotnet-dependency-context-test.csproj | 2 +- .../dotnet-dependency-tool-invoker.csproj | 2 +- .../dotnet-fallbackfoldertool.csproj | 2 +- .../dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj | 2 +- .../dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj | 2 +- .../TestPackages/dotnet-portable/dotnet-portable.csproj | 2 +- .../dotnet-prefercliruntime/dotnet-prefercliruntime.csproj | 2 +- .../AppWithCorruptedLaunchSettings.csproj | 2 +- .../AppWithDepOnToolWithOutputName.csproj | 2 +- .../AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj | 2 +- .../TestProjects/AppWithDirectDep/AppWithDirectDep.csproj | 2 +- .../AppWithDirectDepWithOutputName.csproj | 2 +- .../AppWithFallbackFolderToolDependency.csproj | 2 +- .../AppWithLaunchSettings/AppWithLaunchSettings.csproj | 2 +- .../AppWithLaunchSettingsNoDefault.csproj | 2 +- .../MSBuildAppWithMultipleFrameworksAndTools.csproj | 4 ++-- .../AppWithToolDependency/AppWithToolDependency.csproj | 2 +- .../DependencyContextFromTool.csproj | 2 +- .../TestProjects/FSharpTestAppSimple/TestAppSimple.fsproj | 2 +- .../MSBuildAppWithMultipleFrameworks.csproj | 2 +- .../MSBuildAppWithMultipleFrameworksAndTools.csproj | 4 ++-- TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj | 2 +- .../MultiDependentProject/MultiDependentProject.csproj | 2 +- .../NewtonSoftDependentProject.csproj | 2 +- .../NuGetConfigDependentProject.csproj | 2 +- TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj | 2 +- TestAssets/TestProjects/TestAppWithEmptySln/App/App.csproj | 2 +- .../TestProjects/TestAppWithMultipleSlnFiles/App/App.csproj | 2 +- .../TestAppWithProjDepTool/TestAppWithProjDepTool.csproj | 2 +- .../src/App/App.csproj | 2 +- .../TestProjects/TestAppWithSlnAndCsprojFiles/App/App.csproj | 2 +- .../TestProjects/TestAppWithSlnAndCsprojInSubDir/App.csproj | 2 +- .../TestAppWithSlnAndCsprojInSubDirToRemove/App.csproj | 2 +- .../TestAppWithSlnAndCsprojProjectGuidFiles/App/App.csproj | 2 +- .../TestAppWithSlnAndCsprojToRemove/App/App.csproj | 2 +- .../App/App.csproj | 2 +- .../TestAppWithSlnAndExistingCsprojReferences/App/App.csproj | 2 +- .../App/App.csproj | 2 +- .../TestAppWithSlnAndLastCsprojInSubDirToRemove/App.csproj | 2 +- .../TestAppWithSlnAndSolutionFolders/src/App/App.csproj | 2 +- TestAssets/TestProjects/VBTestApp/VBTestApp.vbproj | 2 +- TestAssets/TestProjects/VSTestCore/VSTestCore.csproj | 2 +- .../TestProjects/VSTestMulti/VSTestDesktopAndNetCore.csproj | 2 +- TestAssets/TestProjects/XunitCore/XunitCore.csproj | 2 +- .../XunitMulti/VSTestXunitDesktopAndNetCore.csproj | 4 ++-- 67 files changed, 75 insertions(+), 75 deletions(-) diff --git a/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj b/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj index f72d85fc6..0034bcf80 100644 --- a/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj +++ b/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj @@ -2,9 +2,9 @@ - netcoreapp2.0;net451 + netcoreapp2.1;net451 Exe - $(AssetTargetFallback);portable-net45+win8;dnxcore50 + $(AssetTargetFallback);portable-net45+win8;dnxcore50 win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64 diff --git a/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj b/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj index d57f09629..1009df7ef 100644 --- a/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj +++ b/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj @@ -2,7 +2,7 @@ netstandard1.6;net451 Library - $(AssetTargetFallback);portable-net45+win8;dnxcore50;netcoreapp2.0 + $(AssetTargetFallback);portable-net45+win8;dnxcore50;netcoreapp2.1 diff --git a/TestAssets/DesktopTestProjects/MultiTFMXunitProject/XUnitProject/XUnitProject.csproj b/TestAssets/DesktopTestProjects/MultiTFMXunitProject/XUnitProject/XUnitProject.csproj index 2ae7ce025..e11243d4f 100644 --- a/TestAssets/DesktopTestProjects/MultiTFMXunitProject/XUnitProject/XUnitProject.csproj +++ b/TestAssets/DesktopTestProjects/MultiTFMXunitProject/XUnitProject/XUnitProject.csproj @@ -2,7 +2,7 @@ - net461;netcoreapp2.0 + net461;netcoreapp2.1 diff --git a/TestAssets/DesktopTestProjects/NETFrameworkReferenceNETStandard20/MultiTFMTestApp/MultiTFMTestApp.csproj b/TestAssets/DesktopTestProjects/NETFrameworkReferenceNETStandard20/MultiTFMTestApp/MultiTFMTestApp.csproj index cc54ec8ae..465f0e78a 100644 --- a/TestAssets/DesktopTestProjects/NETFrameworkReferenceNETStandard20/MultiTFMTestApp/MultiTFMTestApp.csproj +++ b/TestAssets/DesktopTestProjects/NETFrameworkReferenceNETStandard20/MultiTFMTestApp/MultiTFMTestApp.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.0;net461 + netcoreapp2.1;net461 diff --git a/TestAssets/NonRestoredTestProjects/AppThrowingException/AppDependingOnOtherAsTool/AppDependingOnOtherAsTool.csproj b/TestAssets/NonRestoredTestProjects/AppThrowingException/AppDependingOnOtherAsTool/AppDependingOnOtherAsTool.csproj index 30c6823e7..72070fa83 100644 --- a/TestAssets/NonRestoredTestProjects/AppThrowingException/AppDependingOnOtherAsTool/AppDependingOnOtherAsTool.csproj +++ b/TestAssets/NonRestoredTestProjects/AppThrowingException/AppDependingOnOtherAsTool/AppDependingOnOtherAsTool.csproj @@ -3,7 +3,7 @@ Exe - netcoreapp2.0 + netcoreapp2.1 diff --git a/TestAssets/NonRestoredTestProjects/AppWithNonExistingToolDependency/AppWithNonExistingToolDependency.csproj b/TestAssets/NonRestoredTestProjects/AppWithNonExistingToolDependency/AppWithNonExistingToolDependency.csproj index db9d6f117..6edffa788 100644 --- a/TestAssets/NonRestoredTestProjects/AppWithNonExistingToolDependency/AppWithNonExistingToolDependency.csproj +++ b/TestAssets/NonRestoredTestProjects/AppWithNonExistingToolDependency/AppWithNonExistingToolDependency.csproj @@ -3,7 +3,7 @@ Exe - netcoreapp2.0 + netcoreapp2.1 diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Broken/Broken.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Broken/Broken.csproj index 1a79fa49d..75167a0cf 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Broken/Broken.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Broken/Broken.csproj @@ -1,7 +1,7 @@  Library - net451;netcoreapp2.0 + net451;netcoreapp2.1 diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj index 0bdb79506..930f5ff99 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj @@ -3,10 +3,10 @@ Library - net451;netcoreapp2.0 + net451;netcoreapp2.1 - + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj index 1be153a79..764ed0f1e 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj @@ -3,10 +3,10 @@ Library - net451;netcoreapp2.0;netstandard1.4 + net451;netcoreapp2.1;netstandard1.4 - + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/a.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/a.csproj index 68b8ed617..527b9151c 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/a.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/a.csproj @@ -3,7 +3,7 @@ Library - netcoreapp2.0 + netcoreapp2.1 diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/b.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/b.csproj index 68b8ed617..527b9151c 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/b.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/b.csproj @@ -3,7 +3,7 @@ Library - netcoreapp2.0 + netcoreapp2.1 diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj index e11e31084..799473702 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj @@ -3,9 +3,9 @@ Library - net452;netcoreapp2.0 + net452;netcoreapp2.1 - + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.csproj index 0fc35d3d8..6ec6e04f2 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.csproj @@ -5,7 +5,7 @@ Library net451;netcoreapp1.0;netstandard1.4 - + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj index f33aa7821..8fb413a56 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj @@ -5,7 +5,7 @@ Library net451;netcoreapp1.0 - + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj index 8747ed6b7..b16235d3b 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj @@ -5,7 +5,7 @@ Library net451;netcoreapp1.0 - + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.csproj index 0b2792110..a552074b8 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.csproj @@ -5,7 +5,7 @@ Library net451;netcoreapp1.0 - + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj index 328fc5fb1..8c75a39c3 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj @@ -5,7 +5,7 @@ Library net451;netcoreapp1.0 - + diff --git a/TestAssets/NonRestoredTestProjects/PJHalfMigrated/src/ProjectA/ProjectA.csproj b/TestAssets/NonRestoredTestProjects/PJHalfMigrated/src/ProjectA/ProjectA.csproj index 915cb3e07..165e565c0 100755 --- a/TestAssets/NonRestoredTestProjects/PJHalfMigrated/src/ProjectA/ProjectA.csproj +++ b/TestAssets/NonRestoredTestProjects/PJHalfMigrated/src/ProjectA/ProjectA.csproj @@ -1,7 +1,7 @@  - netcoreapp2.0 + netcoreapp2.1 portable ProjectA Exe diff --git a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/TestProjectWithUnresolvedPlatformDependency.csproj b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/TestProjectWithUnresolvedPlatformDependency.csproj index 261918eb3..b93e3b384 100755 --- a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/TestProjectWithUnresolvedPlatformDependency.csproj +++ b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/TestProjectWithUnresolvedPlatformDependency.csproj @@ -1,8 +1,8 @@  - netcoreapp2.0 + netcoreapp2.1 Exe - $(AssetTargetFallback);dnxcore50 + $(AssetTargetFallback);dnxcore50 diff --git a/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/AppWithDepOnTool/AppWithDepOnTool.csproj b/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/AppWithDepOnTool/AppWithDepOnTool.csproj index f5ab2f51a..366b7f409 100644 --- a/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/AppWithDepOnTool/AppWithDepOnTool.csproj +++ b/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/AppWithDepOnTool/AppWithDepOnTool.csproj @@ -3,7 +3,7 @@ Exe - netcoreapp2.0 + netcoreapp2.1 random-name diff --git a/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/ToolWithRandomPackageName/ToolWithRandomPackageName.csproj b/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/ToolWithRandomPackageName/ToolWithRandomPackageName.csproj index 9184414e8..145d47d10 100644 --- a/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/ToolWithRandomPackageName/ToolWithRandomPackageName.csproj +++ b/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/ToolWithRandomPackageName/ToolWithRandomPackageName.csproj @@ -3,7 +3,7 @@ Exe - netcoreapp2.0 + netcoreapp2.1 random-name $(GeneratedPackageId) dotnet-randompackage diff --git a/TestAssets/TestPackages/ToolWithOutputName/ToolWithOutputName.csproj b/TestAssets/TestPackages/ToolWithOutputName/ToolWithOutputName.csproj index 6c57ebe5d..c237cd483 100644 --- a/TestAssets/TestPackages/ToolWithOutputName/ToolWithOutputName.csproj +++ b/TestAssets/TestPackages/ToolWithOutputName/ToolWithOutputName.csproj @@ -2,7 +2,7 @@ - netcoreapp2.0 + netcoreapp2.1 dotnet-tool-with-output-name ToolWithOutputName Exe diff --git a/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj b/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj index 97e20d00d..57417fb03 100644 --- a/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj +++ b/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj @@ -3,7 +3,7 @@ 1.0.0-rc - netcoreapp2.0 + netcoreapp2.1 Exe diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj index a6c5b91c1..38e6c9213 100644 --- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj +++ b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj @@ -6,7 +6,7 @@ 1.0.0-rc - netcoreapp2.0 + netcoreapp2.1 Exe false diff --git a/TestAssets/TestPackages/dotnet-fallbackfoldertool/dotnet-fallbackfoldertool.csproj b/TestAssets/TestPackages/dotnet-fallbackfoldertool/dotnet-fallbackfoldertool.csproj index 35e92a2bb..9e29a16a7 100644 --- a/TestAssets/TestPackages/dotnet-fallbackfoldertool/dotnet-fallbackfoldertool.csproj +++ b/TestAssets/TestPackages/dotnet-fallbackfoldertool/dotnet-fallbackfoldertool.csproj @@ -2,7 +2,7 @@ - netcoreapp2.0 + netcoreapp2.1 dotnet-fallbackfoldertool Exe 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 fd5621f08..4ff2b8d00 100644 --- a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj +++ b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj @@ -5,7 +5,7 @@ 1.0.0 - netcoreapp2.0 + netcoreapp2.1 dotnet-hello Exe win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64 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 2391dfc1b..7e4bc54d0 100644 --- a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj +++ b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj @@ -5,7 +5,7 @@ 2.0.0 - netcoreapp2.0 + netcoreapp2.1 dotnet-hello Exe win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64 diff --git a/TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj b/TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj index bc2925f73..70f8b0dde 100644 --- a/TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj +++ b/TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj @@ -2,7 +2,7 @@ - netcoreapp2.0 + netcoreapp2.1 Exe diff --git a/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj b/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj index 21eb0a6d1..1a4ab4176 100644 --- a/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj +++ b/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj @@ -2,7 +2,7 @@ - netcoreapp2.0 + netcoreapp2.1 Exe diff --git a/TestAssets/TestProjects/AppWithCorruptedLaunchSettings/AppWithCorruptedLaunchSettings.csproj b/TestAssets/TestProjects/AppWithCorruptedLaunchSettings/AppWithCorruptedLaunchSettings.csproj index 45a048433..f2064f994 100644 --- a/TestAssets/TestProjects/AppWithCorruptedLaunchSettings/AppWithCorruptedLaunchSettings.csproj +++ b/TestAssets/TestProjects/AppWithCorruptedLaunchSettings/AppWithCorruptedLaunchSettings.csproj @@ -3,7 +3,7 @@ Exe - netcoreapp2.0 + netcoreapp2.1 win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64 diff --git a/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj b/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj index 9adf4c6fc..b4d5af2e5 100755 --- a/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj +++ b/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj @@ -2,7 +2,7 @@ - netcoreapp2.0 + netcoreapp2.1 Exe diff --git a/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj b/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj index df284421b..748181c2b 100755 --- a/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj +++ b/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj @@ -2,7 +2,7 @@ - netcoreapp2.0 + netcoreapp2.1 Exe diff --git a/TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj b/TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj index 6995199ee..ba0d8a628 100755 --- a/TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj +++ b/TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj @@ -3,7 +3,7 @@ 1.0.0 - netcoreapp2.0 + netcoreapp2.1 AppWithDirectDep Exe false diff --git a/TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj b/TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj index 5afb24921..7685e5e72 100755 --- a/TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj +++ b/TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj @@ -2,7 +2,7 @@ - netcoreapp2.0 + netcoreapp2.1 Exe diff --git a/TestAssets/TestProjects/AppWithFallbackFolderToolDependency/AppWithFallbackFolderToolDependency.csproj b/TestAssets/TestProjects/AppWithFallbackFolderToolDependency/AppWithFallbackFolderToolDependency.csproj index 705cf2077..28ef6634e 100755 --- a/TestAssets/TestProjects/AppWithFallbackFolderToolDependency/AppWithFallbackFolderToolDependency.csproj +++ b/TestAssets/TestProjects/AppWithFallbackFolderToolDependency/AppWithFallbackFolderToolDependency.csproj @@ -2,7 +2,7 @@ - netcoreapp2.0 + netcoreapp2.1 Exe diff --git a/TestAssets/TestProjects/AppWithLaunchSettings/AppWithLaunchSettings.csproj b/TestAssets/TestProjects/AppWithLaunchSettings/AppWithLaunchSettings.csproj index 45a048433..f2064f994 100644 --- a/TestAssets/TestProjects/AppWithLaunchSettings/AppWithLaunchSettings.csproj +++ b/TestAssets/TestProjects/AppWithLaunchSettings/AppWithLaunchSettings.csproj @@ -3,7 +3,7 @@ Exe - netcoreapp2.0 + netcoreapp2.1 win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64 diff --git a/TestAssets/TestProjects/AppWithLaunchSettingsNoDefault/AppWithLaunchSettingsNoDefault.csproj b/TestAssets/TestProjects/AppWithLaunchSettingsNoDefault/AppWithLaunchSettingsNoDefault.csproj index 45a048433..f2064f994 100644 --- a/TestAssets/TestProjects/AppWithLaunchSettingsNoDefault/AppWithLaunchSettingsNoDefault.csproj +++ b/TestAssets/TestProjects/AppWithLaunchSettingsNoDefault/AppWithLaunchSettingsNoDefault.csproj @@ -3,7 +3,7 @@ Exe - netcoreapp2.0 + netcoreapp2.1 win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64 diff --git a/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj b/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj index 33cb2b5a7..b0a9a3aa0 100644 --- a/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj +++ b/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj @@ -3,13 +3,13 @@ Exe - net451;netcoreapp2.0 + net451;netcoreapp2.1 - + diff --git a/TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj b/TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj index 7f9c16848..17f43a432 100755 --- a/TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj +++ b/TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj @@ -2,7 +2,7 @@ - netcoreapp2.0 + netcoreapp2.1 Exe diff --git a/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj b/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj index 9c5447b05..a3149221d 100755 --- a/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj +++ b/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj @@ -3,7 +3,7 @@ 1.0.0 - netcoreapp2.0 + netcoreapp2.1 DependencyContextFromTool Exe false diff --git a/TestAssets/TestProjects/FSharpTestAppSimple/TestAppSimple.fsproj b/TestAssets/TestProjects/FSharpTestAppSimple/TestAppSimple.fsproj index 1af08f3b6..7c81fcb9c 100644 --- a/TestAssets/TestProjects/FSharpTestAppSimple/TestAppSimple.fsproj +++ b/TestAssets/TestProjects/FSharpTestAppSimple/TestAppSimple.fsproj @@ -2,7 +2,7 @@ - netcoreapp2.0 + netcoreapp2.1 Exe true diff --git a/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworks/MSBuildAppWithMultipleFrameworks.csproj b/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworks/MSBuildAppWithMultipleFrameworks.csproj index 89aae6c65..4ef98259b 100644 --- a/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworks/MSBuildAppWithMultipleFrameworks.csproj +++ b/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworks/MSBuildAppWithMultipleFrameworks.csproj @@ -3,7 +3,7 @@ Exe - net451;netcoreapp2.0 + net451;netcoreapp2.1 \ No newline at end of file diff --git a/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj b/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj index 766c1ae66..a3aea4813 100644 --- a/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj +++ b/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj @@ -3,13 +3,13 @@ Exe - net451;netcoreapp2.0 + net451;netcoreapp2.1 - + diff --git a/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj b/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj index 79bceb82d..b68fa804c 100644 --- a/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj +++ b/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj @@ -3,7 +3,7 @@ Exe - netcoreapp2.0 + netcoreapp2.1 win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64 diff --git a/TestAssets/TestProjects/MultiDependentProject/MultiDependentProject.csproj b/TestAssets/TestProjects/MultiDependentProject/MultiDependentProject.csproj index 8437d1b6d..9d52a2484 100644 --- a/TestAssets/TestProjects/MultiDependentProject/MultiDependentProject.csproj +++ b/TestAssets/TestProjects/MultiDependentProject/MultiDependentProject.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.0 + netcoreapp2.1 diff --git a/TestAssets/TestProjects/NewtonSoftDependentProject/NewtonSoftDependentProject.csproj b/TestAssets/TestProjects/NewtonSoftDependentProject/NewtonSoftDependentProject.csproj index 48bba3bea..cff7d9c45 100644 --- a/TestAssets/TestProjects/NewtonSoftDependentProject/NewtonSoftDependentProject.csproj +++ b/TestAssets/TestProjects/NewtonSoftDependentProject/NewtonSoftDependentProject.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.0 + netcoreapp2.1 diff --git a/TestAssets/TestProjects/NuGetConfigDependentProject/NuGetConfigDependentProject.csproj b/TestAssets/TestProjects/NuGetConfigDependentProject/NuGetConfigDependentProject.csproj index fd76d5489..340e58180 100644 --- a/TestAssets/TestProjects/NuGetConfigDependentProject/NuGetConfigDependentProject.csproj +++ b/TestAssets/TestProjects/NuGetConfigDependentProject/NuGetConfigDependentProject.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.0 + netcoreapp2.1 diff --git a/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj b/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj index e9f02f323..f99d38872 100755 --- a/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj +++ b/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj @@ -2,7 +2,7 @@ - netcoreapp2.0 + netcoreapp2.1 Exe true diff --git a/TestAssets/TestProjects/TestAppWithEmptySln/App/App.csproj b/TestAssets/TestProjects/TestAppWithEmptySln/App/App.csproj index ce5bf06cb..a4eeac8a4 100644 --- a/TestAssets/TestProjects/TestAppWithEmptySln/App/App.csproj +++ b/TestAssets/TestProjects/TestAppWithEmptySln/App/App.csproj @@ -3,7 +3,7 @@ Exe - netcoreapp2.0 + netcoreapp2.1 diff --git a/TestAssets/TestProjects/TestAppWithMultipleSlnFiles/App/App.csproj b/TestAssets/TestProjects/TestAppWithMultipleSlnFiles/App/App.csproj index 7a2163613..45701ff71 100644 --- a/TestAssets/TestProjects/TestAppWithMultipleSlnFiles/App/App.csproj +++ b/TestAssets/TestProjects/TestAppWithMultipleSlnFiles/App/App.csproj @@ -3,7 +3,7 @@ Exe - netcoreapp2.0 + netcoreapp2.1 diff --git a/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj b/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj index 3f8176791..b17661355 100644 --- a/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj +++ b/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj @@ -3,7 +3,7 @@ Exe - netcoreapp2.0 + netcoreapp2.1 diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCaseSensitiveSolutionFolders/src/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCaseSensitiveSolutionFolders/src/App/App.csproj index 3a31eb5bf..358a47d7c 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndCaseSensitiveSolutionFolders/src/App/App.csproj +++ b/TestAssets/TestProjects/TestAppWithSlnAndCaseSensitiveSolutionFolders/src/App/App.csproj @@ -3,7 +3,7 @@ Exe - netcoreapp2.0 + netcoreapp2.1 diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojFiles/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCsprojFiles/App/App.csproj index ce5bf06cb..a4eeac8a4 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojFiles/App/App.csproj +++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojFiles/App/App.csproj @@ -3,7 +3,7 @@ Exe - netcoreapp2.0 + netcoreapp2.1 diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDir/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDir/App.csproj index 92f102c88..1fed155a1 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDir/App.csproj +++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDir/App.csproj @@ -3,7 +3,7 @@ Exe - netcoreapp2.0 + netcoreapp2.1 diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/App.csproj index abea1bc3d..5ba5d5bac 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/App.csproj +++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/App.csproj @@ -3,7 +3,7 @@ Exe - netcoreapp2.0 + netcoreapp2.1 diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojProjectGuidFiles/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCsprojProjectGuidFiles/App/App.csproj index ce5bf06cb..a4eeac8a4 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojProjectGuidFiles/App/App.csproj +++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojProjectGuidFiles/App/App.csproj @@ -3,7 +3,7 @@ Exe - netcoreapp2.0 + netcoreapp2.1 diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/App/App.csproj index 7a2163613..45701ff71 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/App/App.csproj +++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/App/App.csproj @@ -3,7 +3,7 @@ Exe - netcoreapp2.0 + netcoreapp2.1 diff --git a/TestAssets/TestProjects/TestAppWithSlnAndDuplicateProjectReferences/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndDuplicateProjectReferences/App/App.csproj index ce5bf06cb..a4eeac8a4 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndDuplicateProjectReferences/App/App.csproj +++ b/TestAssets/TestProjects/TestAppWithSlnAndDuplicateProjectReferences/App/App.csproj @@ -3,7 +3,7 @@ Exe - netcoreapp2.0 + netcoreapp2.1 diff --git a/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferences/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferences/App/App.csproj index 21cce6681..5469ce225 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferences/App/App.csproj +++ b/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferences/App/App.csproj @@ -3,7 +3,7 @@ Exe - netcoreapp2.0 + netcoreapp2.1 diff --git a/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferencesWithEscapedDirSep/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferencesWithEscapedDirSep/App/App.csproj index 21cce6681..5469ce225 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferencesWithEscapedDirSep/App/App.csproj +++ b/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferencesWithEscapedDirSep/App/App.csproj @@ -3,7 +3,7 @@ Exe - netcoreapp2.0 + netcoreapp2.1 diff --git a/TestAssets/TestProjects/TestAppWithSlnAndLastCsprojInSubDirToRemove/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndLastCsprojInSubDirToRemove/App.csproj index abea1bc3d..5ba5d5bac 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndLastCsprojInSubDirToRemove/App.csproj +++ b/TestAssets/TestProjects/TestAppWithSlnAndLastCsprojInSubDirToRemove/App.csproj @@ -3,7 +3,7 @@ Exe - netcoreapp2.0 + netcoreapp2.1 diff --git a/TestAssets/TestProjects/TestAppWithSlnAndSolutionFolders/src/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndSolutionFolders/src/App/App.csproj index 3a31eb5bf..358a47d7c 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndSolutionFolders/src/App/App.csproj +++ b/TestAssets/TestProjects/TestAppWithSlnAndSolutionFolders/src/App/App.csproj @@ -3,7 +3,7 @@ Exe - netcoreapp2.0 + netcoreapp2.1 diff --git a/TestAssets/TestProjects/VBTestApp/VBTestApp.vbproj b/TestAssets/TestProjects/VBTestApp/VBTestApp.vbproj index ce1697ae8..23df6047f 100644 --- a/TestAssets/TestProjects/VBTestApp/VBTestApp.vbproj +++ b/TestAssets/TestProjects/VBTestApp/VBTestApp.vbproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.0 + netcoreapp2.1 diff --git a/TestAssets/TestProjects/VSTestCore/VSTestCore.csproj b/TestAssets/TestProjects/VSTestCore/VSTestCore.csproj index 0d07738af..87c96e9b2 100644 --- a/TestAssets/TestProjects/VSTestCore/VSTestCore.csproj +++ b/TestAssets/TestProjects/VSTestCore/VSTestCore.csproj @@ -3,7 +3,7 @@ Exe - netcoreapp2.0 + netcoreapp2.1 diff --git a/TestAssets/TestProjects/VSTestMulti/VSTestDesktopAndNetCore.csproj b/TestAssets/TestProjects/VSTestMulti/VSTestDesktopAndNetCore.csproj index 1a8fb8e53..1311e72ea 100644 --- a/TestAssets/TestProjects/VSTestMulti/VSTestDesktopAndNetCore.csproj +++ b/TestAssets/TestProjects/VSTestMulti/VSTestDesktopAndNetCore.csproj @@ -2,7 +2,7 @@ - net46;netcoreapp2.0 + net46;netcoreapp2.1 diff --git a/TestAssets/TestProjects/XunitCore/XunitCore.csproj b/TestAssets/TestProjects/XunitCore/XunitCore.csproj index d6016beea..f2721a220 100644 --- a/TestAssets/TestProjects/XunitCore/XunitCore.csproj +++ b/TestAssets/TestProjects/XunitCore/XunitCore.csproj @@ -3,7 +3,7 @@ Exe - netcoreapp2.0 + netcoreapp2.1 diff --git a/TestAssets/TestProjects/XunitMulti/VSTestXunitDesktopAndNetCore.csproj b/TestAssets/TestProjects/XunitMulti/VSTestXunitDesktopAndNetCore.csproj index 3c971a5e9..350f2c991 100644 --- a/TestAssets/TestProjects/XunitMulti/VSTestXunitDesktopAndNetCore.csproj +++ b/TestAssets/TestProjects/XunitMulti/VSTestXunitDesktopAndNetCore.csproj @@ -2,7 +2,7 @@ - net46;netcoreapp2.0 + net46;netcoreapp2.1 win7-x86 win7-x86 @@ -11,7 +11,7 @@ DESKTOP;$(DefineConstants) - + From dc4046ca7ecdf30b6fd63ddb92fe6d868c52991e Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 18 Aug 2017 15:36:01 -0700 Subject: [PATCH 13/20] Update test code to use netcoreapp2.1 --- test/EndToEnd/GivenDotNetUsesMSBuild.cs | 4 ++-- .../GivenAProjectDependenciesCommandFactory.cs | 2 +- .../GivenAProjectToolsCommandResolver.cs | 2 +- .../GivenDotnetPackageAdd.cs | 2 +- .../GivenDotnetBuildBuildsCsproj.cs | 8 ++++---- .../GivenDotnetCleanCleansBuildArtifacts.cs | 2 +- .../GivenDotnetPublishPublishesProjects.cs | 18 +++++++++--------- .../GivenDotnetRunRunsCsProj.cs | 4 ++-- .../GivenDotnetStoresAndPublishesProjects.cs | 2 +- ...uildsAndRunsTestFromCsprojForMultipleTFM.cs | 6 +++--- ...venDotnetTestBuildsAndRunsTestfromCsproj.cs | 2 +- test/dotnet-vstest.Tests/VSTestTests.cs | 2 +- test/dotnet.Tests/GivenThatICareAboutVBApps.cs | 2 +- test/dotnet.Tests/PackagedCommandTests.cs | 4 ++-- 14 files changed, 30 insertions(+), 30 deletions(-) diff --git a/test/EndToEnd/GivenDotNetUsesMSBuild.cs b/test/EndToEnd/GivenDotNetUsesMSBuild.cs index f714ee38c..9c79fb94e 100644 --- a/test/EndToEnd/GivenDotNetUsesMSBuild.cs +++ b/test/EndToEnd/GivenDotNetUsesMSBuild.cs @@ -19,7 +19,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd { string projectDirectory = directory.Path; - string newArgs = "console -f netcoreapp2.0 --debug:ephemeral-hive --no-restore"; + string newArgs = "console -f netcoreapp2.1 --debug:ephemeral-hive --no-restore"; new NewCommandShim() .WithWorkingDirectory(projectDirectory) .Execute(newArgs) @@ -112,7 +112,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd new DotnetCommand(DotnetUnderTest.WithBackwardsCompatibleRuntimes) .WithWorkingDirectory(testProjectDirectory) .ExecuteWithCapturedOutput( - $"-d dependency-tool-invoker -c {configuration} -f netcoreapp2.0 portable") + $"-d dependency-tool-invoker -c {configuration} -f netcoreapp2.1 portable") .Should().Pass() .And.HaveStdOutContaining("Hello Portable World!");; } diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependenciesCommandFactory.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependenciesCommandFactory.cs index 109a449fc..9ad6087f1 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependenciesCommandFactory.cs +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependenciesCommandFactory.cs @@ -198,7 +198,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests var command = factory.Create("dotnet-tool-with-output-name", null); command.CommandArgs.Should().Contain( - Path.Combine("toolwithoutputname", "1.0.0", "lib", "netcoreapp2.0", "dotnet-tool-with-output-name.dll")); + Path.Combine("toolwithoutputname", "1.0.0", "lib", "netcoreapp2.1", "dotnet-tool-with-output-name.dll")); } } } diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs index 83a877151..7c0c745fb 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs @@ -375,7 +375,7 @@ namespace Microsoft.DotNet.Tests "dotnet-fallbackfoldertool", "1.0.0", "lib", - "netcoreapp2.0", + "netcoreapp2.1", "dotnet-fallbackfoldertool.dll")); } diff --git a/test/dotnet-add-package.Tests/GivenDotnetPackageAdd.cs b/test/dotnet-add-package.Tests/GivenDotnetPackageAdd.cs index 356d86ce4..268c64f33 100644 --- a/test/dotnet-add-package.Tests/GivenDotnetPackageAdd.cs +++ b/test/dotnet-add-package.Tests/GivenDotnetPackageAdd.cs @@ -107,7 +107,7 @@ namespace Microsoft.DotNet.Cli.Package.Add.Tests var packageName = "Newtonsoft.Json"; var packageVersion = "9.0.1"; - var framework = "netcoreapp2.0"; + var framework = "netcoreapp2.1"; var cmd = new DotnetCommand() .WithWorkingDirectory(projectDirectory) .ExecuteWithCapturedOutput($"add package {packageName} --version {packageVersion} --framework {framework}"); diff --git a/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs b/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs index febd7a9b3..fd2209bb9 100644 --- a/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs +++ b/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs @@ -29,7 +29,7 @@ namespace Microsoft.DotNet.Cli.Build.Tests var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug"; - var outputDll = testInstance.Root.GetDirectory("bin", configuration, "netcoreapp2.0") + var outputDll = testInstance.Root.GetDirectory("bin", configuration, "netcoreapp2.1") .GetFile($"{testAppName}.dll"); var outputRunCommand = new DotnetCommand(); @@ -66,7 +66,7 @@ namespace Microsoft.DotNet.Cli.Build.Tests new BuildCommand() .WithWorkingDirectory(projectDirectory) - .Execute("--framework netcoreapp2.0") + .Execute("--framework netcoreapp2.1") .Should().Pass(); } @@ -93,7 +93,7 @@ namespace Microsoft.DotNet.Cli.Build.Tests string dir = "pkgs"; string args = $"--packages {dir}"; - string newArgs = $"console -f netcoreapp2.0 -o \"{rootPath}\" --debug:ephemeral-hive --no-restore"; + string newArgs = $"console -f netcoreapp2.1 -o \"{rootPath}\" --debug:ephemeral-hive --no-restore"; new NewCommandShim() .WithWorkingDirectory(rootPath) .Execute(newArgs) @@ -115,7 +115,7 @@ namespace Microsoft.DotNet.Cli.Build.Tests var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug"; var outputDll = Directory.EnumerateFiles( - Path.Combine(rootPath, "bin", configuration, "netcoreapp2.0"), "*.dll", + Path.Combine(rootPath, "bin", configuration, "netcoreapp2.1"), "*.dll", SearchOption.TopDirectoryOnly) .Single(); diff --git a/test/dotnet-clean.Tests/GivenDotnetCleanCleansBuildArtifacts.cs b/test/dotnet-clean.Tests/GivenDotnetCleanCleansBuildArtifacts.cs index 7ac4dd0e6..474a7f2b1 100644 --- a/test/dotnet-clean.Tests/GivenDotnetCleanCleansBuildArtifacts.cs +++ b/test/dotnet-clean.Tests/GivenDotnetCleanCleansBuildArtifacts.cs @@ -28,7 +28,7 @@ namespace Microsoft.DotNet.Cli.Clean.Tests .Should().Pass(); var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug"; - var outputFolder = testInstance.Root.GetDirectory("bin", configuration, "netcoreapp2.0", "win7-x64"); + var outputFolder = testInstance.Root.GetDirectory("bin", configuration, "netcoreapp2.1", "win7-x64"); outputFolder.Should().NotBeEmpty(); diff --git a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs index 2db2018fa..aa705a0c2 100644 --- a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs +++ b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs @@ -33,11 +33,11 @@ namespace Microsoft.DotNet.Cli.Publish.Tests new PublishCommand() .WithWorkingDirectory(testProjectDirectory) - .Execute("--framework netcoreapp2.0") + .Execute("--framework netcoreapp2.1") .Should().Pass(); var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug"; - var outputDll = Path.Combine(testProjectDirectory, "bin", configuration, "netcoreapp2.0", "publish", $"{testAppName}.dll"); + var outputDll = Path.Combine(testProjectDirectory, "bin", configuration, "netcoreapp2.1", "publish", $"{testAppName}.dll"); new DotnetCommand() .ExecuteWithCapturedOutput(outputDll) @@ -57,7 +57,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests new PublishCommand() .WithWorkingDirectory(testProjectDirectory) - .Execute("--framework netcoreapp2.0") + .Execute("--framework netcoreapp2.1") .Should().Pass(); } @@ -74,7 +74,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests new PublishCommand() .WithWorkingDirectory(projectDirectory) - .Execute("--framework netcoreapp2.0") + .Execute("--framework netcoreapp2.1") .Should().Pass(); } @@ -90,7 +90,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests new PublishCommand() .WithWorkingDirectory(testProjectDirectory) - .ExecuteWithCapturedOutput("--framework netcoreapp2.0 --no-restore") + .ExecuteWithCapturedOutput("--framework netcoreapp2.1 --no-restore") .Should().Fail() .And.HaveStdOutContaining("project.assets.json"); } @@ -110,7 +110,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests var rid = DotnetLegacyRuntimeIdentifiers.InferLegacyRestoreRuntimeIdentifier(); new PublishCommand() - .WithFramework("netcoreapp2.0") + .WithFramework("netcoreapp2.1") .WithRuntime(rid) .WithWorkingDirectory(testProjectDirectory) .Execute() @@ -119,7 +119,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug"; var outputProgram = testProjectDirectory - .GetDirectory("bin", configuration, "netcoreapp2.0", rid, "publish", $"{testAppName}{Constants.ExeSuffix}") + .GetDirectory("bin", configuration, "netcoreapp2.1", rid, "publish", $"{testAppName}{Constants.ExeSuffix}") .FullName; EnsureProgramIsRunnable(outputProgram); @@ -185,7 +185,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug"; return testProjectDirectory - .GetDirectory("bin", configuration, "netcoreapp2.0", rid, "publish"); + .GetDirectory("bin", configuration, "netcoreapp2.1", rid, "publish"); } private static void EnsureProgramIsRunnable(string path) @@ -227,7 +227,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug"; var outputProgram = rootDir - .GetDirectory("bin", configuration, "netcoreapp2.0", "publish", $"{rootDir.Name}.dll") + .GetDirectory("bin", configuration, "netcoreapp2.1", "publish", $"{rootDir.Name}.dll") .FullName; new TestCommand(outputProgram) diff --git a/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs b/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs index 5fa67328e..c55c70800 100644 --- a/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs +++ b/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs @@ -70,7 +70,7 @@ namespace Microsoft.DotNet.Cli.Run.Tests new RunCommand() .WithWorkingDirectory(projectDirectory) - .ExecuteWithCapturedOutput("--framework netcoreapp2.0") + .ExecuteWithCapturedOutput("--framework netcoreapp2.1") .Should().Pass() .And.HaveStdOutContaining("This string came from the test library!"); } @@ -131,7 +131,7 @@ namespace Microsoft.DotNet.Cli.Run.Tests new RunCommand() .WithWorkingDirectory(testProjectDirectory) - .ExecuteWithCapturedOutput("--framework netcoreapp2.0") + .ExecuteWithCapturedOutput("--framework netcoreapp2.1") .Should().Pass() .And.HaveStdOutContaining("Hello World!"); } diff --git a/test/dotnet-store.Tests/GivenDotnetStoresAndPublishesProjects.cs b/test/dotnet-store.Tests/GivenDotnetStoresAndPublishesProjects.cs index 00360f446..f62cd8d1e 100644 --- a/test/dotnet-store.Tests/GivenDotnetStoresAndPublishesProjects.cs +++ b/test/dotnet-store.Tests/GivenDotnetStoresAndPublishesProjects.cs @@ -13,7 +13,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests { public class GivenDotnetStoresAndPublishesProjects : TestBase { - private static string _tfm = "netcoreapp2.0"; + private static string _tfm = "netcoreapp2.1"; private static string _frameworkVersion = TestAssetInstance.CurrentRuntimeFrameworkVersion; private static string _arch = RuntimeEnvironment.RuntimeArchitecture.ToLowerInvariant(); diff --git a/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestFromCsprojForMultipleTFM.cs b/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestFromCsprojForMultipleTFM.cs index adfc7b0d4..f86e370ce 100644 --- a/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestFromCsprojForMultipleTFM.cs +++ b/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestFromCsprojForMultipleTFM.cs @@ -40,8 +40,8 @@ namespace Microsoft.DotNet.Cli.Test.Tests result.StdOut .Should().Contain("Total tests: 3. Passed: 2. Failed: 1. Skipped: 0.", "because .NET 4.6 tests will pass") .And.Contain("Passed TestNamespace.VSTestTests.VSTestPassTestDesktop", "because .NET 4.6 tests will pass") - .And.Contain("Total tests: 3. Passed: 1. Failed: 2. Skipped: 0.", "because netcoreapp2.0 tests will fail") - .And.Contain("Failed TestNamespace.VSTestTests.VSTestFailTestNetCoreApp", "because netcoreapp2.0 tests will fail"); + .And.Contain("Total tests: 3. Passed: 1. Failed: 2. Skipped: 0.", "because netcoreapp2.1 tests will fail") + .And.Contain("Failed TestNamespace.VSTestTests.VSTestFailTestNetCoreApp", "because netcoreapp2.1 tests will fail"); } result.ExitCode.Should().Be(1); } @@ -97,7 +97,7 @@ namespace Microsoft.DotNet.Cli.Test.Tests new DotnetTestCommand() .WithWorkingDirectory(projectDirectory) - .ExecuteWithCapturedOutput($"{TestBase.ConsoleLoggerOutputNormal} --framework netcoreapp2.0") + .ExecuteWithCapturedOutput($"{TestBase.ConsoleLoggerOutputNormal} --framework netcoreapp2.1") .Should().Pass(); } } diff --git a/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs b/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs index 807688463..855e2865d 100644 --- a/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs +++ b/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs @@ -117,7 +117,7 @@ namespace Microsoft.DotNet.Cli.Test.Tests var testProjectDirectory = this.CopyAndRestoreVSTestDotNetCoreTestApp("5"); string configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug"; string expectedError = Path.Combine(testProjectDirectory, "bin", - configuration, "netcoreapp2.0", "VSTestCore.dll"); + configuration, "netcoreapp2.1", "VSTestCore.dll"); expectedError = "The test source file " + "\"" + expectedError + "\"" + " provided was not found."; // Call test diff --git a/test/dotnet-vstest.Tests/VSTestTests.cs b/test/dotnet-vstest.Tests/VSTestTests.cs index 47eae7e89..6daefe831 100644 --- a/test/dotnet-vstest.Tests/VSTestTests.cs +++ b/test/dotnet-vstest.Tests/VSTestTests.cs @@ -31,7 +31,7 @@ namespace Microsoft.DotNet.Cli.VSTest.Tests .Should().Pass(); var outputDll = testRoot - .GetDirectory("bin", configuration, "netcoreapp2.0") + .GetDirectory("bin", configuration, "netcoreapp2.1") .GetFile($"{testAppName}.dll"); var argsForVstest = $"\"{outputDll.FullName}\" --logger:console;verbosity=normal"; diff --git a/test/dotnet.Tests/GivenThatICareAboutVBApps.cs b/test/dotnet.Tests/GivenThatICareAboutVBApps.cs index 4b7d0186b..26fb40dd4 100644 --- a/test/dotnet.Tests/GivenThatICareAboutVBApps.cs +++ b/test/dotnet.Tests/GivenThatICareAboutVBApps.cs @@ -57,7 +57,7 @@ namespace Microsoft.DotNet.Tests _testInstance.Root.FullName, "bin", configuration, - "netcoreapp2.0", + "netcoreapp2.1", "publish", "VBTestApp.dll"); diff --git a/test/dotnet.Tests/PackagedCommandTests.cs b/test/dotnet.Tests/PackagedCommandTests.cs index 27c08b918..66f2eb1bf 100644 --- a/test/dotnet.Tests/PackagedCommandTests.cs +++ b/test/dotnet.Tests/PackagedCommandTests.cs @@ -175,7 +175,7 @@ namespace Microsoft.DotNet.Tests ".tools", toolName); - // Other tests may have restored the tool for netcoreapp2.0, so delete its tools folder + // Other tests may have restored the tool for netcoreapp2.1, so delete its tools folder if (Directory.Exists(toolFolder)) { Directory.Delete(toolFolder, true); @@ -423,7 +423,7 @@ namespace Microsoft.DotNet.Tests .WithRestoreFiles(); var assetsFile = new DirectoryInfo(new RepoDirectoriesProvider().NugetPackages) - .GetDirectory(".tools", "dotnet-portable", "1.0.0", "netcoreapp2.0") + .GetDirectory(".tools", "dotnet-portable", "1.0.0", "netcoreapp2.1") .GetFile("project.assets.json"); var stopWatch = Stopwatch.StartNew(); From 60e5fabde2dc3f304a3fc8a28833a7835d354af4 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 18 Aug 2017 18:07:14 -0700 Subject: [PATCH 14/20] Update tool tests to target netcoreapp2.1 --- .../GivenAProjectDependenciesCommandFactory.cs | 3 ++- .../GivenAProjectDependencyCommandResolver.cs | 9 +++++---- .../GivenAProjectToolsCommandResolver.cs | 5 +++-- .../NuGetFrameworks.cs | 14 ++++++++++++++ test/dotnet-new.Tests/GivenThatIWantANewApp.cs | 2 +- test/dotnet.Tests/PackagedCommandTests.cs | 4 ++-- 6 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 test/Microsoft.DotNet.Tools.Tests.Utilities/NuGetFrameworks.cs diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependenciesCommandFactory.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependenciesCommandFactory.cs index 9ad6087f1..a3f5976f5 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependenciesCommandFactory.cs +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependenciesCommandFactory.cs @@ -8,6 +8,7 @@ using Microsoft.DotNet.TestFramework; using Microsoft.DotNet.Tools.Test.Utilities; using NuGet.Frameworks; using Xunit; +using Microsoft.DotNet.Tools.Tests.Utilities; namespace Microsoft.DotNet.Cli.Utils.Tests { @@ -189,7 +190,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests .Should().Pass(); var factory = new ProjectDependenciesCommandFactory( - FrameworkConstants.CommonFrameworks.NetCoreApp20, + NuGetFrameworks.NetCoreApp21, configuration, null, null, diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependencyCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependencyCommandResolver.cs index 74e4ec4e1..a7b6c402e 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependencyCommandResolver.cs +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependencyCommandResolver.cs @@ -11,6 +11,7 @@ using Microsoft.DotNet.TestFramework; using Microsoft.DotNet.Tools.Test.Utilities; using NuGet.Frameworks; using Xunit; +using Microsoft.DotNet.Tools.Tests.Utilities; namespace Microsoft.DotNet.Cli.Utils.Tests { @@ -47,7 +48,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests CommandName = "dotnet-portable", Configuration = "Debug", ProjectDirectory = MSBuildTestProjectInstance.Root.FullName, - Framework = FrameworkConstants.CommonFrameworks.NetCoreApp20 + Framework = NuGetFrameworks.NetCoreApp21 }; var result = projectDependenciesCommandResolver.Resolve(commandResolverArguments); @@ -83,7 +84,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests CommandName = "dotnet-portable", Configuration = "Debug", ProjectDirectory = MSBuildTestProjectInstance.Root.FullName, - Framework = FrameworkConstants.CommonFrameworks.NetCoreApp20 + Framework = NuGetFrameworks.NetCoreApp21 }; var result = projectDependenciesCommandResolver.Resolve(commandResolverArguments); @@ -109,7 +110,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests CommandName = "nonexistent-command", CommandArguments = null, ProjectDirectory = MSBuildTestProjectInstance.Root.FullName, - Framework = FrameworkConstants.CommonFrameworks.NetCoreApp20 + Framework = NuGetFrameworks.NetCoreApp21 }; var result = projectDependenciesCommandResolver.Resolve(commandResolverArguments); @@ -135,7 +136,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests CommandName = "dotnet-portable", Configuration = "Debug", ProjectDirectory = testInstance.Root.FullName, - Framework = FrameworkConstants.CommonFrameworks.NetCoreApp20, + Framework = NuGetFrameworks.NetCoreApp21, OutputPath = outputDir.FullName }; diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs index 7c0c745fb..aa25f2bd8 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs @@ -12,13 +12,14 @@ using NuGet.Frameworks; using NuGet.ProjectModel; using NuGet.Versioning; using Xunit; +using Microsoft.DotNet.Tools.Tests.Utilities; namespace Microsoft.DotNet.Tests { public class GivenAProjectToolsCommandResolver : TestBase { private static readonly NuGetFramework s_toolPackageFramework = - FrameworkConstants.CommonFrameworks.NetCoreApp20; + NuGetFrameworks.NetCoreApp21; private const string TestProjectName = "AppWithToolDependency"; @@ -309,7 +310,7 @@ namespace Microsoft.DotNet.Tests result.Should().NotBeNull(); - result.Args.Should().Contain("--fx-version 2.0.0"); + result.Args.Should().Contain("--fx-version 2.1.0"); } [Fact] diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/NuGetFrameworks.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/NuGetFrameworks.cs new file mode 100644 index 000000000..c82d78051 --- /dev/null +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/NuGetFrameworks.cs @@ -0,0 +1,14 @@ +using NuGet.Frameworks; +using System; +using System.Collections.Generic; +using System.Text; + +namespace Microsoft.DotNet.Tools.Tests.Utilities +{ + // This class is for frameworks that aren't yet in NuGet's FrameworkConstants.CommonFrameworks class + public static class NuGetFrameworks + { + public static readonly NuGetFramework NetCoreApp21 + = new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.NetCoreApp, new Version(2, 1, 0, 0)); + } +} diff --git a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs index a468bd7b8..abe5a7dc6 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs @@ -105,7 +105,7 @@ namespace Microsoft.DotNet.New.Tests var sharedFxDir = dotnetDir .GetDirectory("shared", "Microsoft.NETCore.App") .EnumerateDirectories() - .Single(d => d.Name.StartsWith("2.0.0")); + .Single(d => d.Name.StartsWith("2.1.0")); if (packageName == "microsoft.netcore.app") { diff --git a/test/dotnet.Tests/PackagedCommandTests.cs b/test/dotnet.Tests/PackagedCommandTests.cs index 66f2eb1bf..6e36eb87f 100644 --- a/test/dotnet.Tests/PackagedCommandTests.cs +++ b/test/dotnet.Tests/PackagedCommandTests.cs @@ -246,8 +246,8 @@ namespace Microsoft.DotNet.Tests .CreateInstance() .WithSourceFiles() .WithRestoreFiles(); - - const string framework = ".NETCoreApp,Version=v2.0"; + + string framework = Tools.Tests.Utilities.NuGetFrameworks.NetCoreApp21.DotNetFrameworkName; new BuildCommand() .WithProjectDirectory(testInstance.Root) From 360e657884387b8729d8272e9adda3a9e44b9091 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 18 Aug 2017 18:07:57 -0700 Subject: [PATCH 15/20] Disable tests that require templates that target .NET Core 2.1 (which aren't available yet) --- test/EndToEnd/GivenDotNetUsesMSBuild.cs | 2 +- test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs | 2 +- test/dotnet-new.Tests/GivenThatIWantANewApp.cs | 2 +- .../dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs | 3 ++- .../GivenDotnetPublishPublishesProjects.cs | 2 +- test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/test/EndToEnd/GivenDotNetUsesMSBuild.cs b/test/EndToEnd/GivenDotNetUsesMSBuild.cs index 9c79fb94e..b0d3f1900 100644 --- a/test/EndToEnd/GivenDotNetUsesMSBuild.cs +++ b/test/EndToEnd/GivenDotNetUsesMSBuild.cs @@ -12,7 +12,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd { public class GivenDotNetUsesMSBuild : TestBase { - [Fact] + [Fact(Skip = "https://github.com/dotnet/cli/issues/7476")] public void ItCanNewRestoreBuildRunCleanMSBuildProject() { using (DisposableDirectory directory = Temp.CreateDirectory()) diff --git a/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs b/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs index fd2209bb9..351e73539 100644 --- a/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs +++ b/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs @@ -85,7 +85,7 @@ namespace Microsoft.DotNet.Cli.Build.Tests .And.HaveStdOutContaining("project.assets.json"); } - [Fact] + [Fact(Skip = "https://github.com/dotnet/cli/issues/7476")] public void ItRunsWhenRestoringToSpecificPackageDir() { var rootPath = TestAssets.CreateTestDirectory().FullName; diff --git a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs index abe5a7dc6..7a7b37792 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs @@ -74,7 +74,7 @@ namespace Microsoft.DotNet.New.Tests .Should().Pass(); } - [Theory] + [Theory(Skip = "https://github.com/dotnet/cli/issues/7476")] [InlineData("console", "RuntimeFrameworkVersion", "microsoft.netcore.app")] [InlineData("classlib", "NetStandardImplicitPackageVersion", "netstandard.library")] public void NewProjectRestoresCorrectPackageVersion(string type, string propertyName, string packageName) diff --git a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs index 96bb47c51..fc412edef 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs @@ -27,7 +27,8 @@ namespace Microsoft.DotNet.New.Tests [InlineData("C#", "react", false, true)] [InlineData("C#", "reactredux", false, true)] [InlineData("F#", "console", false, false)] - [InlineData("F#", "classlib", false, false)] + // https://github.com/dotnet/cli/issues/7476 + //[InlineData("F#", "classlib", false, false)] [InlineData("F#", "mstest", false, false)] [InlineData("F#", "xunit", false, false)] [InlineData("F#", "mvc", true, false)] diff --git a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs index aa705a0c2..e13769d0e 100644 --- a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs +++ b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs @@ -197,7 +197,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests } } - [Fact] + [Fact(Skip = "https://github.com/dotnet/cli/issues/7476")] public void ItPublishesAppWhenRestoringToSpecificPackageDirectory() { var rootPath = TestAssets.CreateTestDirectory().FullName; diff --git a/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs b/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs index c55c70800..3d58f41e5 100644 --- a/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs +++ b/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs @@ -192,7 +192,7 @@ namespace Microsoft.DotNet.Cli.Run.Tests .And.HaveStdOutContaining("Hello World!"); } - [Fact] + [Fact(Skip = "https://github.com/dotnet/cli/issues/7476")] public void ItRunsAppWhenRestoringToSpecificPackageDirectory() { var rootPath = TestAssets.CreateTestDirectory().FullName; From b855c1ec0e12f7d2b2d4aad8ec7cf60389aa2234 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Pedro?= Date: Sat, 19 Aug 2017 19:18:48 +0100 Subject: [PATCH 16/20] Renamed 'Runtime Package Store' to 'Runtime Store'. --- packaging/osx/clisdk/resources/cs.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/de.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/en.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/es.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/fr.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/it.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/ja.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/ko.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/pl.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/ru.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/tr.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html | 2 +- packaging/windows/clisdk/bundle.wxl | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html index a4b936329..ecd206c4b 100644 --- a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html @@ -9,7 +9,7 @@
  • .NET Core SDK 2.0.0
  • .NET Core Runtime 2.0.0
    • -
  • Runtime Package Store
    • +
  • Runtime Store

diff --git a/packaging/osx/clisdk/resources/de.lproj/conclusion.html b/packaging/osx/clisdk/resources/de.lproj/conclusion.html index a4b936329..ecd206c4b 100644 --- a/packaging/osx/clisdk/resources/de.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/de.lproj/conclusion.html @@ -9,7 +9,7 @@
  • .NET Core SDK 2.0.0
  • .NET Core Runtime 2.0.0
    • -
  • Runtime Package Store
    • +
  • Runtime Store

diff --git a/packaging/osx/clisdk/resources/en.lproj/conclusion.html b/packaging/osx/clisdk/resources/en.lproj/conclusion.html index a4b936329..ecd206c4b 100644 --- a/packaging/osx/clisdk/resources/en.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/en.lproj/conclusion.html @@ -9,7 +9,7 @@
  • .NET Core SDK 2.0.0
  • .NET Core Runtime 2.0.0
    • -
  • Runtime Package Store
    • +
  • Runtime Store

diff --git a/packaging/osx/clisdk/resources/es.lproj/conclusion.html b/packaging/osx/clisdk/resources/es.lproj/conclusion.html index a4b936329..ecd206c4b 100644 --- a/packaging/osx/clisdk/resources/es.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/es.lproj/conclusion.html @@ -9,7 +9,7 @@
  • .NET Core SDK 2.0.0
  • .NET Core Runtime 2.0.0
    • -
  • Runtime Package Store
    • +
  • Runtime Store

diff --git a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html index a4b936329..ecd206c4b 100644 --- a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html @@ -9,7 +9,7 @@
  • .NET Core SDK 2.0.0
  • .NET Core Runtime 2.0.0
    • -
  • Runtime Package Store
    • +
  • Runtime Store

diff --git a/packaging/osx/clisdk/resources/it.lproj/conclusion.html b/packaging/osx/clisdk/resources/it.lproj/conclusion.html index a4b936329..ecd206c4b 100644 --- a/packaging/osx/clisdk/resources/it.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/it.lproj/conclusion.html @@ -9,7 +9,7 @@
  • .NET Core SDK 2.0.0
  • .NET Core Runtime 2.0.0
    • -
  • Runtime Package Store
    • +
  • Runtime Store

diff --git a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html index a4b936329..ecd206c4b 100644 --- a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html @@ -9,7 +9,7 @@
  • .NET Core SDK 2.0.0
  • .NET Core Runtime 2.0.0
    • -
  • Runtime Package Store
    • +
  • Runtime Store

diff --git a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html index a4b936329..ecd206c4b 100644 --- a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html @@ -9,7 +9,7 @@
  • .NET Core SDK 2.0.0
  • .NET Core Runtime 2.0.0
    • -
  • Runtime Package Store
    • +
  • Runtime Store

diff --git a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html index a4b936329..ecd206c4b 100644 --- a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html @@ -9,7 +9,7 @@
  • .NET Core SDK 2.0.0
  • .NET Core Runtime 2.0.0
    • -
  • Runtime Package Store
    • +
  • Runtime Store

diff --git a/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html b/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html index a4b936329..ecd206c4b 100644 --- a/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html @@ -9,7 +9,7 @@
  • .NET Core SDK 2.0.0
  • .NET Core Runtime 2.0.0
    • -
  • Runtime Package Store
    • +
  • Runtime Store

diff --git a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html index a4b936329..ecd206c4b 100644 --- a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html @@ -9,7 +9,7 @@
  • .NET Core SDK 2.0.0
  • .NET Core Runtime 2.0.0
    • -
  • Runtime Package Store
    • +
  • Runtime Store

diff --git a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html index a4b936329..ecd206c4b 100644 --- a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html @@ -9,7 +9,7 @@
  • .NET Core SDK 2.0.0
  • .NET Core Runtime 2.0.0
    • -
  • Runtime Package Store
    • +
  • Runtime Store

diff --git a/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html b/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html index a4b936329..ecd206c4b 100644 --- a/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html @@ -9,7 +9,7 @@
  • .NET Core SDK 2.0.0
  • .NET Core Runtime 2.0.0
    • -
  • Runtime Package Store
    • +
  • Runtime Store

diff --git a/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html b/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html index a4b936329..ecd206c4b 100644 --- a/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html @@ -9,7 +9,7 @@
  • .NET Core SDK 2.0.0
  • .NET Core Runtime 2.0.0
    • -
  • Runtime Package Store
    • +
  • Runtime Store

diff --git a/packaging/windows/clisdk/bundle.wxl b/packaging/windows/clisdk/bundle.wxl index a5b12953c..13996d719 100644 --- a/packaging/windows/clisdk/bundle.wxl +++ b/packaging/windows/clisdk/bundle.wxl @@ -52,7 +52,7 @@ The following were installed at [DOTNETHOME] • .NET Core SDK 2.0.0 • .NET Core Runtime 2.0.0 - • Runtime Package Store + • Runtime Store This product collects usage data • More information and opt-out https://aka.ms/dotnet-cli-telemetry From a463a34ac51003234e8e4e583ab2f7a9dbc22a38 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 23 Aug 2017 10:40:26 -0700 Subject: [PATCH 17/20] Update CliTargetFramework to netcoreapp2.1, and switch from hardcoding to using the variable in places --- build.proj | 2 +- dir.props | 2 +- src/redist/redist.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.proj b/build.proj index bac606d59..3117ddb85 100644 --- a/build.proj +++ b/build.proj @@ -20,7 +20,7 @@ DependsOnTargets="MSBuildWorkaroundTarget; RestoreDotnetCliBuildFramework"> - diff --git a/dir.props b/dir.props index 756fccc32..eb03fece3 100644 --- a/dir.props +++ b/dir.props @@ -11,7 +11,7 @@ true true - netcoreapp2.0 + netcoreapp2.1 diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index c45cd6bdf..a6ad0ac3f 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -6,7 +6,7 @@ $(CliVersionPrefix) - netcoreapp2.0 + $(CliTargetFramework) $(CLI_SharedFrameworkVersion) true false From b461e75524b63688701162896defc09e0fed804f Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 23 Aug 2017 10:41:37 -0700 Subject: [PATCH 18/20] Disable tests on non-Windows due to bugs related to .NET Core 2.1 https://github.com/dotnet/corefx/issues/23496 https://github.com/dotnet/cli/issues/7501 --- test/ArgumentForwardingTests/ArgumentForwardingTests.cs | 3 ++- test/ArgumentForwardingTests/ArgumentForwardingTests.csproj | 3 ++- .../GivenDotnetStoresAndPublishesProjects.cs | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/test/ArgumentForwardingTests/ArgumentForwardingTests.cs b/test/ArgumentForwardingTests/ArgumentForwardingTests.cs index c4c01e644..10af8517e 100644 --- a/test/ArgumentForwardingTests/ArgumentForwardingTests.cs +++ b/test/ArgumentForwardingTests/ArgumentForwardingTests.cs @@ -42,7 +42,8 @@ namespace Microsoft.DotNet.Tests.ArgumentForwarding /// This is a critical scenario for the driver. /// /// - [Theory] + // This test is "Windows only" for now due to https://github.com/dotnet/corefx/issues/23496 + [WindowsOnlyTheory] [InlineData(@"""abc"" d e")] [InlineData(@"""ábc"" d é")] [InlineData(@"""abc"" d e")] diff --git a/test/ArgumentForwardingTests/ArgumentForwardingTests.csproj b/test/ArgumentForwardingTests/ArgumentForwardingTests.csproj index c71c5cf15..1a58c07c9 100644 --- a/test/ArgumentForwardingTests/ArgumentForwardingTests.csproj +++ b/test/ArgumentForwardingTests/ArgumentForwardingTests.csproj @@ -21,9 +21,10 @@ + + Condition=" '$(IsCrossTargetingBuild)' != 'true' And '$(OS)' == 'Windows_NT'"> diff --git a/test/dotnet-store.Tests/GivenDotnetStoresAndPublishesProjects.cs b/test/dotnet-store.Tests/GivenDotnetStoresAndPublishesProjects.cs index f62cd8d1e..a0e95d8f9 100644 --- a/test/dotnet-store.Tests/GivenDotnetStoresAndPublishesProjects.cs +++ b/test/dotnet-store.Tests/GivenDotnetStoresAndPublishesProjects.cs @@ -108,7 +108,8 @@ namespace Microsoft.DotNet.Cli.Publish.Tests " path: 'lib/netstandard1.3/NuGet.Configuration.dll'"); } - [Fact] + // Windows only for now due to https://github.com/dotnet/cli/issues/7501 + [WindowsOnlyFact] public void ItPublishesAnAppWithMultipleProfiles() { var testAppName = "MultiDependentProject"; From 83b92ee8d6e9baeb171f9ee89cba552a6654c667 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Thu, 24 Aug 2017 14:37:25 -0700 Subject: [PATCH 19/20] Pin Stage0 to a version with .NET Core 2.0 instead of 2.1 This will avoid https://github.com/dotnet/corefx/issues/23496, which https://github.com/dotnet/cli/pull/7506 will work around --- run-build.ps1 | 4 ++-- run-build.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/run-build.ps1 b/run-build.ps1 index 137c93d65..aa39c99b2 100644 --- a/run-build.ps1 +++ b/run-build.ps1 @@ -80,8 +80,8 @@ $env:VSTEST_TRACE_BUILD=1 # install a stage0 $dotnetInstallPath = Join-Path $RepoRoot "scripts\obtain\dotnet-install.ps1" -Write-Output "$dotnetInstallPath -Channel ""master"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture""" -Invoke-Expression "$dotnetInstallPath -Channel ""master"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture""" +Write-Output "$dotnetInstallPath -Channel ""master"" -version ""2.1.0-preview1-007063"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture""" +Invoke-Expression "$dotnetInstallPath -Channel ""master"" -version ""2.1.0-preview1-007063"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture""" if ($LastExitCode -ne 0) { Write-Output "The .NET CLI installation failed with exit code $LastExitCode" diff --git a/run-build.sh b/run-build.sh index dd011e544..7f7c6a04b 100755 --- a/run-build.sh +++ b/run-build.sh @@ -155,7 +155,7 @@ export VSTEST_TRACE_BUILD=1 export DOTNET_MULTILEVEL_LOOKUP=0 # Install a stage 0 -(set -x ; "$REPOROOT/scripts/obtain/dotnet-install.sh" --channel "master" --install-dir "$DOTNET_INSTALL_DIR" --architecture "$ARCHITECTURE" $LINUX_PORTABLE_INSTALL_ARGS) +(set -x ; "$REPOROOT/scripts/obtain/dotnet-install.sh" --channel "master" --version "2.1.0-preview1-007063" --install-dir "$DOTNET_INSTALL_DIR" --architecture "$ARCHITECTURE" $LINUX_PORTABLE_INSTALL_ARGS) EXIT_CODE=$? if [ $EXIT_CODE != 0 ]; then From ee5c02de77b5544cdc94970b89d84da4abba3d9a Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Thu, 24 Aug 2017 12:13:24 -0500 Subject: [PATCH 20/20] MSBuild 15.5.74 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 6ff571a5d..8c518409c 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -2,7 +2,7 @@ 2.1.0-preview2-25615-02 - 15.3.409 + 15.5.0-preview-000074-0946838 2.3.2-beta1-61921-05 2.3.0-pre-20170727-1 1.6.0-beta2-25304