Skip to content

Commit 1c045cf

Browse files
tmdsrainersigwald
andauthored
Remove 'Microsoft (R)', 'Microsoft (C)' from version message. (#7672)
Co-authored-by: Rainer Sigwald <[email protected]>
1 parent a2df02e commit 1c045cf

16 files changed

+47
-103
lines changed

src/MSBuild/Resources/Strings.resx

+2-4
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,8 @@
8686
<value>MSBUILD : error MSB1027: The -noAutoResponse switch cannot be specified in the MSBuild.rsp auto-response file, nor in any response file that is referenced by the auto-response file.</value>
8787
<comment>{StrBegin="MSBUILD : error MSB1027: "}LOCALIZATION: The prefix "MSBUILD : error MSBxxxx:", "-noAutoResponse" and "MSBuild.rsp" should not be localized.</comment>
8888
</data>
89-
<data name="CopyrightMessage" UESanitized="true" Visibility="Public">
90-
<value>Microsoft (R) Build Engine version {0} for {1}
91-
Copyright (C) Microsoft Corporation. All rights reserved.
92-
</value>
89+
<data name="MSBuildVersionMessage" UESanitized="true" Visibility="Public">
90+
<value>MSBuild version {0} for {1}</value>
9391
<comment>LOCALIZATION: {0} contains the DLL version number. {1} contains the name of a runtime, like ".NET Framework", ".NET Core", or "Mono"</comment>
9492
</data>
9593
<data name="DuplicateProjectSwitchError" UESanitized="true" Visibility="Public">

src/MSBuild/Resources/xlf/Strings.cs.xlf

+3-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/MSBuild/Resources/xlf/Strings.de.xlf

+3-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/MSBuild/Resources/xlf/Strings.es.xlf

+3-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/MSBuild/Resources/xlf/Strings.fr.xlf

+3-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/MSBuild/Resources/xlf/Strings.it.xlf

+3-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/MSBuild/Resources/xlf/Strings.ja.xlf

+3-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/MSBuild/Resources/xlf/Strings.ko.xlf

+3-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/MSBuild/Resources/xlf/Strings.pl.xlf

+3-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/MSBuild/Resources/xlf/Strings.pt-BR.xlf

+3-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/MSBuild/Resources/xlf/Strings.ru.xlf

+3-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/MSBuild/Resources/xlf/Strings.tr.xlf

+3-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/MSBuild/Resources/xlf/Strings.xlf

+2-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/MSBuild/Resources/xlf/Strings.zh-Hans.xlf

+3-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/MSBuild/Resources/xlf/Strings.zh-Hant.xlf

+3-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/MSBuild/XMake.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -2074,7 +2074,7 @@ string commandLine
20742074
// NOTE: we heed the nologo switch even if there are switch errors
20752075
if (!recursing && !commandLineSwitches[CommandLineSwitches.ParameterlessSwitch.NoLogo] && !commandLineSwitches.IsParameterizedSwitchSet(CommandLineSwitches.ParameterizedSwitch.Preprocess))
20762076
{
2077-
DisplayCopyrightMessage();
2077+
DisplayVersionMessage();
20782078
}
20792079

20802080

@@ -3664,9 +3664,9 @@ private static void ThrowInvalidToolsVersionInitializationException(IEnumerable<
36643664
}
36653665

36663666
/// <summary>
3667-
/// Displays the application copyright message/logo.
3667+
/// Displays the application version message/logo.
36683668
/// </summary>
3669-
private static void DisplayCopyrightMessage()
3669+
private static void DisplayVersionMessage()
36703670
{
36713671
#if RUNTIME_TYPE_NETCORE
36723672
const string frameworkName = ".NET";
@@ -3676,7 +3676,7 @@ private static void DisplayCopyrightMessage()
36763676
const string frameworkName = ".NET Framework";
36773677
#endif
36783678

3679-
Console.WriteLine(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("CopyrightMessage", ProjectCollection.DisplayVersion, frameworkName));
3679+
Console.WriteLine(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("MSBuildVersionMessage", ProjectCollection.DisplayVersion, frameworkName));
36803680
}
36813681

36823682
/// <summary>

0 commit comments

Comments
 (0)