diff --git a/NuGet.Config b/NuGet.Config index e216f45e7..691898bcb 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -17,5 +17,6 @@ + diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 71abf62a5..ebc52549d 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -2,7 +2,7 @@ 2.0.0-preview3-25419-01 - 15.3.0-preview-000388-01 + 15.3.0-preview-000400-01 2.3.0-beta3-61816-04 1.6.0-beta2-25304 4.2.0-rc-170602-0 diff --git a/packaging/osx/clisdk/Distribution-Template b/packaging/osx/clisdk/Distribution-Template index e4cb89bc4..9b53f10c3 100644 --- a/packaging/osx/clisdk/Distribution-Template +++ b/packaging/osx/clisdk/Distribution-Template @@ -1,11 +1,10 @@ {CLISdkBrandName} (x64) - - + diff --git a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html new file mode 100644 index 000000000..74addd70f --- /dev/null +++ b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html @@ -0,0 +1,27 @@ + + + + + + +
+

The following was installed at /usr/local/share/dotnet +

    +
  • .NET Core SDK 2.0.0
    • +
  • .NET Core Runtime 2.0.0
    • +
  • Runtime Package Store
    • +
+
+
+ + + diff --git a/packaging/osx/clisdk/resources/cs.lproj/eula.rtf b/packaging/osx/clisdk/resources/cs.lproj/eula.rtf deleted file mode 100644 index 47d886627..000000000 Binary files a/packaging/osx/clisdk/resources/cs.lproj/eula.rtf and /dev/null differ diff --git a/packaging/osx/clisdk/resources/cs.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/cs.lproj/firstTimeWelcomeMessage.html deleted file mode 100644 index 81144ea7f..000000000 --- a/packaging/osx/clisdk/resources/cs.lproj/firstTimeWelcomeMessage.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - Welcome to .NET Core! - - - -

- Installation completed successfully. Welcome to .NET Core! -

-

- Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs. -

-

- .NET Core Tools Telemetry -

-

- The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them. -

-

- The data collected is anonymous and will be published in an aggregated form for use by both Microsoft and community engineers under the Creative Commons Attribution License. -

-

- The .NET Core Tools telemetry feature is enabled by default. You can opt-out of the telemetry feature by setting an environment variable DOTNET_CLI_TELEMETRY_OPTOUT (for example, 'export' on macOS/Linux, 'set' on Windows) to true (for example, 'true', 1). You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry. -

- - - \ No newline at end of file diff --git a/packaging/osx/clisdk/resources/cs.lproj/welcome.html b/packaging/osx/clisdk/resources/cs.lproj/welcome.html index 3bf1c66c4..8adc80f3e 100644 --- a/packaging/osx/clisdk/resources/cs.lproj/welcome.html +++ b/packaging/osx/clisdk/resources/cs.lproj/welcome.html @@ -2,19 +2,26 @@ - Welcome to the .NET Core CLI installer. - -

- Microsoft .NET Core CLI -

-

- .NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET Core. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET Core for both you and the tools to use. -

- +
+
+

.NET Core SDK

+

.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+
+
+

Learn more about .NET Core

+ +
+
+
+

Installation note

+

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

+
- \ No newline at end of file + diff --git a/packaging/osx/clisdk/resources/de.lproj/conclusion.html b/packaging/osx/clisdk/resources/de.lproj/conclusion.html new file mode 100644 index 000000000..74addd70f --- /dev/null +++ b/packaging/osx/clisdk/resources/de.lproj/conclusion.html @@ -0,0 +1,27 @@ + + + + + + +
+

The following was installed at /usr/local/share/dotnet +

    +
  • .NET Core SDK 2.0.0
    • +
  • .NET Core Runtime 2.0.0
    • +
  • Runtime Package Store
    • +
+
+
+ + + diff --git a/packaging/osx/clisdk/resources/de.lproj/eula.rtf b/packaging/osx/clisdk/resources/de.lproj/eula.rtf deleted file mode 100644 index 47d886627..000000000 Binary files a/packaging/osx/clisdk/resources/de.lproj/eula.rtf and /dev/null differ diff --git a/packaging/osx/clisdk/resources/de.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/de.lproj/firstTimeWelcomeMessage.html deleted file mode 100644 index 81144ea7f..000000000 --- a/packaging/osx/clisdk/resources/de.lproj/firstTimeWelcomeMessage.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - Welcome to .NET Core! - - - -

- Installation completed successfully. Welcome to .NET Core! -

-

- Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs. -

-

- .NET Core Tools Telemetry -

-

- The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them. -

-

- The data collected is anonymous and will be published in an aggregated form for use by both Microsoft and community engineers under the Creative Commons Attribution License. -

-

- The .NET Core Tools telemetry feature is enabled by default. You can opt-out of the telemetry feature by setting an environment variable DOTNET_CLI_TELEMETRY_OPTOUT (for example, 'export' on macOS/Linux, 'set' on Windows) to true (for example, 'true', 1). You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry. -

- - - \ No newline at end of file diff --git a/packaging/osx/clisdk/resources/de.lproj/welcome.html b/packaging/osx/clisdk/resources/de.lproj/welcome.html index 3bf1c66c4..8adc80f3e 100644 --- a/packaging/osx/clisdk/resources/de.lproj/welcome.html +++ b/packaging/osx/clisdk/resources/de.lproj/welcome.html @@ -2,19 +2,26 @@ - Welcome to the .NET Core CLI installer. - -

- Microsoft .NET Core CLI -

-

- .NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET Core. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET Core for both you and the tools to use. -

- +
+
+

.NET Core SDK

+

.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+
+
+

Learn more about .NET Core

+ +
+
+
+

Installation note

+

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

+
- \ No newline at end of file + diff --git a/packaging/osx/clisdk/resources/en.lproj/conclusion.html b/packaging/osx/clisdk/resources/en.lproj/conclusion.html new file mode 100644 index 000000000..74addd70f --- /dev/null +++ b/packaging/osx/clisdk/resources/en.lproj/conclusion.html @@ -0,0 +1,27 @@ + + + + + + +
+

The following was installed at /usr/local/share/dotnet +

    +
  • .NET Core SDK 2.0.0
    • +
  • .NET Core Runtime 2.0.0
    • +
  • Runtime Package Store
    • +
+
+
+ + + diff --git a/packaging/osx/clisdk/resources/en.lproj/eula.rtf b/packaging/osx/clisdk/resources/en.lproj/eula.rtf deleted file mode 100644 index 47d886627..000000000 Binary files a/packaging/osx/clisdk/resources/en.lproj/eula.rtf and /dev/null differ diff --git a/packaging/osx/clisdk/resources/en.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/en.lproj/firstTimeWelcomeMessage.html deleted file mode 100644 index 81144ea7f..000000000 --- a/packaging/osx/clisdk/resources/en.lproj/firstTimeWelcomeMessage.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - Welcome to .NET Core! - - - -

- Installation completed successfully. Welcome to .NET Core! -

-

- Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs. -

-

- .NET Core Tools Telemetry -

-

- The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them. -

-

- The data collected is anonymous and will be published in an aggregated form for use by both Microsoft and community engineers under the Creative Commons Attribution License. -

-

- The .NET Core Tools telemetry feature is enabled by default. You can opt-out of the telemetry feature by setting an environment variable DOTNET_CLI_TELEMETRY_OPTOUT (for example, 'export' on macOS/Linux, 'set' on Windows) to true (for example, 'true', 1). You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry. -

- - - \ No newline at end of file diff --git a/packaging/osx/clisdk/resources/en.lproj/welcome.html b/packaging/osx/clisdk/resources/en.lproj/welcome.html index 4f18f31a7..8adc80f3e 100644 --- a/packaging/osx/clisdk/resources/en.lproj/welcome.html +++ b/packaging/osx/clisdk/resources/en.lproj/welcome.html @@ -2,19 +2,26 @@ - Welcome to the .NET Core CLI installer. - -

- Microsoft .NET Core CLI -

-

- .NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET Core. It includes several tools, including the C# compiler and the NuGet package manager, and a copy of .NET Core for both you and the tools to use. -

- +
+
+

.NET Core SDK

+

.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+
+
+

Learn more about .NET Core

+ +
+
+
+

Installation note

+

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

+
- \ No newline at end of file + diff --git a/packaging/osx/clisdk/resources/es.lproj/conclusion.html b/packaging/osx/clisdk/resources/es.lproj/conclusion.html new file mode 100644 index 000000000..74addd70f --- /dev/null +++ b/packaging/osx/clisdk/resources/es.lproj/conclusion.html @@ -0,0 +1,27 @@ + + + + + + +
+

The following was installed at /usr/local/share/dotnet +

    +
  • .NET Core SDK 2.0.0
    • +
  • .NET Core Runtime 2.0.0
    • +
  • Runtime Package Store
    • +
+
+
+ + + diff --git a/packaging/osx/clisdk/resources/es.lproj/eula.rtf b/packaging/osx/clisdk/resources/es.lproj/eula.rtf deleted file mode 100644 index 47d886627..000000000 Binary files a/packaging/osx/clisdk/resources/es.lproj/eula.rtf and /dev/null differ diff --git a/packaging/osx/clisdk/resources/es.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/es.lproj/firstTimeWelcomeMessage.html deleted file mode 100644 index 81144ea7f..000000000 --- a/packaging/osx/clisdk/resources/es.lproj/firstTimeWelcomeMessage.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - Welcome to .NET Core! - - - -

- Installation completed successfully. Welcome to .NET Core! -

-

- Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs. -

-

- .NET Core Tools Telemetry -

-

- The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them. -

-

- The data collected is anonymous and will be published in an aggregated form for use by both Microsoft and community engineers under the Creative Commons Attribution License. -

-

- The .NET Core Tools telemetry feature is enabled by default. You can opt-out of the telemetry feature by setting an environment variable DOTNET_CLI_TELEMETRY_OPTOUT (for example, 'export' on macOS/Linux, 'set' on Windows) to true (for example, 'true', 1). You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry. -

- - - \ No newline at end of file diff --git a/packaging/osx/clisdk/resources/es.lproj/welcome.html b/packaging/osx/clisdk/resources/es.lproj/welcome.html index 3bf1c66c4..8adc80f3e 100644 --- a/packaging/osx/clisdk/resources/es.lproj/welcome.html +++ b/packaging/osx/clisdk/resources/es.lproj/welcome.html @@ -2,19 +2,26 @@ - Welcome to the .NET Core CLI installer. - -

- Microsoft .NET Core CLI -

-

- .NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET Core. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET Core for both you and the tools to use. -

- +
+
+

.NET Core SDK

+

.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+
+
+

Learn more about .NET Core

+ +
+
+
+

Installation note

+

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

+
- \ No newline at end of file + diff --git a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html new file mode 100644 index 000000000..74addd70f --- /dev/null +++ b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html @@ -0,0 +1,27 @@ + + + + + + +
+

The following was installed at /usr/local/share/dotnet +

    +
  • .NET Core SDK 2.0.0
    • +
  • .NET Core Runtime 2.0.0
    • +
  • Runtime Package Store
    • +
+
+
+ + + diff --git a/packaging/osx/clisdk/resources/fr.lproj/eula.rtf b/packaging/osx/clisdk/resources/fr.lproj/eula.rtf deleted file mode 100644 index 47d886627..000000000 Binary files a/packaging/osx/clisdk/resources/fr.lproj/eula.rtf and /dev/null differ diff --git a/packaging/osx/clisdk/resources/fr.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/fr.lproj/firstTimeWelcomeMessage.html deleted file mode 100644 index 81144ea7f..000000000 --- a/packaging/osx/clisdk/resources/fr.lproj/firstTimeWelcomeMessage.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - Welcome to .NET Core! - - - -

- Installation completed successfully. Welcome to .NET Core! -

-

- Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs. -

-

- .NET Core Tools Telemetry -

-

- The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them. -

-

- The data collected is anonymous and will be published in an aggregated form for use by both Microsoft and community engineers under the Creative Commons Attribution License. -

-

- The .NET Core Tools telemetry feature is enabled by default. You can opt-out of the telemetry feature by setting an environment variable DOTNET_CLI_TELEMETRY_OPTOUT (for example, 'export' on macOS/Linux, 'set' on Windows) to true (for example, 'true', 1). You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry. -

- - - \ No newline at end of file diff --git a/packaging/osx/clisdk/resources/fr.lproj/welcome.html b/packaging/osx/clisdk/resources/fr.lproj/welcome.html index 3bf1c66c4..8adc80f3e 100644 --- a/packaging/osx/clisdk/resources/fr.lproj/welcome.html +++ b/packaging/osx/clisdk/resources/fr.lproj/welcome.html @@ -2,19 +2,26 @@ - Welcome to the .NET Core CLI installer. - -

- Microsoft .NET Core CLI -

-

- .NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET Core. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET Core for both you and the tools to use. -

- +
+
+

.NET Core SDK

+

.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+
+
+

Learn more about .NET Core

+ +
+
+
+

Installation note

+

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

+
- \ No newline at end of file + diff --git a/packaging/osx/clisdk/resources/it.lproj/conclusion.html b/packaging/osx/clisdk/resources/it.lproj/conclusion.html new file mode 100644 index 000000000..74addd70f --- /dev/null +++ b/packaging/osx/clisdk/resources/it.lproj/conclusion.html @@ -0,0 +1,27 @@ + + + + + + +
+

The following was installed at /usr/local/share/dotnet +

    +
  • .NET Core SDK 2.0.0
    • +
  • .NET Core Runtime 2.0.0
    • +
  • Runtime Package Store
    • +
+
+
+ + + diff --git a/packaging/osx/clisdk/resources/it.lproj/eula.rtf b/packaging/osx/clisdk/resources/it.lproj/eula.rtf deleted file mode 100644 index 47d886627..000000000 Binary files a/packaging/osx/clisdk/resources/it.lproj/eula.rtf and /dev/null differ diff --git a/packaging/osx/clisdk/resources/it.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/it.lproj/firstTimeWelcomeMessage.html deleted file mode 100644 index 81144ea7f..000000000 --- a/packaging/osx/clisdk/resources/it.lproj/firstTimeWelcomeMessage.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - Welcome to .NET Core! - - - -

- Installation completed successfully. Welcome to .NET Core! -

-

- Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs. -

-

- .NET Core Tools Telemetry -

-

- The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them. -

-

- The data collected is anonymous and will be published in an aggregated form for use by both Microsoft and community engineers under the Creative Commons Attribution License. -

-

- The .NET Core Tools telemetry feature is enabled by default. You can opt-out of the telemetry feature by setting an environment variable DOTNET_CLI_TELEMETRY_OPTOUT (for example, 'export' on macOS/Linux, 'set' on Windows) to true (for example, 'true', 1). You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry. -

- - - \ No newline at end of file diff --git a/packaging/osx/clisdk/resources/it.lproj/welcome.html b/packaging/osx/clisdk/resources/it.lproj/welcome.html index 3bf1c66c4..8adc80f3e 100644 --- a/packaging/osx/clisdk/resources/it.lproj/welcome.html +++ b/packaging/osx/clisdk/resources/it.lproj/welcome.html @@ -2,19 +2,26 @@ - Welcome to the .NET Core CLI installer. - -

- Microsoft .NET Core CLI -

-

- .NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET Core. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET Core for both you and the tools to use. -

- +
+
+

.NET Core SDK

+

.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+
+
+

Learn more about .NET Core

+ +
+
+
+

Installation note

+

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

+
- \ No newline at end of file + diff --git a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html new file mode 100644 index 000000000..74addd70f --- /dev/null +++ b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html @@ -0,0 +1,27 @@ + + + + + + +
+

The following was installed at /usr/local/share/dotnet +

    +
  • .NET Core SDK 2.0.0
    • +
  • .NET Core Runtime 2.0.0
    • +
  • Runtime Package Store
    • +
+
+
+ + + diff --git a/packaging/osx/clisdk/resources/ja.lproj/eula.rtf b/packaging/osx/clisdk/resources/ja.lproj/eula.rtf deleted file mode 100644 index 47d886627..000000000 Binary files a/packaging/osx/clisdk/resources/ja.lproj/eula.rtf and /dev/null differ diff --git a/packaging/osx/clisdk/resources/ja.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/ja.lproj/firstTimeWelcomeMessage.html deleted file mode 100644 index 81144ea7f..000000000 --- a/packaging/osx/clisdk/resources/ja.lproj/firstTimeWelcomeMessage.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - Welcome to .NET Core! - - - -

- Installation completed successfully. Welcome to .NET Core! -

-

- Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs. -

-

- .NET Core Tools Telemetry -

-

- The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them. -

-

- The data collected is anonymous and will be published in an aggregated form for use by both Microsoft and community engineers under the Creative Commons Attribution License. -

-

- The .NET Core Tools telemetry feature is enabled by default. You can opt-out of the telemetry feature by setting an environment variable DOTNET_CLI_TELEMETRY_OPTOUT (for example, 'export' on macOS/Linux, 'set' on Windows) to true (for example, 'true', 1). You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry. -

- - - \ No newline at end of file diff --git a/packaging/osx/clisdk/resources/ja.lproj/welcome.html b/packaging/osx/clisdk/resources/ja.lproj/welcome.html index 3bf1c66c4..8adc80f3e 100644 --- a/packaging/osx/clisdk/resources/ja.lproj/welcome.html +++ b/packaging/osx/clisdk/resources/ja.lproj/welcome.html @@ -2,19 +2,26 @@ - Welcome to the .NET Core CLI installer. - -

- Microsoft .NET Core CLI -

-

- .NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET Core. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET Core for both you and the tools to use. -

- +
+
+

.NET Core SDK

+

.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+
+
+

Learn more about .NET Core

+ +
+
+
+

Installation note

+

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

+
- \ No newline at end of file + diff --git a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html new file mode 100644 index 000000000..74addd70f --- /dev/null +++ b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html @@ -0,0 +1,27 @@ + + + + + + +
+

The following was installed at /usr/local/share/dotnet +

    +
  • .NET Core SDK 2.0.0
    • +
  • .NET Core Runtime 2.0.0
    • +
  • Runtime Package Store
    • +
+
+
+ + + diff --git a/packaging/osx/clisdk/resources/ko.lproj/eula.rtf b/packaging/osx/clisdk/resources/ko.lproj/eula.rtf deleted file mode 100644 index 47d886627..000000000 Binary files a/packaging/osx/clisdk/resources/ko.lproj/eula.rtf and /dev/null differ diff --git a/packaging/osx/clisdk/resources/ko.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/ko.lproj/firstTimeWelcomeMessage.html deleted file mode 100644 index 81144ea7f..000000000 --- a/packaging/osx/clisdk/resources/ko.lproj/firstTimeWelcomeMessage.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - Welcome to .NET Core! - - - -

- Installation completed successfully. Welcome to .NET Core! -

-

- Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs. -

-

- .NET Core Tools Telemetry -

-

- The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them. -

-

- The data collected is anonymous and will be published in an aggregated form for use by both Microsoft and community engineers under the Creative Commons Attribution License. -

-

- The .NET Core Tools telemetry feature is enabled by default. You can opt-out of the telemetry feature by setting an environment variable DOTNET_CLI_TELEMETRY_OPTOUT (for example, 'export' on macOS/Linux, 'set' on Windows) to true (for example, 'true', 1). You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry. -

- - - \ No newline at end of file diff --git a/packaging/osx/clisdk/resources/ko.lproj/welcome.html b/packaging/osx/clisdk/resources/ko.lproj/welcome.html index 3bf1c66c4..8adc80f3e 100644 --- a/packaging/osx/clisdk/resources/ko.lproj/welcome.html +++ b/packaging/osx/clisdk/resources/ko.lproj/welcome.html @@ -2,19 +2,26 @@ - Welcome to the .NET Core CLI installer. - -

- Microsoft .NET Core CLI -

-

- .NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET Core. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET Core for both you and the tools to use. -

- +
+
+

.NET Core SDK

+

.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+
+
+

Learn more about .NET Core

+ +
+
+
+

Installation note

+

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

+
- \ No newline at end of file + diff --git a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html new file mode 100644 index 000000000..74addd70f --- /dev/null +++ b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html @@ -0,0 +1,27 @@ + + + + + + +
+

The following was installed at /usr/local/share/dotnet +

    +
  • .NET Core SDK 2.0.0
    • +
  • .NET Core Runtime 2.0.0
    • +
  • Runtime Package Store
    • +
+
+
+ + + diff --git a/packaging/osx/clisdk/resources/pl.lproj/eula.rtf b/packaging/osx/clisdk/resources/pl.lproj/eula.rtf deleted file mode 100644 index 47d886627..000000000 Binary files a/packaging/osx/clisdk/resources/pl.lproj/eula.rtf and /dev/null differ diff --git a/packaging/osx/clisdk/resources/pl.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/pl.lproj/firstTimeWelcomeMessage.html deleted file mode 100644 index 81144ea7f..000000000 --- a/packaging/osx/clisdk/resources/pl.lproj/firstTimeWelcomeMessage.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - Welcome to .NET Core! - - - -

- Installation completed successfully. Welcome to .NET Core! -

-

- Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs. -

-

- .NET Core Tools Telemetry -

-

- The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them. -

-

- The data collected is anonymous and will be published in an aggregated form for use by both Microsoft and community engineers under the Creative Commons Attribution License. -

-

- The .NET Core Tools telemetry feature is enabled by default. You can opt-out of the telemetry feature by setting an environment variable DOTNET_CLI_TELEMETRY_OPTOUT (for example, 'export' on macOS/Linux, 'set' on Windows) to true (for example, 'true', 1). You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry. -

- - - \ No newline at end of file diff --git a/packaging/osx/clisdk/resources/pl.lproj/welcome.html b/packaging/osx/clisdk/resources/pl.lproj/welcome.html index 3bf1c66c4..8adc80f3e 100644 --- a/packaging/osx/clisdk/resources/pl.lproj/welcome.html +++ b/packaging/osx/clisdk/resources/pl.lproj/welcome.html @@ -2,19 +2,26 @@ - Welcome to the .NET Core CLI installer. - -

- Microsoft .NET Core CLI -

-

- .NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET Core. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET Core for both you and the tools to use. -

- +
+
+

.NET Core SDK

+

.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+
+
+

Learn more about .NET Core

+ +
+
+
+

Installation note

+

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

+
- \ No newline at end of file + diff --git a/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html b/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html new file mode 100644 index 000000000..74addd70f --- /dev/null +++ b/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html @@ -0,0 +1,27 @@ + + + + + + +
+

The following was installed at /usr/local/share/dotnet +

    +
  • .NET Core SDK 2.0.0
    • +
  • .NET Core Runtime 2.0.0
    • +
  • Runtime Package Store
    • +
+
+
+ + + diff --git a/packaging/osx/clisdk/resources/pt-br.lproj/eula.rtf b/packaging/osx/clisdk/resources/pt-br.lproj/eula.rtf deleted file mode 100644 index 47d886627..000000000 Binary files a/packaging/osx/clisdk/resources/pt-br.lproj/eula.rtf and /dev/null differ diff --git a/packaging/osx/clisdk/resources/pt-br.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/pt-br.lproj/firstTimeWelcomeMessage.html deleted file mode 100644 index 81144ea7f..000000000 --- a/packaging/osx/clisdk/resources/pt-br.lproj/firstTimeWelcomeMessage.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - Welcome to .NET Core! - - - -

- Installation completed successfully. Welcome to .NET Core! -

-

- Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs. -

-

- .NET Core Tools Telemetry -

-

- The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them. -

-

- The data collected is anonymous and will be published in an aggregated form for use by both Microsoft and community engineers under the Creative Commons Attribution License. -

-

- The .NET Core Tools telemetry feature is enabled by default. You can opt-out of the telemetry feature by setting an environment variable DOTNET_CLI_TELEMETRY_OPTOUT (for example, 'export' on macOS/Linux, 'set' on Windows) to true (for example, 'true', 1). You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry. -

- - - \ No newline at end of file diff --git a/packaging/osx/clisdk/resources/pt-br.lproj/welcome.html b/packaging/osx/clisdk/resources/pt-br.lproj/welcome.html index 3bf1c66c4..8adc80f3e 100644 --- a/packaging/osx/clisdk/resources/pt-br.lproj/welcome.html +++ b/packaging/osx/clisdk/resources/pt-br.lproj/welcome.html @@ -2,19 +2,26 @@ - Welcome to the .NET Core CLI installer. - -

- Microsoft .NET Core CLI -

-

- .NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET Core. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET Core for both you and the tools to use. -

- +
+
+

.NET Core SDK

+

.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+
+
+

Learn more about .NET Core

+ +
+
+
+

Installation note

+

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

+
- \ No newline at end of file + diff --git a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html new file mode 100644 index 000000000..74addd70f --- /dev/null +++ b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html @@ -0,0 +1,27 @@ + + + + + + +
+

The following was installed at /usr/local/share/dotnet +

    +
  • .NET Core SDK 2.0.0
    • +
  • .NET Core Runtime 2.0.0
    • +
  • Runtime Package Store
    • +
+
+
+ + + diff --git a/packaging/osx/clisdk/resources/ru.lproj/eula.rtf b/packaging/osx/clisdk/resources/ru.lproj/eula.rtf deleted file mode 100644 index 47d886627..000000000 Binary files a/packaging/osx/clisdk/resources/ru.lproj/eula.rtf and /dev/null differ diff --git a/packaging/osx/clisdk/resources/ru.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/ru.lproj/firstTimeWelcomeMessage.html deleted file mode 100644 index 81144ea7f..000000000 --- a/packaging/osx/clisdk/resources/ru.lproj/firstTimeWelcomeMessage.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - Welcome to .NET Core! - - - -

- Installation completed successfully. Welcome to .NET Core! -

-

- Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs. -

-

- .NET Core Tools Telemetry -

-

- The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them. -

-

- The data collected is anonymous and will be published in an aggregated form for use by both Microsoft and community engineers under the Creative Commons Attribution License. -

-

- The .NET Core Tools telemetry feature is enabled by default. You can opt-out of the telemetry feature by setting an environment variable DOTNET_CLI_TELEMETRY_OPTOUT (for example, 'export' on macOS/Linux, 'set' on Windows) to true (for example, 'true', 1). You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry. -

- - - \ No newline at end of file diff --git a/packaging/osx/clisdk/resources/ru.lproj/welcome.html b/packaging/osx/clisdk/resources/ru.lproj/welcome.html index 3bf1c66c4..8adc80f3e 100644 --- a/packaging/osx/clisdk/resources/ru.lproj/welcome.html +++ b/packaging/osx/clisdk/resources/ru.lproj/welcome.html @@ -2,19 +2,26 @@ - Welcome to the .NET Core CLI installer. - -

- Microsoft .NET Core CLI -

-

- .NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET Core. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET Core for both you and the tools to use. -

- +
+
+

.NET Core SDK

+

.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+
+
+

Learn more about .NET Core

+ +
+
+
+

Installation note

+

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

+
- \ No newline at end of file + diff --git a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html new file mode 100644 index 000000000..74addd70f --- /dev/null +++ b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html @@ -0,0 +1,27 @@ + + + + + + +
+

The following was installed at /usr/local/share/dotnet +

    +
  • .NET Core SDK 2.0.0
    • +
  • .NET Core Runtime 2.0.0
    • +
  • Runtime Package Store
    • +
+
+
+ + + diff --git a/packaging/osx/clisdk/resources/tr.lproj/eula.rtf b/packaging/osx/clisdk/resources/tr.lproj/eula.rtf deleted file mode 100644 index 47d886627..000000000 Binary files a/packaging/osx/clisdk/resources/tr.lproj/eula.rtf and /dev/null differ diff --git a/packaging/osx/clisdk/resources/tr.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/tr.lproj/firstTimeWelcomeMessage.html deleted file mode 100644 index 81144ea7f..000000000 --- a/packaging/osx/clisdk/resources/tr.lproj/firstTimeWelcomeMessage.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - Welcome to .NET Core! - - - -

- Installation completed successfully. Welcome to .NET Core! -

-

- Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs. -

-

- .NET Core Tools Telemetry -

-

- The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them. -

-

- The data collected is anonymous and will be published in an aggregated form for use by both Microsoft and community engineers under the Creative Commons Attribution License. -

-

- The .NET Core Tools telemetry feature is enabled by default. You can opt-out of the telemetry feature by setting an environment variable DOTNET_CLI_TELEMETRY_OPTOUT (for example, 'export' on macOS/Linux, 'set' on Windows) to true (for example, 'true', 1). You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry. -

- - - \ No newline at end of file diff --git a/packaging/osx/clisdk/resources/tr.lproj/welcome.html b/packaging/osx/clisdk/resources/tr.lproj/welcome.html index 3bf1c66c4..8adc80f3e 100644 --- a/packaging/osx/clisdk/resources/tr.lproj/welcome.html +++ b/packaging/osx/clisdk/resources/tr.lproj/welcome.html @@ -2,19 +2,26 @@ - Welcome to the .NET Core CLI installer. - -

- Microsoft .NET Core CLI -

-

- .NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET Core. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET Core for both you and the tools to use. -

- +
+
+

.NET Core SDK

+

.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+
+
+

Learn more about .NET Core

+ +
+
+
+

Installation note

+

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

+
- \ No newline at end of file + diff --git a/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html b/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html new file mode 100644 index 000000000..74addd70f --- /dev/null +++ b/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html @@ -0,0 +1,27 @@ + + + + + + +
+

The following was installed at /usr/local/share/dotnet +

    +
  • .NET Core SDK 2.0.0
    • +
  • .NET Core Runtime 2.0.0
    • +
  • Runtime Package Store
    • +
+
+
+ + + diff --git a/packaging/osx/clisdk/resources/zh-hans.lproj/eula.rtf b/packaging/osx/clisdk/resources/zh-hans.lproj/eula.rtf deleted file mode 100644 index 47d886627..000000000 Binary files a/packaging/osx/clisdk/resources/zh-hans.lproj/eula.rtf and /dev/null differ diff --git a/packaging/osx/clisdk/resources/zh-hans.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/zh-hans.lproj/firstTimeWelcomeMessage.html deleted file mode 100644 index 81144ea7f..000000000 --- a/packaging/osx/clisdk/resources/zh-hans.lproj/firstTimeWelcomeMessage.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - Welcome to .NET Core! - - - -

- Installation completed successfully. Welcome to .NET Core! -

-

- Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs. -

-

- .NET Core Tools Telemetry -

-

- The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them. -

-

- The data collected is anonymous and will be published in an aggregated form for use by both Microsoft and community engineers under the Creative Commons Attribution License. -

-

- The .NET Core Tools telemetry feature is enabled by default. You can opt-out of the telemetry feature by setting an environment variable DOTNET_CLI_TELEMETRY_OPTOUT (for example, 'export' on macOS/Linux, 'set' on Windows) to true (for example, 'true', 1). You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry. -

- - - \ No newline at end of file diff --git a/packaging/osx/clisdk/resources/zh-hans.lproj/welcome.html b/packaging/osx/clisdk/resources/zh-hans.lproj/welcome.html index 3bf1c66c4..8adc80f3e 100644 --- a/packaging/osx/clisdk/resources/zh-hans.lproj/welcome.html +++ b/packaging/osx/clisdk/resources/zh-hans.lproj/welcome.html @@ -2,19 +2,26 @@ - Welcome to the .NET Core CLI installer. - -

- Microsoft .NET Core CLI -

-

- .NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET Core. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET Core for both you and the tools to use. -

- +
+
+

.NET Core SDK

+

.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+
+
+

Learn more about .NET Core

+ +
+
+
+

Installation note

+

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

+
- \ No newline at end of file + diff --git a/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html b/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html new file mode 100644 index 000000000..74addd70f --- /dev/null +++ b/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html @@ -0,0 +1,27 @@ + + + + + + +
+

The following was installed at /usr/local/share/dotnet +

    +
  • .NET Core SDK 2.0.0
    • +
  • .NET Core Runtime 2.0.0
    • +
  • Runtime Package Store
    • +
+
+
+ + + diff --git a/packaging/osx/clisdk/resources/zh-hant.lproj/eula.rtf b/packaging/osx/clisdk/resources/zh-hant.lproj/eula.rtf deleted file mode 100644 index 47d886627..000000000 Binary files a/packaging/osx/clisdk/resources/zh-hant.lproj/eula.rtf and /dev/null differ diff --git a/packaging/osx/clisdk/resources/zh-hant.lproj/firstTimeWelcomeMessage.html b/packaging/osx/clisdk/resources/zh-hant.lproj/firstTimeWelcomeMessage.html deleted file mode 100644 index 81144ea7f..000000000 --- a/packaging/osx/clisdk/resources/zh-hant.lproj/firstTimeWelcomeMessage.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - Welcome to .NET Core! - - - -

- Installation completed successfully. Welcome to .NET Core! -

-

- Learn more about .NET Core at https://aka.ms/dotnet-docs . Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs. -

-

- .NET Core Tools Telemetry -

-

- The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them. -

-

- The data collected is anonymous and will be published in an aggregated form for use by both Microsoft and community engineers under the Creative Commons Attribution License. -

-

- The .NET Core Tools telemetry feature is enabled by default. You can opt-out of the telemetry feature by setting an environment variable DOTNET_CLI_TELEMETRY_OPTOUT (for example, 'export' on macOS/Linux, 'set' on Windows) to true (for example, 'true', 1). You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry. -

- - - \ No newline at end of file diff --git a/packaging/osx/clisdk/resources/zh-hant.lproj/welcome.html b/packaging/osx/clisdk/resources/zh-hant.lproj/welcome.html index 3bf1c66c4..8adc80f3e 100644 --- a/packaging/osx/clisdk/resources/zh-hant.lproj/welcome.html +++ b/packaging/osx/clisdk/resources/zh-hant.lproj/welcome.html @@ -2,19 +2,26 @@ - Welcome to the .NET Core CLI installer. - -

- Microsoft .NET Core CLI -

-

- .NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET Core. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET Core for both you and the tools to use. -

- +
+
+

.NET Core SDK

+

.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+
+
+

Learn more about .NET Core

+ +
+
+
+

Installation note

+

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

+
- \ No newline at end of file + diff --git a/packaging/windows/clisdk/bundle.wxs b/packaging/windows/clisdk/bundle.wxs index e71700e75..d1de0ef58 100644 --- a/packaging/windows/clisdk/bundle.wxs +++ b/packaging/windows/clisdk/bundle.wxs @@ -12,7 +12,7 @@ diff --git a/packaging/windows/clisdk/dummyeula.rtf b/packaging/windows/clisdk/dummyeula.rtf new file mode 100644 index 000000000..db115770e Binary files /dev/null and b/packaging/windows/clisdk/dummyeula.rtf differ diff --git a/packaging/windows/clisdk/generatebundle.ps1 b/packaging/windows/clisdk/generatebundle.ps1 index bb3db4cf7..8b53d9591 100644 --- a/packaging/windows/clisdk/generatebundle.ps1 +++ b/packaging/windows/clisdk/generatebundle.ps1 @@ -30,7 +30,7 @@ function RunCandleForBundle .\candle.exe -nologo ` -dDotnetSrc="$inputDir" ` - -dMicrosoftEula="$RepoRoot\packaging\windows\eula.rtf" ` + -dMicrosoftEula="$RepoRoot\packaging\windows\clisdk\dummyeula.rtf" ` -dProductMoniker="$ProductMoniker" ` -dBuildVersion="$DotnetMSIVersion" ` -dDisplayVersion="$DotnetCLIDisplayVersion" ` diff --git a/packaging/windows/clisdk/generatemsi.ps1 b/packaging/windows/clisdk/generatemsi.ps1 index c6fdf9c51..fc9da871d 100644 --- a/packaging/windows/clisdk/generatemsi.ps1 +++ b/packaging/windows/clisdk/generatemsi.ps1 @@ -48,7 +48,7 @@ function RunCandle .\candle.exe -nologo ` -dDotnetSrc="$inputDir" ` - -dMicrosoftEula="$RepoRoot\packaging\windows\eula.rtf" ` + -dMicrosoftEula="$RepoRoot\packaging\windows\clisdk\dummyeula.rtf" ` -dProductMoniker="$ProductMoniker" ` -dBuildVersion="$DotnetMSIVersion" ` -dDisplayVersion="$DotnetCLIDisplayVersion" ` diff --git a/src/dotnet/Properties/AssemblyInfo.cs b/src/dotnet/Properties/AssemblyInfo.cs index d80fece97..edc4c971f 100644 --- a/src/dotnet/Properties/AssemblyInfo.cs +++ b/src/dotnet/Properties/AssemblyInfo.cs @@ -7,7 +7,10 @@ using System.Runtime.CompilerServices; [assembly: AssemblyMetadataAttribute("Serviceable", "True")] [assembly: InternalsVisibleTo("dotnet.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("dotnet-add-package.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("dotnet-add-reference.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("dotnet-help.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("dotnet-list-reference.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("dotnet-remove-reference.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("dotnet-remove-package.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("dotnet-sln-add.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("dotnet-sln-list.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] diff --git a/src/tool_msbuild/tool_msbuild.csproj b/src/tool_msbuild/tool_msbuild.csproj index ba18663e9..7a109b08d 100644 --- a/src/tool_msbuild/tool_msbuild.csproj +++ b/src/tool_msbuild/tool_msbuild.csproj @@ -11,5 +11,6 @@ + diff --git a/test/Microsoft.DotNet.Configurer.UnitTests/GivenADotnetFirstTimeUseConfigurer.cs b/test/Microsoft.DotNet.Configurer.UnitTests/GivenADotnetFirstTimeUseConfigurer.cs index 9b951da34..24ed0a67e 100644 --- a/test/Microsoft.DotNet.Configurer.UnitTests/GivenADotnetFirstTimeUseConfigurer.cs +++ b/test/Microsoft.DotNet.Configurer.UnitTests/GivenADotnetFirstTimeUseConfigurer.cs @@ -52,7 +52,7 @@ namespace Microsoft.DotNet.Configurer.UnitTests dotnetFirstTimeUseConfigurer.Configure(); - _reporterMock.Verify(r => r.WriteLine(It.Is(str => str.StartsWith("Welcome to .NET Core!"))), Times.Never); + _reporterMock.Verify(r => r.WriteLine(It.Is(str => str == LocalizableStrings.FirstTimeWelcomeMessage)), Times.Never); _reporterMock.Verify(r => r.Write(It.IsAny()), Times.Never); } @@ -74,7 +74,7 @@ namespace Microsoft.DotNet.Configurer.UnitTests dotnetFirstTimeUseConfigurer.Configure(); - _reporterMock.Verify(r => r.WriteLine(It.Is(str => str.StartsWith("Welcome to .NET Core!"))), Times.Never); + _reporterMock.Verify(r => r.WriteLine(It.Is(str => str == LocalizableStrings.FirstTimeWelcomeMessage)), Times.Never); _reporterMock.Verify(r => r.Write(It.IsAny()), Times.Never); } @@ -96,7 +96,7 @@ namespace Microsoft.DotNet.Configurer.UnitTests dotnetFirstTimeUseConfigurer.Configure(); - _reporterMock.Verify(r => r.WriteLine(It.Is(str => str.StartsWith("Welcome to .NET Core!"))), Times.Never); + _reporterMock.Verify(r => r.WriteLine(It.Is(str => str == LocalizableStrings.FirstTimeWelcomeMessage)), Times.Never); _reporterMock.Verify(r => r.Write(It.IsAny()), Times.Never); } @@ -115,7 +115,7 @@ namespace Microsoft.DotNet.Configurer.UnitTests dotnetFirstTimeUseConfigurer.Configure(); - _reporterMock.Verify(r => r.WriteLine(It.Is(str => str.StartsWith("Welcome to .NET Core!")))); + _reporterMock.Verify(r => r.WriteLine(It.Is(str => str == LocalizableStrings.FirstTimeWelcomeMessage))); _reporterMock.Verify(r => r.Write(It.IsAny()), Times.Never); } @@ -228,8 +228,8 @@ namespace Microsoft.DotNet.Configurer.UnitTests dotnetFirstTimeUseConfigurer.Configure(); - _reporterMock.Verify(r => r.WriteLine(It.Is(str => str.StartsWith("Welcome to .NET Core!")))); - _reporterMock.Verify(r => r.WriteLine(It.Is(str => str.StartsWith("Configuring")))); + _reporterMock.Verify(r => r.WriteLine(It.Is(str => str == LocalizableStrings.FirstTimeWelcomeMessage))); + _reporterMock.Verify(r => r.WriteLine(It.Is(str => str == LocalizableStrings.NugetCachePrimeMessage))); _nugetCachePrimerMock.Verify(r => r.PrimeCache(), Times.Once); _reporterMock.Verify(r => r.Write(It.IsAny()), Times.Never); } diff --git a/test/dotnet-add-reference.Tests/GivenDotnetAddReference.cs b/test/dotnet-add-reference.Tests/GivenDotnetAddReference.cs index ed1011d3b..42545e31c 100644 --- a/test/dotnet-add-reference.Tests/GivenDotnetAddReference.cs +++ b/test/dotnet-add-reference.Tests/GivenDotnetAddReference.cs @@ -3,6 +3,7 @@ using FluentAssertions; using Microsoft.Build.Construction; +using Microsoft.DotNet.Tools; using Microsoft.DotNet.Tools.Test.Utilities; using Msbuild.Tests.Utilities; using System; @@ -46,8 +47,8 @@ Commands: const string ConditionFrameworkNet451 = "== 'net451'"; const string FrameworkNetCoreApp10Arg = "-f netcoreapp1.0"; const string ConditionFrameworkNetCoreApp10 = "== 'netcoreapp1.0'"; - const string ProjectNotCompatibleErrorMessageRegEx = "Project `[^`]*` cannot be added due to incompatible targeted frameworks between the two projects\\. Please review the project you are trying to add and verify that is compatible with the following targets\\:"; - const string ProjectDoesNotTargetFrameworkErrorMessageRegEx = "Project `[^`]*` does not target framework `[^`]*`."; + static readonly string ProjectNotCompatibleErrorMessageRegEx = string.Format(CommonLocalizableStrings.ProjectNotCompatibleWithFrameworks, "[^`]*"); + static readonly string ProjectDoesNotTargetFrameworkErrorMessageRegEx = string.Format(CommonLocalizableStrings.ProjectDoesNotTargetFramework, "[^`]*", "[^`]*"); static readonly string[] DefaultFrameworks = new string[] { "netcoreapp1.0", "net451" }; private TestSetup Setup([System.Runtime.CompilerServices.CallerMemberName] string callingMethod = nameof(Setup), string identifier = "") @@ -106,7 +107,7 @@ Commands: { var cmd = new AddReferenceCommand().Execute(helpArg); cmd.Should().Pass(); - cmd.StdOut.Should().BeVisuallyEquivalentTo(HelpText); + cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(HelpText); } [Theory] @@ -117,8 +118,8 @@ Commands: var cmd = new DotnetCommand() .ExecuteWithCapturedOutput($"add {commandName}"); cmd.Should().Fail(); - cmd.StdErr.Should().Be("Required command was not provided."); - cmd.StdOut.Should().BeVisuallyEquivalentTo(AddCommandHelpText); + cmd.StdErr.Should().Be(CommonLocalizableStrings.RequiredCommandNotPassed); + cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(AddCommandHelpText); } [Fact] @@ -144,8 +145,8 @@ Commands: .WithProject(projName) .Execute($"\"{setup.ValidRefCsprojPath}\""); cmd.ExitCode.Should().NotBe(0); - cmd.StdErr.Should().Be($"Could not find project or directory `{projName}`."); - cmd.StdOut.Should().BeVisuallyEquivalentTo(HelpText); + cmd.StdErr.Should().Be(string.Format(CommonLocalizableStrings.CouldNotFindProjectOrDirectory, projName)); + cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(HelpText); } [Fact] @@ -159,8 +160,8 @@ Commands: .WithProject(projName) .Execute($"\"{setup.ValidRefCsprojPath}\""); cmd.ExitCode.Should().NotBe(0); - cmd.StdErr.Should().Be("Project `Broken/Broken.csproj` is invalid."); - cmd.StdOut.Should().BeVisuallyEquivalentTo(HelpText); + cmd.StdErr.Should().Be(string.Format(CommonLocalizableStrings.ProjectIsInvalid, "Broken/Broken.csproj")); + cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(HelpText); } [Fact] @@ -173,8 +174,8 @@ Commands: .WithWorkingDirectory(workingDir) .Execute($"\"{setup.ValidRefCsprojRelToOtherProjPath}\""); cmd.ExitCode.Should().NotBe(0); - cmd.StdErr.Should().Be($"Found more than one project in `{workingDir + Path.DirectorySeparatorChar}`. Please specify which one to use."); - cmd.StdOut.Should().BeVisuallyEquivalentTo(HelpText); + cmd.StdErr.Should().Be(string.Format(CommonLocalizableStrings.MoreThanOneProjectInDirectory, workingDir + Path.DirectorySeparatorChar)); + cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(HelpText); } [Fact] @@ -186,8 +187,8 @@ Commands: .WithWorkingDirectory(setup.TestRoot) .Execute($"\"{setup.ValidRefCsprojPath}\""); cmd.ExitCode.Should().NotBe(0); - cmd.StdErr.Should().Be($"Could not find any project in `{setup.TestRoot + Path.DirectorySeparatorChar}`."); - cmd.StdOut.Should().BeVisuallyEquivalentTo(HelpText); + cmd.StdErr.Should().Be(string.Format(CommonLocalizableStrings.CouldNotFindAnyProjectInDirectory, setup.TestRoot + Path.DirectorySeparatorChar)); + cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(HelpText); } [Fact] @@ -202,7 +203,7 @@ Commands: .WithProject(lib.CsProjPath) .Execute($"\"{setup.ValidRefCsprojPath}\""); cmd.Should().Pass(); - cmd.StdOut.Should().Be("Reference `ValidRef\\ValidRef.csproj` added to the project."); + cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ReferenceAddedToTheProject, @"ValidRef\ValidRef.csproj")); cmd.StdErr.Should().BeEmpty(); var csproj = lib.CsProj(); csproj.NumberOfItemGroupsWithoutCondition().Should().Be(noCondBefore + 1); @@ -221,7 +222,7 @@ Commands: .WithProject(lib.CsProjPath) .Execute($"{FrameworkNet451Arg} \"{setup.ValidRefCsprojPath}\""); cmd.Should().Pass(); - cmd.StdOut.Should().Be("Reference `ValidRef\\ValidRef.csproj` added to the project."); + cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ReferenceAddedToTheProject, @"ValidRef\ValidRef.csproj")); cmd.StdErr.Should().BeEmpty(); var csproj = lib.CsProj(); csproj.NumberOfItemGroupsWithConditionContaining(ConditionFrameworkNet451).Should().Be(condBefore + 1); @@ -246,7 +247,7 @@ Commands: .WithProject(lib.CsProjName) .Execute($"\"{setup.ValidRefCsprojPath}\""); cmd.Should().Pass(); - cmd.StdOut.Should().Be("Reference `ValidRef\\ValidRef.csproj` added to the project."); + cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ReferenceAddedToTheProject, @"ValidRef\ValidRef.csproj")); var csproj = lib.CsProj(); csproj.NumberOfItemGroupsWithoutCondition().Should().Be(noCondBefore); csproj.NumberOfProjectReferencesWithIncludeContaining(setup.ValidRefCsprojName).Should().Be(1); @@ -270,7 +271,7 @@ Commands: .WithProject(lib.CsProjPath) .Execute($"{FrameworkNet451Arg} \"{setup.ValidRefCsprojPath}\""); cmd.Should().Pass(); - cmd.StdOut.Should().Be("Reference `ValidRef\\ValidRef.csproj` added to the project."); + cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ReferenceAddedToTheProject, @"ValidRef\ValidRef.csproj")); ; var csproj = lib.CsProj(); csproj.NumberOfItemGroupsWithConditionContaining(ConditionFrameworkNet451).Should().Be(condBefore); csproj.NumberOfProjectReferencesWithIncludeAndConditionContaining(setup.ValidRefCsprojName, ConditionFrameworkNet451).Should().Be(1); @@ -294,7 +295,7 @@ Commands: .WithProject(lib.CsProjPath) .Execute($"{FrameworkNet451Arg} \"{setup.ValidRefCsprojPath}\""); cmd.Should().Pass(); - cmd.StdOut.Should().Be("Reference `ValidRef\\ValidRef.csproj` added to the project."); + cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ReferenceAddedToTheProject, @"ValidRef\ValidRef.csproj")); var csproj = lib.CsProj(); csproj.NumberOfItemGroupsWithConditionContaining(ConditionFrameworkNet451).Should().Be(condBefore + 1); csproj.NumberOfProjectReferencesWithIncludeAndConditionContaining(setup.ValidRefCsprojName, ConditionFrameworkNet451).Should().Be(1); @@ -318,7 +319,7 @@ Commands: .WithProject(lib.CsProjPath) .Execute($"\"{setup.ValidRefCsprojPath}\""); cmd.Should().Pass(); - cmd.StdOut.Should().Be("Reference `ValidRef\\ValidRef.csproj` added to the project."); + cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ReferenceAddedToTheProject, @"ValidRef\ValidRef.csproj")); var csproj = lib.CsProj(); csproj.NumberOfItemGroupsWithoutCondition().Should().Be(noCondBefore + 1); csproj.NumberOfProjectReferencesWithIncludeContaining(setup.ValidRefCsprojName).Should().Be(1); @@ -342,7 +343,7 @@ Commands: .WithProject(lib.CsProjName) .Execute($"\"{setup.ValidRefCsprojPath}\""); cmd.Should().Pass(); - cmd.StdOut.Should().Be("Project already has a reference to `ValidRef\\ValidRef.csproj`."); + cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ProjectAlreadyHasAreference, @"ValidRef\ValidRef.csproj")); var csproj = lib.CsProj(); csproj.NumberOfItemGroupsWithoutCondition().Should().Be(noCondBefore); @@ -361,7 +362,7 @@ Commands: .WithProject(proj.CsProjPath) .Execute($"{FrameworkNet451Arg} \"{setup.LibCsprojRelPath}\""); cmd.Should().Pass(); - cmd.StdOut.Should().Be("Project already has a reference to `..\\Lib\\Lib.csproj`."); + cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ProjectAlreadyHasAreference, @"..\Lib\Lib.csproj")); proj.CsProjContent().Should().BeEquivalentTo(contentBefore); } @@ -383,7 +384,7 @@ Commands: .WithProject(lib.CsProjPath) .Execute($"{FrameworkNet451Arg} \"{setup.ValidRefCsprojPath}\""); cmd.Should().Pass(); - cmd.StdOut.Should().Be("Project already has a reference to `ValidRef\\ValidRef.csproj`."); + cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ProjectAlreadyHasAreference, @"ValidRef\ValidRef.csproj")); lib.CsProjContent().Should().BeEquivalentTo(csprojContentBefore); } @@ -399,7 +400,7 @@ Commands: .WithProject(proj.CsProjName) .Execute($"{FrameworkNet451Arg} \"{setup.LibCsprojRelPath}\""); cmd.Should().Pass(); - cmd.StdOut.Should().Be("Project already has a reference to `..\\Lib\\Lib.csproj`."); + cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ProjectAlreadyHasAreference, @"..\Lib\Lib.csproj")); proj.CsProjContent().Should().BeEquivalentTo(contentBefore); } @@ -415,7 +416,7 @@ Commands: .WithProject(proj.CsProjName) .Execute($"\"{setup.LibCsprojRelPath}\""); cmd.Should().Pass(); - cmd.StdOut.Should().Be("Project already has a reference to `..\\Lib\\Lib.csproj`."); + cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ProjectAlreadyHasAreference, @"..\Lib\Lib.csproj")); proj.CsProjContent().Should().BeEquivalentTo(contentBefore); } @@ -431,7 +432,7 @@ Commands: .WithProject(proj.CsProjPath) .Execute($"\"{setup.ValidRefCsprojPath}\""); cmd.Should().Pass(); - cmd.StdOut.Should().Be("Reference `..\\ValidRef\\ValidRef.csproj` added to the project."); + cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ReferenceAddedToTheProject, @"..\ValidRef\ValidRef.csproj")); var csproj = proj.CsProj(); csproj.NumberOfItemGroupsWithoutCondition().Should().Be(noCondBefore + 1); csproj.NumberOfProjectReferencesWithIncludeContaining(setup.ValidRefCsprojName).Should().Be(1); @@ -449,7 +450,7 @@ Commands: .WithProject(proj.CsProjName) .Execute($"{FrameworkNet451Arg} \"{setup.LibCsprojRelPath}\""); cmd.Should().Pass(); - cmd.StdOut.Should().Be("Project already has a reference to `..\\Lib\\Lib.csproj`."); + cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ProjectAlreadyHasAreference, @"..\Lib\Lib.csproj")); proj.CsProjContent().Should().BeEquivalentTo(contentBefore); } @@ -465,7 +466,7 @@ Commands: .WithProject(proj.CsProjPath) .Execute($"{FrameworkNet451Arg} \"{setup.ValidRefCsprojPath}\""); cmd.Should().Pass(); - cmd.StdOut.Should().Be("Reference `..\\ValidRef\\ValidRef.csproj` added to the project."); + cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ReferenceAddedToTheProject, "..\\ValidRef\\ValidRef.csproj")); var csproj = proj.CsProj(); csproj.NumberOfItemGroupsWithConditionContaining(ConditionFrameworkNet451).Should().Be(condBefore + 1); csproj.NumberOfProjectReferencesWithIncludeAndConditionContaining(setup.ValidRefCsprojName, ConditionFrameworkNet451).Should().Be(1); @@ -483,7 +484,7 @@ Commands: .WithProject(proj.CsProjPath) .Execute($"\"{setup.ValidRefCsprojPath}\""); cmd.Should().Pass(); - cmd.StdOut.Should().Be("Reference `..\\ValidRef\\ValidRef.csproj` added to the project."); + cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ReferenceAddedToTheProject, @"..\ValidRef\ValidRef.csproj")); var csproj = proj.CsProj(); csproj.NumberOfItemGroupsWithoutCondition().Should().Be(noCondBefore); csproj.NumberOfProjectReferencesWithIncludeContaining(setup.ValidRefCsprojName).Should().Be(1); @@ -492,8 +493,8 @@ Commands: [Fact] public void ItAddsMultipleRefsNoCondToTheSameItemGroup() { - const string OutputText = @"Reference `Lib\Lib.csproj` added to the project. -Reference `ValidRef\ValidRef.csproj` added to the project."; + string OutputText = $@"{string.Format(CommonLocalizableStrings.ReferenceAddedToTheProject, @"Lib\Lib.csproj")} +{string.Format(CommonLocalizableStrings.ReferenceAddedToTheProject, @"ValidRef\ValidRef.csproj")}"; var setup = Setup(); var lib = NewLibWithFrameworks(dir: setup.TestRoot); @@ -514,8 +515,8 @@ Reference `ValidRef\ValidRef.csproj` added to the project."; [Fact] public void ItAddsMultipleRefsWithCondToTheSameItemGroup() { - const string OutputText = @"Reference `Lib\Lib.csproj` added to the project. -Reference `ValidRef\ValidRef.csproj` added to the project."; + string OutputText = $@"{string.Format(CommonLocalizableStrings.ReferenceAddedToTheProject, @"Lib\Lib.csproj")} +{string.Format(CommonLocalizableStrings.ReferenceAddedToTheProject, @"ValidRef\ValidRef.csproj")}"; var setup = Setup(); var lib = NewLibWithFrameworks(dir: setup.TestRoot); @@ -544,7 +545,7 @@ Reference `ValidRef\ValidRef.csproj` added to the project."; .WithWorkingDirectory(lib.Path) .Execute($"\"{setup.ValidRefCsprojPath}\""); cmd.Should().Pass(); - cmd.StdOut.Should().Be("Reference `ValidRef\\ValidRef.csproj` added to the project."); + cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ReferenceAddedToTheProject, @"ValidRef\ValidRef.csproj")); cmd.StdErr.Should().BeEmpty(); var csproj = lib.CsProj(); csproj.NumberOfItemGroupsWithoutCondition().Should().Be(noCondBefore + 1); @@ -562,7 +563,7 @@ Reference `ValidRef\ValidRef.csproj` added to the project."; .WithProject(lib.CsProjName) .Execute("\"IDoNotExist.csproj\""); cmd.Should().Fail(); - cmd.StdErr.Should().Be("Reference IDoNotExist.csproj does not exist."); + cmd.StdErr.Should().Be(string.Format(CommonLocalizableStrings.ReferenceDoesNotExist, "IDoNotExist.csproj")); lib.CsProjContent().Should().BeEquivalentTo(contentBefore); } @@ -578,7 +579,7 @@ Reference `ValidRef\ValidRef.csproj` added to the project."; .WithProject(lib.CsProjPath) .Execute($"\"{setup.ValidRefCsprojPath}\" \"IDoNotExist.csproj\""); cmd.Should().Fail(); - cmd.StdErr.Should().Be("Reference IDoNotExist.csproj does not exist."); + cmd.StdErr.Should().Be(string.Format(CommonLocalizableStrings.ReferenceDoesNotExist, "IDoNotExist.csproj")); lib.CsProjContent().Should().BeEquivalentTo(contentBefore); } @@ -594,7 +595,7 @@ Reference `ValidRef\ValidRef.csproj` added to the project."; .WithProject(lib.CsProjName) .Execute($"\"{setup.ValidRefCsprojPath.Replace('\\', '/')}\""); cmd.Should().Pass(); - cmd.StdOut.Should().Be("Reference `ValidRef\\ValidRef.csproj` added to the project."); + cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ReferenceAddedToTheProject, @"ValidRef\ValidRef.csproj")); cmd.StdErr.Should().BeEmpty(); var csproj = lib.CsProj(); csproj.NumberOfItemGroupsWithoutCondition().Should().Be(noCondBefore + 1); @@ -613,7 +614,7 @@ Reference `ValidRef\ValidRef.csproj` added to the project."; .WithProject(setup.LibCsprojPath) .Execute($"\"{setup.ValidRefCsprojRelPath}\""); cmd.Should().Pass(); - cmd.StdOut.Should().Be("Reference `..\\ValidRef\\ValidRef.csproj` added to the project."); + cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ReferenceAddedToTheProject, @"..\ValidRef\ValidRef.csproj")); cmd.StdErr.Should().BeEmpty(); var csproj = proj.CsProj(); csproj.NumberOfItemGroupsWithoutCondition().Should().Be(noCondBefore + 1); @@ -632,7 +633,7 @@ Reference `ValidRef\ValidRef.csproj` added to the project."; .WithProject(lib.CsProjPath) .Execute($"{FrameworkNet451Arg} \"{net45lib.CsProjPath}\""); cmd.Should().Pass(); - cmd.StdOut.Should().Be("Reference `..\\Net45Lib\\Net45Lib.csproj` added to the project."); + cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ReferenceAddedToTheProject, @"..\Net45Lib\Net45Lib.csproj")); var csproj = lib.CsProj(); csproj.NumberOfItemGroupsWithConditionContaining(ConditionFrameworkNet451).Should().Be(condBefore + 1); csproj.NumberOfProjectReferencesWithIncludeAndConditionContaining(net45lib.CsProjName, ConditionFrameworkNet451).Should().Be(1); @@ -650,7 +651,8 @@ Reference `ValidRef\ValidRef.csproj` added to the project."; .WithProject(net452netcoreapp10lib.CsProjPath) .Execute($"\"{lib.CsProjPath}\""); cmd.Should().Pass(); - cmd.StdOut.Should().Be("Reference `..\\Lib\\Lib.csproj` added to the project."); + cmd.Should().Pass(); + cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ReferenceAddedToTheProject, @"..\Lib\Lib.csproj")); var csproj = net452netcoreapp10lib.CsProj(); csproj.NumberOfItemGroupsWithoutCondition().Should().Be(noCondBefore + 1); csproj.NumberOfProjectReferencesWithIncludeContaining(lib.CsProjName).Should().Be(1); @@ -672,7 +674,7 @@ Reference `ValidRef\ValidRef.csproj` added to the project."; .WithProject(lib.CsProjPath) .Execute($"-f {framework} \"{net45lib.CsProjPath}\""); cmd.Should().Fail(); - cmd.StdErr.Should().Be($"Project `{setup.LibCsprojPath}` does not target framework `{framework}`."); + cmd.StdErr.Should().Be(string.Format(CommonLocalizableStrings.ProjectDoesNotTargetFramework, setup.LibCsprojPath, framework)); lib.CsProjContent().Should().BeEquivalentTo(csProjContent); } diff --git a/test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj b/test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj index 7e107c72b..46b4c5b3a 100644 --- a/test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj +++ b/test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj @@ -6,6 +6,9 @@ $(CLI_SharedFrameworkVersion) true dotnet-add-reference.Tests + ../../tools/Key.snk + true + true $(AssetTargetFallback);dotnet5.4;portable-net451+win8 @@ -13,6 +16,7 @@ + diff --git a/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs b/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs index 30b16d53d..d6dc5a530 100644 --- a/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs +++ b/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs @@ -143,7 +143,7 @@ namespace Microsoft.DotNet.Cli.Build.Tests .WithWorkingDirectory(testInstance.Root) .ExecuteWithCapturedOutput(); cmd.Should().Pass(); - cmd.StdOut.Should().ContainVisuallySameFragment(expectedBuildSummary); + cmd.StdOut.Should().ContainVisuallySameFragmentIfNotLocalized(expectedBuildSummary); } } } diff --git a/test/dotnet-list-reference.Tests/GivenDotnetListReference.cs b/test/dotnet-list-reference.Tests/GivenDotnetListReference.cs index 9f3bd680b..7d55ff688 100644 --- a/test/dotnet-list-reference.Tests/GivenDotnetListReference.cs +++ b/test/dotnet-list-reference.Tests/GivenDotnetListReference.cs @@ -3,6 +3,7 @@ using FluentAssertions; using Microsoft.Build.Construction; +using Microsoft.DotNet.Tools; using Microsoft.DotNet.Tools.Test.Utilities; using Msbuild.Tests.Utilities; using System; @@ -50,7 +51,7 @@ Commands: { var cmd = new ListReferenceCommand().Execute(helpArg); cmd.Should().Pass(); - cmd.StdOut.Should().BeVisuallyEquivalentTo(HelpText); + cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(HelpText); } [Theory] @@ -61,8 +62,8 @@ Commands: var cmd = new DotnetCommand() .ExecuteWithCapturedOutput($"list {commandName}"); cmd.Should().Fail(); - cmd.StdErr.Should().Be("Required command was not provided."); - cmd.StdOut.Should().BeVisuallyEquivalentTo(ListCommandHelpText); + cmd.StdErr.Should().Be(CommonLocalizableStrings.RequiredCommandNotPassed); + cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(ListCommandHelpText); } [Fact] @@ -88,8 +89,8 @@ Commands: .WithProject(projName) .Execute($"\"{setup.ValidRefCsprojPath}\""); cmd.ExitCode.Should().NotBe(0); - cmd.StdErr.Should().Be($"Could not find project or directory `{projName}`."); - cmd.StdOut.Should().BeVisuallyEquivalentTo(HelpText); + cmd.StdErr.Should().Be(string.Format(CommonLocalizableStrings.CouldNotFindProjectOrDirectory, projName)); + cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(HelpText); } [Fact] @@ -103,8 +104,8 @@ Commands: .WithProject(projName) .Execute($"\"{setup.ValidRefCsprojPath}\""); cmd.ExitCode.Should().NotBe(0); - cmd.StdErr.Should().Be("Project `Broken/Broken.csproj` is invalid."); - cmd.StdOut.Should().BeVisuallyEquivalentTo(HelpText); + cmd.StdErr.Should().Be(string.Format(CommonLocalizableStrings.ProjectIsInvalid, "Broken/Broken.csproj")); + cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(HelpText); } [Fact] @@ -117,8 +118,8 @@ Commands: .WithWorkingDirectory(workingDir) .Execute($"\"{setup.ValidRefCsprojRelToOtherProjPath}\""); cmd.ExitCode.Should().NotBe(0); - cmd.StdErr.Should().Be($"Found more than one project in `{workingDir + Path.DirectorySeparatorChar}`. Please specify which one to use."); - cmd.StdOut.Should().BeVisuallyEquivalentTo(HelpText); + cmd.StdErr.Should().Be(string.Format(CommonLocalizableStrings.MoreThanOneProjectInDirectory, workingDir + Path.DirectorySeparatorChar)); + cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(HelpText); } [Fact] @@ -130,8 +131,8 @@ Commands: .WithWorkingDirectory(setup.TestRoot) .Execute($"\"{setup.ValidRefCsprojPath}\""); cmd.ExitCode.Should().NotBe(0); - cmd.StdErr.Should().Be($"Could not find any project in `{setup.TestRoot + Path.DirectorySeparatorChar}`."); - cmd.StdOut.Should().BeVisuallyEquivalentTo(HelpText); + cmd.StdErr.Should().Be(string.Format(CommonLocalizableStrings.CouldNotFindAnyProjectInDirectory, setup.TestRoot + Path.DirectorySeparatorChar)); + cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(HelpText); } [Fact] @@ -143,14 +144,15 @@ Commands: .WithProject(lib.CsProjPath) .Execute(); cmd.Should().Pass(); - cmd.StdOut.Should().Be($"There are no Project to Project references in project {lib.CsProjPath}. ;; Project to Project is the type of the item being requested (project, package, p2p) and {lib.CsProjPath} is the object operated on (a project file or a solution file). "); + cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.NoReferencesFound, CommonLocalizableStrings.P2P, lib.CsProjPath)); } [Fact] public void ItPrintsSingleReference() { - const string OutputText = @"Project reference(s) --------------------- + string OutputText = CommonLocalizableStrings.ProjectReferenceOneOrMore; + OutputText += $@" +{new string('-', OutputText.Length)} ..\ref\ref.csproj"; var lib = NewLib("lib"); @@ -167,8 +169,9 @@ Commands: [Fact] public void ItPrintsMultipleReferences() { - const string OutputText = @"Project reference(s) --------------------- + string OutputText = CommonLocalizableStrings.ProjectReferenceOneOrMore; + OutputText += $@" +{new string('-', OutputText.Length)} ..\ref1\ref1.csproj ..\ref2\ref2.csproj ..\ref3\ref3.csproj"; diff --git a/test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj b/test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj index 66c649155..c62326007 100644 --- a/test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj +++ b/test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj @@ -6,12 +6,16 @@ $(CLI_SharedFrameworkVersion) true dotnet-list-reference.Tests + ../../tools/Key.snk + true + true $(AssetTargetFallback);dotnet5.4;portable-net451+win8 + diff --git a/test/dotnet-remove-reference.Tests/GivenDotnetRemoveP2P.cs b/test/dotnet-remove-reference.Tests/GivenDotnetRemoveP2P.cs index 239c067c7..0a61664fc 100644 --- a/test/dotnet-remove-reference.Tests/GivenDotnetRemoveP2P.cs +++ b/test/dotnet-remove-reference.Tests/GivenDotnetRemoveP2P.cs @@ -3,6 +3,7 @@ using FluentAssertions; using Microsoft.Build.Construction; +using Microsoft.DotNet.Tools; using Microsoft.DotNet.Tools.Test.Utilities; using Msbuild.Tests.Utilities; using System; @@ -132,7 +133,7 @@ Commands: { var cmd = new RemoveReferenceCommand().Execute(helpArg); cmd.Should().Pass(); - cmd.StdOut.Should().BeVisuallyEquivalentTo(HelpText); + cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(HelpText); } [Theory] @@ -143,8 +144,8 @@ Commands: var cmd = new DotnetCommand() .ExecuteWithCapturedOutput($"remove {commandName}"); cmd.Should().Fail(); - cmd.StdErr.Should().Be("Required command was not provided."); - cmd.StdOut.Should().BeVisuallyEquivalentTo(RemoveCommandHelpText); + cmd.StdErr.Should().Be(CommonLocalizableStrings.RequiredCommandNotPassed); + cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(RemoveCommandHelpText); } [Fact] @@ -169,8 +170,8 @@ Commands: .WithProject(projName) .Execute($"\"{setup.ValidRefCsprojPath}\""); cmd.ExitCode.Should().NotBe(0); - cmd.StdErr.Should().Be($"Could not find project or directory `{projName}`."); - cmd.StdOut.Should().BeVisuallyEquivalentTo(HelpText); + cmd.StdErr.Should().Be(string.Format(CommonLocalizableStrings.CouldNotFindProjectOrDirectory, projName)); + cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(HelpText); } [Fact] @@ -184,8 +185,8 @@ Commands: .WithProject(projName) .Execute($"\"{setup.ValidRefCsprojPath}\""); cmd.ExitCode.Should().NotBe(0); - cmd.StdErr.Should().Be("Project `Broken/Broken.csproj` is invalid."); - cmd.StdOut.Should().BeVisuallyEquivalentTo(HelpText); + cmd.StdErr.Should().Be(string.Format(CommonLocalizableStrings.ProjectIsInvalid, "Broken/Broken.csproj")); + cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(HelpText); } [Fact] @@ -198,8 +199,8 @@ Commands: .WithWorkingDirectory(workingDir) .Execute($"\"{setup.ValidRefCsprojRelToOtherProjPath}\""); cmd.ExitCode.Should().NotBe(0); - cmd.StdErr.Should().Be($"Found more than one project in `{workingDir + Path.DirectorySeparatorChar}`. Please specify which one to use."); - cmd.StdOut.Should().BeVisuallyEquivalentTo(HelpText); + cmd.StdErr.Should().Be(string.Format(CommonLocalizableStrings.MoreThanOneProjectInDirectory, workingDir + Path.DirectorySeparatorChar)); + cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(HelpText); } [Fact] @@ -211,8 +212,8 @@ Commands: .WithWorkingDirectory(setup.TestRoot) .Execute($"\"{setup.ValidRefCsprojPath}\""); cmd.ExitCode.Should().NotBe(0); - cmd.StdErr.Should().Be($"Could not find any project in `{setup.TestRoot + Path.DirectorySeparatorChar}`."); - cmd.StdOut.Should().BeVisuallyEquivalentTo(HelpText); + cmd.StdErr.Should().Be(string.Format(CommonLocalizableStrings.CouldNotFindAnyProjectInDirectory, setup.TestRoot + Path.DirectorySeparatorChar)); + cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(HelpText); } [Fact] @@ -228,7 +229,7 @@ Commands: .WithProject(lib.CsProjPath) .Execute($"\"{libref.CsProjPath}\""); cmd.Should().Pass(); - cmd.StdOut.Should().Be($"Project reference `{Path.Combine("Lib", setup.LibCsprojName)}` removed."); + cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ProjectReferenceRemoved, Path.Combine("Lib", setup.LibCsprojName))); var csproj = lib.CsProj(); csproj.NumberOfItemGroupsWithoutCondition().Should().Be(noCondBefore - 1); csproj.NumberOfProjectReferencesWithIncludeContaining(libref.Name).Should().Be(0); @@ -247,7 +248,7 @@ Commands: .WithProject(lib.CsProjPath) .Execute($"{FrameworkNet451Arg} \"{libref.CsProjPath}\""); cmd.Should().Pass(); - cmd.StdOut.Should().Be($"Project reference `{Path.Combine("Lib", setup.LibCsprojName)}` removed."); + cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ProjectReferenceRemoved, Path.Combine("Lib", setup.LibCsprojName))); var csproj = lib.CsProj(); csproj.NumberOfItemGroupsWithConditionContaining(ConditionFrameworkNet451).Should().Be(condBefore - 1); csproj.NumberOfProjectReferencesWithIncludeAndConditionContaining(libref.Name, ConditionFrameworkNet451).Should().Be(0); @@ -267,7 +268,7 @@ Commands: .WithProject(lib.CsProjPath) .Execute($"\"{libref.CsProjPath}\""); cmd.Should().Pass(); - cmd.StdOut.Should().Be($"Project reference `{Path.Combine("Lib", setup.LibCsprojName)}` removed."); + cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ProjectReferenceRemoved, Path.Combine("Lib", setup.LibCsprojName))); var csproj = lib.CsProj(); csproj.NumberOfItemGroupsWithoutCondition().Should().Be(noCondBefore); csproj.NumberOfProjectReferencesWithIncludeContaining(libref.Name).Should().Be(0); @@ -286,7 +287,7 @@ Commands: .WithProject(lib.CsProjPath) .Execute($"\"{libref.CsProjPath}\""); cmd.Should().Pass(); - cmd.StdOut.Should().Be($"Project reference `{libref.CsProjPath}` could not be found."); + cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ProjectReferenceCouldNotBeFound, libref.CsProjPath)); lib.CsProjContent().Should().BeEquivalentTo(csprojContetntBefore); } @@ -303,7 +304,7 @@ Commands: .WithProject(lib.CsProjPath) .Execute($"{FrameworkNet451Arg} \"{libref.CsProjPath}\""); cmd.Should().Pass(); - cmd.StdOut.Should().Be($"Project reference `{libref.CsProjPath}` could not be found."); + cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ProjectReferenceCouldNotBeFound, libref.CsProjPath)); lib.CsProjContent().Should().BeEquivalentTo(csprojContetntBefore); } @@ -323,7 +324,7 @@ Commands: .WithProject(lib.CsProjPath) .Execute($"\"{librefNoCond.CsProjPath}\""); cmd.Should().Pass(); - cmd.StdOut.Should().Be($"Project reference `{Path.Combine("Lib", setup.LibCsprojName)}` removed."); + cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ProjectReferenceRemoved, Path.Combine("Lib", setup.LibCsprojName))); var csproj = lib.CsProj(); csproj.NumberOfItemGroupsWithoutCondition().Should().Be(noCondBefore - 1); csproj.NumberOfProjectReferencesWithIncludeContaining(librefNoCond.Name).Should().Be(0); @@ -348,7 +349,7 @@ Commands: .WithProject(lib.CsProjPath) .Execute($"{FrameworkNet451Arg} \"{librefCond.CsProjPath}\""); cmd.Should().Pass(); - cmd.StdOut.Should().Be($"Project reference `{Path.Combine("Lib", setup.LibCsprojName)}` removed."); + cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ProjectReferenceRemoved, Path.Combine("Lib", setup.LibCsprojName))); var csproj = lib.CsProj(); csproj.NumberOfItemGroupsWithoutCondition().Should().Be(noCondBefore); csproj.NumberOfProjectReferencesWithIncludeContaining(librefNoCond.Name).Should().Be(1); @@ -373,7 +374,7 @@ Commands: .WithProject(lib.CsProjPath) .Execute($"{FrameworkNet451Arg} \"{librefCondNet451.CsProjPath}\""); cmd.Should().Pass(); - cmd.StdOut.Should().Be($"Project reference `{Path.Combine("Lib", setup.LibCsprojName)}` removed."); + cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ProjectReferenceRemoved, Path.Combine("Lib", setup.LibCsprojName))); var csproj = lib.CsProj(); csproj.NumberOfItemGroupsWithConditionContaining(ConditionFrameworkNet451).Should().Be(condNet451Before - 1); csproj.NumberOfProjectReferencesWithIncludeAndConditionContaining(librefCondNet451.Name, ConditionFrameworkNet451).Should().Be(0); @@ -389,8 +390,8 @@ Commands: var proj = new ProjDir(Path.Combine(setup.TestRoot, "WithDoubledRef")); var libref = GetLibRef(setup); - string removedText = $@"Project reference `{setup.LibCsprojRelPath}` removed. -Project reference `{setup.LibCsprojRelPath}` removed."; + string removedText = $@"{string.Format(CommonLocalizableStrings.ProjectReferenceRemoved, setup.LibCsprojRelPath)} +{string.Format(CommonLocalizableStrings.ProjectReferenceRemoved, setup.LibCsprojRelPath)}"; int noCondBefore = proj.CsProj().NumberOfItemGroupsWithoutCondition(); var cmd = new RemoveReferenceCommand() @@ -418,7 +419,7 @@ Project reference `{setup.LibCsprojRelPath}` removed."; .WithProject(lib.CsProjPath) .Execute($"\"{setup.ValidRefCsprojRelToOtherProjPath}\""); cmd.Should().Pass(); - cmd.StdOut.Should().Be($"Project reference `{setup.ValidRefCsprojRelToOtherProjPath}` removed."); + cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ProjectReferenceRemoved, setup.ValidRefCsprojRelToOtherProjPath)); var csproj = lib.CsProj(); csproj.NumberOfItemGroupsWithoutCondition().Should().Be(noCondBefore - 1); csproj.NumberOfProjectReferencesWithIncludeContaining(libref.Name).Should().Be(0); @@ -437,7 +438,7 @@ Project reference `{setup.LibCsprojRelPath}` removed."; .WithProject(lib.CsProjPath) .Execute($"\"{setup.ValidRefCsprojRelToOtherProjPath}\""); cmd.Should().Pass(); - cmd.StdOut.Should().Be($"Project reference `{setup.ValidRefCsprojRelToOtherProjPath}` removed."); + cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ProjectReferenceRemoved, setup.ValidRefCsprojRelToOtherProjPath)); var csproj = lib.CsProj(); csproj.NumberOfItemGroupsWithoutCondition().Should().Be(noCondBefore - 1); csproj.NumberOfProjectReferencesWithIncludeContaining(libref.Name).Should().Be(0); @@ -456,7 +457,7 @@ Project reference `{setup.LibCsprojRelPath}` removed."; .WithProject(lib.CsProjPath) .Execute($"\"{setup.ValidRefCsprojPath}\""); cmd.Should().Pass(); - cmd.StdOut.Should().Be($"Project reference `{setup.ValidRefCsprojRelToOtherProjPath}` removed."); + cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ProjectReferenceRemoved, setup.ValidRefCsprojRelToOtherProjPath)); var csproj = lib.CsProj(); csproj.NumberOfItemGroupsWithoutCondition().Should().Be(noCondBefore - 1); csproj.NumberOfProjectReferencesWithIncludeContaining(libref.Name).Should().Be(0); @@ -470,8 +471,8 @@ Project reference `{setup.LibCsprojRelPath}` removed."; var libref = AddLibRef(setup, lib); var validref = AddValidRef(setup, lib); - string outputText = $@"Project reference `{Path.Combine("Lib", setup.LibCsprojName)}` removed. -Project reference `{Path.Combine(setup.ValidRefCsprojRelPath)}` removed."; + string outputText = $@"{string.Format(CommonLocalizableStrings.ProjectReferenceRemoved, Path.Combine("Lib", setup.LibCsprojName))} +{string.Format(CommonLocalizableStrings.ProjectReferenceRemoved, Path.Combine(setup.ValidRefCsprojRelPath))}"; int noCondBefore = lib.CsProj().NumberOfItemGroupsWithoutCondition(); var cmd = new RemoveReferenceCommand() @@ -494,8 +495,8 @@ Project reference `{Path.Combine(setup.ValidRefCsprojRelPath)}` removed."; var libref = GetLibRef(setup); var validref = AddValidRef(setup, lib); - string OutputText = $@"Project reference `{setup.LibCsprojPath}` could not be found. -Project reference `{Path.Combine(setup.ValidRefCsprojRelPath)}` removed."; + string outputText = $@"{string.Format(CommonLocalizableStrings.ProjectReferenceCouldNotBeFound, setup.LibCsprojPath)} +{string.Format(CommonLocalizableStrings.ProjectReferenceRemoved, Path.Combine(setup.ValidRefCsprojRelPath))}"; int noCondBefore = lib.CsProj().NumberOfItemGroupsWithoutCondition(); var cmd = new RemoveReferenceCommand() @@ -503,7 +504,7 @@ Project reference `{Path.Combine(setup.ValidRefCsprojRelPath)}` removed."; .WithProject(lib.CsProjPath) .Execute($"\"{libref.CsProjPath}\" \"{validref.CsProjPath}\""); cmd.Should().Pass(); - cmd.StdOut.Should().BeVisuallyEquivalentTo(OutputText); + cmd.StdOut.Should().BeVisuallyEquivalentTo(outputText); var csproj = lib.CsProj(); csproj.NumberOfItemGroupsWithoutCondition().Should().Be(noCondBefore - 1); csproj.NumberOfProjectReferencesWithIncludeContaining(validref.Name).Should().Be(0); diff --git a/test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj b/test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj index 09b86ea4d..53a68dce5 100644 --- a/test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj +++ b/test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj @@ -6,12 +6,16 @@ $(CLI_SharedFrameworkVersion) true dotnet-remove-reference.Tests + ../../tools/Key.snk + true + true $(AssetTargetFallback);dotnet5.4;portable-net451+win8 +