From 4edbcb06eee68f154dc97f82d40868e6569e572e Mon Sep 17 00:00:00 2001 From: Shayne Boyer Date: Thu, 16 Feb 2017 16:10:19 -0500 Subject: [PATCH 01/22] misspelling of targeting --- Documentation/cli-installation-scenarios.md | 6 +++--- src/dotnet/MsbuildProject.cs | 2 +- .../dotnet-add/dotnet-add-package/LocalizableStrings.cs | 2 +- .../dotnet-add-package/xlf/LocalizableStrings.cs.xlf | 2 +- .../dotnet-add-package/xlf/LocalizableStrings.de.xlf | 2 +- .../dotnet-add-package/xlf/LocalizableStrings.es.xlf | 2 +- .../dotnet-add-package/xlf/LocalizableStrings.fr.xlf | 2 +- .../dotnet-add-package/xlf/LocalizableStrings.it.xlf | 2 +- .../dotnet-add-package/xlf/LocalizableStrings.ja.xlf | 2 +- .../dotnet-add-package/xlf/LocalizableStrings.ko.xlf | 2 +- .../dotnet-add-package/xlf/LocalizableStrings.pl.xlf | 2 +- .../dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf | 2 +- .../dotnet-add-package/xlf/LocalizableStrings.ru.xlf | 2 +- .../dotnet-add-package/xlf/LocalizableStrings.tr.xlf | 2 +- .../dotnet-add-package/xlf/LocalizableStrings.xlf | 2 +- .../dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf | 2 +- .../dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf | 2 +- .../dotnet-add/dotnet-add-reference/LocalizableStrings.cs | 2 +- .../commands/dotnet-add/dotnet-add-reference/Program.cs | 2 +- .../dotnet-add-reference/xlf/LocalizableStrings.cs.xlf | 2 +- .../dotnet-add-reference/xlf/LocalizableStrings.de.xlf | 2 +- .../dotnet-add-reference/xlf/LocalizableStrings.es.xlf | 2 +- .../dotnet-add-reference/xlf/LocalizableStrings.fr.xlf | 2 +- .../dotnet-add-reference/xlf/LocalizableStrings.it.xlf | 2 +- .../dotnet-add-reference/xlf/LocalizableStrings.ja.xlf | 2 +- .../dotnet-add-reference/xlf/LocalizableStrings.ko.xlf | 2 +- .../dotnet-add-reference/xlf/LocalizableStrings.pl.xlf | 2 +- .../dotnet-add-reference/xlf/LocalizableStrings.pt-BR.xlf | 2 +- .../dotnet-add-reference/xlf/LocalizableStrings.ru.xlf | 2 +- .../dotnet-add-reference/xlf/LocalizableStrings.tr.xlf | 2 +- .../dotnet-add-reference/xlf/LocalizableStrings.xlf | 2 +- .../dotnet-add-reference/xlf/LocalizableStrings.zh-Hans.xlf | 2 +- .../dotnet-add-reference/xlf/LocalizableStrings.zh-Hant.xlf | 2 +- .../dotnet-remove-reference/LocalizableStrings.cs | 2 +- .../dotnet-remove-reference/xlf/LocalizableStrings.cs.xlf | 2 +- .../dotnet-remove-reference/xlf/LocalizableStrings.de.xlf | 2 +- .../dotnet-remove-reference/xlf/LocalizableStrings.es.xlf | 2 +- .../dotnet-remove-reference/xlf/LocalizableStrings.fr.xlf | 2 +- .../dotnet-remove-reference/xlf/LocalizableStrings.it.xlf | 2 +- .../dotnet-remove-reference/xlf/LocalizableStrings.ja.xlf | 2 +- .../dotnet-remove-reference/xlf/LocalizableStrings.ko.xlf | 2 +- .../dotnet-remove-reference/xlf/LocalizableStrings.pl.xlf | 2 +- .../xlf/LocalizableStrings.pt-BR.xlf | 2 +- .../dotnet-remove-reference/xlf/LocalizableStrings.ru.xlf | 2 +- .../dotnet-remove-reference/xlf/LocalizableStrings.tr.xlf | 2 +- .../dotnet-remove-reference/xlf/LocalizableStrings.xlf | 2 +- .../xlf/LocalizableStrings.zh-Hans.xlf | 2 +- .../xlf/LocalizableStrings.zh-Hant.xlf | 2 +- .../Rules/GivenThatIWantToMigrateScripts.cs | 4 ++-- .../Rules/GivenThatIWantToMigrateTFMs.cs | 2 +- test/dotnet-add-reference.Tests/GivenDotnetAddReference.cs | 2 +- test/dotnet-remove-reference.Tests/GivenDotnetRemoveP2P.cs | 2 +- 52 files changed, 55 insertions(+), 55 deletions(-) diff --git a/Documentation/cli-installation-scenarios.md b/Documentation/cli-installation-scenarios.md index d028a45af..fa7f68223 100644 --- a/Documentation/cli-installation-scenarios.md +++ b/Documentation/cli-installation-scenarios.md @@ -422,7 +422,7 @@ ADD HKLM\SOFTWARE\WOW6432Node\dotnet\Setup\InstalledVersions\x86\sdk\[REG_DWORD] Installing 1.1.0-567890 (RTM) which is incompatible since 1.0.2 -Note: User is unable to run apps targetting 1.0.1 or 1.0.2 until compatible version is installed. +Note: User is unable to run apps targeting 1.0.1 or 1.0.2 until compatible version is installed. ``` NOP HKLM\SOFTWARE\WOW6432Node\dotnet\Setup\InstalledVersions\x86\sdk\[REG_DWORD]1.0.0-rc1=1 @@ -445,7 +445,7 @@ ADD HKLM\SOFTWARE\WOW6432Node\dotnet\Setup\InstalledVersions\x86\sdk\[REG_DWORD] Installing 1.0.0-rc2-123456 to a clean machine -Note: User is unable to run apps targetting 1.0.0 until RTM is installed. +Note: User is unable to run apps targeting 1.0.0 until RTM is installed. ``` ADD HKLM\SOFTWARE\WOW6432Node\dotnet\Setup\InstalledVersions\x86\sdk\[REG_DWORD]1.0.0-rc1=1 @@ -455,7 +455,7 @@ ADD HKLM\SOFTWARE\WOW6432Node\dotnet\Setup\InstalledVersions\x86\sdk\[REG_DWORD] Installing 1.0.1-rc1-234567 -Note: User is still unable to run apps targetting 1.0.0 until any 1.0.0+ RTM is installed. +Note: User is still unable to run apps targeting 1.0.0 until any 1.0.0+ RTM is installed. ``` NOP HKLM\SOFTWARE\WOW6432Node\dotnet\Setup\InstalledVersions\x86\sdk\[REG_DWORD]1.0.0-rc1=1 diff --git a/src/dotnet/MsbuildProject.cs b/src/dotnet/MsbuildProject.cs index 414ebf4cb..78518bab5 100644 --- a/src/dotnet/MsbuildProject.cs +++ b/src/dotnet/MsbuildProject.cs @@ -174,7 +174,7 @@ namespace Microsoft.DotNet.Tools return false; } - public bool IsTargettingFramework(NuGetFramework framework) + public bool IstargetingFramework(NuGetFramework framework) { foreach (var tfm in GetTargetFrameworks()) { diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.cs b/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.cs index 21f84fe76..2b1fed976 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.cs @@ -13,7 +13,7 @@ namespace Microsoft.DotNet.Tools.Add.PackageReference public const string SpecifyExactlyOnePackageReference = "Please specify one package reference to add."; - public const string CmdFrameworkDescription = "Add reference only when targetting a specific framework"; + public const string CmdFrameworkDescription = "Add reference only when targeting a specific framework"; public const string CmdNoRestoreDescription = "Add reference without performing restore preview and compatibility check."; diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.cs.xlf index 46213a706..81f41d71c 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.cs.xlf @@ -24,7 +24,7 @@ - Add reference only when targetting a specific framework + Add reference only when targeting a specific framework Přidat odkaz jen při zaměření na určitou platformu diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.de.xlf index 7bc4f9156..812a3c0a3 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.de.xlf @@ -24,7 +24,7 @@ - Add reference only when targetting a specific framework + Add reference only when targeting a specific framework Verweis nur bei Verwendung eines bestimmten Zielframeworks hinzufügen diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf index dfe725df3..8ae4e50a7 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf @@ -24,7 +24,7 @@ - Add reference only when targetting a specific framework + Add reference only when targeting a specific framework Se agrega una referencia solo cuando hay una plataforma de destino específica diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.fr.xlf index 15ca8160d..db5c7d0b4 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.fr.xlf @@ -24,7 +24,7 @@ - Add reference only when targetting a specific framework + Add reference only when targeting a specific framework Ajouter une référence uniquement en cas de ciblage d'un framework spécifique diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.it.xlf index 01156d8a5..7b04ffe81 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.it.xlf @@ -24,7 +24,7 @@ - Add reference only when targetting a specific framework + Add reference only when targeting a specific framework Aggiunge il riferimento solo se destinato a un framework specifico diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ja.xlf index d7df49f70..f4e1486d4 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ja.xlf @@ -24,7 +24,7 @@ - Add reference only when targetting a specific framework + Add reference only when targeting a specific framework 特定のフレームワークを対象とする場合にのみ参照を追加する diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ko.xlf index e0988549e..afad24c23 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ko.xlf @@ -24,7 +24,7 @@ - Add reference only when targetting a specific framework + Add reference only when targeting a specific framework 특정 프레임워크를 대상으로 지정할 때에만 참조를 추가합니다. diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pl.xlf index 33e240e00..ea5c4c903 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pl.xlf @@ -24,7 +24,7 @@ - Add reference only when targetting a specific framework + Add reference only when targeting a specific framework Dodaj odwołanie tylko w przypadku określenia konkretnej platformy docelowej diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf index cc564117f..3151acc6f 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf @@ -24,7 +24,7 @@ - Add reference only when targetting a specific framework + Add reference only when targeting a specific framework Adicionar referência apenas ao visar uma estrutura específica diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ru.xlf index 14d5108fc..2c738e3d8 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ru.xlf @@ -24,7 +24,7 @@ - Add reference only when targetting a specific framework + Add reference only when targeting a specific framework Добавлять ссылку только при выборе конкретной целевой платформы diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.tr.xlf index 9ad58f591..bba870af9 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.tr.xlf @@ -24,7 +24,7 @@ - Add reference only when targetting a specific framework + Add reference only when targeting a specific framework Yalnızca belirli bir çerçeveyi hedeflerken başvuru ekler diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.xlf index 5002b59b5..bd99ee489 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.xlf @@ -20,7 +20,7 @@ - Add reference only when targetting a specific framework + Add reference only when targeting a specific framework diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf index 2b50715d9..77a56e04b 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf @@ -24,7 +24,7 @@ - Add reference only when targetting a specific framework + Add reference only when targeting a specific framework 仅针对特定框架添加引用 diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf index 52e90f9ab..918afbb8f 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf @@ -24,7 +24,7 @@ - Add reference only when targetting a specific framework + Add reference only when targeting a specific framework 只有在以特定架構為目標時才新增參考 diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-reference/LocalizableStrings.cs b/src/dotnet/commands/dotnet-add/dotnet-add-reference/LocalizableStrings.cs index 5689cebf2..0e87d24bd 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-reference/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-add/dotnet-add-reference/LocalizableStrings.cs @@ -11,6 +11,6 @@ namespace Microsoft.DotNet.Tools.Add.ProjectToProjectReference public const string AppHelpText = "Project to project references to add"; - public const string CmdFrameworkDescription = "Add reference only when targetting a specific framework"; + public const string CmdFrameworkDescription = "Add reference only when targeting a specific framework"; } } diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-reference/Program.cs b/src/dotnet/commands/dotnet-add/dotnet-add-reference/Program.cs index b041d83ff..a35358366 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-reference/Program.cs +++ b/src/dotnet/commands/dotnet-add/dotnet-add-reference/Program.cs @@ -74,7 +74,7 @@ namespace Microsoft.DotNet.Tools.Add.ProjectToProjectReference else { var framework = NuGetFramework.Parse(frameworkString); - if (!msbuildProj.IsTargettingFramework(framework)) + if (!msbuildProj.IstargetingFramework(framework)) { Reporter.Error.WriteLine(string.Format( CommonLocalizableStrings.ProjectDoesNotTargetFramework, diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.cs.xlf index e7f2ec5a6..b3db50aea 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.cs.xlf @@ -19,7 +19,7 @@ - Add reference only when targetting a specific framework + Add reference only when targeting a specific framework Přidat odkaz jen při zaměření na určitou platformu diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.de.xlf index ab216036c..f944d7809 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.de.xlf @@ -19,7 +19,7 @@ - Add reference only when targetting a specific framework + Add reference only when targeting a specific framework Verweis nur bei Verwendung eines bestimmten Zielframeworks hinzufügen diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.es.xlf index 41577c611..c4e22ed67 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.es.xlf @@ -19,7 +19,7 @@ - Add reference only when targetting a specific framework + Add reference only when targeting a specific framework Se agrega una referencia solo cuando hay una plataforma de destino específica diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.fr.xlf index 70196228a..ffd71a68f 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.fr.xlf @@ -19,7 +19,7 @@ - Add reference only when targetting a specific framework + Add reference only when targeting a specific framework Ajouter une référence uniquement en cas de ciblage d'un framework spécifique diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.it.xlf index ada7aee58..9e6e38ee6 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.it.xlf @@ -19,7 +19,7 @@ - Add reference only when targetting a specific framework + Add reference only when targeting a specific framework Aggiunge il riferimento solo se destinato a un framework specifico diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.ja.xlf index 53dad6616..7e65c5b27 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.ja.xlf @@ -19,7 +19,7 @@ - Add reference only when targetting a specific framework + Add reference only when targeting a specific framework 特定のフレームワークを対象とする場合にのみ参照を追加する diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.ko.xlf index a0d05418b..5e4cf684b 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.ko.xlf @@ -19,7 +19,7 @@ - Add reference only when targetting a specific framework + Add reference only when targeting a specific framework 특정 프레임워크를 대상으로 지정할 때에만 참조를 추가합니다. diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.pl.xlf index 3f1ad612c..8cee046ac 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.pl.xlf @@ -19,7 +19,7 @@ - Add reference only when targetting a specific framework + Add reference only when targeting a specific framework Dodaj odwołanie tylko w przypadku określenia konkretnej platformy docelowej diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.pt-BR.xlf index 2f7bcade7..0fafb93ec 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.pt-BR.xlf @@ -19,7 +19,7 @@ - Add reference only when targetting a specific framework + Add reference only when targeting a specific framework Adicionar referência apenas ao visar uma estrutura específica diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.ru.xlf index 3198bd913..4335d8f3f 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.ru.xlf @@ -19,7 +19,7 @@ - Add reference only when targetting a specific framework + Add reference only when targeting a specific framework Добавлять ссылку только при выборе конкретной целевой платформы diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.tr.xlf index 23de59c66..cea7362db 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.tr.xlf @@ -19,7 +19,7 @@ - Add reference only when targetting a specific framework + Add reference only when targeting a specific framework Yalnızca belirli bir çerçeveyi hedeflerken başvuru ekler diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.xlf index 6f8ec752e..4886133ed 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.xlf @@ -16,7 +16,7 @@ - Add reference only when targetting a specific framework + Add reference only when targeting a specific framework diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.zh-Hans.xlf index b5497776a..49f2114dd 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.zh-Hans.xlf @@ -19,7 +19,7 @@ - Add reference only when targetting a specific framework + Add reference only when targeting a specific framework 仅针对特定框架添加引用 diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.zh-Hant.xlf index 94c9c7298..d1eb19332 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.zh-Hant.xlf @@ -19,7 +19,7 @@ - Add reference only when targetting a specific framework + Add reference only when targeting a specific framework 只有在以特定架構為目標時才新增參考 diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/LocalizableStrings.cs b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/LocalizableStrings.cs index 30c459246..de954c2d8 100644 --- a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/LocalizableStrings.cs @@ -11,6 +11,6 @@ namespace Microsoft.DotNet.Tools.Remove.ProjectToProjectReference public const string AppHelpText = "Project to project references to remove"; - public const string CmdFrameworkDescription = "Remove reference only when targetting a specific framework"; + public const string CmdFrameworkDescription = "Remove reference only when targeting a specific framework"; } } diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.cs.xlf index 87b4a917e..9c7a9cd11 100644 --- a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.cs.xlf @@ -14,7 +14,7 @@ - Remove reference only when targetting a specific framework + Remove reference only when targeting a specific framework Odebrat odkaz jen při zaměření na určitou platformu diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.de.xlf index 7ad399a36..afbf983b3 100644 --- a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.de.xlf @@ -14,7 +14,7 @@ - Remove reference only when targetting a specific framework + Remove reference only when targeting a specific framework Verweis nur bei Verwendung eines bestimmten Zielframeworks entfernen diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.es.xlf index c695dd48c..a0e7ae325 100644 --- a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.es.xlf @@ -14,7 +14,7 @@ - Remove reference only when targetting a specific framework + Remove reference only when targeting a specific framework Se quita la referencia solo cuando hay una plataforma de destino específica diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.fr.xlf index eebe93da6..adadb65a4 100644 --- a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.fr.xlf @@ -14,7 +14,7 @@ - Remove reference only when targetting a specific framework + Remove reference only when targeting a specific framework Supprimer la référence uniquement en cas de ciblage d'un framework spécifique diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.it.xlf index 03d53d6a2..d92c386ef 100644 --- a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.it.xlf @@ -14,7 +14,7 @@ - Remove reference only when targetting a specific framework + Remove reference only when targeting a specific framework Rimuove il riferimento solo se destinato a un framework specifico diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.ja.xlf index eaa6aadb7..555811e31 100644 --- a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.ja.xlf @@ -14,7 +14,7 @@ - Remove reference only when targetting a specific framework + Remove reference only when targeting a specific framework 特定のフレームワークを対象とする場合にのみ参照を削除する diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.ko.xlf index 23594bc7a..61cf7f313 100644 --- a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.ko.xlf @@ -14,7 +14,7 @@ - Remove reference only when targetting a specific framework + Remove reference only when targeting a specific framework 특정 프레임워크를 대상으로 지정할 때에만 참조를 제거합니다. diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.pl.xlf index a2d5e1617..68c638aa5 100644 --- a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.pl.xlf @@ -14,7 +14,7 @@ - Remove reference only when targetting a specific framework + Remove reference only when targeting a specific framework Usuń odwołanie tylko w przypadku określenia konkretnej platformy docelowej diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.pt-BR.xlf index 5bde95fa1..c249dfbed 100644 --- a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.pt-BR.xlf @@ -14,7 +14,7 @@ - Remove reference only when targetting a specific framework + Remove reference only when targeting a specific framework Remover referência apenas ao visar uma estrutura específica diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.ru.xlf index ba1c0e9ea..6897282c2 100644 --- a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.ru.xlf @@ -14,7 +14,7 @@ - Remove reference only when targetting a specific framework + Remove reference only when targeting a specific framework Удалять ссылку только при выборе конкретной целевой платформы diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.tr.xlf index 371bb8b30..7a9fc334e 100644 --- a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.tr.xlf @@ -14,7 +14,7 @@ - Remove reference only when targetting a specific framework + Remove reference only when targeting a specific framework Yalnızca belirli bir çerçeveyi hedeflerken başvuruyu kaldırır diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.xlf b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.xlf index efd5e43f3..c863654f6 100644 --- a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.xlf +++ b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.xlf @@ -12,7 +12,7 @@ - Remove reference only when targetting a specific framework + Remove reference only when targeting a specific framework diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.zh-Hans.xlf index 155982623..7c8a50d40 100644 --- a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.zh-Hans.xlf @@ -14,7 +14,7 @@ - Remove reference only when targetting a specific framework + Remove reference only when targeting a specific framework 仅针对特定框架删除引用 diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.zh-Hant.xlf index 028237600..74295fb07 100644 --- a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.zh-Hant.xlf @@ -14,7 +14,7 @@ - Remove reference only when targetting a specific framework + Remove reference only when targeting a specific framework 只有在以特定架構為目標時才移除參考 diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateScripts.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateScripts.cs index 9122551db..73b749c2b 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateScripts.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateScripts.cs @@ -223,7 +223,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests } [Fact] - public void MigratingScriptsWithMultiTFMCreatesTargetWithIsCrossTargettingBuildNotEqualTrueCondition() + public void MigratingScriptsWithMultiTFMCreatesTargetWithIsCrosstargetingBuildNotEqualTrueCondition() { var scriptMigrationRule = new MigrateScriptsRule(); ProjectRootElement mockProj = ProjectRootElement.Create(); @@ -241,7 +241,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests } [Fact] - public void MigratingScriptsWithSingleTFMDoesNotCreateTargetWithIsCrossTargettingBuild() + public void MigratingScriptsWithSingleTFMDoesNotCreateTargetWithIsCrosstargetingBuild() { var scriptMigrationRule = new MigrateScriptsRule(); ProjectRootElement mockProj = ProjectRootElement.Create(); diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTFMs.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTFMs.cs index 438a505c5..30e6bee18 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTFMs.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTFMs.cs @@ -15,7 +15,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests { public class GivenThatIWantToMigrateTFMs : TestBase { - [Fact(Skip="Emitting this until x-targetting full support is in")] + [Fact(Skip="Emitting this until x-targeting full support is in")] public void MigratingNetcoreappProjectDoesNotPopulateTargetFrameworkIdentifierAndTargetFrameworkVersion() { var testDirectory = Temp.CreateDirectory().Path; diff --git a/test/dotnet-add-reference.Tests/GivenDotnetAddReference.cs b/test/dotnet-add-reference.Tests/GivenDotnetAddReference.cs index 4a7ab7fe0..0f71da16c 100644 --- a/test/dotnet-add-reference.Tests/GivenDotnetAddReference.cs +++ b/test/dotnet-add-reference.Tests/GivenDotnetAddReference.cs @@ -23,7 +23,7 @@ Arguments: Options: -h|--help Show help information - -f|--framework Add reference only when targetting a specific framework + -f|--framework Add reference only when targeting a specific framework Additional Arguments: Project to project references to add diff --git a/test/dotnet-remove-reference.Tests/GivenDotnetRemoveP2P.cs b/test/dotnet-remove-reference.Tests/GivenDotnetRemoveP2P.cs index f4b5e831b..793330431 100644 --- a/test/dotnet-remove-reference.Tests/GivenDotnetRemoveP2P.cs +++ b/test/dotnet-remove-reference.Tests/GivenDotnetRemoveP2P.cs @@ -22,7 +22,7 @@ Arguments: Options: -h|--help Show help information - -f|--framework Remove reference only when targetting a specific framework + -f|--framework Remove reference only when targeting a specific framework Additional Arguments: Project to project references to remove From c9fa9be412decac7e50c6853d1fd1821d2065b5b Mon Sep 17 00:00:00 2001 From: Shayne Boyer Date: Thu, 16 Feb 2017 16:11:11 -0500 Subject: [PATCH 02/22] Fixes 5740 --- .../dotnet-add/dotnet-add-package/LocalizableStrings.cs | 2 +- .../dotnet-add/dotnet-add-package/xlf/LocalizableStrings.cs.xlf | 2 +- .../dotnet-add/dotnet-add-package/xlf/LocalizableStrings.de.xlf | 2 +- .../dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf | 2 +- .../dotnet-add/dotnet-add-package/xlf/LocalizableStrings.fr.xlf | 2 +- .../dotnet-add/dotnet-add-package/xlf/LocalizableStrings.it.xlf | 2 +- .../dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ja.xlf | 2 +- .../dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ko.xlf | 2 +- .../dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pl.xlf | 2 +- .../dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf | 2 +- .../dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ru.xlf | 2 +- .../dotnet-add/dotnet-add-package/xlf/LocalizableStrings.tr.xlf | 2 +- .../dotnet-add/dotnet-add-package/xlf/LocalizableStrings.xlf | 2 +- .../dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf | 2 +- .../dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.cs b/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.cs index 2b1fed976..5c5bf6287 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.cs @@ -9,7 +9,7 @@ namespace Microsoft.DotNet.Tools.Add.PackageReference public const string AppDescription = "Command to add package reference"; - public const string CmdPackageDescription = "Package references to add"; + public const string CmdPackageDescription = "Package reference to add"; public const string SpecifyExactlyOnePackageReference = "Please specify one package reference to add."; diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.cs.xlf index 81f41d71c..51a28a3ce 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.cs.xlf @@ -14,7 +14,7 @@ - Package references to add + Package reference to add Odkazy na balíčky k přidání diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.de.xlf index 812a3c0a3..4fd380cd2 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.de.xlf @@ -14,7 +14,7 @@ - Package references to add + Package reference to add Hinzuzufügende Paketverweise diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf index 8ae4e50a7..8d3f7d94b 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf @@ -14,7 +14,7 @@ - Package references to add + Package reference to add Referencias de paquete para agregar diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.fr.xlf index db5c7d0b4..b258a0743 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.fr.xlf @@ -14,7 +14,7 @@ - Package references to add + Package reference to add Références de package à ajouter diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.it.xlf index 7b04ffe81..9fba963df 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.it.xlf @@ -14,7 +14,7 @@ - Package references to add + Package reference to add Riferimenti al pacchetto da aggiungere diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ja.xlf index f4e1486d4..cf35c00b0 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ja.xlf @@ -14,7 +14,7 @@ - Package references to add + Package reference to add 追加するパッケージ参照 diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ko.xlf index afad24c23..4e064d586 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ko.xlf @@ -14,7 +14,7 @@ - Package references to add + Package reference to add 추가할 패키지 참조 diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pl.xlf index ea5c4c903..14bac13b1 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pl.xlf @@ -14,7 +14,7 @@ - Package references to add + Package reference to add Odwołania do pakietów, które mają zostać dodane diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf index 3151acc6f..0a42d0f57 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf @@ -14,7 +14,7 @@ - Package references to add + Package reference to add Referências do pacote a serem adicionadas diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ru.xlf index 2c738e3d8..6f64d5d76 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ru.xlf @@ -14,7 +14,7 @@ - Package references to add + Package reference to add Добавляемые ссылки на пакеты diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.tr.xlf index bba870af9..cd5b78bf5 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.tr.xlf @@ -14,7 +14,7 @@ - Package references to add + Package reference to add Eklenecek paket başvuruları diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.xlf index bd99ee489..b5fb96c8f 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.xlf @@ -12,7 +12,7 @@ - Package references to add + Package reference to add diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf index 77a56e04b..65e9ab256 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf @@ -14,7 +14,7 @@ - Package references to add + Package reference to add 要添加的包引用 diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf index 918afbb8f..b0175bbab 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf @@ -14,7 +14,7 @@ - Package references to add + Package reference to add 要新增的套件參考 From 14f43ef8961a8dd74cf16792760422d5f55fb541 Mon Sep 17 00:00:00 2001 From: Shayne Boyer Date: Thu, 16 Feb 2017 17:14:54 -0500 Subject: [PATCH 03/22] fix camelcasing --- src/dotnet/MsbuildProject.cs | 2 +- src/dotnet/commands/dotnet-add/dotnet-add-reference/Program.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dotnet/MsbuildProject.cs b/src/dotnet/MsbuildProject.cs index 78518bab5..bceeb144d 100644 --- a/src/dotnet/MsbuildProject.cs +++ b/src/dotnet/MsbuildProject.cs @@ -174,7 +174,7 @@ namespace Microsoft.DotNet.Tools return false; } - public bool IstargetingFramework(NuGetFramework framework) + public bool IsTargetingFramework(NuGetFramework framework) { foreach (var tfm in GetTargetFrameworks()) { diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-reference/Program.cs b/src/dotnet/commands/dotnet-add/dotnet-add-reference/Program.cs index a35358366..aef1d216d 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-reference/Program.cs +++ b/src/dotnet/commands/dotnet-add/dotnet-add-reference/Program.cs @@ -74,7 +74,7 @@ namespace Microsoft.DotNet.Tools.Add.ProjectToProjectReference else { var framework = NuGetFramework.Parse(frameworkString); - if (!msbuildProj.IstargetingFramework(framework)) + if (!msbuildProj.IsTargetingFramework(framework)) { Reporter.Error.WriteLine(string.Format( CommonLocalizableStrings.ProjectDoesNotTargetFramework, From f0785750403038d4055d0737bbde31e9ef31e467 Mon Sep 17 00:00:00 2001 From: Shayne Boyer Date: Wed, 22 Feb 2017 10:40:37 -0500 Subject: [PATCH 04/22] undo .xlf files --- .../dotnet-add-package/xlf/LocalizableStrings.cs.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.de.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.es.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.fr.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.it.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.ja.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.ko.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.pl.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.ru.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.tr.xlf | 4 ++-- .../dotnet-add/dotnet-add-package/xlf/LocalizableStrings.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.cs.xlf index 51a28a3ce..46213a706 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.cs.xlf @@ -14,7 +14,7 @@ - Package reference to add + Package references to add Odkazy na balíčky k přidání @@ -24,7 +24,7 @@ - Add reference only when targeting a specific framework + Add reference only when targetting a specific framework Přidat odkaz jen při zaměření na určitou platformu diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.de.xlf index 4fd380cd2..7bc4f9156 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.de.xlf @@ -14,7 +14,7 @@ - Package reference to add + Package references to add Hinzuzufügende Paketverweise @@ -24,7 +24,7 @@ - Add reference only when targeting a specific framework + Add reference only when targetting a specific framework Verweis nur bei Verwendung eines bestimmten Zielframeworks hinzufügen diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf index 8d3f7d94b..dfe725df3 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf @@ -14,7 +14,7 @@ - Package reference to add + Package references to add Referencias de paquete para agregar @@ -24,7 +24,7 @@ - Add reference only when targeting a specific framework + Add reference only when targetting a specific framework Se agrega una referencia solo cuando hay una plataforma de destino específica diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.fr.xlf index b258a0743..15ca8160d 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.fr.xlf @@ -14,7 +14,7 @@ - Package reference to add + Package references to add Références de package à ajouter @@ -24,7 +24,7 @@ - Add reference only when targeting a specific framework + Add reference only when targetting a specific framework Ajouter une référence uniquement en cas de ciblage d'un framework spécifique diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.it.xlf index 9fba963df..01156d8a5 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.it.xlf @@ -14,7 +14,7 @@ - Package reference to add + Package references to add Riferimenti al pacchetto da aggiungere @@ -24,7 +24,7 @@ - Add reference only when targeting a specific framework + Add reference only when targetting a specific framework Aggiunge il riferimento solo se destinato a un framework specifico diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ja.xlf index cf35c00b0..d7df49f70 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ja.xlf @@ -14,7 +14,7 @@ - Package reference to add + Package references to add 追加するパッケージ参照 @@ -24,7 +24,7 @@ - Add reference only when targeting a specific framework + Add reference only when targetting a specific framework 特定のフレームワークを対象とする場合にのみ参照を追加する diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ko.xlf index 4e064d586..e0988549e 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ko.xlf @@ -14,7 +14,7 @@ - Package reference to add + Package references to add 추가할 패키지 참조 @@ -24,7 +24,7 @@ - Add reference only when targeting a specific framework + Add reference only when targetting a specific framework 특정 프레임워크를 대상으로 지정할 때에만 참조를 추가합니다. diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pl.xlf index 14bac13b1..33e240e00 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pl.xlf @@ -14,7 +14,7 @@ - Package reference to add + Package references to add Odwołania do pakietów, które mają zostać dodane @@ -24,7 +24,7 @@ - Add reference only when targeting a specific framework + Add reference only when targetting a specific framework Dodaj odwołanie tylko w przypadku określenia konkretnej platformy docelowej diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf index 0a42d0f57..cc564117f 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf @@ -14,7 +14,7 @@ - Package reference to add + Package references to add Referências do pacote a serem adicionadas @@ -24,7 +24,7 @@ - Add reference only when targeting a specific framework + Add reference only when targetting a specific framework Adicionar referência apenas ao visar uma estrutura específica diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ru.xlf index 6f64d5d76..14d5108fc 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ru.xlf @@ -14,7 +14,7 @@ - Package reference to add + Package references to add Добавляемые ссылки на пакеты @@ -24,7 +24,7 @@ - Add reference only when targeting a specific framework + Add reference only when targetting a specific framework Добавлять ссылку только при выборе конкретной целевой платформы diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.tr.xlf index cd5b78bf5..9ad58f591 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.tr.xlf @@ -14,7 +14,7 @@ - Package reference to add + Package references to add Eklenecek paket başvuruları @@ -24,7 +24,7 @@ - Add reference only when targeting a specific framework + Add reference only when targetting a specific framework Yalnızca belirli bir çerçeveyi hedeflerken başvuru ekler diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.xlf index b5fb96c8f..5002b59b5 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.xlf @@ -12,7 +12,7 @@ - Package reference to add + Package references to add @@ -20,7 +20,7 @@ - Add reference only when targeting a specific framework + Add reference only when targetting a specific framework diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf index 65e9ab256..2b50715d9 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf @@ -14,7 +14,7 @@ - Package reference to add + Package references to add 要添加的包引用 @@ -24,7 +24,7 @@ - Add reference only when targeting a specific framework + Add reference only when targetting a specific framework 仅针对特定框架添加引用 diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf index b0175bbab..52e90f9ab 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf @@ -14,7 +14,7 @@ - Package reference to add + Package references to add 要新增的套件參考 @@ -24,7 +24,7 @@ - Add reference only when targeting a specific framework + Add reference only when targetting a specific framework 只有在以特定架構為目標時才新增參考 From 2f65c3ee6a78a870b89dc134f7ee19cad8694295 Mon Sep 17 00:00:00 2001 From: Shayne Boyer Date: Wed, 22 Feb 2017 10:43:40 -0500 Subject: [PATCH 05/22] undo .xlf fils for add-reference --- .../dotnet-add-reference/xlf/LocalizableStrings.cs.xlf | 2 +- .../dotnet-add-reference/xlf/LocalizableStrings.de.xlf | 2 +- .../dotnet-add-reference/xlf/LocalizableStrings.es.xlf | 2 +- .../dotnet-add-reference/xlf/LocalizableStrings.fr.xlf | 2 +- .../dotnet-add-reference/xlf/LocalizableStrings.it.xlf | 2 +- .../dotnet-add-reference/xlf/LocalizableStrings.ja.xlf | 2 +- .../dotnet-add-reference/xlf/LocalizableStrings.ko.xlf | 2 +- .../dotnet-add-reference/xlf/LocalizableStrings.pl.xlf | 2 +- .../dotnet-add-reference/xlf/LocalizableStrings.pt-BR.xlf | 2 +- .../dotnet-add-reference/xlf/LocalizableStrings.ru.xlf | 2 +- .../dotnet-add-reference/xlf/LocalizableStrings.tr.xlf | 2 +- .../dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.xlf | 2 +- .../dotnet-add-reference/xlf/LocalizableStrings.zh-Hans.xlf | 2 +- .../dotnet-add-reference/xlf/LocalizableStrings.zh-Hant.xlf | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.cs.xlf index b3db50aea..e7f2ec5a6 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.cs.xlf @@ -19,7 +19,7 @@ - Add reference only when targeting a specific framework + Add reference only when targetting a specific framework Přidat odkaz jen při zaměření na určitou platformu diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.de.xlf index f944d7809..ab216036c 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.de.xlf @@ -19,7 +19,7 @@ - Add reference only when targeting a specific framework + Add reference only when targetting a specific framework Verweis nur bei Verwendung eines bestimmten Zielframeworks hinzufügen diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.es.xlf index c4e22ed67..41577c611 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.es.xlf @@ -19,7 +19,7 @@ - Add reference only when targeting a specific framework + Add reference only when targetting a specific framework Se agrega una referencia solo cuando hay una plataforma de destino específica diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.fr.xlf index ffd71a68f..70196228a 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.fr.xlf @@ -19,7 +19,7 @@ - Add reference only when targeting a specific framework + Add reference only when targetting a specific framework Ajouter une référence uniquement en cas de ciblage d'un framework spécifique diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.it.xlf index 9e6e38ee6..ada7aee58 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.it.xlf @@ -19,7 +19,7 @@ - Add reference only when targeting a specific framework + Add reference only when targetting a specific framework Aggiunge il riferimento solo se destinato a un framework specifico diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.ja.xlf index 7e65c5b27..53dad6616 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.ja.xlf @@ -19,7 +19,7 @@ - Add reference only when targeting a specific framework + Add reference only when targetting a specific framework 特定のフレームワークを対象とする場合にのみ参照を追加する diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.ko.xlf index 5e4cf684b..a0d05418b 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.ko.xlf @@ -19,7 +19,7 @@ - Add reference only when targeting a specific framework + Add reference only when targetting a specific framework 특정 프레임워크를 대상으로 지정할 때에만 참조를 추가합니다. diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.pl.xlf index 8cee046ac..3f1ad612c 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.pl.xlf @@ -19,7 +19,7 @@ - Add reference only when targeting a specific framework + Add reference only when targetting a specific framework Dodaj odwołanie tylko w przypadku określenia konkretnej platformy docelowej diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.pt-BR.xlf index 0fafb93ec..2f7bcade7 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.pt-BR.xlf @@ -19,7 +19,7 @@ - Add reference only when targeting a specific framework + Add reference only when targetting a specific framework Adicionar referência apenas ao visar uma estrutura específica diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.ru.xlf index 4335d8f3f..3198bd913 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.ru.xlf @@ -19,7 +19,7 @@ - Add reference only when targeting a specific framework + Add reference only when targetting a specific framework Добавлять ссылку только при выборе конкретной целевой платформы diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.tr.xlf index cea7362db..23de59c66 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.tr.xlf @@ -19,7 +19,7 @@ - Add reference only when targeting a specific framework + Add reference only when targetting a specific framework Yalnızca belirli bir çerçeveyi hedeflerken başvuru ekler diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.xlf index 4886133ed..6f8ec752e 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.xlf @@ -16,7 +16,7 @@ - Add reference only when targeting a specific framework + Add reference only when targetting a specific framework diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.zh-Hans.xlf index 49f2114dd..b5497776a 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.zh-Hans.xlf @@ -19,7 +19,7 @@ - Add reference only when targeting a specific framework + Add reference only when targetting a specific framework 仅针对特定框架添加引用 diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.zh-Hant.xlf index d1eb19332..94c9c7298 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.zh-Hant.xlf @@ -19,7 +19,7 @@ - Add reference only when targeting a specific framework + Add reference only when targetting a specific framework 只有在以特定架構為目標時才新增參考 From 0e3b47b725d2963f10bf607cbfd187f31efc7159 Mon Sep 17 00:00:00 2001 From: Shayne Boyer Date: Wed, 22 Feb 2017 10:46:31 -0500 Subject: [PATCH 06/22] undo .xlf remove-reference --- .../dotnet-remove-reference/xlf/LocalizableStrings.cs.xlf | 2 +- .../dotnet-remove-reference/xlf/LocalizableStrings.de.xlf | 2 +- .../dotnet-remove-reference/xlf/LocalizableStrings.es.xlf | 2 +- .../dotnet-remove-reference/xlf/LocalizableStrings.fr.xlf | 2 +- .../dotnet-remove-reference/xlf/LocalizableStrings.it.xlf | 2 +- .../dotnet-remove-reference/xlf/LocalizableStrings.ja.xlf | 2 +- .../dotnet-remove-reference/xlf/LocalizableStrings.ko.xlf | 2 +- .../dotnet-remove-reference/xlf/LocalizableStrings.pl.xlf | 2 +- .../dotnet-remove-reference/xlf/LocalizableStrings.pt-BR.xlf | 2 +- .../dotnet-remove-reference/xlf/LocalizableStrings.ru.xlf | 2 +- .../dotnet-remove-reference/xlf/LocalizableStrings.tr.xlf | 2 +- .../dotnet-remove-reference/xlf/LocalizableStrings.xlf | 2 +- .../dotnet-remove-reference/xlf/LocalizableStrings.zh-Hans.xlf | 2 +- .../dotnet-remove-reference/xlf/LocalizableStrings.zh-Hant.xlf | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.cs.xlf index 9c7a9cd11..87b4a917e 100644 --- a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.cs.xlf @@ -14,7 +14,7 @@ - Remove reference only when targeting a specific framework + Remove reference only when targetting a specific framework Odebrat odkaz jen při zaměření na určitou platformu diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.de.xlf index afbf983b3..7ad399a36 100644 --- a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.de.xlf @@ -14,7 +14,7 @@ - Remove reference only when targeting a specific framework + Remove reference only when targetting a specific framework Verweis nur bei Verwendung eines bestimmten Zielframeworks entfernen diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.es.xlf index a0e7ae325..c695dd48c 100644 --- a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.es.xlf @@ -14,7 +14,7 @@ - Remove reference only when targeting a specific framework + Remove reference only when targetting a specific framework Se quita la referencia solo cuando hay una plataforma de destino específica diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.fr.xlf index adadb65a4..eebe93da6 100644 --- a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.fr.xlf @@ -14,7 +14,7 @@ - Remove reference only when targeting a specific framework + Remove reference only when targetting a specific framework Supprimer la référence uniquement en cas de ciblage d'un framework spécifique diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.it.xlf index d92c386ef..03d53d6a2 100644 --- a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.it.xlf @@ -14,7 +14,7 @@ - Remove reference only when targeting a specific framework + Remove reference only when targetting a specific framework Rimuove il riferimento solo se destinato a un framework specifico diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.ja.xlf index 555811e31..eaa6aadb7 100644 --- a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.ja.xlf @@ -14,7 +14,7 @@ - Remove reference only when targeting a specific framework + Remove reference only when targetting a specific framework 特定のフレームワークを対象とする場合にのみ参照を削除する diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.ko.xlf index 61cf7f313..23594bc7a 100644 --- a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.ko.xlf @@ -14,7 +14,7 @@ - Remove reference only when targeting a specific framework + Remove reference only when targetting a specific framework 특정 프레임워크를 대상으로 지정할 때에만 참조를 제거합니다. diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.pl.xlf index 68c638aa5..a2d5e1617 100644 --- a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.pl.xlf @@ -14,7 +14,7 @@ - Remove reference only when targeting a specific framework + Remove reference only when targetting a specific framework Usuń odwołanie tylko w przypadku określenia konkretnej platformy docelowej diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.pt-BR.xlf index c249dfbed..5bde95fa1 100644 --- a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.pt-BR.xlf @@ -14,7 +14,7 @@ - Remove reference only when targeting a specific framework + Remove reference only when targetting a specific framework Remover referência apenas ao visar uma estrutura específica diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.ru.xlf index 6897282c2..ba1c0e9ea 100644 --- a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.ru.xlf @@ -14,7 +14,7 @@ - Remove reference only when targeting a specific framework + Remove reference only when targetting a specific framework Удалять ссылку только при выборе конкретной целевой платформы diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.tr.xlf index 7a9fc334e..371bb8b30 100644 --- a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.tr.xlf @@ -14,7 +14,7 @@ - Remove reference only when targeting a specific framework + Remove reference only when targetting a specific framework Yalnızca belirli bir çerçeveyi hedeflerken başvuruyu kaldırır diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.xlf b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.xlf index c863654f6..efd5e43f3 100644 --- a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.xlf +++ b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.xlf @@ -12,7 +12,7 @@ - Remove reference only when targeting a specific framework + Remove reference only when targetting a specific framework diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.zh-Hans.xlf index 7c8a50d40..155982623 100644 --- a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.zh-Hans.xlf @@ -14,7 +14,7 @@ - Remove reference only when targeting a specific framework + Remove reference only when targetting a specific framework 仅针对特定框架删除引用 diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.zh-Hant.xlf index 74295fb07..028237600 100644 --- a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/xlf/LocalizableStrings.zh-Hant.xlf @@ -14,7 +14,7 @@ - Remove reference only when targeting a specific framework + Remove reference only when targetting a specific framework 只有在以特定架構為目標時才移除參考 From 664f08998548971a70ade3d2d54b477880493313 Mon Sep 17 00:00:00 2001 From: Piotr Puszkiewicz Date: Tue, 28 Feb 2017 18:16:51 -0800 Subject: [PATCH 07/22] Reduce chmod --- build/Compile.targets | 26 ------------------------ build_projects/dotnet-cli-build/Chmod.cs | 22 ++++---------------- src/redist/redist.csproj | 10 +++++++-- 3 files changed, 12 insertions(+), 46 deletions(-) diff --git a/build/Compile.targets b/build/Compile.targets index 2010fa6b3..5d956a799 100644 --- a/build/Compile.targets +++ b/build/Compile.targets @@ -22,32 +22,6 @@ Configuration="$(Configuration)" ProjectPath="$(RootProject)" /> - - - - - - u=rw,g=r,o=r - - - - - u=rwx,g=rx,o=rx - - - - - u=rwx,g=rx,o=rx - - - - - diff --git a/build_projects/dotnet-cli-build/Chmod.cs b/build_projects/dotnet-cli-build/Chmod.cs index 736c60c34..1d87e93c7 100644 --- a/build_projects/dotnet-cli-build/Chmod.cs +++ b/build_projects/dotnet-cli-build/Chmod.cs @@ -9,27 +9,13 @@ namespace Microsoft.DotNet.Cli.Build public class Chmod : ToolTask { [Required] - public string File { get; set; } + public string Glob { get; set; } [Required] public string Mode { get; set; } public bool Recursive { get; set; } - protected override bool ValidateParameters() - { - base.ValidateParameters(); - - if (!System.IO.File.Exists(File)) - { - Log.LogError($"File '{File} does not exist."); - - return false; - } - - return true; - } - protected override string ToolName { get { return "chmod"; } @@ -47,12 +33,12 @@ namespace Microsoft.DotNet.Cli.Build protected override string GenerateCommandLineCommands() { - return $"{GetRecursive()} {GetMode()} {GetFilePath()}"; + return $"{GetRecursive()} {GetMode()} {GetGlob()}"; } - private string GetFilePath() + private string GetGlob() { - return File; + return Glob; } private string GetMode() diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 5044398c5..1dfdc3a2a 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -144,8 +144,8 @@ + Glob="$(CrossgenPath)" + Mode="u+x" /> + + + + + From 0100fd9aa72e08bbe71adf5f2c312c667fbde373 Mon Sep 17 00:00:00 2001 From: Piotr Puszkiewicz Date: Tue, 28 Feb 2017 18:53:13 -0800 Subject: [PATCH 08/22] Simplify chmod usage --- src/redist/redist.csproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 1dfdc3a2a..de49e32ab 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -164,6 +164,7 @@ - + + From 3682882be43cf1242cd5a3020c3489dec4cbe863 Mon Sep 17 00:00:00 2001 From: Piotr Puszkiewicz Date: Tue, 28 Feb 2017 19:13:00 -0800 Subject: [PATCH 09/22] Make RunCsc.sh executable --- src/redist/redist.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index de49e32ab..f6570c83d 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -166,5 +166,6 @@ + From db3577091373a51a9180f984672720c90f2e8e1f Mon Sep 17 00:00:00 2001 From: Piotr Puszkiewicz Date: Tue, 28 Feb 2017 19:30:43 -0800 Subject: [PATCH 10/22] Add back Windows condition --- build/Test.targets | 3 ++- src/redist/redist.csproj | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build/Test.targets b/build/Test.targets index f86cb01ea..9eca40552 100644 --- a/build/Test.targets +++ b/build/Test.targets @@ -65,7 +65,8 @@ + ProjectPath=""$(TestDirectory)/Microsoft.DotNet.Cli.Tests.sln"" + MaxCpuCount="1" /> + AfterTargets="CrossgenPublishDir" + Condition=" '$(OSName)' != 'win' "> From 28d83da782f026fb9da80353511d5019987e3469 Mon Sep 17 00:00:00 2001 From: Piotr Puszkiewicz Date: Tue, 28 Feb 2017 19:04:47 -0800 Subject: [PATCH 11/22] Remove vbc in a target --- build/Compile.targets | 6 ------ src/redist/redist.csproj | 9 +++++++++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/build/Compile.targets b/build/Compile.targets index 5d956a799..84cbd56e4 100644 --- a/build/Compile.targets +++ b/build/Compile.targets @@ -22,12 +22,6 @@ Configuration="$(Configuration)" ProjectPath="$(RootProject)" /> - - - - - - diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index eff7569c4..4393b5cf6 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -169,4 +169,13 @@ + + + + <_VbcPath Include="$(OutputDirectory)/sdk/**/vbc.exe" /> + + + + From 283a80dff0c75a9d16ad0491cdd3ac71919098f4 Mon Sep 17 00:00:00 2001 From: Piotr Puszkiewicz Date: Tue, 28 Feb 2017 19:10:49 -0800 Subject: [PATCH 12/22] Move Symbols package creation to redist target --- build/Compile.targets | 4 ---- src/redist/redist.csproj | 10 ++++++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/build/Compile.targets b/build/Compile.targets index 84cbd56e4..831ae9fc6 100644 --- a/build/Compile.targets +++ b/build/Compile.targets @@ -23,13 +23,9 @@ ProjectPath="$(RootProject)" /> - - - diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 4393b5cf6..d11ea364a 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -178,4 +178,14 @@ + + + + <_AllSdkFiles Include="$(OutputDirectory)/**/*" /> + + + + From eee7c7ed323ec6ce929927377560c73c5184ed67 Mon Sep 17 00:00:00 2001 From: Piotr Puszkiewicz Date: Tue, 28 Feb 2017 19:16:55 -0800 Subject: [PATCH 13/22] Move PDB removal to redist.csproj target --- build/Compile.targets | 5 ----- src/redist/redist.csproj | 15 ++++++++++++--- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/build/Compile.targets b/build/Compile.targets index 831ae9fc6..56bd6d433 100644 --- a/build/Compile.targets +++ b/build/Compile.targets @@ -22,11 +22,6 @@ Configuration="$(Configuration)" ProjectPath="$(RootProject)" /> - - - - - - <_VbcPath Include="$(OutputDirectory)/sdk/**/vbc.exe" /> + <_VbcPath Include="$(PublishDir)/sdk/**/vbc.exe" /> + AfterTargets="RemoveVbc"> - <_AllSdkFiles Include="$(OutputDirectory)/**/*" /> + <_AllSdkFiles Include="$(PublishDir)/**/*" /> + + + + + + + + From 7bdd7befd84a0d56bf1ef0529c7e17a50ab89ee2 Mon Sep 17 00:00:00 2001 From: Piotr Puszkiewicz Date: Tue, 28 Feb 2017 22:52:08 -0800 Subject: [PATCH 14/22] Merge resolution --- src/redist/redist.csproj | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 00cde5754..1de45e8b8 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -161,15 +161,6 @@ DestinationFiles="@(NETCore10Assemblies)" /> - - - - - - - @@ -179,6 +170,15 @@ + + + + + + + @@ -192,7 +192,7 @@ - + From 12fde69e868145d3ae58fbbdd45025c4f435a655 Mon Sep 17 00:00:00 2001 From: Piotr Puszkiewicz Date: Wed, 1 Mar 2017 00:30:02 -0800 Subject: [PATCH 15/22] Move remaining Publish actions to redist.csproj --- build/Compile.targets | 51 +------------------------------ build/Prepare.targets | 2 -- build/compile/LzmaArchive.targets | 3 +- dir.props | 2 ++ src/redist/redist.csproj | 50 ++++++++++++++++++++++++++++-- 5 files changed, 52 insertions(+), 56 deletions(-) diff --git a/build/Compile.targets b/build/Compile.targets index 56bd6d433..d48bc1ff6 100644 --- a/build/Compile.targets +++ b/build/Compile.targets @@ -1,17 +1,9 @@ - - - - - + BuildProjectsForNuGetPackages;" /> @@ -21,46 +13,5 @@ - - - - - - - - CLIBuildDll=$(CLIBuildDll); - NuGetPackagesDir=$(NuGetPackagesDir); - SdkLayoutDirectory=$(SdkOutputDirectory)/Sdks/%(BundledSdk.Identity); - SdkPackageName=%(BundledSdk.Identity); - SdkPackageVersion=%(BundledSdk.Version); - Stage0Directory=$(Stage0Directory) - - - - - - - - - - - - - TemplateLayoutDirectory=$(SdkOutputDirectory)/Templates; - TemplatePackageName=%(BundledTemplate.Identity); - TemplatePackageVersion=%(BundledTemplate.Version); - Stage0Directory=$(Stage0Directory) - - - - - - diff --git a/build/Prepare.targets b/build/Prepare.targets index b29d8737d..22212ab6e 100644 --- a/build/Prepare.targets +++ b/build/Prepare.targets @@ -2,8 +2,6 @@ - - diff --git a/build/compile/LzmaArchive.targets b/build/compile/LzmaArchive.targets index 61c22c8b5..77155e5da 100644 --- a/build/compile/LzmaArchive.targets +++ b/build/compile/LzmaArchive.targets @@ -111,8 +111,7 @@ - + diff --git a/dir.props b/dir.props index 1c28a15e9..8d31ff867 100644 --- a/dir.props +++ b/dir.props @@ -20,6 +20,8 @@ + + diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 1de45e8b8..9dd47bb28 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -1,7 +1,8 @@  - + + $(CliVersionPrefix) netcoreapp2.0 @@ -110,6 +111,51 @@ AssetPath="%(NuPkgContentForMSBuildExtensionsRelativePaths.Identity)" /> + + + + + CLIBuildDll=$(CLIBuildDll); + NuGetPackagesDir=$(NuGetPackagesDir); + SdkLayoutDirectory=$(SdkOutputDirectory)/Sdks/%(BundledSdk.Identity); + SdkPackageName=%(BundledSdk.Identity); + SdkPackageVersion=%(BundledSdk.Version); + Stage0Directory=$(Stage0Directory); + + + + + + + + + + + + + TemplateLayoutDirectory=$(SdkOutputDirectory)/Templates; + TemplatePackageName=%(BundledTemplate.Identity); + TemplatePackageVersion=%(BundledTemplate.Version); + Stage0Directory=$(Stage0Directory); + + + + + + + + + + + @@ -164,7 +210,7 @@ - <_VbcPath Include="$(PublishDir)/sdk/**/vbc.exe" /> + <_VbcPath Include="$(PublishDir)/**/vbc.exe" /> From eb09b622368a454e9f14c23f34f5800e8b29845e Mon Sep 17 00:00:00 2001 From: Piotr Puszkiewicz Date: Wed, 1 Mar 2017 00:46:13 -0800 Subject: [PATCH 16/22] Because ; --- src/redist/redist.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 9dd47bb28..38fd403bd 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -121,7 +121,7 @@ SdkLayoutDirectory=$(SdkOutputDirectory)/Sdks/%(BundledSdk.Identity); SdkPackageName=%(BundledSdk.Identity); SdkPackageVersion=%(BundledSdk.Version); - Stage0Directory=$(Stage0Directory); + Stage0Directory=$(Stage0Directory) @@ -140,7 +140,7 @@ TemplateLayoutDirectory=$(SdkOutputDirectory)/Templates; TemplatePackageName=%(BundledTemplate.Identity); TemplatePackageVersion=%(BundledTemplate.Version); - Stage0Directory=$(Stage0Directory); + Stage0Directory=$(Stage0Directory) From 5f4ef8ff77bdcd65efde3271a5b0ed42f7bca242 Mon Sep 17 00:00:00 2001 From: Piotr Puszkiewicz Date: Wed, 1 Mar 2017 01:08:33 -0800 Subject: [PATCH 17/22] Remove unnecessary P2P's from redist.csproj --- src/redist/redist.csproj | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index eff7569c4..cec06cefd 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -23,12 +23,6 @@ - - - - - - From 65f6424ddf478760efd6883d669a86ec4e0bbda8 Mon Sep 17 00:00:00 2001 From: Piotr Puszkiewicz Date: Wed, 1 Mar 2017 01:24:07 -0800 Subject: [PATCH 18/22] symbols sdk --- src/redist/redist.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 38fd403bd..0ff3712c5 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -232,7 +232,7 @@ + DestinationFiles="@(_AllSdkFiles->'$(SymbolsDirectory)/sdk/%(RecursiveDir)%(Filename)%(Extension)')" /> Date: Wed, 1 Mar 2017 11:46:53 -0800 Subject: [PATCH 19/22] Updating the badge names that we use when checking if the build changed. Before, we were using an API to generate the OS names, now we are using msbuild OSName property, which names the OS differently. --- build/VersionBadge.props | 6 +++--- .../CheckIfAllBuildsHavePublished.cs | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build/VersionBadge.props b/build/VersionBadge.props index 7ed806034..ba2538508 100644 --- a/build/VersionBadge.props +++ b/build/VersionBadge.props @@ -1,9 +1,9 @@ $(OSName)_$(Architecture) - Ubuntu_16_04_x64 - Fedora_23_x64 - openSUSE_13_2_x64 + ubuntu_16_04_x64 + fedora_23_x64 + openSUSE_13_2_x64 $(BaseOutputDirectory)/$(VersionBadgeMoniker)_$(Configuration)_version_badge.svg diff --git a/build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs b/build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs index cfeb125a1..35b1e9f1e 100644 --- a/build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs +++ b/build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs @@ -46,15 +46,15 @@ namespace Microsoft.DotNet.Cli.Build { var badges = new Dictionary() { - { "Windows_x86", false }, - { "Windows_x64", false }, - { "Ubuntu_x64", false }, - { "Ubuntu_16_04_x64", false }, - { "RHEL_x64", false }, - { "OSX_x64", false }, - { "Debian_x64", false }, - { "CentOS_x64", false }, - { "Fedora_23_x64", false }, + { "win_x86", false }, + { "win_x64", false }, + { "ubuntu_x64", false }, + { "ubuntu_16_04_x64", false }, + { "rhel_x64", false }, + { "osx_x64", false }, + { "debian_x64", false }, + { "centos_x64", false }, + { "fedora_23_x64", false }, { "openSUSE_13_2_x64", false } }; From b64068291bd035f0a689640df59dfd73dec35182 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Wed, 1 Mar 2017 15:12:16 -0600 Subject: [PATCH 20/22] Remove OpenSUSE13 and Fedora23 since they are end of lifed. --- .../AppWithProjTool2Fx/App.csproj | 2 +- .../PackageWithFakeNativeDep.csproj | 2 +- .../v1/dotnet-hello/dotnet-hello.csproj | 2 +- .../v2/dotnet-hello/dotnet-hello.csproj | 2 +- .../MSBuildTestApp/MSBuildTestApp.csproj | 2 +- build/Branding.props | 2 +- build/VersionBadge.props | 2 - build/publish/FinishBuild.targets | 3 +- .../CheckIfAllBuildsHavePublished.cs | 10 ++--- .../GetCurrentRuntimeInformation.cs | 19 +++++++- .../Utils/Monikers.cs | 43 ------------------- netci.groovy | 2 +- .../CrossGen.Dependencies.csproj | 2 +- 13 files changed, 33 insertions(+), 60 deletions(-) delete mode 100644 build_projects/shared-build-targets-utils/Utils/Monikers.cs diff --git a/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj b/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj index a5487baba..4096632bd 100644 --- a/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj +++ b/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj @@ -3,7 +3,7 @@ netcoreapp1.0;net451 Exe $(PackageTargetFallback);portable-net45+win8;dnxcore50 - win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64 + win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64 diff --git a/TestAssets/TestPackages/PackageWithFakeNativeDep/PackageWithFakeNativeDep.csproj b/TestAssets/TestPackages/PackageWithFakeNativeDep/PackageWithFakeNativeDep.csproj index 6f9d59cfe..57c97bd00 100644 --- a/TestAssets/TestPackages/PackageWithFakeNativeDep/PackageWithFakeNativeDep.csproj +++ b/TestAssets/TestPackages/PackageWithFakeNativeDep/PackageWithFakeNativeDep.csproj @@ -2,7 +2,7 @@ net45 PackageWithFakeNativeDep - win7-x64;win7-x86;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64;osx.10.10-x64;rhel.7-x64 + win7-x64;win7-x86;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;osx.10.10-x64;rhel.7-x64 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 02db5109d..908965e3b 100644 --- a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj +++ b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj @@ -9,7 +9,7 @@ $(CLI_SharedFrameworkVersion) dotnet-hello Exe - win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64 + win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64 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 f71ccbede..065c24d50 100644 --- a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj +++ b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj @@ -9,7 +9,7 @@ $(CLI_SharedFrameworkVersion) dotnet-hello Exe - win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64 + win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64 diff --git a/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj b/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj index f4bc3f4d1..ae3c52dfb 100644 --- a/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj +++ b/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj @@ -2,7 +2,7 @@ Exe netcoreapp1.0 - win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64 + win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64 diff --git a/build/Branding.props b/build/Branding.props index 21ae2d473..a11613cd0 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -12,7 +12,7 @@ Microsoft.NETCore.App $(SharedFrameworkName) - $(Rid) + $(Rid) $(OSName)-$(Architecture) dotnet-sdk diff --git a/build/VersionBadge.props b/build/VersionBadge.props index ba2538508..cb2f3efde 100644 --- a/build/VersionBadge.props +++ b/build/VersionBadge.props @@ -2,8 +2,6 @@ $(OSName)_$(Architecture) ubuntu_16_04_x64 - fedora_23_x64 - openSUSE_13_2_x64 $(BaseOutputDirectory)/$(VersionBadgeMoniker)_$(Configuration)_version_badge.svg diff --git a/build/publish/FinishBuild.targets b/build/publish/FinishBuild.targets index 206e131f2..ab0873ec5 100644 --- a/build/publish/FinishBuild.targets +++ b/build/publish/FinishBuild.targets @@ -8,7 +8,8 @@ + NugetVersion="$(FullNugetVersion)" + VersionBadgeMoniker="$(VersionBadgeMoniker)"> diff --git a/build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs b/build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs index 35b1e9f1e..db3cbd396 100644 --- a/build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs +++ b/build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs @@ -26,6 +26,9 @@ namespace Microsoft.DotNet.Cli.Build [Required] public string NugetVersion { get; set; } + [Required] + public string VersionBadgeMoniker { get; set; } + [Output] public string HaveAllBuildsPublished { get; set; } @@ -54,14 +57,11 @@ namespace Microsoft.DotNet.Cli.Build { "osx_x64", false }, { "debian_x64", false }, { "centos_x64", false }, - { "fedora_23_x64", false }, - { "openSUSE_13_2_x64", false } }; - var versionBadgeName = $"{Monikers.GetBadgeMoniker()}"; - if (!badges.ContainsKey(versionBadgeName)) + if (!badges.ContainsKey(VersionBadgeMoniker)) { - throw new ArgumentException($"A new OS build '{versionBadgeName}' was added without adding the moniker to the {nameof(badges)} lookup"); + throw new ArgumentException($"A new OS build '{VersionBadgeMoniker}' was added without adding the moniker to the {nameof(badges)} lookup"); } IEnumerable blobs = AzurePublisherTool.ListBlobs(AzurePublisher.Product.Sdk, NugetVersion); diff --git a/build_projects/dotnet-cli-build/GetCurrentRuntimeInformation.cs b/build_projects/dotnet-cli-build/GetCurrentRuntimeInformation.cs index dbbeaa0de..5d58cb5f9 100644 --- a/build_projects/dotnet-cli-build/GetCurrentRuntimeInformation.cs +++ b/build_projects/dotnet-cli-build/GetCurrentRuntimeInformation.cs @@ -3,6 +3,7 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; +using Microsoft.DotNet.Cli.Build.Framework; using Microsoft.DotNet.PlatformAbstractions; namespace Microsoft.DotNet.Cli.Build @@ -22,9 +23,25 @@ namespace Microsoft.DotNet.Cli.Build { Rid = RuntimeEnvironment.GetRuntimeIdentifier(); Architecture = RuntimeEnvironment.RuntimeArchitecture; - OSName = Monikers.GetOSShortName(); + OSName = GetOSShortName(); return true; } + + private static string GetOSShortName() + { + string osname = ""; + switch (CurrentPlatform.Current) + { + case BuildPlatform.Windows: + osname = "win"; + break; + default: + osname = CurrentPlatform.Current.ToString().ToLower(); + break; + } + + return osname; + } } } \ No newline at end of file diff --git a/build_projects/shared-build-targets-utils/Utils/Monikers.cs b/build_projects/shared-build-targets-utils/Utils/Monikers.cs deleted file mode 100644 index 2c4b8e69e..000000000 --- a/build_projects/shared-build-targets-utils/Utils/Monikers.cs +++ /dev/null @@ -1,43 +0,0 @@ -using Microsoft.DotNet.Cli.Build.Framework; -using Microsoft.DotNet.PlatformAbstractions; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace Microsoft.DotNet.Cli.Build -{ - public class Monikers - { - public static string GetBadgeMoniker() - { - switch (RuntimeEnvironment.GetRuntimeIdentifier()) - { - case "ubuntu.16.04-x64": - return "Ubuntu_16_04_x64"; - case "fedora.23-x64": - return "Fedora_23_x64"; - case "opensuse.13.2-x64": - return "openSUSE_13_2_x64"; - } - - return $"{CurrentPlatform.Current}_{CurrentArchitecture.Current}"; - } - - public static string GetOSShortName() - { - string osname = ""; - switch (CurrentPlatform.Current) - { - case BuildPlatform.Windows: - osname = "win"; - break; - default: - osname = CurrentPlatform.Current.ToString().ToLower(); - break; - } - - return osname; - } - } -} diff --git a/netci.groovy b/netci.groovy index 8a2698aab..cc510c646 100644 --- a/netci.groovy +++ b/netci.groovy @@ -9,7 +9,7 @@ def project = GithubProject def branch = GithubBranchName def isPR = true -def platformList = ['Debian8.2:x64:Debug', 'Ubuntu:x64:Release', 'Ubuntu16.04:x64:Debug', 'OSX:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'RHEL7.2:x64:Release', 'CentOS7.1:x64:Debug', 'Fedora23:x64:Debug', 'OpenSUSE13.2:x64:Debug'] +def platformList = ['Debian8.2:x64:Debug', 'Ubuntu:x64:Release', 'Ubuntu16.04:x64:Debug', 'OSX:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'RHEL7.2:x64:Release', 'CentOS7.1:x64:Debug'] def static getBuildJobName(def configuration, def os, def architecture) { return configuration.toLowerCase() + '_' + os.toLowerCase() + '_' + architecture.toLowerCase() diff --git a/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj b/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj index 82aebedc1..8ae84a8ff 100644 --- a/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj +++ b/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj @@ -3,7 +3,7 @@ netcoreapp2.0 - win7-x64;win7-x86;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64;osx.10.10-x64;rhel.7-x64 + win7-x64;win7-x86;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;osx.10.10-x64;rhel.7-x64 From e4b04baa4da6be2223cff9e4c6e687916b27dee8 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Wed, 1 Mar 2017 16:38:29 -0600 Subject: [PATCH 21/22] Remove OpenSUSE and Fedora from the readme. --- README.md | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index d1223ed6b..f2d037906 100644 --- a/README.md +++ b/README.md @@ -33,9 +33,9 @@ This project has adopted the code of conduct defined by the [Contributor Covenan Build Status ------------ -|Ubuntu 14.04 / Linux Mint 17 |Ubuntu 16.04 |Debian 8.2 |Windows x64 |Windows x86 |Mac OS X |CentOS 7.1 / Oracle Linux 7.1 |RHEL 7.2 |OpenSUSE 13.2 |Fedora 23| -|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:| -|[![][ubuntu-14.04-build-badge]][ubuntu-14.04-build]|[![][ubuntu-16.04-build-badge]][ubuntu-16.04-build]|[![][debian-8.2-build-badge]][debian-8.2-build]|[![][win-x64-build-badge]][win-x64-build]|[![][win-x86-build-badge]][win-x86-build]|[![][osx-build-badge]][osx-build]|[![][centos-build-badge]][centos-build]|[![][rhel-build-badge]][rhel-build]|[![][opensuse-13.2-build-badge]][opensuse-13.2-build]|[![][fedora-23-build-badge]][fedora-23-build]| +|Ubuntu 14.04 / Linux Mint 17 |Ubuntu 16.04 |Debian 8.2 |Windows x64 |Windows x86 |Mac OS X |CentOS 7.1 / Oracle Linux 7.1 |RHEL 7.2 | +|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:| +|[![][ubuntu-14.04-build-badge]][ubuntu-14.04-build]|[![][ubuntu-16.04-build-badge]][ubuntu-16.04-build]|[![][debian-8.2-build-badge]][debian-8.2-build]|[![][win-x64-build-badge]][win-x64-build]|[![][win-x86-build-badge]][win-x86-build]|[![][osx-build-badge]][osx-build]|[![][centos-build-badge]][centos-build]|[![][rhel-build-badge]][rhel-build]| [win-x64-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5449/badge [win-x64-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5449 @@ -61,12 +61,6 @@ Build Status [rhel-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5446/badge [rhel-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5446 -[opensuse-13.2-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5444/badge -[opensuse-13.2-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5444 - -[fedora-23-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5443/badge -[fedora-23-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5443 - Installers and Binaries ----------------------- @@ -87,8 +81,6 @@ In order to download just the .NET Core runtime without the SDK, please visit ht | **Mac OS X** | [Installer][osx-installer] - [Checksum][osx-installer-checksum]
[tar.gz][osx-targz] - [Checksum][osx-targz-checksum] | | **CentOS 7.1 / Oracle Linux 7** | [tar.gz][centos-targz] - [Checksum][centos-targz-checksum] | | **RHEL 7.2** | [tar.gz][rhel-targz] - [Checksum][rhel-targz-checksum] | -| **openSUSE 13.2** | [tar.gz][opensuse-13.2-targz] - [Checksum][opensuse-13.2-targz-checksum] | -| **Fedora 23** | [tar.gz][fedora-23-targz] - [Checksum][fedora-23-targz-checksum] | *Note: Our Debian packages are put together slightly differently than the other OS specific installers. Instead of combining everything, we have separate component packages that depend on each other. If you're installing these directly from the .deb files (via dpkg or similar), then you'll need to install the [corresponding Host, Host FX Resolver, and Shared Framework packages](https://github.com/dotnet/core-setup#daily-builds) before installing the Sdk package.* @@ -128,12 +120,6 @@ In order to download just the .NET Core runtime without the SDK, please visit ht [rhel-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-rhel-x64.latest.tar.gz [rhel-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-rhel-x64.latest.tar.gz.sha -[opensuse-13.2-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-opensuse.13.2-x64.latest.tar.gz -[opensuse-13.2-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-opensuse.13.2-x64.latest.tar.gz.sha - -[fedora-23-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-fedora.23-x64.latest.tar.gz -[fedora-23-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-fedora.23-x64.latest.tar.gz.sha - Docker ------ From bb33fc12859095f13f5e7692ad531e959a3e2e5b Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Wed, 1 Mar 2017 20:01:18 -0600 Subject: [PATCH 22/22] update version badge for new moniker name. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f2d037906..e0c2f74eb 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ In order to download just the .NET Core runtime without the SDK, please visit ht [version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/latest.version [comment]: # (The latest versions are always the same across all platforms. Just need one to show, so picking win-x64's svg.) -[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/Windows_x64_Release_version_badge.svg +[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/win_x64_Release_version_badge.svg [win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-win-x64.latest.exe [win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-win-x64.latest.exe.sha