Skip to content

Commit bd63619

Browse files
committed
log message in confusing resource state
1 parent 919385e commit bd63619

File tree

15 files changed

+127
-43
lines changed

15 files changed

+127
-43
lines changed

src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.resx

Lines changed: 55 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<root>
3-
<!--
4-
Microsoft ResX Schema
5-
3+
<!--
4+
Microsoft ResX Schema
5+
66
Version 2.0
7-
8-
The primary goals of this format is to allow a simple XML format
9-
that is mostly human readable. The generation and parsing of the
10-
various data types are done through the TypeConverter classes
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
1111
associated with the data types.
12-
12+
1313
Example:
14-
14+
1515
... ado.net/XML headers & schema ...
1616
<resheader name="resmimetype">text/microsoft-resx</resheader>
1717
<resheader name="version">2.0</resheader>
@@ -26,79 +26,79 @@
2626
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
2727
<comment>This is a comment</comment>
2828
</data>
29-
30-
There are any number of "resheader" rows that contain simple
29+
30+
There are any number of "resheader" rows that contain simple
3131
name/value pairs.
32-
33-
Each data row contains a name, and value. The row also contains a
34-
type or mimetype. Type corresponds to a .NET class that support
35-
text/value conversion through the TypeConverter architecture.
36-
Classes that don't support this are serialized and stored with the
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
3737
mimetype set.
38-
39-
The mimetype is used for serialized objects, and tells the
40-
ResXResourceReader how to depersist the object. This is currently not
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
4141
extensible. For a given mimetype the value must be set accordingly:
42-
43-
Note - application/x-microsoft.net.object.binary.base64 is the format
44-
that the ResXResourceWriter will generate, however the reader can
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
4545
read any of the formats listed below.
46-
46+
4747
mimetype: application/x-microsoft.net.object.binary.base64
48-
value : The object must be serialized with
48+
value : The object must be serialized with
4949
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
5050
: and then encoded with base64 encoding.
51-
51+
5252
mimetype: application/x-microsoft.net.object.soap.base64
53-
value : The object must be serialized with
53+
value : The object must be serialized with
5454
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
5555
: and then encoded with base64 encoding.
5656
5757
mimetype: application/x-microsoft.net.object.bytearray.base64
58-
value : The object must be serialized into a byte array
58+
value : The object must be serialized into a byte array
5959
: using a System.ComponentModel.TypeConverter
6060
: and then encoded with base64 encoding.
6161
-->
6262
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63-
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
6464
<xsd:element name="root" msdata:IsDataSet="true">
6565
<xsd:complexType>
6666
<xsd:choice maxOccurs="unbounded">
6767
<xsd:element name="metadata">
6868
<xsd:complexType>
6969
<xsd:sequence>
70-
<xsd:element name="value" type="xsd:string" minOccurs="0" />
70+
<xsd:element name="value" type="xsd:string" minOccurs="0"/>
7171
</xsd:sequence>
72-
<xsd:attribute name="name" use="required" type="xsd:string" />
73-
<xsd:attribute name="type" type="xsd:string" />
74-
<xsd:attribute name="mimetype" type="xsd:string" />
75-
<xsd:attribute ref="xml:space" />
72+
<xsd:attribute name="name" use="required" type="xsd:string"/>
73+
<xsd:attribute name="type" type="xsd:string"/>
74+
<xsd:attribute name="mimetype" type="xsd:string"/>
75+
<xsd:attribute ref="xml:space"/>
7676
</xsd:complexType>
7777
</xsd:element>
7878
<xsd:element name="assembly">
7979
<xsd:complexType>
80-
<xsd:attribute name="alias" type="xsd:string" />
81-
<xsd:attribute name="name" type="xsd:string" />
80+
<xsd:attribute name="alias" type="xsd:string"/>
81+
<xsd:attribute name="name" type="xsd:string"/>
8282
</xsd:complexType>
8383
</xsd:element>
8484
<xsd:element name="data">
8585
<xsd:complexType>
8686
<xsd:sequence>
87-
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88-
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
8989
</xsd:sequence>
90-
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91-
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92-
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93-
<xsd:attribute ref="xml:space" />
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
93+
<xsd:attribute ref="xml:space"/>
9494
</xsd:complexType>
9595
</xsd:element>
9696
<xsd:element name="resheader">
9797
<xsd:complexType>
9898
<xsd:sequence>
99-
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
100100
</xsd:sequence>
101-
<xsd:attribute name="name" type="xsd:string" use="required" />
101+
<xsd:attribute name="name" type="xsd:string" use="required"/>
102102
</xsd:complexType>
103103
</xsd:element>
104104
</xsd:choice>
@@ -183,6 +183,7 @@
183183
</data>
184184
<data name="HostObjectNotDetected" xml:space="preserve">
185185
<value>No host object detected.</value>
186+
<comment/>
186187
</data>
187188
<data name="ImageLoadFailed" xml:space="preserve">
188189
<value>CONTAINER1009: Failed to load image from local registry. stdout: {0}</value>
@@ -250,6 +251,7 @@
250251
</data>
251252
<data name="NormalizedContainerName" xml:space="preserve">
252253
<value>'{0}' was not a valid container image name, it was normalized to '{1}'</value>
254+
<comment/>
253255
</data>
254256
<data name="PublishDirectoryDoesntExist" xml:space="preserve">
255257
<value>CONTAINER2011: {0} '{1}' does not exist</value>
@@ -333,12 +335,15 @@
333335
</data>
334336
<data name="ContainerBuilder_ImageUploadedToLocalDaemon" xml:space="preserve">
335337
<value>Pushed image '{0}' to {1}.</value>
338+
<comment/>
336339
</data>
337340
<data name="ContainerBuilder_ImageUploadedToRegistry" xml:space="preserve">
338341
<value>Pushed image '{0}' to registry '{1}'.</value>
342+
<comment/>
339343
</data>
340344
<data name="ContainerBuilder_StartBuildingImage" xml:space="preserve">
341345
<value>Building image '{0}' with tags '{1}' on top of base image '{2}'.</value>
346+
<comment/>
342347
</data>
343348
<data name="LocalDocker_FailedToGetConfig" xml:space="preserve">
344349
<value>Error while reading daemon config: {0}</value>
@@ -350,12 +355,15 @@
350355
</data>
351356
<data name="Registry_ConfigUploaded" xml:space="preserve">
352357
<value>Uploaded config to registry.</value>
358+
<comment/>
353359
</data>
354360
<data name="Registry_ConfigUploadStarted" xml:space="preserve">
355361
<value>Uploading config to registry at blob '{0}',</value>
362+
<comment/>
356363
</data>
357364
<data name="Registry_LayerExists" xml:space="preserve">
358365
<value>Layer '{0}' already exists.</value>
366+
<comment/>
359367
</data>
360368
<data name="Registry_LayerUploaded" xml:space="preserve">
361369
<value>Finished uploading layer '{0}' to '{1}'.</value>
@@ -409,4 +417,8 @@
409417
<value>local registry via '{0}'</value>
410418
<comment>{0} is the command used</comment>
411419
</data>
420+
<data name="GenerateDigestLabelWithoutGenerateLabels" xml:space="preserve">
421+
<value>CONTAINER20030: GenerateLabels was disabled but GenerateDigestLabel was enabled - no digest label will be created.</value>
422+
<comment>{StrBegin="CONTAINER2030: "}</comment>
423+
</data>
412424
</root>

src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.cs.xlf

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.de.xlf

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.es.xlf

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.fr.xlf

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.it.xlf

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ja.xlf

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ko.xlf

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pl.xlf

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pt-BR.xlf

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)