From 83d2f8162d29a66a8ff323c4bba93c8250013511 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <amauryleve@microsoft.com>
Date: Thu, 25 Aug 2022 16:21:04 +0200
Subject: [PATCH] Bump version to 17.3.1 and cherry-pick loc files (#3966)

Co-authored-by: Alex Hsu <csigs@users.noreply.github.com>
Co-authored-by: Test Platform Bot <79333716+testplatform-bot@users.noreply.github.com>
Co-authored-by: Medeni Baykal <433724+Haplois@users.noreply.github.com>
---
 .../Resources/xlf/Resources.xlf.lcl                       | 8 ++++----
 .../Resources/xlf/Resources.xlf.lcl                       | 8 ++++----
 .../Resources/xlf/Resources.xlf.lcl                       | 8 ++++----
 .../Resources/xlf/Resources.xlf.lcl                       | 8 ++++----
 .../Resources/xlf/Resources.xlf.lcl                       | 8 ++++----
 .../Resources/xlf/Resources.xlf.lcl                       | 8 ++++----
 .../Resources/xlf/Resources.xlf.lcl                       | 8 ++++----
 .../Resources/xlf/Resources.xlf.lcl                       | 8 ++++----
 .../Resources/xlf/Resources.xlf.lcl                       | 8 ++++----
 .../Resources/xlf/Resources.xlf.lcl                       | 8 ++++----
 .../Resources/xlf/Resources.xlf.lcl                       | 8 ++++----
 .../Resources/xlf/Resources.xlf.lcl                       | 8 ++++----
 .../Resources/xlf/Resources.xlf.lcl                       | 8 ++++----
 eng/Versions.props                                        | 2 +-
 scripts/build/TestPlatform.Dependencies.props             | 2 +-
 scripts/build/TestPlatform.Settings.targets               | 2 +-
 .../Resources/xlf/Resources.cs.xlf                        | 4 ++--
 .../Resources/xlf/Resources.de.xlf                        | 4 ++--
 .../Resources/xlf/Resources.es.xlf                        | 2 +-
 .../Resources/xlf/Resources.fr.xlf                        | 2 +-
 .../Resources/xlf/Resources.it.xlf                        | 2 +-
 .../Resources/xlf/Resources.ja.xlf                        | 2 +-
 .../Resources/xlf/Resources.ko.xlf                        | 2 +-
 .../Resources/xlf/Resources.pl.xlf                        | 2 +-
 .../Resources/xlf/Resources.pt-BR.xlf                     | 2 +-
 .../Resources/xlf/Resources.ru.xlf                        | 4 ++--
 .../Resources/xlf/Resources.tr.xlf                        | 2 +-
 .../Resources/xlf/Resources.zh-Hans.xlf                   | 4 ++--
 .../Resources/xlf/Resources.zh-Hant.xlf                   | 4 ++--
 .../Extension/Features.cs                                 | 2 +-
 30 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/Localize/lcl/cs/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/cs/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
index cedde0e337..8e4a8a1eff 100644
--- a/Localize/lcl/cs/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
+++ b/Localize/lcl/cs/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
@@ -313,14 +313,14 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" Leaf="true">
+      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
+          <Val><![CDATA[Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Proces testhost se ukončil s chybou: {0}. Další informace najdete v diagnostických protokolech.]]></Val>
+            <Val><![CDATA[Proces testhost pro zdroj(e) {0} se ukončil s chybou: {1}. Další informace najdete v diagnostických protokolech.]]></Val>
           </Tgt>
           <Prev Cat="Text">
-            <Val><![CDATA[Testhost process exited with error: {0}]]></Val>
+            <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
           </Prev>
         </Str>
         <Disp Icon="Str" />
diff --git a/Localize/lcl/de/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/de/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
index 12b65e4a02..9307033f41 100644
--- a/Localize/lcl/de/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
+++ b/Localize/lcl/de/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
@@ -313,14 +313,14 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" Leaf="true">
+      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
+          <Val><![CDATA[Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der TestHost-Prozess wurde mit folgendem Fehler beendet: {0}. Weitere Informationen finden Sie in den Diagnoseprotokollen.]]></Val>
+            <Val><![CDATA[Der TestHost-Prozess für die Quelle(n) {0} wurde mit folgendem Fehler beendet: {1}. Weitere Informationen finden Sie in den Diagnoseprotokollen.]]></Val>
           </Tgt>
           <Prev Cat="Text">
-            <Val><![CDATA[Testhost process exited with error: {0}]]></Val>
+            <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
           </Prev>
         </Str>
         <Disp Icon="Str" />
diff --git a/Localize/lcl/es/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/es/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
index 3083cc4283..e1e62884a1 100644
--- a/Localize/lcl/es/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
+++ b/Localize/lcl/es/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
@@ -313,14 +313,14 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" Leaf="true">
+      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
+          <Val><![CDATA[Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El proceso del host de prueba finalizó con el siguiente error: {0}. Consulte los registros de diagnóstico para obtener más información.]]></Val>
+            <Val><![CDATA[El proceso del host de prueba para fuentes "{0}" finalizó con el siguiente error: {1}. Consulte los registros de diagnóstico para obtener más información.]]></Val>
           </Tgt>
           <Prev Cat="Text">
-            <Val><![CDATA[Testhost process exited with error: {0}]]></Val>
+            <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
           </Prev>
         </Str>
         <Disp Icon="Str" />
diff --git a/Localize/lcl/fr/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/fr/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
index 60bc9e985c..24f3a90f03 100644
--- a/Localize/lcl/fr/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
+++ b/Localize/lcl/fr/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
@@ -313,14 +313,14 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" Leaf="true">
+      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
+          <Val><![CDATA[Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le processus Testhost s'est arrêté. Erreur : {0}. Pour plus d'informations, consultez les journaux de diagnostic.]]></Val>
+            <Val><![CDATA[Le processus Testhost pour la ou les sources '{0}' s’est arrêté. Erreur : {1}. Pour plus d’informations, consultez les journaux de diagnostic.]]></Val>
           </Tgt>
           <Prev Cat="Text">
-            <Val><![CDATA[Testhost process exited with error: {0}]]></Val>
+            <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
           </Prev>
         </Str>
         <Disp Icon="Str" />
diff --git a/Localize/lcl/it/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/it/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
index 756abd29ca..290efd47a7 100644
--- a/Localize/lcl/it/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
+++ b/Localize/lcl/it/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
@@ -313,14 +313,14 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" Leaf="true">
+      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
+          <Val><![CDATA[Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il processo testhost è terminato con l'errore {0}. Per altre informazioni, vedere i log di diagnostica.]]></Val>
+            <Val><![CDATA[Il processo Testhost per le origini '{0}' è terminato con errore: {1}. Per altre informazioni, controllare i log di diagnostica.]]></Val>
           </Tgt>
           <Prev Cat="Text">
-            <Val><![CDATA[Testhost process exited with error: {0}]]></Val>
+            <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
           </Prev>
         </Str>
         <Disp Icon="Str" />
diff --git a/Localize/lcl/ja/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ja/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
index 3969742e90..a64536a7c9 100644
--- a/Localize/lcl/ja/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
+++ b/Localize/lcl/ja/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
@@ -313,14 +313,14 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" Leaf="true">
+      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
+          <Val><![CDATA[Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Testhost プロセスがエラーで終了しました: {0}。詳細については、診断ログを確認してください。]]></Val>
+            <Val><![CDATA[ソース `{0}` の Testhost プロセスがエラーで終了しました: {1}。詳細については、診断ログを確認してください。]]></Val>
           </Tgt>
           <Prev Cat="Text">
-            <Val><![CDATA[Testhost process exited with error: {0}]]></Val>
+            <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
           </Prev>
         </Str>
         <Disp Icon="Str" />
diff --git a/Localize/lcl/ko/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ko/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
index 0825a9f504..ccdfee008b 100644
--- a/Localize/lcl/ko/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
+++ b/Localize/lcl/ko/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
@@ -313,14 +313,14 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" Leaf="true">
+      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
+          <Val><![CDATA[Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Testhost 프로세스가 종료되었습니다(오류: {0}). 자세한 내용은 진단 로그를 확인하세요.]]></Val>
+            <Val><![CDATA[원본 '{0}'에 대한 Testhost 프로세스가 오류 {1}과(와) 함께 종료되었습니다. 자세한 내용은 진단 로그를 확인하세요.]]></Val>
           </Tgt>
           <Prev Cat="Text">
-            <Val><![CDATA[Testhost process exited with error: {0}]]></Val>
+            <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
           </Prev>
         </Str>
         <Disp Icon="Str" />
diff --git a/Localize/lcl/pl/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/pl/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
index 6e41d4f4e7..1db4fced8f 100644
--- a/Localize/lcl/pl/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
+++ b/Localize/lcl/pl/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
@@ -313,14 +313,14 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" Leaf="true">
+      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
+          <Val><![CDATA[Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zakończono proces testhost z powodu błędu: {0}. Sprawdź dzienniki diagnostyczne, aby uzyskać więcej informacji.]]></Val>
+            <Val><![CDATA[Zakończono proces hosta testowego dla źródła „{0}” z powodu błędu: {1}. Sprawdź dzienniki diagnostyczne, aby uzyskać więcej informacji.]]></Val>
           </Tgt>
           <Prev Cat="Text">
-            <Val><![CDATA[Testhost process exited with error: {0}]]></Val>
+            <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
           </Prev>
         </Str>
         <Disp Icon="Str" />
diff --git a/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
index 36f52ca137..ad4b9b5a8e 100644
--- a/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
+++ b/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
@@ -313,14 +313,14 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" Leaf="true">
+      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
+          <Val><![CDATA[Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O processo do testhost foi encerrado com o erro: {0}. Verifique os logs de diagnóstico para obter mais informações.]]></Val>
+            <Val><![CDATA[Processo testhost para fonte(s) '{0}' encerrado com erro: {1}. Verifique os logs de diagnóstico para mais informações.]]></Val>
           </Tgt>
           <Prev Cat="Text">
-            <Val><![CDATA[Testhost process exited with error: {0}]]></Val>
+            <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
           </Prev>
         </Str>
         <Disp Icon="Str" />
diff --git a/Localize/lcl/ru/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ru/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
index 5aeb78a2d6..2a0f88fa2c 100644
--- a/Localize/lcl/ru/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
+++ b/Localize/lcl/ru/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
@@ -313,14 +313,14 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" Leaf="true">
+      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
+          <Val><![CDATA[Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Процесс testhost завершился с ошибкой: {0}. Дополнительные сведения см. в журналах диагностики.]]></Val>
+            <Val><![CDATA[Процесс testhost для источника (-ов) {0} завершился с ошибкой. {1}Дополнительные сведения см. в журналах диагностики.]]></Val>
           </Tgt>
           <Prev Cat="Text">
-            <Val><![CDATA[Testhost process exited with error: {0}]]></Val>
+            <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
           </Prev>
         </Str>
         <Disp Icon="Str" />
diff --git a/Localize/lcl/tr/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/tr/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
index 5c59e55851..9ec2a300c4 100644
--- a/Localize/lcl/tr/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
+++ b/Localize/lcl/tr/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
@@ -313,14 +313,14 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" Leaf="true">
+      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
+          <Val><![CDATA[Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Testhost işleminden şu hatayla çıkıldı: {0}. Daha fazla bilgi için lütfen tanılama günlüklerine bakın.]]></Val>
+            <Val><![CDATA['{0}' kaynağı için testhost işleminden şu hatayla çıkıldı: {1}. Daha fazla bilgi edinmek için lütfen tanılama günlüklerini denetleyin.]]></Val>
           </Tgt>
           <Prev Cat="Text">
-            <Val><![CDATA[Testhost process exited with error: {0}]]></Val>
+            <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
           </Prev>
         </Str>
         <Disp Icon="Str" />
diff --git a/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
index 6c58030854..e53145c311 100644
--- a/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
+++ b/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
@@ -313,14 +313,14 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" Leaf="true">
+      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
+          <Val><![CDATA[Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Testhost 进程已退出，但出现错误: {0}。请查看诊断日志了解详细信息。]]></Val>
+            <Val><![CDATA[源“{0}”的 Testhost 进程已退出，但出现错误: {1}。请查看诊断日志以了解详细信息。]]></Val>
           </Tgt>
           <Prev Cat="Text">
-            <Val><![CDATA[Testhost process exited with error: {0}]]></Val>
+            <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
           </Prev>
         </Str>
         <Disp Icon="Str" />
diff --git a/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
index fd6432e914..25c67bc22a 100644
--- a/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
+++ b/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
@@ -313,14 +313,14 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" Leaf="true">
+      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
+          <Val><![CDATA[Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Testhost 處理序已結束。錯誤: {0}。如需詳細資訊，請查看診斷記錄。]]></Val>
+            <Val><![CDATA[來源 '{0}' 的 Testhost 處理序已結束，發生錯誤: {1}。如需詳細資訊，請查看診斷記錄。]]></Val>
           </Tgt>
           <Prev Cat="Text">
-            <Val><![CDATA[Testhost process exited with error: {0}]]></Val>
+            <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
           </Prev>
         </Str>
         <Disp Icon="Str" />
diff --git a/eng/Versions.props b/eng/Versions.props
index aec6aa1cc7..81210565d2 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <!-- This repo version -->
-    <VersionPrefix>17.3.0</VersionPrefix>
+    <VersionPrefix>17.3.1</VersionPrefix>
     <PreReleaseVersionLabel>release</PreReleaseVersionLabel>
     <!-- Opt-out repo features -->
     <UsingToolXliff>false</UsingToolXliff>
diff --git a/scripts/build/TestPlatform.Dependencies.props b/scripts/build/TestPlatform.Dependencies.props
index fc53f36c50..bd1aaaf5a4 100644
--- a/scripts/build/TestPlatform.Dependencies.props
+++ b/scripts/build/TestPlatform.Dependencies.props
@@ -11,7 +11,7 @@
     <!-- this version also needs to be "statically" readable because the test fixture will inspect this file for the version
     and because during the test `dotnet test` will run and re-build some of the test projects and at that time the version
     from a build parameter would not be available, so I am writing this version from the build.ps1 script to keep it in sync -->
-    <NETTestSdkVersion>17.3.0-dev</NETTestSdkVersion>
+    <NETTestSdkVersion>17.3.1-dev</NETTestSdkVersion>
 
     <!-- These versions are used for running unit tests, and running acceptance tests. They are also used as the default version for projects
     in TestAssets.sln to allow running and debugging tests in that solution directly in VS without having to run them via AcceptanceTests. -->
diff --git a/scripts/build/TestPlatform.Settings.targets b/scripts/build/TestPlatform.Settings.targets
index 4eca46ed75..44b6f2701f 100644
--- a/scripts/build/TestPlatform.Settings.targets
+++ b/scripts/build/TestPlatform.Settings.targets
@@ -5,7 +5,7 @@
     <!-- This version is read by vsts-prebuild.ps1 and is a base for the current version, this should be updated
     at the start of new iteration to the goal number. This is also used to version the local packages. This version needs to be statically
     readable when we read the file as xml, don't move it to a .props file, unless you change the build server process -->
-    <TPVersionPrefix>17.3.0</TPVersionPrefix>
+    <TPVersionPrefix>17.3.1</TPVersionPrefix>
     <LangVersion>preview</LangVersion>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <AnalysisLevel>preview</AnalysisLevel>
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.cs.xlf b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.cs.xlf
index 7d8278769c..f046e6a9d6 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.cs.xlf
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.cs.xlf
@@ -79,7 +79,7 @@
       </trans-unit>
       <trans-unit id="TestHostExitedWithError">
         <source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
-        <target state="new">Proces testhost se ukončil s chybou: {0}. Další informace najdete v diagnostických protokolech.</target>
+        <target state="translated">Proces testhost pro zdroj(e) {0} se ukončil s chybou: {1}. Další informace najdete v diagnostických protokolech.</target>
         <note>{0} a source, or very rarely list of sources, {1} the output error.</note>
       </trans-unit>
       <trans-unit id="DataCollectorDebuggerWarning">
@@ -189,4 +189,4 @@
       </trans-unit>
     </body>
   </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.de.xlf b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.de.xlf
index ded59894c9..166cebad19 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.de.xlf
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.de.xlf
@@ -79,7 +79,7 @@
       </trans-unit>
       <trans-unit id="TestHostExitedWithError">
         <source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
-        <target state="new">Der TestHost-Prozess wurde mit folgendem Fehler beendet: {0}. Weitere Informationen finden Sie in den Diagnoseprotokollen.</target>
+        <target state="translated">Der TestHost-Prozess für die Quelle(n) {0} wurde mit folgendem Fehler beendet: {1}. Weitere Informationen finden Sie in den Diagnoseprotokollen.</target>
         <note>{0} a source, or very rarely list of sources, {1} the output error.</note>
       </trans-unit>
       <trans-unit id="DataCollectorDebuggerWarning">
@@ -189,4 +189,4 @@
       </trans-unit>
     </body>
   </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.es.xlf b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.es.xlf
index 776c3d432b..c070166ab1 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.es.xlf
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.es.xlf
@@ -79,7 +79,7 @@
       </trans-unit>
       <trans-unit id="TestHostExitedWithError">
         <source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
-        <target state="new">El proceso del host de prueba finalizó con el siguiente error: {0}. Consulte los registros de diagnóstico para obtener más información.</target>
+        <target state="translated">El proceso del host de prueba para fuentes "{0}" finalizó con el siguiente error: {1}. Consulte los registros de diagnóstico para obtener más información.</target>
         <note>{0} a source, or very rarely list of sources, {1} the output error.</note>
       </trans-unit>
       <trans-unit id="DataCollectorDebuggerWarning">
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.fr.xlf b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.fr.xlf
index 004fa43660..ff6e3a1b0b 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.fr.xlf
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.fr.xlf
@@ -79,7 +79,7 @@
       </trans-unit>
       <trans-unit id="TestHostExitedWithError">
         <source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
-        <target state="new">Le processus Testhost s'est arrêté. Erreur : {0}. Pour plus d'informations, consultez les journaux de diagnostic.</target>
+        <target state="translated">Le processus Testhost pour la ou les sources '{0}' s’est arrêté. Erreur : {1}. Pour plus d’informations, consultez les journaux de diagnostic.</target>
         <note>{0} a source, or very rarely list of sources, {1} the output error.</note>
       </trans-unit>
       <trans-unit id="DataCollectorDebuggerWarning">
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.it.xlf b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.it.xlf
index be2dcd0ddb..aab2d43d1d 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.it.xlf
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.it.xlf
@@ -79,7 +79,7 @@
       </trans-unit>
       <trans-unit id="TestHostExitedWithError">
         <source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
-        <target state="new">Il processo testhost è terminato con l'errore {0}. Per altre informazioni, vedere i log di diagnostica.</target>
+        <target state="translated">Il processo Testhost per le origini '{0}' è terminato con errore: {1}. Per altre informazioni, controllare i log di diagnostica.</target>
         <note>{0} a source, or very rarely list of sources, {1} the output error.</note>
       </trans-unit>
       <trans-unit id="DataCollectorDebuggerWarning">
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.ja.xlf b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.ja.xlf
index 55789062e0..25bfd815ab 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.ja.xlf
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.ja.xlf
@@ -79,7 +79,7 @@
       </trans-unit>
       <trans-unit id="TestHostExitedWithError">
         <source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
-        <target state="new">Testhost プロセスがエラーで終了しました: {0}。詳細については、診断ログを確認してください。</target>
+        <target state="translated">ソース `{0}` の Testhost プロセスがエラーで終了しました: {1}。詳細については、診断ログを確認してください。</target>
         <note>{0} a source, or very rarely list of sources, {1} the output error.</note>
       </trans-unit>
       <trans-unit id="DataCollectorDebuggerWarning">
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.ko.xlf b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.ko.xlf
index aed45d6aaf..07f2ff9cdb 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.ko.xlf
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.ko.xlf
@@ -79,7 +79,7 @@
       </trans-unit>
       <trans-unit id="TestHostExitedWithError">
         <source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
-        <target state="new">Testhost 프로세스가 종료되었습니다(오류: {0}). 자세한 내용은 진단 로그를 확인하세요.</target>
+        <target state="translated">원본 '{0}'에 대한 Testhost 프로세스가 오류 {1}과(와) 함께 종료되었습니다. 자세한 내용은 진단 로그를 확인하세요.</target>
         <note>{0} a source, or very rarely list of sources, {1} the output error.</note>
       </trans-unit>
       <trans-unit id="DataCollectorDebuggerWarning">
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.pl.xlf b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.pl.xlf
index 7da5bf9915..7012030aab 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.pl.xlf
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.pl.xlf
@@ -79,7 +79,7 @@
       </trans-unit>
       <trans-unit id="TestHostExitedWithError">
         <source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
-        <target state="new">Zakończono proces testhost z powodu błędu: {0}. Sprawdź dzienniki diagnostyczne, aby uzyskać więcej informacji.</target>
+        <target state="translated">Zakończono proces hosta testowego dla źródła „{0}” z powodu błędu: {1}. Sprawdź dzienniki diagnostyczne, aby uzyskać więcej informacji.</target>
         <note>{0} a source, or very rarely list of sources, {1} the output error.</note>
       </trans-unit>
       <trans-unit id="DataCollectorDebuggerWarning">
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.pt-BR.xlf b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.pt-BR.xlf
index 3252c13d16..83aede5e9b 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.pt-BR.xlf
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.pt-BR.xlf
@@ -79,7 +79,7 @@
       </trans-unit>
       <trans-unit id="TestHostExitedWithError">
         <source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
-        <target state="new">O processo do testhost foi encerrado com o erro: {0}. Verifique os logs de diagnóstico para obter mais informações.</target>
+        <target state="translated">Processo testhost para fonte(s) '{0}' encerrado com erro: {1}. Verifique os logs de diagnóstico para mais informações.</target>
         <note>{0} a source, or very rarely list of sources, {1} the output error.</note>
       </trans-unit>
       <trans-unit id="DataCollectorDebuggerWarning">
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.ru.xlf b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.ru.xlf
index 3787669cf1..50021e2125 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.ru.xlf
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.ru.xlf
@@ -79,7 +79,7 @@
       </trans-unit>
       <trans-unit id="TestHostExitedWithError">
         <source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
-        <target state="new">Процесс testhost завершился с ошибкой: {0}. Дополнительные сведения см. в журналах диагностики.</target>
+        <target state="translated">Процесс testhost для источника (-ов) {0} завершился с ошибкой. {1}Дополнительные сведения см. в журналах диагностики.</target>
         <note>{0} a source, or very rarely list of sources, {1} the output error.</note>
       </trans-unit>
       <trans-unit id="DataCollectorDebuggerWarning">
@@ -189,4 +189,4 @@
       </trans-unit>
     </body>
   </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.tr.xlf b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.tr.xlf
index 3568758c06..757732eace 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.tr.xlf
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.tr.xlf
@@ -79,7 +79,7 @@
       </trans-unit>
       <trans-unit id="TestHostExitedWithError">
         <source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
-        <target state="new">Testhost işleminden şu hatayla çıkıldı: {0}. Daha fazla bilgi için lütfen tanılama günlüklerine bakın.</target>
+        <target state="translated">'{0}' kaynağı için testhost işleminden şu hatayla çıkıldı: {1}. Daha fazla bilgi edinmek için lütfen tanılama günlüklerini denetleyin.</target>
         <note>{0} a source, or very rarely list of sources, {1} the output error.</note>
       </trans-unit>
       <trans-unit id="DataCollectorDebuggerWarning">
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.zh-Hans.xlf b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.zh-Hans.xlf
index 2f5e04f447..83546bb429 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.zh-Hans.xlf
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.zh-Hans.xlf
@@ -79,7 +79,7 @@
       </trans-unit>
       <trans-unit id="TestHostExitedWithError">
         <source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
-        <target state="new">Testhost 进程已退出，但出现错误: {0}。请查看诊断日志了解详细信息。</target>
+        <target state="translated">源“{0}”的 Testhost 进程已退出，但出现错误: {1}。请查看诊断日志以了解详细信息。</target>
         <note>{0} a source, or very rarely list of sources, {1} the output error.</note>
       </trans-unit>
       <trans-unit id="DataCollectorDebuggerWarning">
@@ -189,4 +189,4 @@
       </trans-unit>
     </body>
   </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.zh-Hant.xlf b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.zh-Hant.xlf
index ae7f09aa86..8ac04fed92 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.zh-Hant.xlf
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.zh-Hant.xlf
@@ -79,7 +79,7 @@
       </trans-unit>
       <trans-unit id="TestHostExitedWithError">
         <source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
-        <target state="new">Testhost 處理序已結束。錯誤: {0}。如需詳細資訊，請查看診斷記錄。</target>
+        <target state="translated">來源 '{0}' 的 Testhost 處理序已結束，發生錯誤: {1}。如需詳細資訊，請查看診斷記錄。</target>
         <note>{0} a source, or very rarely list of sources, {1} the output error.</note>
       </trans-unit>
       <trans-unit id="DataCollectorDebuggerWarning">
@@ -189,4 +189,4 @@
       </trans-unit>
     </body>
   </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/Extension/Features.cs b/test/Microsoft.TestPlatform.AcceptanceTests/Extension/Features.cs
index bbfb7104e3..e5fca8736e 100644
--- a/test/Microsoft.TestPlatform.AcceptanceTests/Extension/Features.cs
+++ b/test/Microsoft.TestPlatform.AcceptanceTests/Extension/Features.cs
@@ -15,7 +15,7 @@ public static class Features
     public static IImmutableDictionary<string, Feature> TestPlatformFeatures { get; } = new Dictionary<string, Feature>
     {
         [ATTACH_DEBUGGER_FLOW] = new(version: "v16.7.0-preview-20200519-01", issue: "https://github.com/microsoft/vstest/pull/2325"),
-        [MULTI_TFM] = new(version: "17.3.0-dev", issue: "https://github.com/microsoft/vstest/pull/3412")
+        [MULTI_TFM] = new(version: "v17.3.0", issue: "https://github.com/microsoft/vstest/pull/3412")
     }.ToImmutableDictionary();
 
     public static IImmutableDictionary<string, Feature> AdapterFeatures { get; internal set; } = new Dictionary<string, Feature>