Skip to content

Commit

Permalink
Localize Microsoft.TestPlatform.build.dll (#952)
Browse files Browse the repository at this point in the history
* Localize Microsoft.TestPlatform.build.dll

* Packeging localized resource dll in nuspec file

* Fix build failure on linux machine

* Build was failing because we were not restoring for netcoreapp1.0 but building for it

* Reverting back changes for trx logger and translation layer

* Do restore before pack as we are moving project in different location before packing

* Create TestPlatform.build nuget package on linux
  • Loading branch information
Faizan2304 authored Jul 27, 2017
1 parent 2c3a9f5 commit fd51793
Show file tree
Hide file tree
Showing 22 changed files with 798 additions and 21 deletions.
13 changes: 7 additions & 6 deletions scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,27 @@
<TargetFramework>netstandard1.3</TargetFramework>
<WarningsAsErrors>true</WarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\Resources.resx" />
</ItemGroup>
<ItemGroup>
<Content Include="Microsoft.TestPlatform.targets">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<Compile Update="Resources\Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Update="Resources\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Build.Framework">
<Version>15.1.548</Version>
Expand Down
91 changes: 91 additions & 0 deletions src/Microsoft.TestPlatform.Build/Resources/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

129 changes: 129 additions & 0 deletions src/Microsoft.TestPlatform.Build/Resources/Resources.resx
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="BuildCompleted" xml:space="preserve">
<value>Build completed.</value>
</data>
<data name="BuildStarted" xml:space="preserve">
<value>Build started, please wait...</value>
</data>
<data name="TestRunningSummary" xml:space="preserve">
<value>Test run for {0}({1})</value>
</data>
</root>
40 changes: 40 additions & 0 deletions src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.cs.xlf
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="cs" original="../Resources.resx" build-num="-191745455">
<header>
<count-group name="BlackBox wordcount">
<count count-type="x-wordCount">27</count>
<count count-type="x-adjWordCount">22.95</count>
<count count-type="x-curAdjWordCount">22.95</count>
<count count-type="x-repeatAdjWordCount">0</count>
<count count-type="x-termWordCount">0</count>
</count-group>
<count-group name="BlackBox wordcount analysis">
<count count-type="x-match102%">0</count>
<count count-type="x-match101%">0</count>
<count count-type="x-match100%">0</count>
<count count-type="x-match99-90%">0</count>
<count count-type="x-match89-75%">0</count>
<count count-type="x-mt">27</count>
<count count-type="repetition">0</count>
</count-group>
</header>
<body>
<trans-unit id="BuildCompleted">
<source>Build completed.</source>
<target state="new">Build completed.</target>
<note></note>
</trans-unit>
<trans-unit id="BuildStarted">
<source>Build started, please wait...</source>
<target state="new">Build started, please wait...</target>
<note></note>
</trans-unit>
<trans-unit id="TestRunningSummary">
<source>Test run for {0}({1})</source>
<target state="new">Test run for {0}({1})</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
40 changes: 40 additions & 0 deletions src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.de.xlf
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="de" original="../Resources.resx" build-num="-508382432">
<header>
<count-group name="BlackBox wordcount">
<count count-type="x-wordCount">27</count>
<count count-type="x-adjWordCount">22.95</count>
<count count-type="x-curAdjWordCount">22.95</count>
<count count-type="x-repeatAdjWordCount">0</count>
<count count-type="x-termWordCount">0</count>
</count-group>
<count-group name="BlackBox wordcount analysis">
<count count-type="x-match102%">0</count>
<count count-type="x-match101%">0</count>
<count count-type="x-match100%">0</count>
<count count-type="x-match99-90%">0</count>
<count count-type="x-match89-75%">0</count>
<count count-type="x-mt">27</count>
<count count-type="repetition">0</count>
</count-group>
</header>
<body>
<trans-unit id="BuildCompleted">
<source>Build completed.</source>
<target state="new">Build completed.</target>
<note></note>
</trans-unit>
<trans-unit id="BuildStarted">
<source>Build started, please wait...</source>
<target state="new">Build started, please wait...</target>
<note></note>
</trans-unit>
<trans-unit id="TestRunningSummary">
<source>Test run for {0}({1})</source>
<target state="new">Test run for {0}({1})</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
Loading

0 comments on commit fd51793

Please sign in to comment.