Skip to content

Commit 9e7c61c

Browse files
dsplaisteddsplaisted
authored
Merge pull request #1618 from dsplaisted/1336-conflicts-read-framework-list
In conflict resolution, treat items from FrameworkList.xml as platform assemblies
2 parents 26e83ab + 8057f42 commit 9e7c61c

24 files changed

+454
-14
lines changed

Diff for: ‎src/Tasks/Common/Resources/Strings.Designer.cs

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

Diff for: ‎src/Tasks/Common/Resources/Strings.resx

+6
Original file line numberDiff line numberDiff line change
@@ -315,4 +315,10 @@
315315
<data name="UnsupportedSDKVersionForNetStandard20" xml:space="preserve">
316316
<value>The version of Microsoft.NET.Sdk used by this project is insufficient to support references to libraries targeting .NET Standard 1.5 or higher. Please install version 2.0 or higher of the .NET Core SDK.</value>
317317
</data>
318+
<data name="ErrorParsingFrameworkListInvalidValue" xml:space="preserve">
319+
<value>Error parsing FrameworkList from '{0}'. {1} '{2}' was invalid.</value>
320+
</data>
321+
<data name="FrameworkListPathNotRooted" xml:space="preserve">
322+
<value>Framework list file path '{0}' is not rooted. Only full paths are supported.</value>
323+
</data>
318324
</root>

Diff for: ‎src/Tasks/Common/Resources/xlf/Strings.cs.xlf

+10
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,16 @@
332332
<target state="translated">Platforma RuntimeIdentifier a PlatformTarget se musí shodovat.</target>
333333
<note />
334334
</trans-unit>
335+
<trans-unit id="ErrorParsingFrameworkListInvalidValue">
336+
<source>Error parsing FrameworkList from '{0}'. {1} '{2}' was invalid.</source>
337+
<target state="new">Error parsing FrameworkList from '{0}'. {1} '{2}' was invalid.</target>
338+
<note />
339+
</trans-unit>
340+
<trans-unit id="FrameworkListPathNotRooted">
341+
<source>Framework list file path '{0}' is not rooted. Only full paths are supported.</source>
342+
<target state="new">Framework list file path '{0}' is not rooted. Only full paths are supported.</target>
343+
<note />
344+
</trans-unit>
335345
</body>
336346
</file>
337347
</xliff>

Diff for: ‎src/Tasks/Common/Resources/xlf/Strings.de.xlf

+10
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,16 @@
332332
<target state="translated">Die RuntimeIdentifier-Plattform und PlatformTarget müssen übereinstimmen.</target>
333333
<note />
334334
</trans-unit>
335+
<trans-unit id="ErrorParsingFrameworkListInvalidValue">
336+
<source>Error parsing FrameworkList from '{0}'. {1} '{2}' was invalid.</source>
337+
<target state="new">Error parsing FrameworkList from '{0}'. {1} '{2}' was invalid.</target>
338+
<note />
339+
</trans-unit>
340+
<trans-unit id="FrameworkListPathNotRooted">
341+
<source>Framework list file path '{0}' is not rooted. Only full paths are supported.</source>
342+
<target state="new">Framework list file path '{0}' is not rooted. Only full paths are supported.</target>
343+
<note />
344+
</trans-unit>
335345
</body>
336346
</file>
337347
</xliff>

Diff for: ‎src/Tasks/Common/Resources/xlf/Strings.es.xlf

+10
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,16 @@
332332
<target state="translated">Las plataformas RuntimeIdentifier y PlatformTarget deben coincidir.</target>
333333
<note />
334334
</trans-unit>
335+
<trans-unit id="ErrorParsingFrameworkListInvalidValue">
336+
<source>Error parsing FrameworkList from '{0}'. {1} '{2}' was invalid.</source>
337+
<target state="new">Error parsing FrameworkList from '{0}'. {1} '{2}' was invalid.</target>
338+
<note />
339+
</trans-unit>
340+
<trans-unit id="FrameworkListPathNotRooted">
341+
<source>Framework list file path '{0}' is not rooted. Only full paths are supported.</source>
342+
<target state="new">Framework list file path '{0}' is not rooted. Only full paths are supported.</target>
343+
<note />
344+
</trans-unit>
335345
</body>
336346
</file>
337347
</xliff>

Diff for: ‎src/Tasks/Common/Resources/xlf/Strings.fr.xlf

+10
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,16 @@
332332
<target state="translated">La plateforme RuntimeIdentifier et la PlatformTarget doivent correspondre.</target>
333333
<note />
334334
</trans-unit>
335+
<trans-unit id="ErrorParsingFrameworkListInvalidValue">
336+
<source>Error parsing FrameworkList from '{0}'. {1} '{2}' was invalid.</source>
337+
<target state="new">Error parsing FrameworkList from '{0}'. {1} '{2}' was invalid.</target>
338+
<note />
339+
</trans-unit>
340+
<trans-unit id="FrameworkListPathNotRooted">
341+
<source>Framework list file path '{0}' is not rooted. Only full paths are supported.</source>
342+
<target state="new">Framework list file path '{0}' is not rooted. Only full paths are supported.</target>
343+
<note />
344+
</trans-unit>
335345
</body>
336346
</file>
337347
</xliff>

Diff for: ‎src/Tasks/Common/Resources/xlf/Strings.it.xlf

+10
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,16 @@
332332
<target state="translated">La piattaforma di RuntimeIdentifier e quella di PlatformTarget devono corrispondere.</target>
333333
<note />
334334
</trans-unit>
335+
<trans-unit id="ErrorParsingFrameworkListInvalidValue">
336+
<source>Error parsing FrameworkList from '{0}'. {1} '{2}' was invalid.</source>
337+
<target state="new">Error parsing FrameworkList from '{0}'. {1} '{2}' was invalid.</target>
338+
<note />
339+
</trans-unit>
340+
<trans-unit id="FrameworkListPathNotRooted">
341+
<source>Framework list file path '{0}' is not rooted. Only full paths are supported.</source>
342+
<target state="new">Framework list file path '{0}' is not rooted. Only full paths are supported.</target>
343+
<note />
344+
</trans-unit>
335345
</body>
336346
</file>
337347
</xliff>

Diff for: ‎src/Tasks/Common/Resources/xlf/Strings.ja.xlf

+10
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,16 @@
332332
<target state="translated">RuntimeIdentifier プラットフォームと PlatformTarget は一致している必要があります。</target>
333333
<note />
334334
</trans-unit>
335+
<trans-unit id="ErrorParsingFrameworkListInvalidValue">
336+
<source>Error parsing FrameworkList from '{0}'. {1} '{2}' was invalid.</source>
337+
<target state="new">Error parsing FrameworkList from '{0}'. {1} '{2}' was invalid.</target>
338+
<note />
339+
</trans-unit>
340+
<trans-unit id="FrameworkListPathNotRooted">
341+
<source>Framework list file path '{0}' is not rooted. Only full paths are supported.</source>
342+
<target state="new">Framework list file path '{0}' is not rooted. Only full paths are supported.</target>
343+
<note />
344+
</trans-unit>
335345
</body>
336346
</file>
337347
</xliff>

Diff for: ‎src/Tasks/Common/Resources/xlf/Strings.ko.xlf

+10
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,16 @@
332332
<target state="translated">RuntimeIdentifier 플랫폼과 PlatformTarget은 일치해야 합니다.</target>
333333
<note />
334334
</trans-unit>
335+
<trans-unit id="ErrorParsingFrameworkListInvalidValue">
336+
<source>Error parsing FrameworkList from '{0}'. {1} '{2}' was invalid.</source>
337+
<target state="new">Error parsing FrameworkList from '{0}'. {1} '{2}' was invalid.</target>
338+
<note />
339+
</trans-unit>
340+
<trans-unit id="FrameworkListPathNotRooted">
341+
<source>Framework list file path '{0}' is not rooted. Only full paths are supported.</source>
342+
<target state="new">Framework list file path '{0}' is not rooted. Only full paths are supported.</target>
343+
<note />
344+
</trans-unit>
335345
</body>
336346
</file>
337347
</xliff>

Diff for: ‎src/Tasks/Common/Resources/xlf/Strings.pl.xlf

+10
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,16 @@
332332
<target state="translated">Platforma RuntimeIdentifier i wartość PlatformTarget muszą być zgodne.</target>
333333
<note />
334334
</trans-unit>
335+
<trans-unit id="ErrorParsingFrameworkListInvalidValue">
336+
<source>Error parsing FrameworkList from '{0}'. {1} '{2}' was invalid.</source>
337+
<target state="new">Error parsing FrameworkList from '{0}'. {1} '{2}' was invalid.</target>
338+
<note />
339+
</trans-unit>
340+
<trans-unit id="FrameworkListPathNotRooted">
341+
<source>Framework list file path '{0}' is not rooted. Only full paths are supported.</source>
342+
<target state="new">Framework list file path '{0}' is not rooted. Only full paths are supported.</target>
343+
<note />
344+
</trans-unit>
335345
</body>
336346
</file>
337347
</xliff>

Diff for: ‎src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf

+10
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,16 @@
332332
<target state="translated">A plataforma RuntimeIdentifier e a PlatformTarget devem corresponder.</target>
333333
<note />
334334
</trans-unit>
335+
<trans-unit id="ErrorParsingFrameworkListInvalidValue">
336+
<source>Error parsing FrameworkList from '{0}'. {1} '{2}' was invalid.</source>
337+
<target state="new">Error parsing FrameworkList from '{0}'. {1} '{2}' was invalid.</target>
338+
<note />
339+
</trans-unit>
340+
<trans-unit id="FrameworkListPathNotRooted">
341+
<source>Framework list file path '{0}' is not rooted. Only full paths are supported.</source>
342+
<target state="new">Framework list file path '{0}' is not rooted. Only full paths are supported.</target>
343+
<note />
344+
</trans-unit>
335345
</body>
336346
</file>
337347
</xliff>

Diff for: ‎src/Tasks/Common/Resources/xlf/Strings.ru.xlf

+10
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,16 @@
332332
<target state="translated">Платформа RuntimeIdentifier и PlatformTarget должны совпадать.</target>
333333
<note />
334334
</trans-unit>
335+
<trans-unit id="ErrorParsingFrameworkListInvalidValue">
336+
<source>Error parsing FrameworkList from '{0}'. {1} '{2}' was invalid.</source>
337+
<target state="new">Error parsing FrameworkList from '{0}'. {1} '{2}' was invalid.</target>
338+
<note />
339+
</trans-unit>
340+
<trans-unit id="FrameworkListPathNotRooted">
341+
<source>Framework list file path '{0}' is not rooted. Only full paths are supported.</source>
342+
<target state="new">Framework list file path '{0}' is not rooted. Only full paths are supported.</target>
343+
<note />
344+
</trans-unit>
335345
</body>
336346
</file>
337347
</xliff>

Diff for: ‎src/Tasks/Common/Resources/xlf/Strings.tr.xlf

+10
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,16 @@
332332
<target state="translated">RuntimeIdentifier platformu ile PlatformTarget eşleşmelidir.</target>
333333
<note />
334334
</trans-unit>
335+
<trans-unit id="ErrorParsingFrameworkListInvalidValue">
336+
<source>Error parsing FrameworkList from '{0}'. {1} '{2}' was invalid.</source>
337+
<target state="new">Error parsing FrameworkList from '{0}'. {1} '{2}' was invalid.</target>
338+
<note />
339+
</trans-unit>
340+
<trans-unit id="FrameworkListPathNotRooted">
341+
<source>Framework list file path '{0}' is not rooted. Only full paths are supported.</source>
342+
<target state="new">Framework list file path '{0}' is not rooted. Only full paths are supported.</target>
343+
<note />
344+
</trans-unit>
335345
</body>
336346
</file>
337347
</xliff>

Diff for: ‎src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf

+10
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,16 @@
332332
<target state="translated">RuntimeIdentifier 平台和 PlatformTarget 必须匹配。</target>
333333
<note />
334334
</trans-unit>
335+
<trans-unit id="ErrorParsingFrameworkListInvalidValue">
336+
<source>Error parsing FrameworkList from '{0}'. {1} '{2}' was invalid.</source>
337+
<target state="new">Error parsing FrameworkList from '{0}'. {1} '{2}' was invalid.</target>
338+
<note />
339+
</trans-unit>
340+
<trans-unit id="FrameworkListPathNotRooted">
341+
<source>Framework list file path '{0}' is not rooted. Only full paths are supported.</source>
342+
<target state="new">Framework list file path '{0}' is not rooted. Only full paths are supported.</target>
343+
<note />
344+
</trans-unit>
335345
</body>
336346
</file>
337347
</xliff>

Diff for: ‎src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf

+10
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,16 @@
332332
<target state="translated">RuntimeIdentifier 平台必須與 PlatformTarget 相符。</target>
333333
<note />
334334
</trans-unit>
335+
<trans-unit id="ErrorParsingFrameworkListInvalidValue">
336+
<source>Error parsing FrameworkList from '{0}'. {1} '{2}' was invalid.</source>
337+
<target state="new">Error parsing FrameworkList from '{0}'. {1} '{2}' was invalid.</target>
338+
<note />
339+
</trans-unit>
340+
<trans-unit id="FrameworkListPathNotRooted">
341+
<source>Framework list file path '{0}' is not rooted. Only full paths are supported.</source>
342+
<target state="new">Framework list file path '{0}' is not rooted. Only full paths are supported.</target>
343+
<note />
344+
</trans-unit>
335345
</body>
336346
</file>
337347
</xliff>

Diff for: ‎src/Tasks/Common/src/ConflictResolution/ConflictResolver.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ private TConflictItem ResolveConflict(TConflictItem item1, TConflictItem item2)
248248
return item2;
249249
}
250250

251-
string message = conflictMessage + SENTENCE_SPACING + string.Format(CultureInfo.InvariantCulture, Strings.ConflictCouldNotDetermineWinner);
251+
string message = conflictMessage + SENTENCE_SPACING + string.Format(CultureInfo.CurrentCulture, Strings.ConflictCouldNotDetermineWinner);
252252

253253
log.LogMessage(message);
254254
return null;

0 commit comments

Comments
 (0)