Merge pull request #12612 from sfoslund/ParseTPPrev8

[Preview 8] Parse target platform properties from target framework
dotnet · Jul 23, 2020 · fc32d1d · fc32d1d
2 parents 285cac3 + f19d2d2
commit fc32d1d
Show file tree

Hide file tree

Showing 27 changed files with 213 additions and 41 deletions.
diff --git a/eng/restore-toolset.ps1 b/eng/restore-toolset.ps1
@@ -1,6 +1,6 @@
 function InitializeCustomSDKToolset {
   if ($env:TestFullMSBuild -eq "true") {
-     $env:DOTNET_SDK_TEST_MSBUILD_PATH = InitializeVisualStudioMSBuild -install:$false -vsRequirements:$GlobalJson.tools.'vs-opt'
+     $env:DOTNET_SDK_TEST_MSBUILD_PATH = InitializeVisualStudioMSBuild -install:$true -vsRequirements:$GlobalJson.tools.'vs-opt'
      Write-Host "INFO: Tests will run against full MSBuild in $env:DOTNET_SDK_TEST_MSBUILD_PATH"
   }
 

diff --git a/global.json b/global.json
@@ -7,8 +7,9 @@
       ]
     },
     "vs-opt": {
-      "version": "15.9"
-    }
+      "version": "16.8"
+    },
+    "xcopy-msbuild": "16.8.0-preview1"
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20364.3",

diff --git a/src/Layout/redist/minimumMSBuildVersion b/src/Layout/redist/minimumMSBuildVersion
@@ -1 +1 @@
-16.5.0
+16.8.0
diff --git a/src/Tasks/Common/Resources/Strings.resx b/src/Tasks/Common/Resources/Strings.resx
@@ -645,4 +645,8 @@ The following are names of parameters or literal values and should not be transl
     <value>NETSDK1135: MinimumOSPlatform {0} cannot be higher than TargetPlatformVersion {1}.</value>
     <comment>{StrBegin="NETSDK1135: "}</comment>
   </data>
+    <data name="UnsupportedTargetPlatformIdentifier" xml:space="preserve">
+    <value>NETSDK1136: The target platform identifier {0} was not recognized.</value>
+    <comment>{StrBegin="NETSDK1136: "}</comment>
+  </data>
 </root>
diff --git a/src/Tasks/Common/Resources/xlf/Strings.cs.xlf b/src/Tasks/Common/Resources/xlf/Strings.cs.xlf
@@ -643,6 +643,11 @@ The following are names of parameters or literal values and should not be transl
         <target state="translated">NETSDK1045: Aktuální sada .NET SDK nepodporuje cílení {0} {1}. Buď zacilte {0} {2} nebo nižší, nebo použijte verzi sady .NET SDK, která podporuje {0} {1}.</target>
         <note>{StrBegin="NETSDK1045: "}</note>
       </trans-unit>
+      <trans-unit id="UnsupportedTargetPlatformIdentifier">
+        <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>
         <target state="translated">NETSDK1107: K sestavování desktopových aplikací pro Windows se vyžaduje Microsoft.NET.Sdk.WindowsDesktop. Aktuální verze sady SDK nepodporuje hodnoty UseWpf a UseWindowsForms.</target>

diff --git a/src/Tasks/Common/Resources/xlf/Strings.de.xlf b/src/Tasks/Common/Resources/xlf/Strings.de.xlf
@@ -643,6 +643,11 @@ The following are names of parameters or literal values and should not be transl
         <target state="translated">NETSDK1045: Das aktuelle .NET SDK unterstützt {0} {1} nicht als Ziel. Geben Sie entweder {0} {2} oder niedriger als Ziel an, oder verwenden Sie eine .NET SDK-Version, die {0} {1} unterstützt.</target>
         <note>{StrBegin="NETSDK1045: "}</note>
       </trans-unit>
+      <trans-unit id="UnsupportedTargetPlatformIdentifier">
+        <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>
         <target state="translated">NETSDK1107: Für das Erstellen von Windows-Desktopanwendungen ist Microsoft.NET.Sdk.WindowsDesktop erforderlich. "UseWpf" und "UseWindowsForms" werden vom aktuellen SDK nicht unterstützt.</target>

diff --git a/src/Tasks/Common/Resources/xlf/Strings.es.xlf b/src/Tasks/Common/Resources/xlf/Strings.es.xlf
@@ -643,6 +643,11 @@ The following are names of parameters or literal values and should not be transl
         <target state="translated">NETSDK1045: El SDK de .NET actual no admite el destino {0} {1}. Use el destino {0} {2} u otro inferior, o bien una versión del SDK de .NET que admita {0} {1}.</target>
         <note>{StrBegin="NETSDK1045: "}</note>
       </trans-unit>
+      <trans-unit id="UnsupportedTargetPlatformIdentifier">
+        <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>
         <target state="translated">NETSDK1107: Se requiere Microsoft.NET.Sdk.WindowsDesktop para compilar las aplicaciones de escritorio de Windows. El SDK actual no admite "UseWpf" ni "UseWindowsForms".</target>

diff --git a/src/Tasks/Common/Resources/xlf/Strings.fr.xlf b/src/Tasks/Common/Resources/xlf/Strings.fr.xlf
@@ -643,6 +643,11 @@ The following are names of parameters or literal values and should not be transl
         <target state="translated">NETSDK1045: Le kit .NET SDK actuel ne prend pas en charge le ciblage de {0} {1}. Vous devez soit cibler {0} {2} ou une version antérieure, soit utiliser une version du kit .NET SDK qui prend en charge {0} {1}.</target>
         <note>{StrBegin="NETSDK1045: "}</note>
       </trans-unit>
+      <trans-unit id="UnsupportedTargetPlatformIdentifier">
+        <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>
         <target state="translated">NETSDK1107: vous devez disposer de Microsoft.NET.Sdk.WindowsDesktop pour générer des applications de bureau Windows. 'UseWpf' et 'UseWindowsForms' ne sont pas pris en charge par le kit SDK actuel.</target>

diff --git a/src/Tasks/Common/Resources/xlf/Strings.it.xlf b/src/Tasks/Common/Resources/xlf/Strings.it.xlf
@@ -643,6 +643,11 @@ The following are names of parameters or literal values and should not be transl
         <target state="translated">NETSDK1045: la versione corrente di .NET SDK non supporta {0} {1} come destinazione. Impostare come destinazione {0} {2} o una versione precedente oppure usare una versione di .NET SDK che supporta {0} {1}.</target>
         <note>{StrBegin="NETSDK1045: "}</note>
       </trans-unit>
+      <trans-unit id="UnsupportedTargetPlatformIdentifier">
+        <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>
         <target state="translated">NETSDK1107: per compilare applicazioni desktop di Windows, è necessario Microsoft.NET.Sdk.WindowsDesktop. 'UseWpf' e 'UseWindowsForms' non sono supportati dall'SDK corrente.</target>

diff --git a/src/Tasks/Common/Resources/xlf/Strings.ja.xlf b/src/Tasks/Common/Resources/xlf/Strings.ja.xlf
@@ -643,6 +643,11 @@ The following are names of parameters or literal values and should not be transl
         <target state="translated">NETSDK1045: 現在の .NET SDK は、ターゲットとする {0} {1} をサポートしていません。{0} {2} 以下をターゲットとするか、{0} {1} をサポートする .NET SDK のバージョンを使用してください。</target>
         <note>{StrBegin="NETSDK1045: "}</note>
       </trans-unit>
+      <trans-unit id="UnsupportedTargetPlatformIdentifier">
+        <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>
         <target state="translated">NETSDK1107: Windows デスクトップ アプリケーションを作成するには、Microsoft.NET.Sdk.WindowsDesktop が必要です。現在の SDK では、'UseWpf' と 'UseWindowsForms' はサポートされていません。</target>

diff --git a/src/Tasks/Common/Resources/xlf/Strings.ko.xlf b/src/Tasks/Common/Resources/xlf/Strings.ko.xlf
@@ -643,6 +643,11 @@ The following are names of parameters or literal values and should not be transl
         <target state="translated">NETSDK1045: 현재 .NET SDK에서는 {0} {1}을(를) 대상으로 하는 것을 지원하지 않습니다. {0} {2} 이하를 대상으로 하거나 {0} {1}을(를) 지원하는 .NET SDK 버전을 사용하세요.</target>
         <note>{StrBegin="NETSDK1045: "}</note>
       </trans-unit>
+      <trans-unit id="UnsupportedTargetPlatformIdentifier">
+        <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>
         <target state="translated">NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop을 사용하려면 Windows 데스크톱 애플리케이션을 빌드해야 합니다. 'UseWpf' 및 'UseWindowsForms'는 현재 SDK에서 지원하지 않습니다.</target>

diff --git a/src/Tasks/Common/Resources/xlf/Strings.pl.xlf b/src/Tasks/Common/Resources/xlf/Strings.pl.xlf
@@ -643,6 +643,11 @@ The following are names of parameters or literal values and should not be transl
         <target state="translated">NETSDK1045: Bieżący zestaw .NET SDK nie obsługuje używania środowiska docelowego {0} {1}. Użyj jako środowiska docelowego wersji {0} {2} lub starszej albo użyj wersji zestawu .NET SDK obsługującej środowisko {0} {1}.</target>
         <note>{StrBegin="NETSDK1045: "}</note>
       </trans-unit>
+      <trans-unit id="UnsupportedTargetPlatformIdentifier">
+        <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>
         <target state="translated">NETSDK1107: Do kompilowania aplikacji klasycznych systemu Windows konieczny jest zestaw Microsoft.NET.Sdk.WindowsDesktop. Właściwości „UseWpf” i „UseWindowsForms” nie są obsługiwane przez bieżący zestaw SDK.</target>

diff --git a/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf b/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf
@@ -643,6 +643,11 @@ The following are names of parameters or literal values and should not be transl
         <target state="translated">NETSDK1045: O SDK do .NET atual não dá suporte para direcionar a {0} {1}. Direcione a {0} {2} ou inferior, ou use uma versão do SDK do .NET compatível com  {0} {1}.</target>
         <note>{StrBegin="NETSDK1045: "}</note>
       </trans-unit>
+      <trans-unit id="UnsupportedTargetPlatformIdentifier">
+        <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>
         <target state="translated">NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop é necessário para compilar aplicativos da área de trabalho do Windows. Não há suporte para 'UseWpf' e 'UseWindowsForms' no SDK atual.</target>

diff --git a/src/Tasks/Common/Resources/xlf/Strings.ru.xlf b/src/Tasks/Common/Resources/xlf/Strings.ru.xlf
@@ -643,6 +643,11 @@ The following are names of parameters or literal values and should not be transl
         <target state="translated">NETSDK1045: текущий пакет SDK для .NET не поддерживает целевой объект {0} {1}. Выберите {0} {2} или более раннюю версию либо используйте версию пакета SDK для .NET, которая поддерживает {0} {1}.</target>
         <note>{StrBegin="NETSDK1045: "}</note>
       </trans-unit>
+      <trans-unit id="UnsupportedTargetPlatformIdentifier">
+        <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>
         <target state="translated">NETSDK1107: для сборки классических приложений для Windows требуется Microsoft.NET.Sdk.WindowsDesktop. "UseWpf" и "UseWindowsForms" не поддерживаются текущим пакетом SDK.</target>

diff --git a/src/Tasks/Common/Resources/xlf/Strings.tr.xlf b/src/Tasks/Common/Resources/xlf/Strings.tr.xlf
@@ -643,6 +643,11 @@ The following are names of parameters or literal values and should not be transl
         <target state="translated">NETSDK1045: Geçerli .NET SDK’sı {0} {1} sürümünü hedeflemeyi desteklemiyor. {0} {2} veya daha düşük bir sürümü hedefleyin veya {0} {1} destekleyen bir .NET SDK’sı kullanın.</target>
         <note>{StrBegin="NETSDK1045: "}</note>
       </trans-unit>
+      <trans-unit id="UnsupportedTargetPlatformIdentifier">
+        <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>
         <target state="translated">NETSDK1107: Windows Masaüstü uygulamalarını derlemek için Microsoft.NET.Sdk.WindowsDesktop gereklidir. 'UseWpf' ve 'UseWindowsForms' geçerli SDK tarafından desteklenmiyor.</target>

diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf
@@ -643,6 +643,11 @@ The following are names of parameters or literal values and should not be transl
         <target state="translated">NETSDK1045: 当前 .NET SDK 不支持将 {0} {1} 设置为目标。请将 {0} {2} 或更低版本设置为目标，或使用支持 {0} {1} 的 .NET SDK 版本。</target>
         <note>{StrBegin="NETSDK1045: "}</note>
       </trans-unit>
+      <trans-unit id="UnsupportedTargetPlatformIdentifier">
+        <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>
         <target state="translated">NETSDK1107: 要构建 Windows 桌面应用程序，需使用 Microsoft.NET.Sdk.WindowsDesktop。当前 SDK 不支持 "UseWpf" 和 "UseWindowsForms"。</target>

diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf
@@ -643,6 +643,11 @@ The following are names of parameters or literal values and should not be transl
         <target state="translated">NETSDK1045: 目前的 .NET SDK 不支援以 {0} {1} 作為目標。請以 {0} {2} 或更低版本作為目標，或是使用支援 {0} {1} 的 .NET SDK 版本。</target>
         <note>{StrBegin="NETSDK1045: "}</note>
       </trans-unit>
+      <trans-unit id="UnsupportedTargetPlatformIdentifier">
+        <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>
         <target state="translated">NETSDK1107: 需有 Microsoft.NET.Sdk.WindowsDesktop 才能建置 Windows 傳統型應用程式。目前的 SDK 不支援 'UseWpf' 和 'UseWindowsForms'。</target>