Fixing merge issues

dotnet · Jul 23, 2020 · aa0ee77 · aa0ee77
1 parent cbedf95
commit aa0ee77
Show file tree

Hide file tree

Showing 14 changed files with 42 additions and 42 deletions.
diff --git a/src/Tasks/Common/Resources/xlf/Strings.cs.xlf b/src/Tasks/Common/Resources/xlf/Strings.cs.xlf
@@ -644,9 +644,9 @@ The following are names of parameters or literal values and should not be transl
         <note>{StrBegin="NETSDK1045: "}</note>
       </trans-unit>
       <trans-unit id="UnsupportedTargetPlatformIdentifier">
-        <source>NETSDK1135: The target platform identifier {0} was not recognized.</source>
-        <target state="new">NETSDK1135: The target platform identifier {0} was not recognized.</target>
-        <note>{StrBegin="NETSDK1135: "}</note>
+        <source>NETSDK1136: The target platform identifier {0} was not recognized.</source>
+        <target state="new">NETSDK1136: The target platform identifier {0} was not recognized.</target>
+        <note>{StrBegin="NETSDK1136: "}</note>
       </trans-unit>
       <trans-unit id="UseWpfOrUseWindowsFormsRequiresWindowsDesktopFramework">
         <source>NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK.</source>

diff --git a/src/Tasks/Common/Resources/xlf/Strings.de.xlf b/src/Tasks/Common/Resources/xlf/Strings.de.xlf
@@ -644,9 +644,9 @@ The following are names of parameters or literal values and should not be transl
         <note>{StrBegin="NETSDK1045: "}</note>
       </trans-unit>
       <trans-unit id="UnsupportedTargetPlatformIdentifier">
-        <source>NETSDK1135: The target platform identifier {0} was not recognized.</source>
-        <target state="new">NETSDK1135: The target platform identifier {0} was not recognized.</target>
-        <note>{StrBegin="NETSDK1135: "}</note>
+        <source>NETSDK1136: The target platform identifier {0} was not recognized.</source>
+        <target state="new">NETSDK1136: The target platform identifier {0} was not recognized.</target>
+        <note>{StrBegin="NETSDK1136: "}</note>
       </trans-unit>
       <trans-unit id="UseWpfOrUseWindowsFormsRequiresWindowsDesktopFramework">
         <source>NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK.</source>

diff --git a/src/Tasks/Common/Resources/xlf/Strings.es.xlf b/src/Tasks/Common/Resources/xlf/Strings.es.xlf
@@ -644,9 +644,9 @@ The following are names of parameters or literal values and should not be transl
         <note>{StrBegin="NETSDK1045: "}</note>
       </trans-unit>
       <trans-unit id="UnsupportedTargetPlatformIdentifier">
-        <source>NETSDK1135: The target platform identifier {0} was not recognized.</source>
-        <target state="new">NETSDK1135: The target platform identifier {0} was not recognized.</target>
-        <note>{StrBegin="NETSDK1135: "}</note>
+        <source>NETSDK1136: The target platform identifier {0} was not recognized.</source>
+        <target state="new">NETSDK1136: The target platform identifier {0} was not recognized.</target>
+        <note>{StrBegin="NETSDK1136: "}</note>
       </trans-unit>
       <trans-unit id="UseWpfOrUseWindowsFormsRequiresWindowsDesktopFramework">
         <source>NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK.</source>

diff --git a/src/Tasks/Common/Resources/xlf/Strings.fr.xlf b/src/Tasks/Common/Resources/xlf/Strings.fr.xlf
@@ -644,9 +644,9 @@ The following are names of parameters or literal values and should not be transl
         <note>{StrBegin="NETSDK1045: "}</note>
       </trans-unit>
       <trans-unit id="UnsupportedTargetPlatformIdentifier">
-        <source>NETSDK1135: The target platform identifier {0} was not recognized.</source>
-        <target state="new">NETSDK1135: The target platform identifier {0} was not recognized.</target>
-        <note>{StrBegin="NETSDK1135: "}</note>
+        <source>NETSDK1136: The target platform identifier {0} was not recognized.</source>
+        <target state="new">NETSDK1136: The target platform identifier {0} was not recognized.</target>
+        <note>{StrBegin="NETSDK1136: "}</note>
       </trans-unit>
       <trans-unit id="UseWpfOrUseWindowsFormsRequiresWindowsDesktopFramework">
         <source>NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK.</source>

diff --git a/src/Tasks/Common/Resources/xlf/Strings.it.xlf b/src/Tasks/Common/Resources/xlf/Strings.it.xlf
@@ -644,9 +644,9 @@ The following are names of parameters or literal values and should not be transl
         <note>{StrBegin="NETSDK1045: "}</note>
       </trans-unit>
       <trans-unit id="UnsupportedTargetPlatformIdentifier">
-        <source>NETSDK1135: The target platform identifier {0} was not recognized.</source>
-        <target state="new">NETSDK1135: The target platform identifier {0} was not recognized.</target>
-        <note>{StrBegin="NETSDK1135: "}</note>
+        <source>NETSDK1136: The target platform identifier {0} was not recognized.</source>
+        <target state="new">NETSDK1136: The target platform identifier {0} was not recognized.</target>
+        <note>{StrBegin="NETSDK1136: "}</note>
       </trans-unit>
       <trans-unit id="UseWpfOrUseWindowsFormsRequiresWindowsDesktopFramework">
         <source>NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK.</source>

diff --git a/src/Tasks/Common/Resources/xlf/Strings.ja.xlf b/src/Tasks/Common/Resources/xlf/Strings.ja.xlf
@@ -644,9 +644,9 @@ The following are names of parameters or literal values and should not be transl
         <note>{StrBegin="NETSDK1045: "}</note>
       </trans-unit>
       <trans-unit id="UnsupportedTargetPlatformIdentifier">
-        <source>NETSDK1135: The target platform identifier {0} was not recognized.</source>
-        <target state="new">NETSDK1135: The target platform identifier {0} was not recognized.</target>
-        <note>{StrBegin="NETSDK1135: "}</note>
+        <source>NETSDK1136: The target platform identifier {0} was not recognized.</source>
+        <target state="new">NETSDK1136: The target platform identifier {0} was not recognized.</target>
+        <note>{StrBegin="NETSDK1136: "}</note>
       </trans-unit>
       <trans-unit id="UseWpfOrUseWindowsFormsRequiresWindowsDesktopFramework">
         <source>NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK.</source>

diff --git a/src/Tasks/Common/Resources/xlf/Strings.ko.xlf b/src/Tasks/Common/Resources/xlf/Strings.ko.xlf
@@ -644,9 +644,9 @@ The following are names of parameters or literal values and should not be transl
         <note>{StrBegin="NETSDK1045: "}</note>
       </trans-unit>
       <trans-unit id="UnsupportedTargetPlatformIdentifier">
-        <source>NETSDK1135: The target platform identifier {0} was not recognized.</source>
-        <target state="new">NETSDK1135: The target platform identifier {0} was not recognized.</target>
-        <note>{StrBegin="NETSDK1135: "}</note>
+        <source>NETSDK1136: The target platform identifier {0} was not recognized.</source>
+        <target state="new">NETSDK1136: The target platform identifier {0} was not recognized.</target>
+        <note>{StrBegin="NETSDK1136: "}</note>
       </trans-unit>
       <trans-unit id="UseWpfOrUseWindowsFormsRequiresWindowsDesktopFramework">
         <source>NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK.</source>

diff --git a/src/Tasks/Common/Resources/xlf/Strings.pl.xlf b/src/Tasks/Common/Resources/xlf/Strings.pl.xlf
@@ -644,9 +644,9 @@ The following are names of parameters or literal values and should not be transl
         <note>{StrBegin="NETSDK1045: "}</note>
       </trans-unit>
       <trans-unit id="UnsupportedTargetPlatformIdentifier">
-        <source>NETSDK1135: The target platform identifier {0} was not recognized.</source>
-        <target state="new">NETSDK1135: The target platform identifier {0} was not recognized.</target>
-        <note>{StrBegin="NETSDK1135: "}</note>
+        <source>NETSDK1136: The target platform identifier {0} was not recognized.</source>
+        <target state="new">NETSDK1136: The target platform identifier {0} was not recognized.</target>
+        <note>{StrBegin="NETSDK1136: "}</note>
       </trans-unit>
       <trans-unit id="UseWpfOrUseWindowsFormsRequiresWindowsDesktopFramework">
         <source>NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK.</source>

diff --git a/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf b/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf
@@ -644,9 +644,9 @@ The following are names of parameters or literal values and should not be transl
         <note>{StrBegin="NETSDK1045: "}</note>
       </trans-unit>
       <trans-unit id="UnsupportedTargetPlatformIdentifier">
-        <source>NETSDK1135: The target platform identifier {0} was not recognized.</source>
-        <target state="new">NETSDK1135: The target platform identifier {0} was not recognized.</target>
-        <note>{StrBegin="NETSDK1135: "}</note>
+        <source>NETSDK1136: The target platform identifier {0} was not recognized.</source>
+        <target state="new">NETSDK1136: The target platform identifier {0} was not recognized.</target>
+        <note>{StrBegin="NETSDK1136: "}</note>
       </trans-unit>
       <trans-unit id="UseWpfOrUseWindowsFormsRequiresWindowsDesktopFramework">
         <source>NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK.</source>

diff --git a/src/Tasks/Common/Resources/xlf/Strings.ru.xlf b/src/Tasks/Common/Resources/xlf/Strings.ru.xlf
@@ -644,9 +644,9 @@ The following are names of parameters or literal values and should not be transl
         <note>{StrBegin="NETSDK1045: "}</note>
       </trans-unit>
       <trans-unit id="UnsupportedTargetPlatformIdentifier">
-        <source>NETSDK1135: The target platform identifier {0} was not recognized.</source>
-        <target state="new">NETSDK1135: The target platform identifier {0} was not recognized.</target>
-        <note>{StrBegin="NETSDK1135: "}</note>
+        <source>NETSDK1136: The target platform identifier {0} was not recognized.</source>
+        <target state="new">NETSDK1136: The target platform identifier {0} was not recognized.</target>
+        <note>{StrBegin="NETSDK1136: "}</note>
       </trans-unit>
       <trans-unit id="UseWpfOrUseWindowsFormsRequiresWindowsDesktopFramework">
         <source>NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK.</source>

diff --git a/src/Tasks/Common/Resources/xlf/Strings.tr.xlf b/src/Tasks/Common/Resources/xlf/Strings.tr.xlf
@@ -644,9 +644,9 @@ The following are names of parameters or literal values and should not be transl
         <note>{StrBegin="NETSDK1045: "}</note>
       </trans-unit>
       <trans-unit id="UnsupportedTargetPlatformIdentifier">
-        <source>NETSDK1135: The target platform identifier {0} was not recognized.</source>
-        <target state="new">NETSDK1135: The target platform identifier {0} was not recognized.</target>
-        <note>{StrBegin="NETSDK1135: "}</note>
+        <source>NETSDK1136: The target platform identifier {0} was not recognized.</source>
+        <target state="new">NETSDK1136: The target platform identifier {0} was not recognized.</target>
+        <note>{StrBegin="NETSDK1136: "}</note>
       </trans-unit>
       <trans-unit id="UseWpfOrUseWindowsFormsRequiresWindowsDesktopFramework">
         <source>NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK.</source>

diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf
@@ -644,9 +644,9 @@ The following are names of parameters or literal values and should not be transl
         <note>{StrBegin="NETSDK1045: "}</note>
       </trans-unit>
       <trans-unit id="UnsupportedTargetPlatformIdentifier">
-        <source>NETSDK1135: The target platform identifier {0} was not recognized.</source>
-        <target state="new">NETSDK1135: The target platform identifier {0} was not recognized.</target>
-        <note>{StrBegin="NETSDK1135: "}</note>
+        <source>NETSDK1136: The target platform identifier {0} was not recognized.</source>
+        <target state="new">NETSDK1136: The target platform identifier {0} was not recognized.</target>
+        <note>{StrBegin="NETSDK1136: "}</note>
       </trans-unit>
       <trans-unit id="UseWpfOrUseWindowsFormsRequiresWindowsDesktopFramework">
         <source>NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK.</source>

diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf
@@ -644,9 +644,9 @@ The following are names of parameters or literal values and should not be transl
         <note>{StrBegin="NETSDK1045: "}</note>
       </trans-unit>
       <trans-unit id="UnsupportedTargetPlatformIdentifier">
-        <source>NETSDK1135: The target platform identifier {0} was not recognized.</source>
-        <target state="new">NETSDK1135: The target platform identifier {0} was not recognized.</target>
-        <note>{StrBegin="NETSDK1135: "}</note>
+        <source>NETSDK1136: The target platform identifier {0} was not recognized.</source>
+        <target state="new">NETSDK1136: The target platform identifier {0} was not recognized.</target>
+        <note>{StrBegin="NETSDK1136: "}</note>
       </trans-unit>
       <trans-unit id="UseWpfOrUseWindowsFormsRequiresWindowsDesktopFramework">
         <source>NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK.</source>

diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildWithATargetPlatform.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildWithATargetPlatform.cs
@@ -21,10 +21,10 @@ public GivenThatWeWantToBuildWithATargetPlatform(ITestOutputHelper log) : base(l
 
         [Theory]
         [InlineData("netcoreapp3.1", ".NETCoreApp", "v3.1", "Windows", "7.0")] // Default values pre-5.0
-        [InlineData("net5.0", ".NETCoreApp", "v5.0", "", "")]
+        [InlineData("net5.0", ".NETCoreApp", "v5.0", "Windows", "7.0")]
         [InlineData("net5.0-Windows7.0", ".NETCoreApp", "v5.0", "Windows", "7.0")]
         [InlineData("net5.0-WINDOWS7.0", ".NETCoreApp", "v5.0", "Windows", "7.0")]
-        [InlineData("net5.0-windows", ".NETCoreApp", "v5.0", "Windows", "7.0")] // Depends on https://github.com/dotnet/wpf/pull/3177
+        [InlineData("net5.0-windows", ".NETCoreApp", "v5.0", "Windows", "7.0")]
         [InlineData("net5.0-windows10.0.19041", ".NETCoreApp", "v5.0", "Windows", "10.0.19041")]
         public void It_defines_target_platform_from_target_framework(string targetFramework, string expectedTargetFrameworkIdentifier, string expectedTargetFrameworkVersion, string expectedTargetPlatformIdentifier, string expectedTargetPlatformVersion)
         {
@@ -81,7 +81,7 @@ public void It_fails_on_unsupported_os()
                 .Should()
                 .Fail()
                 .And
-                .HaveStdOutContaining("NETSDK1135");
+                .HaveStdOutContaining("NETSDK1136");
         }
     }
 }