diff --git a/src/vstest.console/CommandLine/Executor.cs b/src/vstest.console/CommandLine/Executor.cs
index 2554b1ac7f..7de6f10111 100644
--- a/src/vstest.console/CommandLine/Executor.cs
+++ b/src/vstest.console/CommandLine/Executor.cs
@@ -449,7 +449,6 @@ private void PrintSplashScreen(bool isDiag, string[]? args)
string assemblyVersionAndArchitecture = $"{assemblyVersion} ({_processHelper.GetCurrentProcessArchitecture().ToString().ToLowerInvariant()})";
string commandLineBanner = string.Format(CultureInfo.CurrentCulture, CommandLineResources.MicrosoftCommandLineTitle, assemblyVersionAndArchitecture);
Output.WriteLine(commandLineBanner, OutputLevel.Information);
- Output.WriteLine(CommandLineResources.CopyrightCommandLineTitle, OutputLevel.Information);
PrintWarningIfRunningEmulatedOnArm64();
PrintWarningIfInvokedThroughDotnetVSTest(args);
Output.WriteLine(string.Empty, OutputLevel.Information);
diff --git a/src/vstest.console/Resources/Resources.Designer.cs b/src/vstest.console/Resources/Resources.Designer.cs
index 06a734d6be..850de3db44 100644
--- a/src/vstest.console/Resources/Resources.Designer.cs
+++ b/src/vstest.console/Resources/Resources.Designer.cs
@@ -318,15 +318,6 @@ internal static string ConfigurationArgumentHelp {
}
}
- ///
- /// Looks up a localized string similar to Copyright (c) Microsoft Corporation. All rights reserved..
- ///
- internal static string CopyrightCommandLineTitle {
- get {
- return ResourceManager.GetString("CopyrightCommandLineTitle", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to The Data Collector friendly name '{0}' is not valid. The Data Collector will be ignored..
///
@@ -1036,7 +1027,7 @@ internal static string MalformedRunSettingsKey {
}
///
- /// Looks up a localized string similar to Microsoft (R) Test Execution Command Line Tool Version {0}.
+ /// Looks up a localized string similar to VSTest version {0}.
///
internal static string MicrosoftCommandLineTitle {
get {
diff --git a/src/vstest.console/Resources/Resources.resx b/src/vstest.console/Resources/Resources.resx
index 60d401156a..337e146fa5 100644
--- a/src/vstest.console/Resources/Resources.resx
+++ b/src/vstest.console/Resources/Resources.resx
@@ -191,9 +191,6 @@
-c|--Configuration|/c|/Configuration:<Configuration>
The configuration the project is built for i.e. Debug/Release
-
- Copyright (c) Microsoft Corporation. All rights reserved.
-
Days
@@ -387,7 +384,7 @@
The Test Logger URI '{0}' is not valid. The Test Logger will be ignored.
- Microsoft (R) Test Execution Command Line Tool Version {0}
+ VSTest version {0}Minutes
diff --git a/src/vstest.console/Resources/xlf/Resources.cs.xlf b/src/vstest.console/Resources/xlf/Resources.cs.xlf
index 44ca5f0e8d..6ce31ceeb3 100644
--- a/src/vstest.console/Resources/xlf/Resources.cs.xlf
+++ b/src/vstest.console/Resources/xlf/Resources.cs.xlf
@@ -84,14 +84,9 @@
Zobrazí tuto zprávu o používání.
-
- Copyright (c) Microsoft Corporation. All rights reserved.
- Copyright (c) Microsoft Corporation. Všechna práva vyhrazena.
-
-
- Microsoft (R) Test Execution Command Line Tool Version {0}
- Microsoft (R) Test Execution Command Line Tool verze {0}
+ VSTest version {0}
+ Microsoft (R) Test Execution Command Line Tool verze {0}
diff --git a/src/vstest.console/Resources/xlf/Resources.de.xlf b/src/vstest.console/Resources/xlf/Resources.de.xlf
index 438dc57145..1b56b1b953 100644
--- a/src/vstest.console/Resources/xlf/Resources.de.xlf
+++ b/src/vstest.console/Resources/xlf/Resources.de.xlf
@@ -84,14 +84,9 @@
Zeigt diese Syntaxmeldung an.
-
- Copyright (c) Microsoft Corporation. All rights reserved.
- Copyright (c) Microsoft Corporation. Alle Rechte vorbehalten.
-
-
- Microsoft (R) Test Execution Command Line Tool Version {0}
- Microsoft (R) Testausführungs-Befehlszeilentool Version {0}
+ VSTest version {0}
+ Microsoft (R) Testausführungs-Befehlszeilentool Version {0}
diff --git a/src/vstest.console/Resources/xlf/Resources.es.xlf b/src/vstest.console/Resources/xlf/Resources.es.xlf
index 17b30e05d1..ea1967f79b 100644
--- a/src/vstest.console/Resources/xlf/Resources.es.xlf
+++ b/src/vstest.console/Resources/xlf/Resources.es.xlf
@@ -84,14 +84,9 @@
Muestra este mensaje de uso.
-
- Copyright (c) Microsoft Corporation. All rights reserved.
- Copyright (c) Microsoft Corporation. Todos los derechos reservados.
-
-
- Microsoft (R) Test Execution Command Line Tool Version {0}
- Herramienta de línea de comandos de ejecución de pruebas de Microsoft(R), versión {0}
+ VSTest version {0}
+ Herramienta de línea de comandos de ejecución de pruebas de Microsoft(R), versión {0}
diff --git a/src/vstest.console/Resources/xlf/Resources.fr.xlf b/src/vstest.console/Resources/xlf/Resources.fr.xlf
index 505a781acf..dd926cf77f 100644
--- a/src/vstest.console/Resources/xlf/Resources.fr.xlf
+++ b/src/vstest.console/Resources/xlf/Resources.fr.xlf
@@ -84,14 +84,9 @@
Permet d'afficher ce message d'utilisation.
-
- Copyright (c) Microsoft Corporation. All rights reserved.
- Copyright (c) Microsoft Corporation. Tous droits réservés.
-
-
- Microsoft (R) Test Execution Command Line Tool Version {0}
- Outil en ligne de commande d'exécution de tests Microsoft (R), version {0}
+ VSTest version {0}
+ Outil en ligne de commande d'exécution de tests Microsoft (R), version {0}
diff --git a/src/vstest.console/Resources/xlf/Resources.it.xlf b/src/vstest.console/Resources/xlf/Resources.it.xlf
index 2872b82107..4e45150da5 100644
--- a/src/vstest.console/Resources/xlf/Resources.it.xlf
+++ b/src/vstest.console/Resources/xlf/Resources.it.xlf
@@ -84,14 +84,9 @@
Visualizza questo messaggio relativo alla sintassi.
-
- Copyright (c) Microsoft Corporation. All rights reserved.
- Copyright (c) Microsoft Corporation. Tutti i diritti sono riservati.
-
-
- Microsoft (R) Test Execution Command Line Tool Version {0}
- Strumento da riga di comando per l'esecuzione di test Microsoft (R) Versione {0}
+ VSTest version {0}
+ Strumento da riga di comando per l'esecuzione di test Microsoft (R) Versione {0}
diff --git a/src/vstest.console/Resources/xlf/Resources.ja.xlf b/src/vstest.console/Resources/xlf/Resources.ja.xlf
index 85fed213bd..b25365aceb 100644
--- a/src/vstest.console/Resources/xlf/Resources.ja.xlf
+++ b/src/vstest.console/Resources/xlf/Resources.ja.xlf
@@ -84,14 +84,9 @@
この使用方法に関するメッセージを表示します。
-
- Copyright (c) Microsoft Corporation. All rights reserved.
- Copyright (c) Microsoft Corporation. All rights reserved.
-
-
- Microsoft (R) Test Execution Command Line Tool Version {0}
- Microsoft (R) Test Execution Command Line Tool Version {0}
+ VSTest version {0}
+ Microsoft (R) Test Execution Command Line Tool Version {0}
diff --git a/src/vstest.console/Resources/xlf/Resources.ko.xlf b/src/vstest.console/Resources/xlf/Resources.ko.xlf
index 00e5283bae..37b534d154 100644
--- a/src/vstest.console/Resources/xlf/Resources.ko.xlf
+++ b/src/vstest.console/Resources/xlf/Resources.ko.xlf
@@ -84,14 +84,9 @@
이 사용법 메시지를 표시합니다.
-
- Copyright (c) Microsoft Corporation. All rights reserved.
- Copyright (c) Microsoft Corporation. All rights reserved.
-
-
- Microsoft (R) Test Execution Command Line Tool Version {0}
- Microsoft (R) Test Execution Command Line Tool Version {0}
+ VSTest version {0}
+ Microsoft (R) Test Execution Command Line Tool Version {0}
diff --git a/src/vstest.console/Resources/xlf/Resources.pl.xlf b/src/vstest.console/Resources/xlf/Resources.pl.xlf
index 62f2c25292..7aabd80f70 100644
--- a/src/vstest.console/Resources/xlf/Resources.pl.xlf
+++ b/src/vstest.console/Resources/xlf/Resources.pl.xlf
@@ -84,14 +84,9 @@
Wyświetla ten komunikat dotyczący sposobu użycia.
-
- Copyright (c) Microsoft Corporation. All rights reserved.
- Copyright (c) Microsoft Corporation. Wszelkie prawa zastrzeżone.
-
-
- Microsoft (R) Test Execution Command Line Tool Version {0}
- Narzędzie wiersza polecenia firmy Microsoft (R) służące do wykonania testów (wersja {0})
+ VSTest version {0}
+ Narzędzie wiersza polecenia firmy Microsoft (R) służące do wykonania testów (wersja {0})
diff --git a/src/vstest.console/Resources/xlf/Resources.pt-BR.xlf b/src/vstest.console/Resources/xlf/Resources.pt-BR.xlf
index aa745028a8..2e7af2c324 100644
--- a/src/vstest.console/Resources/xlf/Resources.pt-BR.xlf
+++ b/src/vstest.console/Resources/xlf/Resources.pt-BR.xlf
@@ -84,14 +84,9 @@
Exibe esta mensagem de uso.
-
- Copyright (c) Microsoft Corporation. All rights reserved.
- Copyright (c) Microsoft Corporation. Todos os direitos reservados.
-
-
- Microsoft (R) Test Execution Command Line Tool Version {0}
- Ferramenta de Linha de Comando de Execução de Teste da Microsoft (R) Versão {0}
+ VSTest version {0}
+ Ferramenta de Linha de Comando de Execução de Teste da Microsoft (R) Versão {0}
diff --git a/src/vstest.console/Resources/xlf/Resources.ru.xlf b/src/vstest.console/Resources/xlf/Resources.ru.xlf
index 96c41e2f5b..28bbbf6179 100644
--- a/src/vstest.console/Resources/xlf/Resources.ru.xlf
+++ b/src/vstest.console/Resources/xlf/Resources.ru.xlf
@@ -84,14 +84,9 @@
Отображение этого сообщения об использовании.
-
- Copyright (c) Microsoft Corporation. All rights reserved.
- (с) Корпорация Майкрософт (Microsoft Corporation). Все права защищены.
-
-
- Microsoft (R) Test Execution Command Line Tool Version {0}
- Программа Microsoft (R) Test Execution Command Line Tool версии {0}
+ VSTest version {0}
+ Программа Microsoft (R) Test Execution Command Line Tool версии {0}
diff --git a/src/vstest.console/Resources/xlf/Resources.tr.xlf b/src/vstest.console/Resources/xlf/Resources.tr.xlf
index 82dc76ba2c..2e3124fa3b 100644
--- a/src/vstest.console/Resources/xlf/Resources.tr.xlf
+++ b/src/vstest.console/Resources/xlf/Resources.tr.xlf
@@ -84,14 +84,9 @@
Bu kullanım iletisini görüntüler.
-
- Copyright (c) Microsoft Corporation. All rights reserved.
- Telif Hakkı (c) Microsoft Corporation. Tüm hakları saklıdır.
-
-
- Microsoft (R) Test Execution Command Line Tool Version {0}
- Microsoft (R) Test Yürütmesi Komut Satırı Aracı Sürüm {0}
+ VSTest version {0}
+ Microsoft (R) Test Yürütmesi Komut Satırı Aracı Sürüm {0}
diff --git a/src/vstest.console/Resources/xlf/Resources.zh-Hans.xlf b/src/vstest.console/Resources/xlf/Resources.zh-Hans.xlf
index 7295a1d891..17345c0475 100644
--- a/src/vstest.console/Resources/xlf/Resources.zh-Hans.xlf
+++ b/src/vstest.console/Resources/xlf/Resources.zh-Hans.xlf
@@ -84,14 +84,9 @@
显示此用法信息。
-
- Copyright (c) Microsoft Corporation. All rights reserved.
- 版权所有 (C) Microsoft Corporation。保留所有权利。
-
-
- Microsoft (R) Test Execution Command Line Tool Version {0}
- Microsoft (R) 测试执行命令行工具版本 {0}
+ VSTest version {0}
+ Microsoft (R) 测试执行命令行工具版本 {0}
diff --git a/src/vstest.console/Resources/xlf/Resources.zh-Hant.xlf b/src/vstest.console/Resources/xlf/Resources.zh-Hant.xlf
index e6166bd4b3..8e1f777960 100644
--- a/src/vstest.console/Resources/xlf/Resources.zh-Hant.xlf
+++ b/src/vstest.console/Resources/xlf/Resources.zh-Hant.xlf
@@ -84,14 +84,9 @@
顯示此使用方式訊息。
-
- Copyright (c) Microsoft Corporation. All rights reserved.
- Copyright (C) Microsoft Corporation. 著作權所有，並保留一切權利。
-
-
- Microsoft (R) Test Execution Command Line Tool Version {0}
- Microsoft (R) Test Execution Command Line Tool {0} 版
+ VSTest version {0}
+ Microsoft (R) Test Execution Command Line Tool {0} 版
diff --git a/test/vstest.console.UnitTests/ExecutorUnitTests.cs b/test/vstest.console.UnitTests/ExecutorUnitTests.cs
index d26c3934c2..e8102f24da 100644
--- a/test/vstest.console.UnitTests/ExecutorUnitTests.cs
+++ b/test/vstest.console.UnitTests/ExecutorUnitTests.cs
@@ -49,10 +49,8 @@ public void ExecutorPrintsSplashScreenTest()
Assert.IsTrue(mockOutput.Messages.Count > 0, "Executor must print at least copyright info");
Assert.IsNotNull(mockOutput.Messages.First().Message, "First Printed Message cannot be null or empty");
- // Just check first 20 characters - don't need to check whole thing as assembly version is variable
- // "First Printed message must be Microsoft Copyright");
StringAssert.Contains(mockOutput.Messages.First().Message,
- CommandLineResources.MicrosoftCommandLineTitle.Substring(0, 20));
+ CommandLineResources.MicrosoftCommandLineTitle.Split(['{'], 2)[0]);
var suffixIndex = assemblyVersion.IndexOf("-");
var version = suffixIndex == -1 ? assemblyVersion : assemblyVersion.Substring(0, suffixIndex);
@@ -71,11 +69,10 @@ public void ExecutorShouldNotPrintsSplashScreenIfNoLogoPassed()
// Verify that messages exist
Assert.IsTrue(mockOutput.Messages.Count == 1, "Executor should not print no valid arguments provided");
- // Just check first 20 characters - don't need to check whole thing as assembly version is variable
+ // Check the part of message before the actual version because that is variable.
Assert.IsFalse(
mockOutput.Messages.First()
- .Message!.Contains(CommandLineResources.MicrosoftCommandLineTitle.Substring(0, 20)),
- "First Printed message must be Microsoft Copyright");
+ .Message!.Contains(CommandLineResources.MicrosoftCommandLineTitle.Split(['{'], 2)[0]));
}
[TestMethod]
@@ -333,11 +330,11 @@ public void ExecutorShouldPrintWarningIfRunningEmulatedOnARM64()
var exitCode = new Executor(mockOutput, _mockTestPlatformEventSource.Object, processHelper.Object, environment.Object).Execute();
var assemblyVersion = typeof(Executor).Assembly.GetCustomAttribute()!.InformationalVersion;
- Assert.AreEqual(5, mockOutput.Messages.Count);
+ Assert.AreEqual(4, mockOutput.Messages.Count);
Assert.AreEqual("vstest.console.exe is running in emulated mode as x64. For better performance, please consider using the native runner vstest.console.arm64.exe.",
- mockOutput.Messages[2].Message);
+ mockOutput.Messages[1].Message);
Assert.AreEqual(OutputLevel.Warning,
- mockOutput.Messages[2].Level);
+ mockOutput.Messages[1].Level);
}
[TestMethod]
@@ -353,8 +350,8 @@ public void ExecutorShouldPrintRunnerArchitecture()
var exitCode = new Executor(mockOutput, _mockTestPlatformEventSource.Object, processHelper.Object, environment.Object).Execute();
var assemblyVersion = typeof(Executor).Assembly.GetCustomAttribute()!.InformationalVersion;
- Assert.AreEqual(4, mockOutput.Messages.Count);
- Assert.IsTrue(Regex.IsMatch(mockOutput.Messages[0].Message!, @"Microsoft \(R\) Test Execution Command Line Tool Version .* \(x64\)"));
+ Assert.AreEqual(3, mockOutput.Messages.Count);
+ Assert.IsTrue(Regex.IsMatch(mockOutput.Messages[0].Message!, @"VSTest version .* \(x64\)"));
Assert.IsFalse(mockOutput.Messages.Any(message => message.Message!.Contains("vstest.console.exe is running in emulated mode")));
}