diff --git a/scripts/build.sh b/scripts/build.sh index ddd0d18a00..d3960d60fd 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -213,20 +213,20 @@ function invoke_build() else # Need to target the appropriate targetframework for each project until netstandard2.0 ships PROJECTFRAMEWORKMAP=( \ - Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine:netstandard1.5 \ + Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine:netstandard1.4 \ testhost.x86/testhost.x86:netcoreapp1.0 \ Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions:netcoreapp1.0 \ Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions:netstandard1.0 \ package/package/package:netcoreapp1.0 \ - Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel:netstandard1.5 \ + Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel:netstandard1.4 \ Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer:netstandard1.5 \ datacollector/datacollector:netcoreapp2.0 \ vstest.console/vstest.console:netcoreapp2.0 \ - Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common:netstandard1.5 \ - Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client:netstandard1.5 \ + Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common:netstandard1.4 \ + Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client:netstandard1.4 \ Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger:netstandard1.5 \ - Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities:netstandard1.5 \ - Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities:netstandard1.5 \ + Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities:netstandard1.4 \ + Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities:netstandard1.4 \ Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build:netstandard1.3 \ testhost/testhost:netcoreapp1.0 \ Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities:netstandard1.4 @@ -387,6 +387,7 @@ function create_package() for i in ${projectFiles[@]}; do log "$DOTNET_PATH pack --no-build $stagingDir/${i} -o $packageOutputDir -p:Version=$TPB_Version" \ + && $DOTNET_PATH restore $stagingDir/${i} \ && $DOTNET_PATH pack --no-build $stagingDir/${i} -o $packageOutputDir -p:Version=$TPB_Version done diff --git a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj index 3a8c8d53a4..d8198dc3c6 100644 --- a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj +++ b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj @@ -9,11 +9,27 @@ netstandard1.3 true + + + PreserveNewest + + + True + True + Resources.resx + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + 15.1.548 diff --git a/src/Microsoft.TestPlatform.Build/Resources/Resources.Designer.cs b/src/Microsoft.TestPlatform.Build/Resources/Resources.Designer.cs new file mode 100644 index 0000000000..89e0b0712a --- /dev/null +++ b/src/Microsoft.TestPlatform.Build/Resources/Resources.Designer.cs @@ -0,0 +1,91 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Microsoft.TestPlatform.Build.Resources { + using System; + using System.Reflection; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.TestPlatform.Build.Resources.Resources", typeof(Resources).GetTypeInfo().Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized string similar to Build completed.. + /// + internal static string BuildCompleted { + get { + return ResourceManager.GetString("BuildCompleted", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Build started, please wait.... + /// + internal static string BuildStarted { + get { + return ResourceManager.GetString("BuildStarted", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Test run for {0}({1}). + /// + internal static string TestRunningSummary { + get { + return ResourceManager.GetString("TestRunningSummary", resourceCulture); + } + } + } +} diff --git a/src/Microsoft.TestPlatform.Build/Resources/Resources.resx b/src/Microsoft.TestPlatform.Build/Resources/Resources.resx new file mode 100644 index 0000000000..ebd07c3b71 --- /dev/null +++ b/src/Microsoft.TestPlatform.Build/Resources/Resources.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Build completed. + + + Build started, please wait... + + + Test run for {0}({1}) + + \ No newline at end of file diff --git a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.cs.xlf b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.cs.xlf new file mode 100644 index 0000000000..f5da19f028 --- /dev/null +++ b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.cs.xlf @@ -0,0 +1,40 @@ + + + +
+ + 27 + 22.95 + 22.95 + 0 + 0 + + + 0 + 0 + 0 + 0 + 0 + 27 + 0 + +
+ + + Build completed. + Build completed. + + + + Build started, please wait... + Build started, please wait... + + + + Test run for {0}({1}) + Test run for {0}({1}) + + + + + \ No newline at end of file diff --git a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.de.xlf b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.de.xlf new file mode 100644 index 0000000000..014bd55349 --- /dev/null +++ b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.de.xlf @@ -0,0 +1,40 @@ + + + +
+ + 27 + 22.95 + 22.95 + 0 + 0 + + + 0 + 0 + 0 + 0 + 0 + 27 + 0 + +
+ + + Build completed. + Build completed. + + + + Build started, please wait... + Build started, please wait... + + + + Test run for {0}({1}) + Test run for {0}({1}) + + + + + \ No newline at end of file diff --git a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.es.xlf b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.es.xlf new file mode 100644 index 0000000000..90a8571486 --- /dev/null +++ b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.es.xlf @@ -0,0 +1,40 @@ + + + +
+ + 27 + 22.95 + 22.95 + 0 + 0 + + + 0 + 0 + 0 + 0 + 0 + 27 + 0 + +
+ + + Build completed. + Build completed. + + + + Build started, please wait... + Build started, please wait... + + + + Test run for {0}({1}) + Test run for {0}({1}) + + + + + \ No newline at end of file diff --git a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.fr.xlf b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.fr.xlf new file mode 100644 index 0000000000..99f0186c45 --- /dev/null +++ b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.fr.xlf @@ -0,0 +1,40 @@ + + + +
+ + 27 + 22.95 + 22.95 + 0 + 0 + + + 0 + 0 + 0 + 0 + 0 + 27 + 0 + +
+ + + Build completed. + Build completed. + + + + Build started, please wait... + Build started, please wait... + + + + Test run for {0}({1}) + Test run for {0}({1}) + + + + + \ No newline at end of file diff --git a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.it.xlf b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.it.xlf new file mode 100644 index 0000000000..b562cbdd17 --- /dev/null +++ b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.it.xlf @@ -0,0 +1,40 @@ + + + +
+ + 27 + 22.95 + 22.95 + 0 + 0 + + + 0 + 0 + 0 + 0 + 0 + 27 + 0 + +
+ + + Build completed. + Build completed. + + + + Build started, please wait... + Build started, please wait... + + + + Test run for {0}({1}) + Test run for {0}({1}) + + + + + \ No newline at end of file diff --git a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.ja.xlf b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.ja.xlf new file mode 100644 index 0000000000..7f65d867b0 --- /dev/null +++ b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.ja.xlf @@ -0,0 +1,40 @@ + + + +
+ + 27 + 22.95 + 22.95 + 0 + 0 + + + 0 + 0 + 0 + 0 + 0 + 27 + 0 + +
+ + + Build completed. + Build completed. + + + + Build started, please wait... + Build started, please wait... + + + + Test run for {0}({1}) + Test run for {0}({1}) + + + + + \ No newline at end of file diff --git a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.ko.xlf b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.ko.xlf new file mode 100644 index 0000000000..96e17539f3 --- /dev/null +++ b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.ko.xlf @@ -0,0 +1,40 @@ + + + +
+ + 27 + 22.95 + 22.95 + 0 + 0 + + + 0 + 0 + 0 + 0 + 0 + 27 + 0 + +
+ + + Build completed. + Build completed. + + + + Build started, please wait... + Build started, please wait... + + + + Test run for {0}({1}) + Test run for {0}({1}) + + + + + \ No newline at end of file diff --git a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.pl.xlf b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.pl.xlf new file mode 100644 index 0000000000..7ebc54aa2f --- /dev/null +++ b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.pl.xlf @@ -0,0 +1,40 @@ + + + +
+ + 27 + 22.95 + 22.95 + 0 + 0 + + + 0 + 0 + 0 + 0 + 0 + 27 + 0 + +
+ + + Build completed. + Build completed. + + + + Build started, please wait... + Build started, please wait... + + + + Test run for {0}({1}) + Test run for {0}({1}) + + + + + \ No newline at end of file diff --git a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.pt-BR.xlf b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.pt-BR.xlf new file mode 100644 index 0000000000..a8a5ac9f06 --- /dev/null +++ b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.pt-BR.xlf @@ -0,0 +1,40 @@ + + + +
+ + 27 + 22.95 + 22.95 + 0 + 0 + + + 0 + 0 + 0 + 0 + 0 + 27 + 0 + +
+ + + Build completed. + Build completed. + + + + Build started, please wait... + Build started, please wait... + + + + Test run for {0}({1}) + Test run for {0}({1}) + + + + + \ No newline at end of file diff --git a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.ru.xlf b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.ru.xlf new file mode 100644 index 0000000000..d56a6bfd10 --- /dev/null +++ b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.ru.xlf @@ -0,0 +1,40 @@ + + + +
+ + 27 + 22.95 + 22.95 + 0 + 0 + + + 0 + 0 + 0 + 0 + 0 + 27 + 0 + +
+ + + Build completed. + Build completed. + + + + Build started, please wait... + Build started, please wait... + + + + Test run for {0}({1}) + Test run for {0}({1}) + + + + + \ No newline at end of file diff --git a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.tr.xlf b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.tr.xlf new file mode 100644 index 0000000000..4a4ea42327 --- /dev/null +++ b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.tr.xlf @@ -0,0 +1,40 @@ + + + +
+ + 27 + 22.95 + 22.95 + 0 + 0 + + + 0 + 0 + 0 + 0 + 0 + 27 + 0 + +
+ + + Build completed. + Build completed. + + + + Build started, please wait... + Build started, please wait... + + + + Test run for {0}({1}) + Test run for {0}({1}) + + + + + \ No newline at end of file diff --git a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf new file mode 100644 index 0000000000..c29c69fb77 --- /dev/null +++ b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf @@ -0,0 +1,22 @@ + + + + + + Build completed. + Build completed. + + + + Build started, please wait... + Build started, please wait... + + + + Test run for {0}({1}) + Test run for {0}({1}) + + + + + \ No newline at end of file diff --git a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.zh-Hans.xlf b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.zh-Hans.xlf new file mode 100644 index 0000000000..80bf1afc35 --- /dev/null +++ b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.zh-Hans.xlf @@ -0,0 +1,40 @@ + + + +
+ + 27 + 22.95 + 22.95 + 0 + 0 + + + 0 + 0 + 0 + 0 + 0 + 27 + 0 + +
+ + + Build completed. + Build completed. + + + + Build started, please wait... + Build started, please wait... + + + + Test run for {0}({1}) + Test run for {0}({1}) + + + + + \ No newline at end of file diff --git a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.zh-Hant.xlf b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.zh-Hant.xlf new file mode 100644 index 0000000000..4bcec279e8 --- /dev/null +++ b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.zh-Hant.xlf @@ -0,0 +1,40 @@ + + + +
+ + 27 + 22.95 + 22.95 + 0 + 0 + + + 0 + 0 + 0 + 0 + 0 + 27 + 0 + +
+ + + Build completed. + Build completed. + + + + Build started, please wait... + Build started, please wait... + + + + Test run for {0}({1}) + Test run for {0}({1}) + + + + + \ No newline at end of file diff --git a/src/Microsoft.TestPlatform.Build/Tasks/BuildLogTask.cs b/src/Microsoft.TestPlatform.Build/Tasks/BuildLogTask.cs index 5c3a623b07..a740000315 100644 --- a/src/Microsoft.TestPlatform.Build/Tasks/BuildLogTask.cs +++ b/src/Microsoft.TestPlatform.Build/Tasks/BuildLogTask.cs @@ -3,12 +3,9 @@ namespace Microsoft.TestPlatform.Build.Tasks { - using System.Collections.Generic; - - using Microsoft.Build.Framework; - using Microsoft.Build.Utilities; using System; - using System.IO; + using Microsoft.Build.Utilities; + using Microsoft.TestPlatform.Build.Resources; public class BuildLogTask : Task { @@ -22,11 +19,11 @@ public override bool Execute() { if (BuildStarted) { - Console.WriteLine("Build started, please wait..."); + Console.WriteLine(Resources.BuildStarted); } else { - Console.WriteLine("Build completed."); + Console.WriteLine(Resources.BuildCompleted); Console.WriteLine(); } return true; diff --git a/src/Microsoft.TestPlatform.Build/Tasks/VSTestTask.cs b/src/Microsoft.TestPlatform.Build/Tasks/VSTestTask.cs index ca3d394db5..3a886360ba 100644 --- a/src/Microsoft.TestPlatform.Build/Tasks/VSTestTask.cs +++ b/src/Microsoft.TestPlatform.Build/Tasks/VSTestTask.cs @@ -5,14 +5,12 @@ namespace Microsoft.TestPlatform.Build.Tasks { using System; using System.Collections.Generic; - using System.Diagnostics; using System.IO; - using Microsoft.Build.Framework; using Microsoft.Build.Utilities; - - using Trace; + using Microsoft.TestPlatform.Build.Resources; using Microsoft.TestPlatform.Build.Utils; + using Trace; public class VSTestTask : Task, ICancelableTask { @@ -113,7 +111,7 @@ public override bool Execute() vsTestForwardingApp = new VSTestForwardingApp(this.VSTestConsolePath, this.CreateArgument()); if (!string.IsNullOrEmpty(this.VSTestFramework)) { - Console.WriteLine("Test run for {0}({1})", this.TestFileFullPath, this.VSTestFramework); + Console.WriteLine(Resources.TestRunningSummary, this.TestFileFullPath, this.VSTestFramework); } return vsTestForwardingApp.Execute() == 0; diff --git a/src/package/nuspec/TestPlatform.Build.nuspec b/src/package/nuspec/TestPlatform.Build.nuspec index 4e5f6b9b22..5f0e81a78e 100644 --- a/src/package/nuspec/TestPlatform.Build.nuspec +++ b/src/package/nuspec/TestPlatform.Build.nuspec @@ -14,7 +14,10 @@ © Microsoft Corporation. All rights reserved. - + + + + diff --git a/src/package/package/package.csproj b/src/package/package/package.csproj index 47c75cfc74..96018c4117 100644 --- a/src/package/package/package.csproj +++ b/src/package/package/package.csproj @@ -5,7 +5,7 @@ - net451;netcoreapp2.0 + net451;netcoreapp2.0;netcoreapp1.0 package false false @@ -25,7 +25,7 @@ $(NoWarn);2008 - + win7-x64