Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding the Runtime Identifier and PlatformTarget to the error message #1902

Merged
merged 2 commits into from
Jan 27, 2018
Merged

Adding the Runtime Identifier and PlatformTarget to the error message #1902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41855d0
Adding the Runtime Identifier and PlatformTarget to the error message…
livarcocc Jan 25, 2018
5d74ded
Switching the error message test to use Strings.resx and String.Forma…
Jan 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Tasks/Common/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@
<value>It is not supported to build or publish a self-contained application without specifying a RuntimeIdentifier. Please either specify a RuntimeIdentifier or set SelfContained to false.</value>
</data>
<data name="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget" xml:space="preserve">
<value>The RuntimeIdentifier platform and the PlatformTarget must match.</value>
<value>The RuntimeIdentifier platform '{0}' and the PlatformTarget '{1}' must be compatible.</value>
</data>
<data name="ChoosingAssemblyVersion" xml:space="preserve">
<value>Choosing '{0}' because AssemblyVersion '{1}' is greater than '{2}'.</value>
Expand Down
4 changes: 2 additions & 2 deletions src/Tasks/Common/Resources/xlf/Strings.cs.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,8 +328,8 @@
<note />
</trans-unit>
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
<source>The RuntimeIdentifier platform and the PlatformTarget must match.</source>
<target state="translated">Platforma RuntimeIdentifier a PlatformTarget se musí shodovat.</target>
<source>The RuntimeIdentifier platform '{0}' and the PlatformTarget '{1}' must be compatible.</source>
<target state="needs-review-translation">Platforma RuntimeIdentifier a PlatformTarget se musí shodovat.</target>
<note />
</trans-unit>
<trans-unit id="ErrorParsingFrameworkListInvalidValue">
Expand Down
4 changes: 2 additions & 2 deletions src/Tasks/Common/Resources/xlf/Strings.de.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,8 +328,8 @@
<note />
</trans-unit>
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
<source>The RuntimeIdentifier platform and the PlatformTarget must match.</source>
<target state="translated">Die RuntimeIdentifier-Plattform und PlatformTarget müssen übereinstimmen.</target>
<source>The RuntimeIdentifier platform '{0}' and the PlatformTarget '{1}' must be compatible.</source>
<target state="needs-review-translation">Die RuntimeIdentifier-Plattform und PlatformTarget müssen übereinstimmen.</target>
<note />
</trans-unit>
<trans-unit id="ErrorParsingFrameworkListInvalidValue">
Expand Down
4 changes: 2 additions & 2 deletions src/Tasks/Common/Resources/xlf/Strings.es.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,8 +328,8 @@
<note />
</trans-unit>
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
<source>The RuntimeIdentifier platform and the PlatformTarget must match.</source>
<target state="translated">Las plataformas RuntimeIdentifier y PlatformTarget deben coincidir.</target>
<source>The RuntimeIdentifier platform '{0}' and the PlatformTarget '{1}' must be compatible.</source>
<target state="needs-review-translation">Las plataformas RuntimeIdentifier y PlatformTarget deben coincidir.</target>
<note />
</trans-unit>
<trans-unit id="ErrorParsingFrameworkListInvalidValue">
Expand Down
4 changes: 2 additions & 2 deletions src/Tasks/Common/Resources/xlf/Strings.fr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,8 +328,8 @@
<note />
</trans-unit>
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
<source>The RuntimeIdentifier platform and the PlatformTarget must match.</source>
<target state="translated">La plateforme RuntimeIdentifier et la PlatformTarget doivent correspondre.</target>
<source>The RuntimeIdentifier platform '{0}' and the PlatformTarget '{1}' must be compatible.</source>
<target state="needs-review-translation">La plateforme RuntimeIdentifier et la PlatformTarget doivent correspondre.</target>
<note />
</trans-unit>
<trans-unit id="ErrorParsingFrameworkListInvalidValue">
Expand Down
4 changes: 2 additions & 2 deletions src/Tasks/Common/Resources/xlf/Strings.it.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,8 +328,8 @@
<note />
</trans-unit>
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
<source>The RuntimeIdentifier platform and the PlatformTarget must match.</source>
<target state="translated">La piattaforma di RuntimeIdentifier e quella di PlatformTarget devono corrispondere.</target>
<source>The RuntimeIdentifier platform '{0}' and the PlatformTarget '{1}' must be compatible.</source>
<target state="needs-review-translation">La piattaforma di RuntimeIdentifier e quella di PlatformTarget devono corrispondere.</target>
<note />
</trans-unit>
<trans-unit id="ErrorParsingFrameworkListInvalidValue">
Expand Down
4 changes: 2 additions & 2 deletions src/Tasks/Common/Resources/xlf/Strings.ja.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,8 +328,8 @@
<note />
</trans-unit>
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
<source>The RuntimeIdentifier platform and the PlatformTarget must match.</source>
<target state="translated">RuntimeIdentifier プラットフォームと PlatformTarget は一致している必要があります。</target>
<source>The RuntimeIdentifier platform '{0}' and the PlatformTarget '{1}' must be compatible.</source>
<target state="needs-review-translation">RuntimeIdentifier プラットフォームと PlatformTarget は一致している必要があります。</target>
<note />
</trans-unit>
<trans-unit id="ErrorParsingFrameworkListInvalidValue">
Expand Down
4 changes: 2 additions & 2 deletions src/Tasks/Common/Resources/xlf/Strings.ko.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,8 +328,8 @@
<note />
</trans-unit>
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
<source>The RuntimeIdentifier platform and the PlatformTarget must match.</source>
<target state="translated">RuntimeIdentifier 플랫폼과 PlatformTarget은 일치해야 합니다.</target>
<source>The RuntimeIdentifier platform '{0}' and the PlatformTarget '{1}' must be compatible.</source>
<target state="needs-review-translation">RuntimeIdentifier 플랫폼과 PlatformTarget은 일치해야 합니다.</target>
<note />
</trans-unit>
<trans-unit id="ErrorParsingFrameworkListInvalidValue">
Expand Down
4 changes: 2 additions & 2 deletions src/Tasks/Common/Resources/xlf/Strings.pl.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,8 +328,8 @@
<note />
</trans-unit>
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
<source>The RuntimeIdentifier platform and the PlatformTarget must match.</source>
<target state="translated">Platforma RuntimeIdentifier i wartość PlatformTarget muszą być zgodne.</target>
<source>The RuntimeIdentifier platform '{0}' and the PlatformTarget '{1}' must be compatible.</source>
<target state="needs-review-translation">Platforma RuntimeIdentifier i wartość PlatformTarget muszą być zgodne.</target>
<note />
</trans-unit>
<trans-unit id="ErrorParsingFrameworkListInvalidValue">
Expand Down
4 changes: 2 additions & 2 deletions src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,8 +328,8 @@
<note />
</trans-unit>
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
<source>The RuntimeIdentifier platform and the PlatformTarget must match.</source>
<target state="translated">A plataforma RuntimeIdentifier e a PlatformTarget devem corresponder.</target>
<source>The RuntimeIdentifier platform '{0}' and the PlatformTarget '{1}' must be compatible.</source>
<target state="needs-review-translation">A plataforma RuntimeIdentifier e a PlatformTarget devem corresponder.</target>
<note />
</trans-unit>
<trans-unit id="ErrorParsingFrameworkListInvalidValue">
Expand Down
4 changes: 2 additions & 2 deletions src/Tasks/Common/Resources/xlf/Strings.ru.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,8 +328,8 @@
<note />
</trans-unit>
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
<source>The RuntimeIdentifier platform and the PlatformTarget must match.</source>
<target state="translated">Платформа RuntimeIdentifier и PlatformTarget должны совпадать.</target>
<source>The RuntimeIdentifier platform '{0}' and the PlatformTarget '{1}' must be compatible.</source>
<target state="needs-review-translation">Платформа RuntimeIdentifier и PlatformTarget должны совпадать.</target>
<note />
</trans-unit>
<trans-unit id="ErrorParsingFrameworkListInvalidValue">
Expand Down
4 changes: 2 additions & 2 deletions src/Tasks/Common/Resources/xlf/Strings.tr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,8 +328,8 @@
<note />
</trans-unit>
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
<source>The RuntimeIdentifier platform and the PlatformTarget must match.</source>
<target state="translated">RuntimeIdentifier platformu ile PlatformTarget eşleşmelidir.</target>
<source>The RuntimeIdentifier platform '{0}' and the PlatformTarget '{1}' must be compatible.</source>
<target state="needs-review-translation">RuntimeIdentifier platformu ile PlatformTarget eşleşmelidir.</target>
<note />
</trans-unit>
<trans-unit id="ErrorParsingFrameworkListInvalidValue">
Expand Down
4 changes: 2 additions & 2 deletions src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,8 +328,8 @@
<note />
</trans-unit>
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
<source>The RuntimeIdentifier platform and the PlatformTarget must match.</source>
<target state="translated">RuntimeIdentifier 平台和 PlatformTarget 必须匹配。</target>
<source>The RuntimeIdentifier platform '{0}' and the PlatformTarget '{1}' must be compatible.</source>
<target state="needs-review-translation">RuntimeIdentifier 平台和 PlatformTarget 必须匹配。</target>
<note />
</trans-unit>
<trans-unit id="ErrorParsingFrameworkListInvalidValue">
Expand Down
4 changes: 2 additions & 2 deletions src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,8 +328,8 @@
<note />
</trans-unit>
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
<source>The RuntimeIdentifier platform and the PlatformTarget must match.</source>
<target state="translated">RuntimeIdentifier 平台必須與 PlatformTarget 相符。</target>
<source>The RuntimeIdentifier platform '{0}' and the PlatformTarget '{1}' must be compatible.</source>
<target state="needs-review-translation">RuntimeIdentifier 平台必須與 PlatformTarget 相符。</target>
<note />
</trans-unit>
<trans-unit id="ErrorParsingFrameworkListInvalidValue">
Expand Down
1 change: 1 addition & 0 deletions src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@

<ItemGroup>
<InternalsVisibleTo Include="Microsoft.NET.Build.Tasks.UnitTests" />
<InternalsVisibleTo Include="Microsoft.NET.Build.Tests" />
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.RuntimeIdentifierInference.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ Copyright (c) .NET Foundation. All rights reserved.
Condition="'$(RuntimeIdentifier)' != '' and '$(PlatformTarget)' != ''">

<NETSdkError Condition="'$(PlatformTarget)' != 'AnyCPU' and !$(RuntimeIdentifier.ToUpper().Contains($(PlatformTarget.ToUpper())))"
ResourceName="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget" />
ResourceName="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget"
FormatArguments="$(RuntimeIdentifier);$(PlatformTarget)" />

</Target>

Expand Down
16 changes: 12 additions & 4 deletions src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildASelfContainedApp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using FluentAssertions;
using Microsoft.DotNet.Cli.Utils;
using Microsoft.NET.Build.Tasks;
using Microsoft.NET.TestFramework;
using Microsoft.NET.TestFramework.Assertions;
using Microsoft.NET.TestFramework.Commands;
Expand Down Expand Up @@ -71,15 +72,18 @@ public void It_builds_a_runnable_output()
[Fact]
public void It_errors_out_when_RuntimeIdentifier_architecture_and_PlatformTarget_do_not_match()
{
var testAsset = _testAssetsManager
const string RuntimeIdentifier = "win10-x64";
const string PlatformTarget = "x86";

var testAsset = _testAssetsManager
.CopyTestAsset("HelloWorld")
.WithSource()
.WithProjectChanges(project =>
{
var ns = project.Root.Name.Namespace;
var propertyGroup = project.Root.Elements(ns + "PropertyGroup").First();
propertyGroup.Add(new XElement(ns + "RuntimeIdentifier", "win10-x64"));
propertyGroup.Add(new XElement(ns + "PlatformTarget", "x86"));
propertyGroup.Add(new XElement(ns + "RuntimeIdentifier", RuntimeIdentifier));
propertyGroup.Add(new XElement(ns + "PlatformTarget", PlatformTarget));
})
.Restore(Log);

Expand All @@ -88,7 +92,11 @@ public void It_errors_out_when_RuntimeIdentifier_architecture_and_PlatformTarget
buildCommand
.Execute()
.Should()
.Fail();
.Fail()
.And.HaveStdOutContaining(string.Format(
Strings.CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget,
RuntimeIdentifier,
PlatformTarget));
}

[Fact]
Expand Down