Merge pull request #9677 from dotnet/merges/release/2.1.4xx-to-release/2.2.1xx

Merge release/2.1.4xx to release/2.2.1xx

README.md

@@ -216,3 +216,5 @@ License
 -------
 
 By downloading the .zip you are agreeing to the terms in the project [EULA](https://aka.ms/dotnet-core-eula).
+
+

build/DependencyVersions.props

@@ -12,7 +12,7 @@
     <DotnetWatchPackageVersion>2.1.1</DotnetWatchPackageVersion>
     <MicrosoftNETCoreAppPackageVersion>2.2.0-preview1-26609-02</MicrosoftNETCoreAppPackageVersion>
     <MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
-    <MicrosoftBuildPackageVersion>15.8.0-preview-000138</MicrosoftBuildPackageVersion>
+    <MicrosoftBuildPackageVersion>15.8.0-preview-000160</MicrosoftBuildPackageVersion>
     <MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
     <MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
     <MicrosoftBuildLocalizationPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildLocalizationPackageVersion>
@@ -23,10 +23,10 @@
     <MicrosoftNETCoreCompilersPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftNETCoreCompilersPackageVersion>
     <MicrosoftCodeAnalysisBuildTasksPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftCodeAnalysisBuildTasksPackageVersion>
     <MicrosoftNetCompilersNetcorePackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftNetCompilersNetcorePackageVersion>
-    <MicrosoftNETSdkPackageVersion>1.0.0-preview1-62924-06</MicrosoftNETSdkPackageVersion>
+    <MicrosoftNETSdkPackageVersion>2.2.100-preview1-63118-02</MicrosoftNETSdkPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
-    <MicrosoftNETSdkRazorPackageVersion>$(MicrosoftAspNetCoreAppPackageVersion)</MicrosoftNETSdkRazorPackageVersion>
+    <MicrosoftNETSdkRazorPackageVersion>2.1.1</MicrosoftNETSdkRazorPackageVersion>
-    <MicrosoftNETSdkWebPackageVersion>2.1.400-preview1-20180614-1774926</MicrosoftNETSdkWebPackageVersion>
+    <MicrosoftNETSdkWebPackageVersion>2.1.400-preview1-20180705-1834985</MicrosoftNETSdkWebPackageVersion>
     <MicrosoftNETSdkPublishPackageVersion>$(MicrosoftNETSdkWebPackageVersion)</MicrosoftNETSdkPublishPackageVersion>
     <MicrosoftNETSdkWebProjectSystemPackageVersion>$(MicrosoftNETSdkWebPackageVersion)</MicrosoftNETSdkWebProjectSystemPackageVersion>
     <MicrosoftDotNetCommonItemTemplatesPackageVersion>1.0.2-beta3</MicrosoftDotNetCommonItemTemplatesPackageVersion>
@@ -42,8 +42,8 @@
     <MicrosoftDotNetCliCommandLinePackageVersion>0.1.1</MicrosoftDotNetCliCommandLinePackageVersion>
     <MicrosoftDotNetProjectJsonMigrationPackageVersion>1.3.1</MicrosoftDotNetProjectJsonMigrationPackageVersion>
     <MicrosoftDotNetToolsMigrateCommandPackageVersion>$(MicrosoftDotNetProjectJsonMigrationPackageVersion)</MicrosoftDotNetToolsMigrateCommandPackageVersion>
-    <MicrosoftDotNetArchivePackageVersion>0.2.0-beta-62628-01</MicrosoftDotNetArchivePackageVersion>
+    <MicrosoftDotNetArchivePackageVersion>0.2.0-beta-63027-01</MicrosoftDotNetArchivePackageVersion>
-    <NuGetBuildTasksPackageVersion>4.8.0-preview3.5278</NuGetBuildTasksPackageVersion>
+    <NuGetBuildTasksPackageVersion>4.8.0-preview5.5328</NuGetBuildTasksPackageVersion>
     <NuGetBuildTasksPackPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetBuildTasksPackPackageVersion>
     <NuGetCommonPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetCommonPackageVersion>
     <NuGetCommandLineXPlatPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetCommandLineXPlatPackageVersion>
@@ -53,7 +53,7 @@
     <NuGetProjectModelPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetProjectModelPackageVersion>
     <NuGetVersioningPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetVersioningPackageVersion>
     <NuGetSdkResolverPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetSdkResolverPackageVersion>
-    <MicrosoftNETTestSdkPackageVersion>15.8.0-preview-20180605-02</MicrosoftNETTestSdkPackageVersion>
+    <MicrosoftNETTestSdkPackageVersion>15.8.0</MicrosoftNETTestSdkPackageVersion>
     <MicrosoftTestPlatformCLIPackageVersion>$(MicrosoftNETTestSdkPackageVersion)</MicrosoftTestPlatformCLIPackageVersion>
     <MicrosoftTestPlatformBuildPackageVersion>$(MicrosoftNETTestSdkPackageVersion)</MicrosoftTestPlatformBuildPackageVersion>
     <XliffTasksPackageVersion>0.2.0-beta-000042</XliffTasksPackageVersion>

build/NugetConfigFile.targets

@@ -30,6 +30,7 @@
     <add key="container-tools" value="https://www.myget.org/F/container-tools-for-visual-studio/api/v3/index.json" />
     <add key="linux-musl-bootstrap-feed" value="https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20180420-03/aspnet-inputs/index.json" />
     <add key="dotnet-msbuild" value="https://dotnet.myget.org/F/msbuild/api/v3/index.json" />
+    <add key="myget-vstest" value="https://dotnet.myget.org/F/vstest/api/v3/index.json" />
         ]]>
       </NugetConfigCLIFeeds>
 

build/package/Installer.MSI.targets

@@ -14,6 +14,7 @@
       <CombinedFrameworkSdkHostBundleEngineName>$(InstallerOutputDirectory)/$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)-engine.exe</CombinedFrameworkSdkHostBundleEngineName>
 
       <SdkGenerateMsiPowershellScript>$(RepoRoot)/packaging/windows/clisdk/generatemsi.ps1</SdkGenerateMsiPowershellScript>
+      <SdkStableFileIdForApphostTransform>$(RepoRoot)/packaging/windows/clisdk/stablefileidforapphosttransform.xslt</SdkStableFileIdForApphostTransform>
       <SdkGenerateBundlePowershellScript>$(RepoRoot)/packaging/windows/clisdk/generatebundle.ps1</SdkGenerateBundlePowershellScript>
       <SdkGenerateNupkgPowershellScript>$(RepoRoot)/packaging/windows/clisdk/generatenupkg.ps1</SdkGenerateNupkgPowershellScript>
 
@@ -110,7 +111,9 @@
                       '$(SimpleVersion)'
                       '$(NugetVersion)'
                       '$(SdkInstallerUpgradeCode)'
-                      '$(Architecture)'" />
+                      '$(Architecture)'
+                      '$(SdkStableFileIdForApphostTransform)'
+                      " />
     </Target>
 
     <Target Name="GenerateMSBuildExtensionsMsi"

packaging/windows/clisdk/StableFileIdForApphostTransform.xslt

@@ -0,0 +1,26 @@
+<xsl:stylesheet version="1.0"
+            xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+            xmlns:msxsl="urn:schemas-microsoft-com:xslt"
+            exclude-result-prefixes="msxsl"
+            xmlns:wix="http://schemas.microsoft.com/wix/2006/wi"
+            xmlns:my="my:my">
+
+    <xsl:output method="xml" indent="yes" />
+
+    <xsl:strip-space elements="*"/>
+
+    <xsl:template match="@*|node()">
+        <xsl:copy>
+            <xsl:apply-templates select="@*|node()"/>
+        </xsl:copy>
+    </xsl:template>
+
+    <xsl:template match='wix:Wix/wix:Fragment/wix:ComponentGroup/wix:Component/wix:File[contains(@Source, "AppHostTemplate\apphost.exe")]'>
+        <xsl:copy>
+            <xsl:apply-templates select="@*"/>
+            <xsl:attribute name="Id">
+                <xsl:text>apphosttemplateapphostexe</xsl:text>
+            </xsl:attribute>
+        </xsl:copy>
+    </xsl:template>
+</xsl:stylesheet>

packaging/windows/clisdk/generatemsi.ps1

@@ -10,7 +10,8 @@ param(
     [Parameter(Mandatory=$true)][string]$DotnetCLIDisplayVersion,
     [Parameter(Mandatory=$true)][string]$DotnetCLINugetVersion,
     [Parameter(Mandatory=$true)][string]$UpgradeCode,
-    [Parameter(Mandatory=$true)][string]$Architecture
+    [Parameter(Mandatory=$true)][string]$Architecture,
+    [Parameter(Mandatory=$true)][string]$StableFileIdForApphostTransform
 )
 
 . "$PSScriptRoot\..\..\..\scripts\common\_common.ps1"
@@ -26,7 +27,19 @@ function RunHeat
 
     Write-Output Running heat..
 
-    .\heat.exe dir `"$inputDir`" -template fragment -sreg -gg -var var.DotnetSrc -cg InstallFiles -srd -dr DOTNETHOME -out $InstallFileswsx | Out-Host
+    # -t $StableFileIdForApphostTransform to avoid sign check baseline apphost.exe name changes every build. Sign check uses File Id in MSI as whitelist name.
+    # Template apphost.exe get a new "File Id" in msi different every time (since File Id is generated according to file
+    # path, and file path has version number)
+    # use XSLT tranform to match the file path contains "AppHostTemplate\apphost.exe" and give it the same ID all the time.
+
+    .\heat.exe dir `"$inputDir`" -template fragment  `
+        -sreg -gg  `
+        -var var.DotnetSrc  `
+        -cg InstallFiles  `
+        -srd  `
+        -dr DOTNETHOME  `
+        -t $StableFileIdForApphostTransform  `
+        -out $InstallFileswsx | Out-Host
 
     if($LastExitCode -ne 0)
     {

src/Microsoft.DotNet.Cli.Utils/LocalizableStrings.resx

@@ -276,4 +276,7 @@
 
 dotnet tool install --global {1}</value>
   </data>
+  <data name="DotnetCliHomeUsed" xml:space="preserve">
+    <value>Using home directory '{0}' set by the '{1}' environment variable.</value>
+  </data>
 </root>

src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.cs.xlf

@@ -268,6 +268,11 @@ dotnet tool install --global {1}</source>
 dotnet tool install --global {1}</target>
         <note />
       </trans-unit>
+      <trans-unit id="DotnetCliHomeUsed">
+        <source>Using home directory '{0}' set by the '{1}' environment variable.</source>
+        <target state="translated">Použije se domovský adresář {0} nastavený proměnnou prostředí {1}.</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.de.xlf

@@ -268,6 +268,11 @@ dotnet tool install --global {1}</source>
 dotnet tool install --global {1}</target>
         <note />
       </trans-unit>
+      <trans-unit id="DotnetCliHomeUsed">
+        <source>Using home directory '{0}' set by the '{1}' environment variable.</source>
+        <target state="translated">Hiermit wird das über die Umgebungsvariable "{1}" festgelegte Basisverzeichnis "{0}" verwendet.</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.es.xlf

@@ -268,6 +268,11 @@ dotnet tool install --global {1}</source>
 dotnet tool install --global {1}</target>
         <note />
       </trans-unit>
+      <trans-unit id="DotnetCliHomeUsed">
+        <source>Using home directory '{0}' set by the '{1}' environment variable.</source>
+        <target state="translated">Se utiliza el directorio principal "{0}" establecido por la variable de entorno "{1}".</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.fr.xlf

@@ -268,6 +268,11 @@ dotnet tool install --global {1}</source>
 dotnet tool install --global {1}</target>
         <note />
       </trans-unit>
+      <trans-unit id="DotnetCliHomeUsed">
+        <source>Using home directory '{0}' set by the '{1}' environment variable.</source>
+        <target state="translated">Utilisation du répertoire de base '{0}' défini par la variable d’environnement '{1}'.</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.it.xlf

@@ -268,6 +268,11 @@ dotnet tool install --global {1}</source>
 dotnet tool install --global {1}</target>
         <note />
       </trans-unit>
+      <trans-unit id="DotnetCliHomeUsed">
+        <source>Using home directory '{0}' set by the '{1}' environment variable.</source>
+        <target state="translated">Verrà usata la home directory '{0}' impostata dalla variabile di ambiente '{1}'.</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ja.xlf

@@ -268,6 +268,11 @@ dotnet tool install --global {1}</source>
 dotnet tool install --global {1}</target>
         <note />
       </trans-unit>
+      <trans-unit id="DotnetCliHomeUsed">
+        <source>Using home directory '{0}' set by the '{1}' environment variable.</source>
+        <target state="translated">'{1}' 環境変数で設定したルート ディレクトリ '{0}' を使用しています。</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ko.xlf

@@ -268,6 +268,11 @@ dotnet tool install --global {1}</source>
 dotnet 도구를 설치하세요. install --global {1}</target>
         <note />
       </trans-unit>
+      <trans-unit id="DotnetCliHomeUsed">
+        <source>Using home directory '{0}' set by the '{1}' environment variable.</source>
+        <target state="translated">'{1}' 환경 변수에 의해 설정되는 홈 디렉터리 '{0}'을(를) 사용합니다.</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pl.xlf

@@ -268,6 +268,11 @@ dotnet tool install --global {1}</source>
 dotnet tool install --global {1}</target>
         <note />
       </trans-unit>
+      <trans-unit id="DotnetCliHomeUsed">
+        <source>Using home directory '{0}' set by the '{1}' environment variable.</source>
+        <target state="translated">Używany jest katalog główny „{0}” ustawiony za pomocą zmiennej środowiskowej „{1}”.</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pt-BR.xlf

@@ -268,6 +268,11 @@ dotnet tool install --global {1}</source>
 dotnet tool install --global {1}</target>
         <note />
       </trans-unit>
+      <trans-unit id="DotnetCliHomeUsed">
+        <source>Using home directory '{0}' set by the '{1}' environment variable.</source>
+        <target state="translated">Usando o diretório inicial '{0}' definido pela variável de ambiente '{1}'.</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ru.xlf

@@ -268,6 +268,11 @@ dotnet tool install --global {1}</source>
 dotnet tool install --global {1}</target>
         <note />
       </trans-unit>
+      <trans-unit id="DotnetCliHomeUsed">
+        <source>Using home directory '{0}' set by the '{1}' environment variable.</source>
+        <target state="translated">Используется домашний каталог "{0}", заданный переменной среды "{1}".</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.tr.xlf

@@ -268,6 +268,11 @@ dotnet tool install --global {1}</source>
 dotnet tool install --global {1}</target>
         <note />
       </trans-unit>
+      <trans-unit id="DotnetCliHomeUsed">
+        <source>Using home directory '{0}' set by the '{1}' environment variable.</source>
+        <target state="translated">'{1}' ortam değişkeni tarafından ayarlanan '{0}' giriş dizini kullanılıyor.</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hans.xlf

@@ -268,6 +268,11 @@ dotnet tool install --global {1}</source>
 dotnet 工具安装 -- 全局 {1}</target>
         <note />
       </trans-unit>
+      <trans-unit id="DotnetCliHomeUsed">
+        <source>Using home directory '{0}' set by the '{1}' environment variable.</source>
+        <target state="translated">使用由“{1}”环境变量设置的“{0}”主目录。</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hant.xlf

@@ -268,6 +268,11 @@ dotnet tool install --global {1}</source>
 dotnet tool install --global {1}</target>
         <note />
       </trans-unit>
+      <trans-unit id="DotnetCliHomeUsed">
+        <source>Using home directory '{0}' set by the '{1}' environment variable.</source>
+        <target state="translated">使用依 '{1}' 環境變數設定的主目錄 '{0}'。</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.cs.xlf

@@ -73,7 +73,7 @@ Další informace o konfiguraci protokolu HTTPS najdete na webu https://go.micro
       </trans-unit>
       <trans-unit id="FailedToDetermineUserHomeDirectory">
         <source>The user's home directory could not be determined. Set the '{0}' environment variable to specify the directory to use.</source>
-        <target state="new">The user's home directory could not be determined. Set the '{0}' environment variable to specify the directory to use.</target>
+        <target state="translated">Nešlo určit domovský adresář uživatele. Nastavte proměnnou prostředí {0}, která určí adresář, který se má použít.</target>
         <note />
       </trans-unit>
     </body>

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.de.xlf

@@ -73,7 +73,7 @@ Weitere Informationen zur Konfiguration von HTTPS finden Sie unter https://go.mi
       </trans-unit>
       <trans-unit id="FailedToDetermineUserHomeDirectory">
         <source>The user's home directory could not be determined. Set the '{0}' environment variable to specify the directory to use.</source>
-        <target state="new">The user's home directory could not be determined. Set the '{0}' environment variable to specify the directory to use.</target>
+        <target state="translated">Das Startverzeichnis des Benutzers konnte nicht ermittelt werden. Legen Sie die Umgebungsvariable "{0}" fest, um das zu verwendende Verzeichnis anzugeben.</target>
         <note />
       </trans-unit>
     </body>

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf

@@ -72,7 +72,7 @@ Para obtener más información sobre la configuración HTTPS, vea https://go.mic
       </trans-unit>
       <trans-unit id="FailedToDetermineUserHomeDirectory">
         <source>The user's home directory could not be determined. Set the '{0}' environment variable to specify the directory to use.</source>
-        <target state="new">The user's home directory could not be determined. Set the '{0}' environment variable to specify the directory to use.</target>
+        <target state="translated">No se puede determinar el directorio raíz del usuario. Establezca la variable de entorno “{0}” para especificar el directorio que debe usarse.</target>
         <note />
       </trans-unit>
     </body>

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.fr.xlf

@@ -73,7 +73,7 @@ Pour plus d'informations sur la configuration du protocole HTTPS, consultez http
       </trans-unit>
       <trans-unit id="FailedToDetermineUserHomeDirectory">
         <source>The user's home directory could not be determined. Set the '{0}' environment variable to specify the directory to use.</source>
-        <target state="new">The user's home directory could not be determined. Set the '{0}' environment variable to specify the directory to use.</target>
+        <target state="translated">Impossible de déterminer le répertoire de base de l'utilisateur. Définissez la variable d'environnement '{0}' pour spécifier le répertoire à utiliser.</target>
         <note />
       </trans-unit>
     </body>

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.it.xlf

@@ -73,7 +73,7 @@ Per altre informazioni sulla configurazione di HTTPS, vedere https://go.microsof
       </trans-unit>
       <trans-unit id="FailedToDetermineUserHomeDirectory">
         <source>The user's home directory could not be determined. Set the '{0}' environment variable to specify the directory to use.</source>
-        <target state="new">The user's home directory could not be determined. Set the '{0}' environment variable to specify the directory to use.</target>
+        <target state="translated">Non è stato possibile determinare la home directory dell'utente. Impostare la variabile di ambiente '{0}' per specificare la directory da usare.</target>
         <note />
       </trans-unit>
     </body>

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ja.xlf

@@ -73,7 +73,7 @@ HTTPS を構成する方法の詳細については、https://go.microsoft.com/f
       </trans-unit>
       <trans-unit id="FailedToDetermineUserHomeDirectory">
         <source>The user's home directory could not be determined. Set the '{0}' environment variable to specify the directory to use.</source>
-        <target state="new">The user's home directory could not be determined. Set the '{0}' environment variable to specify the directory to use.</target>
+        <target state="translated">ユーザーのホーム ディレクトリを特定できませんでした。使用するディレクトリを指定するには、'{0}' 環境変数を設定してください。</target>
         <note />
       </trans-unit>
     </body>

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ko.xlf

@@ -73,7 +73,7 @@ HTTPS 구성에 대한 자세한 내용은 https://go.microsoft.com/fwlink/?link
       </trans-unit>
       <trans-unit id="FailedToDetermineUserHomeDirectory">
         <source>The user's home directory could not be determined. Set the '{0}' environment variable to specify the directory to use.</source>
-        <target state="new">The user's home directory could not be determined. Set the '{0}' environment variable to specify the directory to use.</target>
+        <target state="translated">사용자의 홈 디렉터리를 확인할 수 없습니다. '{0}' 환경 변수를 설정하여 사용할 디렉터리를 지정하세요.</target>
         <note />
       </trans-unit>
     </body>

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pl.xlf

@@ -73,7 +73,7 @@ Aby uzyskać więcej informacji na temat konfigurowania protokołu HTTPS, zobacz
       </trans-unit>
       <trans-unit id="FailedToDetermineUserHomeDirectory">
         <source>The user's home directory could not be determined. Set the '{0}' environment variable to specify the directory to use.</source>
-        <target state="new">The user's home directory could not be determined. Set the '{0}' environment variable to specify the directory to use.</target>
+        <target state="translated">Nie można określić katalogu macierzystego użytkownika. Ustaw zmienną środowiskową „{0}”, aby określić katalog do użycia.</target>
         <note />
       </trans-unit>
     </body>

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pt-BR.xlf

@@ -73,7 +73,7 @@ Para obter mais informações de como configurar HTTPS, confira https://go.micro
       </trans-unit>
       <trans-unit id="FailedToDetermineUserHomeDirectory">
         <source>The user's home directory could not be determined. Set the '{0}' environment variable to specify the directory to use.</source>
-        <target state="new">The user's home directory could not be determined. Set the '{0}' environment variable to specify the directory to use.</target>
+        <target state="translated">O diretório inicial do usuário não pôde ser definido. Configure a variável de ambiente '{0}' para especificar o diretório a ser utilizado.</target>
         <note />
       </trans-unit>
     </body>

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ru.xlf

@@ -73,7 +73,7 @@ For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?l
       </trans-unit>
       <trans-unit id="FailedToDetermineUserHomeDirectory">
         <source>The user's home directory could not be determined. Set the '{0}' environment variable to specify the directory to use.</source>
-        <target state="new">The user's home directory could not be determined. Set the '{0}' environment variable to specify the directory to use.</target>
+        <target state="translated">Не удалось определить домашний каталог пользователя. Чтобы указать нужный каталог, задайте переменную среды "{0}".</target>
         <note />
       </trans-unit>
     </body>

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.tr.xlf

@@ -73,7 +73,7 @@ HTTPS yapılandırması hakkında daha fazla bilgi edinmek için bkz. https://go
       </trans-unit>
       <trans-unit id="FailedToDetermineUserHomeDirectory">
         <source>The user's home directory could not be determined. Set the '{0}' environment variable to specify the directory to use.</source>
-        <target state="new">The user's home directory could not be determined. Set the '{0}' environment variable to specify the directory to use.</target>
+        <target state="translated">Kullanıcının giriş dizini belirlenemedi. Kullanılacak dizini belirtmek için '{0}' ortam değişkenini ayarlayın.</target>
         <note />
       </trans-unit>
     </body>

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hans.xlf

@@ -73,7 +73,7 @@ For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?l
       </trans-unit>
       <trans-unit id="FailedToDetermineUserHomeDirectory">
         <source>The user's home directory could not be determined. Set the '{0}' environment variable to specify the directory to use.</source>
-        <target state="new">The user's home directory could not be determined. Set the '{0}' environment variable to specify the directory to use.</target>
+        <target state="translated">无法确定用户的主目录。设置“{0}”环境变量以指定要使用的目录。</target>
         <note />
       </trans-unit>
     </body>

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hant.xlf

@@ -73,7 +73,7 @@ For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?l
       </trans-unit>
       <trans-unit id="FailedToDetermineUserHomeDirectory">
         <source>The user's home directory could not be determined. Set the '{0}' environment variable to specify the directory to use.</source>
-        <target state="new">The user's home directory could not be determined. Set the '{0}' environment variable to specify the directory to use.</target>
+        <target state="translated">無法判定該使用者的主目錄。請設定 '{0}' 環境變數，指定要使用的目錄。</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/CommandLine/xlf/LocalizableStrings.ko.xlf

@@ -109,12 +109,12 @@
       </trans-unit>
       <trans-unit id="CommandAcceptsOnlyOneArgument">
         <source>Command '{0}' only accepts a single argument but {1} were provided.</source>
-        <target state="translated">‘{0}’ 명령은 단일 인수만 허용하는데, {1}이(가) 제공되었습니다.</target>
+        <target state="translated">'{0}' 명령은 단일 인수만 허용하는데, {1}이(가) 제공되었습니다.</target>
         <note />
       </trans-unit>
       <trans-unit id="CommandAcceptsOnlyOneSubcommand">
         <source>Command '{0}' only accepts a single subcommand but multiple were provided: {1}</source>
-        <target state="translated">‘{0}’ 명령은 단일 하위 명령만 허용하는데, 여러 하위 명령이 제공되었습니다. {1}</target>
+        <target state="translated">'{0}' 명령은 단일 하위 명령만 허용하는데, 여러 하위 명령이 제공되었습니다. {1}</target>
         <note />
       </trans-unit>
       <trans-unit id="FileDoesNotExist">

src/dotnet/Program.cs

@@ -149,6 +149,8 @@ namespace Microsoft.DotNet.Cli
                         bool skipFirstRunExperience =
                             environmentProvider.GetEnvironmentVariableAsBool("DOTNET_SKIP_FIRST_TIME_EXPERIENCE", false);
 
+                        ReportDotnetHomeUsage(environmentProvider);
+
                         topLevelCommandParserResult = new TopLevelCommandParserResult(command);
                         var hasSuperUserAccess = false;
                         if (IsDotnetBeingInvokedFromNativeInstaller(topLevelCommandParserResult))
@@ -229,6 +231,21 @@ namespace Microsoft.DotNet.Cli
             return exitCode;
         }
 
+        private static void ReportDotnetHomeUsage(IEnvironmentProvider provider)
+        {
+            var home = provider.GetEnvironmentVariable(CliFolderPathCalculator.DotnetHomeVariableName);
+            if (string.IsNullOrEmpty(home))
+            {
+                return;
+            }
+
+            Reporter.Verbose.WriteLine(
+                string.Format(
+                    LocalizableStrings.DotnetCliHomeUsed,
+                    home,
+                    CliFolderPathCalculator.DotnetHomeVariableName));
+        }
+
         private static bool IsDotnetBeingInvokedFromNativeInstaller(TopLevelCommandParserResult parseResult)
         {
             return parseResult.Command == "internal-reportinstallsuccess";

src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.cs.xlf

@@ -84,7 +84,7 @@
       </trans-unit>
       <trans-unit id="CmdInteractiveRestoreDescription">
         <source>Allows the command to stop and wait for user input or action (for example to complete authentication).</source>
-        <target state="new">Allows the command to stop and wait for user input or action (for example to complete authentication).</target>
+        <target state="translated">Umožňuje, aby se příkaz zastavil a počkal na vstup nebo akci uživatele (například na dokončení ověření).</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.de.xlf

@@ -84,7 +84,7 @@
       </trans-unit>
       <trans-unit id="CmdInteractiveRestoreDescription">
         <source>Allows the command to stop and wait for user input or action (for example to complete authentication).</source>
-        <target state="new">Allows the command to stop and wait for user input or action (for example to complete authentication).</target>
+        <target state="translated">Hiermit wird zugelassen, dass der Befehl anhält und auf eine Benutzereingabe oder Aktion wartet (beispielsweise auf den Abschluss der Authentifizierung).</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf

@@ -84,7 +84,7 @@
       </trans-unit>
       <trans-unit id="CmdInteractiveRestoreDescription">
         <source>Allows the command to stop and wait for user input or action (for example to complete authentication).</source>
-        <target state="new">Allows the command to stop and wait for user input or action (for example to complete authentication).</target>
+        <target state="translated">Permite que el comando se detenga y espere la entrada o acción del usuario (por ejemplo, para autenticarse).</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.fr.xlf

@@ -84,7 +84,7 @@
       </trans-unit>
       <trans-unit id="CmdInteractiveRestoreDescription">
         <source>Allows the command to stop and wait for user input or action (for example to complete authentication).</source>
-        <target state="new">Allows the command to stop and wait for user input or action (for example to complete authentication).</target>
+        <target state="translated">Permet à la commande de s'arrêter et d'attendre une entrée ou une action de l'utilisateur (par exemple pour effectuer une authentification).</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.it.xlf

@@ -84,7 +84,7 @@
       </trans-unit>
       <trans-unit id="CmdInteractiveRestoreDescription">
         <source>Allows the command to stop and wait for user input or action (for example to complete authentication).</source>
-        <target state="new">Allows the command to stop and wait for user input or action (for example to complete authentication).</target>
+        <target state="translated">Consente al comando di arrestare l'esecuzione e attendere l'input o l'azione dell'utente, ad esempio per completare l'autenticazione.</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ja.xlf

@@ -84,7 +84,7 @@
       </trans-unit>
       <trans-unit id="CmdInteractiveRestoreDescription">
         <source>Allows the command to stop and wait for user input or action (for example to complete authentication).</source>
-        <target state="new">Allows the command to stop and wait for user input or action (for example to complete authentication).</target>
+        <target state="translated">コマンドを停止して、ユーザーの入力またはアクション (認証の完了など) を待機できるようにします。</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ko.xlf

@@ -84,7 +84,7 @@
       </trans-unit>
       <trans-unit id="CmdInteractiveRestoreDescription">
         <source>Allows the command to stop and wait for user input or action (for example to complete authentication).</source>
-        <target state="new">Allows the command to stop and wait for user input or action (for example to complete authentication).</target>
+        <target state="translated">명령을 중지하고 사용자 입력 또는 작업을 기다리도록 허용합니다(예: 인증 완료).</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pl.xlf

@@ -84,7 +84,7 @@
       </trans-unit>
       <trans-unit id="CmdInteractiveRestoreDescription">
         <source>Allows the command to stop and wait for user input or action (for example to complete authentication).</source>
-        <target state="new">Allows the command to stop and wait for user input or action (for example to complete authentication).</target>
+        <target state="translated">Zezwala poleceniu na zatrzymanie działania i zaczekanie na wprowadzenie danych lub wykonanie akcji przez użytkownika (na przykład ukończenie uwierzytelniania).</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf

@@ -84,7 +84,7 @@
       </trans-unit>
       <trans-unit id="CmdInteractiveRestoreDescription">
         <source>Allows the command to stop and wait for user input or action (for example to complete authentication).</source>
-        <target state="new">Allows the command to stop and wait for user input or action (for example to complete authentication).</target>
+        <target state="translated">Permite que o comando seja interrompido e aguarde a ação ou entrada do usuário (por exemplo, para concluir a autenticação).</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ru.xlf

@@ -84,7 +84,7 @@
       </trans-unit>
       <trans-unit id="CmdInteractiveRestoreDescription">
         <source>Allows the command to stop and wait for user input or action (for example to complete authentication).</source>
-        <target state="new">Allows the command to stop and wait for user input or action (for example to complete authentication).</target>
+        <target state="translated">Позволяет остановить команду и ожидать ввода или действия пользователя (например, для проверки подлинности).</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.tr.xlf

@@ -84,7 +84,7 @@
       </trans-unit>
       <trans-unit id="CmdInteractiveRestoreDescription">
         <source>Allows the command to stop and wait for user input or action (for example to complete authentication).</source>
-        <target state="new">Allows the command to stop and wait for user input or action (for example to complete authentication).</target>
+        <target state="translated">Komutun durup kullanıcı girişini veya eylemini (örneğin, kimlik doğrulamasının tamamlanmasını) beklemesine izin verir .</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf

@@ -84,7 +84,7 @@
       </trans-unit>
       <trans-unit id="CmdInteractiveRestoreDescription">
         <source>Allows the command to stop and wait for user input or action (for example to complete authentication).</source>
-        <target state="new">Allows the command to stop and wait for user input or action (for example to complete authentication).</target>
+        <target state="translated">允许命令停止和等待用户输入或操作(例如，用以完成身份验证)。</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf

@@ -84,7 +84,7 @@
       </trans-unit>
       <trans-unit id="CmdInteractiveRestoreDescription">
         <source>Allows the command to stop and wait for user input or action (for example to complete authentication).</source>
-        <target state="new">Allows the command to stop and wait for user input or action (for example to complete authentication).</target>
+        <target state="translated">允許命令停止並等候使用者輸入或動作 (例如: 完成驗證)。</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-publish/LocalizableStrings.resx

@@ -135,16 +135,9 @@
   <data name="ManifestOptionDescription" xml:space="preserve">
     <value>The path to a target manifest file that contains the list of packages to be excluded from the publish step.</value>
   </data>
-  <data name="ModeOptionDescription" xml:space="preserve">
+  <data name="SelfContainedOptionDescription" xml:space="preserve">
-    <value>The mode to use when publishing the application.
+    <value>Publish the .NET Core runtime with your application so the runtime doesn't need to be installed on the target machine.
-The 'self-contained' mode publishes the application with the .NET Core runtime.
+The default is 'true' if a runtime identifier is specified.</value>
-The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable.
-The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable.
-The default is 'fx-dependent-no-exe' when a target runtime is not specified.
-The default is 'self-contained' when a target runtime is specified.</value>
-  </data>
-  <data name="ModeOptionName" xml:space="preserve">
-    <value>MODE</value>
   </data>
   <data name="NoBuildOptionDescription" xml:space="preserve">
     <value>Do not build the project before publishing. Implies --no-restore.</value>
@@ -153,16 +146,10 @@ The default is 'self-contained' when a target runtime is specified.</value>
     <value>The target framework to publish for. The target framework has to be specified in the project file.</value>
   </data>
   <data name="RuntimeOptionDescription" xml:space="preserve">
-    <value>The target runtime to publish the application for.
+    <value>The target runtime to publish for. This is used when creating a self-contained deployment.
-The default is to publish a framework-dependent application without an executable.</value>
+The default is to publish a framework-dependent application.</value>
   </data>
   <data name="ConfigurationOptionDescription" xml:space="preserve">
     <value>The configuration to publish for. The default for most projects is 'Debug'.</value>
   </data>
-  <data name="PublishModeAndSelfContainedOptionsConflict" xml:space="preserve">
-    <value>The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options.</value>
-  </data>
-  <data name="UnsupportedPublishMode" xml:space="preserve">
-    <value>The specified publish mode '{0}' is not supported.</value>
-  </data>
 </root>

src/dotnet/commands/dotnet-publish/Program.cs

@@ -39,37 +39,6 @@ namespace Microsoft.DotNet.Tools.Publish
 
             var appliedPublishOption = result["dotnet"]["publish"];
 
-            if (appliedPublishOption.HasOption("mode") && appliedPublishOption.HasOption("self-contained"))
-            {
-                throw new GracefulException(LocalizableStrings.PublishModeAndSelfContainedOptionsConflict);
-            }
-
-            var mode = appliedPublishOption.ValueOrDefault<string>("mode");
-            switch (mode)
-            {
-                case null:
-                    break;
-
-                case PublishCommandParser.SelfContainedMode:
-                    msbuildArgs.Add("-p:SelfContained=true");
-                    break;
-
-                case PublishCommandParser.FxDependentMode:
-                    msbuildArgs.Add("-p:SelfContained=false");
-                    break;
-
-                case PublishCommandParser.FxDependentNoExeMode:
-                    msbuildArgs.Add("-p:SelfContained=false");
-                    msbuildArgs.Add("-p:UseAppHost=false");
-                    break;
-
-                default:
-                    throw new GracefulException(
-                        string.Format(
-                            LocalizableStrings.UnsupportedPublishMode,
-                            mode));
-            }
-
             msbuildArgs.AddRange(appliedPublishOption.OptionValuesToBeForwarded());
 
             msbuildArgs.AddRange(appliedPublishOption.Arguments);

src/dotnet/commands/dotnet-publish/PublishCommandParser.cs

@@ -10,10 +10,6 @@ namespace Microsoft.DotNet.Cli
 {
     internal static class PublishCommandParser
     {
-        public const string SelfContainedMode = "self-contained";
-        public const string FxDependentMode = "fx-dependent";
-        public const string FxDependentNoExeMode = "fx-dependent-no-exe";
-
         public static Command Publish() =>
             CreateWithRestoreOptions.Command(
                 "publish",
@@ -44,7 +40,7 @@ namespace Microsoft.DotNet.Cli
                     Accept.NoArguments().ForwardAs("-property:NoBuild=true")),
                 Create.Option(
                     "--self-contained",
-                    "", // Hidden option for backwards-compatibility (now '--mode self-contained').
+                    LocalizableStrings.SelfContainedOptionDescription,
                     Accept.ZeroOrOneArgument()
                         .WithSuggestionsFrom("true", "false")
                         .ForwardAsSingle(o =>
@@ -52,14 +48,6 @@ namespace Microsoft.DotNet.Cli
                             string value = o.Arguments.Any() ? o.Arguments.Single() : "true";
                             return $"-property:SelfContained={value}";
                         })),
-                Create.Option(
-                    "--mode",
-                    LocalizableStrings.ModeOptionDescription,
-                    Accept.AnyOneOf(
-                        SelfContainedMode,
-                        FxDependentMode,
-                        FxDependentNoExeMode)
-                        .With(name: LocalizableStrings.ModeOptionName)),
                 CommonOptions.NoRestoreOption(),
                 CommonOptions.VerbosityOption());
     }

src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.cs.xlf

@@ -43,10 +43,10 @@
         <note />
       </trans-unit>
       <trans-unit id="RuntimeOptionDescription">
-        <source>The target runtime to publish the application for.
+        <source>The target runtime to publish for. This is used when creating a self-contained deployment.
-The default is to publish a framework-dependent application without an executable.</source>
+The default is to publish a framework-dependent application.</source>
-        <target state="needs-review-translation">Cílový modul runtime pro publikování. Používá se při vytváření nezávislého nasazení.
+        <target state="needs-review-translation">Cílový modul runtime pro publikování aplikace.
-Ve výchozím nastavení se publikuje aplikace závislá na architektuře.</target>
+Výchozí možnost je publikovat aplikaci pro určitou architekturu bez spustitelného souboru.</target>
         <note />
       </trans-unit>
       <trans-unit id="ConfigurationOptionDescription">
@@ -54,34 +54,10 @@ Ve výchozím nastavení se publikuje aplikace závislá na architektuře.</targ
         <target state="translated">Konfigurace pro publikování. Výchozí možností pro většinu projektů je Debug.</target>
         <note />
       </trans-unit>
-      <trans-unit id="ModeOptionDescription">
+      <trans-unit id="SelfContainedOptionDescription">
-        <source>The mode to use when publishing the application.
+        <source>Publish the .NET Core runtime with your application so the runtime doesn't need to be installed on the target machine.
-The 'self-contained' mode publishes the application with the .NET Core runtime.
+The default is 'true' if a runtime identifier is specified.</source>
-The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable.
+        <target state="needs-review-translation">Publikuje spolu s aplikací modul runtime .NET Core, aby se tento modul nemusel instalovat na cílový počítač. Standardně se nastaví na True, pokud je zadaný identifikátor modulu runtime.</target>
-The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable.
-The default is 'fx-dependent-no-exe' when a target runtime is not specified.
-The default is 'self-contained' when a target runtime is specified.</source>
-        <target state="new">The mode to use when publishing the application.
-The 'self-contained' mode publishes the application with the .NET Core runtime.
-The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable.
-The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable.
-The default is 'fx-dependent-no-exe' when a target runtime is not specified.
-The default is 'self-contained' when a target runtime is specified.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ModeOptionName">
-        <source>MODE</source>
-        <target state="new">MODE</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="PublishModeAndSelfContainedOptionsConflict">
-        <source>The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options.</source>
-        <target state="new">The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UnsupportedPublishMode">
-        <source>The specified publish mode '{0}' is not supported.</source>
-        <target state="new">The specified publish mode '{0}' is not supported.</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.de.xlf

@@ -43,10 +43,9 @@
         <note />
       </trans-unit>
       <trans-unit id="RuntimeOptionDescription">
-        <source>The target runtime to publish the application for.
+        <source>The target runtime to publish for. This is used when creating a self-contained deployment.
-The default is to publish a framework-dependent application without an executable.</source>
+The default is to publish a framework-dependent application.</source>
-        <target state="needs-review-translation">Die Zielruntime für die Veröffentlichung. Diese wird zum Erstellen einer eigenständigen Bereitstellung verwendet.
+        <target state="needs-review-translation">Die Zielruntime, für die die Anwendung veröffentlicht wird. Standardmäßig wird eine frameworkunabhängige Anwendung ohne ausführbare Datei veröffentlicht.</target>
-Standardmäßig wird eine frameworkabhängige Anwendung veröffentlicht.</target>
         <note />
       </trans-unit>
       <trans-unit id="ConfigurationOptionDescription">
@@ -54,34 +53,10 @@ Standardmäßig wird eine frameworkabhängige Anwendung veröffentlicht.</target
         <target state="translated">Die Konfiguration für die Veröffentlichung. Der Standardwert für die meisten Projekte ist "Debug".</target>
         <note />
       </trans-unit>
-      <trans-unit id="ModeOptionDescription">
+      <trans-unit id="SelfContainedOptionDescription">
-        <source>The mode to use when publishing the application.
+        <source>Publish the .NET Core runtime with your application so the runtime doesn't need to be installed on the target machine.
-The 'self-contained' mode publishes the application with the .NET Core runtime.
+The default is 'true' if a runtime identifier is specified.</source>
-The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable.
+        <target state="needs-review-translation">Veröffentlichen Sie die .NET Core-Runtime mit Ihrer Anwendung, damit die Runtime auf dem Zielcomputer nicht installiert werden muss. Der Standardwert ist "true", wenn ein Runtimebezeichner angegeben ist.</target>
-The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable.
-The default is 'fx-dependent-no-exe' when a target runtime is not specified.
-The default is 'self-contained' when a target runtime is specified.</source>
-        <target state="new">The mode to use when publishing the application.
-The 'self-contained' mode publishes the application with the .NET Core runtime.
-The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable.
-The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable.
-The default is 'fx-dependent-no-exe' when a target runtime is not specified.
-The default is 'self-contained' when a target runtime is specified.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ModeOptionName">
-        <source>MODE</source>
-        <target state="new">MODE</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="PublishModeAndSelfContainedOptionsConflict">
-        <source>The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options.</source>
-        <target state="new">The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UnsupportedPublishMode">
-        <source>The specified publish mode '{0}' is not supported.</source>
-        <target state="new">The specified publish mode '{0}' is not supported.</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.es.xlf

@@ -43,10 +43,10 @@
         <note />
       </trans-unit>
       <trans-unit id="RuntimeOptionDescription">
-        <source>The target runtime to publish the application for.
+        <source>The target runtime to publish for. This is used when creating a self-contained deployment.
-The default is to publish a framework-dependent application without an executable.</source>
+The default is to publish a framework-dependent application.</source>
-        <target state="needs-review-translation">El tiempo de ejecución de destino para el que se publica. Se usa cuando se crea una implementación autocontenida.
+        <target state="needs-review-translation">Entorno de tiempo de ejecución para el que se publica la aplicación.
-El valor predeterminado es publicar una aplicación dependiente de la plataforma.</target>
+La opción predeterminada es publicar una aplicación dependiente de la plataforma sin archivo ejecutable.</target>
         <note />
       </trans-unit>
       <trans-unit id="ConfigurationOptionDescription">
@@ -54,34 +54,10 @@ El valor predeterminado es publicar una aplicación dependiente de la plataforma
         <target state="translated">La configuración para la que se publica. El valor predeterminado para la mayoría de los proyectos es "Debug".</target>
         <note />
       </trans-unit>
-      <trans-unit id="ModeOptionDescription">
+      <trans-unit id="SelfContainedOptionDescription">
-        <source>The mode to use when publishing the application.
+        <source>Publish the .NET Core runtime with your application so the runtime doesn't need to be installed on the target machine.
-The 'self-contained' mode publishes the application with the .NET Core runtime.
+The default is 'true' if a runtime identifier is specified.</source>
-The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable.
+        <target state="needs-review-translation">Publica el tiempo de ejecución de .NET Core con su aplicación para que no sea necesario instalarlo en la máquina de destino. Si se especifica un identificador de tiempo de ejecución, se toma como predeterminado el valor "true".</target>
-The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable.
-The default is 'fx-dependent-no-exe' when a target runtime is not specified.
-The default is 'self-contained' when a target runtime is specified.</source>
-        <target state="new">The mode to use when publishing the application.
-The 'self-contained' mode publishes the application with the .NET Core runtime.
-The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable.
-The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable.
-The default is 'fx-dependent-no-exe' when a target runtime is not specified.
-The default is 'self-contained' when a target runtime is specified.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ModeOptionName">
-        <source>MODE</source>
-        <target state="new">MODE</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="PublishModeAndSelfContainedOptionsConflict">
-        <source>The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options.</source>
-        <target state="new">The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UnsupportedPublishMode">
-        <source>The specified publish mode '{0}' is not supported.</source>
-        <target state="new">The specified publish mode '{0}' is not supported.</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.fr.xlf

@@ -43,10 +43,10 @@
         <note />
       </trans-unit>
       <trans-unit id="RuntimeOptionDescription">
-        <source>The target runtime to publish the application for.
+        <source>The target runtime to publish for. This is used when creating a self-contained deployment.
-The default is to publish a framework-dependent application without an executable.</source>
+The default is to publish a framework-dependent application.</source>
-        <target state="needs-review-translation">Runtime cible pour lequel la publication est effectuée. S'utilise pour la création d'un déploiement autonome.
+        <target state="needs-review-translation">Runtime cible pour lequel publier l'application.
-L'action par défaut consiste à publier une application qui dépend d'un framework.</target>
+Le comportement par défaut est de publier une application dépendante du framework sans exécutable.</target>
         <note />
       </trans-unit>
       <trans-unit id="ConfigurationOptionDescription">
@@ -54,34 +54,10 @@ L'action par défaut consiste à publier une application qui dépend d'un framew
         <target state="translated">Configuration pour laquelle la publication est effectuée. La valeur par défaut pour la plupart des projets est 'Debug'.</target>
         <note />
       </trans-unit>
-      <trans-unit id="ModeOptionDescription">
+      <trans-unit id="SelfContainedOptionDescription">
-        <source>The mode to use when publishing the application.
+        <source>Publish the .NET Core runtime with your application so the runtime doesn't need to be installed on the target machine.
-The 'self-contained' mode publishes the application with the .NET Core runtime.
+The default is 'true' if a runtime identifier is specified.</source>
-The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable.
+        <target state="needs-review-translation">Publiez le runtime .NET Core avec votre application pour éviter à l'utilisateur de l'installer sur la machine cible. La valeur par défaut est 'true' si un identificateur de runtime est spécifié.</target>
-The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable.
-The default is 'fx-dependent-no-exe' when a target runtime is not specified.
-The default is 'self-contained' when a target runtime is specified.</source>
-        <target state="new">The mode to use when publishing the application.
-The 'self-contained' mode publishes the application with the .NET Core runtime.
-The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable.
-The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable.
-The default is 'fx-dependent-no-exe' when a target runtime is not specified.
-The default is 'self-contained' when a target runtime is specified.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ModeOptionName">
-        <source>MODE</source>
-        <target state="new">MODE</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="PublishModeAndSelfContainedOptionsConflict">
-        <source>The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options.</source>
-        <target state="new">The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UnsupportedPublishMode">
-        <source>The specified publish mode '{0}' is not supported.</source>
-        <target state="new">The specified publish mode '{0}' is not supported.</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.it.xlf

@@ -43,10 +43,10 @@
         <note />
       </trans-unit>
       <trans-unit id="RuntimeOptionDescription">
-        <source>The target runtime to publish the application for.
+        <source>The target runtime to publish for. This is used when creating a self-contained deployment.
-The default is to publish a framework-dependent application without an executable.</source>
+The default is to publish a framework-dependent application.</source>
-        <target state="needs-review-translation">Runtime di destinazione per cui eseguire la pubblicazione. Viene usata durante la creazione della distribuzione indipendente.
+        <target state="needs-review-translation">Runtime di destinazione per cui pubblicare l'applicazione.
-Per impostazione predefinita, viene pubblicata un'applicazione dipendente dal framework.</target>
+Per impostazione predefinita, viene pubblicata un'applicazione dipendente dal framework senza un eseguibile.</target>
         <note />
       </trans-unit>
       <trans-unit id="ConfigurationOptionDescription">
@@ -54,34 +54,10 @@ Per impostazione predefinita, viene pubblicata un'applicazione dipendente dal fr
         <target state="translated">Configurazione per cui eseguire la pubblicazione. L'impostazione predefinita per la maggior parte dei progetti è 'Debug'.</target>
         <note />
       </trans-unit>
-      <trans-unit id="ModeOptionDescription">
+      <trans-unit id="SelfContainedOptionDescription">
-        <source>The mode to use when publishing the application.
+        <source>Publish the .NET Core runtime with your application so the runtime doesn't need to be installed on the target machine.
-The 'self-contained' mode publishes the application with the .NET Core runtime.
+The default is 'true' if a runtime identifier is specified.</source>
-The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable.
+        <target state="needs-review-translation">Pubblica il runtime di .NET Core con l'applicazione in modo che non sia necessario installarlo nel computer di destinazione. Se si specifica un identificatore di runtime, l'impostazione predefinita è 'true'.</target>
-The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable.
-The default is 'fx-dependent-no-exe' when a target runtime is not specified.
-The default is 'self-contained' when a target runtime is specified.</source>
-        <target state="new">The mode to use when publishing the application.
-The 'self-contained' mode publishes the application with the .NET Core runtime.
-The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable.
-The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable.
-The default is 'fx-dependent-no-exe' when a target runtime is not specified.
-The default is 'self-contained' when a target runtime is specified.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ModeOptionName">
-        <source>MODE</source>
-        <target state="new">MODE</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="PublishModeAndSelfContainedOptionsConflict">
-        <source>The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options.</source>
-        <target state="new">The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UnsupportedPublishMode">
-        <source>The specified publish mode '{0}' is not supported.</source>
-        <target state="new">The specified publish mode '{0}' is not supported.</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ja.xlf

@@ -43,10 +43,10 @@
         <note />
       </trans-unit>
       <trans-unit id="RuntimeOptionDescription">
-        <source>The target runtime to publish the application for.
+        <source>The target runtime to publish for. This is used when creating a self-contained deployment.
-The default is to publish a framework-dependent application without an executable.</source>
+The default is to publish a framework-dependent application.</source>
-        <target state="needs-review-translation">発行する対象のターゲット ランタイム。これは、自己完結型の配置を作成する際に使用します。
+        <target state="needs-review-translation">発行するアプリケーションのターゲット ランタイム。
-既定では、フレームワーク依存アプリケーションを発行します。</target>
+既定値は、実行可能ファイルのないフレームワーク依存のアプリケーションを発行することです。</target>
         <note />
       </trans-unit>
       <trans-unit id="ConfigurationOptionDescription">
@@ -54,34 +54,10 @@ The default is to publish a framework-dependent application without an executabl
         <target state="translated">発行する対象の構成。大部分のプロジェクトで、既定値は 'Debug' です。</target>
         <note />
       </trans-unit>
-      <trans-unit id="ModeOptionDescription">
+      <trans-unit id="SelfContainedOptionDescription">
-        <source>The mode to use when publishing the application.
+        <source>Publish the .NET Core runtime with your application so the runtime doesn't need to be installed on the target machine.
-The 'self-contained' mode publishes the application with the .NET Core runtime.
+The default is 'true' if a runtime identifier is specified.</source>
-The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable.
+        <target state="needs-review-translation">ランタイムをターゲット マシンにインストールしなくてもよいよう、.NET Core ランタイムをアプリケーションと一緒に発行します。ランタイム ID が指定される場合、既定の 'true' になります。</target>
-The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable.
-The default is 'fx-dependent-no-exe' when a target runtime is not specified.
-The default is 'self-contained' when a target runtime is specified.</source>
-        <target state="new">The mode to use when publishing the application.
-The 'self-contained' mode publishes the application with the .NET Core runtime.
-The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable.
-The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable.
-The default is 'fx-dependent-no-exe' when a target runtime is not specified.
-The default is 'self-contained' when a target runtime is specified.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ModeOptionName">
-        <source>MODE</source>
-        <target state="new">MODE</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="PublishModeAndSelfContainedOptionsConflict">
-        <source>The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options.</source>
-        <target state="new">The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UnsupportedPublishMode">
-        <source>The specified publish mode '{0}' is not supported.</source>
-        <target state="new">The specified publish mode '{0}' is not supported.</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ko.xlf

@@ -43,10 +43,10 @@
         <note />
       </trans-unit>
       <trans-unit id="RuntimeOptionDescription">
-        <source>The target runtime to publish the application for.
+        <source>The target runtime to publish for. This is used when creating a self-contained deployment.
-The default is to publish a framework-dependent application without an executable.</source>
+The default is to publish a framework-dependent application.</source>
-        <target state="needs-review-translation">게시할 대상 런타임입니다. 자체 포함 배포를 만들 때 사용됩니다.
+        <target state="needs-review-translation">응용 프로그램을 게시할 대상 런타임입니다.
-기본값은 프레임워크 종속 응용 프로그램을 게시하는 것입니다.</target>
+기본값은 실행 파일 없이 프레임워크 종속 응용 프로그램을 게시하는 것입니다.</target>
         <note />
       </trans-unit>
       <trans-unit id="ConfigurationOptionDescription">
@@ -54,34 +54,10 @@ The default is to publish a framework-dependent application without an executabl
         <target state="translated">게시할 구성입니다. 대부분의 프로젝트에서 기본값은 'Debug'입니다.</target>
         <note />
       </trans-unit>
-      <trans-unit id="ModeOptionDescription">
+      <trans-unit id="SelfContainedOptionDescription">
-        <source>The mode to use when publishing the application.
+        <source>Publish the .NET Core runtime with your application so the runtime doesn't need to be installed on the target machine.
-The 'self-contained' mode publishes the application with the .NET Core runtime.
+The default is 'true' if a runtime identifier is specified.</source>
-The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable.
+        <target state="needs-review-translation">런타임은 대상 컴퓨터에 설치할 필요가 없으므로 응용 프로그램과 함께 .NET Core 런타임을 게시합니다. 런타임 식별자가 지정된 경우 기본값은 'true'입니다.</target>
-The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable.
-The default is 'fx-dependent-no-exe' when a target runtime is not specified.
-The default is 'self-contained' when a target runtime is specified.</source>
-        <target state="new">The mode to use when publishing the application.
-The 'self-contained' mode publishes the application with the .NET Core runtime.
-The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable.
-The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable.
-The default is 'fx-dependent-no-exe' when a target runtime is not specified.
-The default is 'self-contained' when a target runtime is specified.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ModeOptionName">
-        <source>MODE</source>
-        <target state="new">MODE</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="PublishModeAndSelfContainedOptionsConflict">
-        <source>The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options.</source>
-        <target state="new">The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UnsupportedPublishMode">
-        <source>The specified publish mode '{0}' is not supported.</source>
-        <target state="new">The specified publish mode '{0}' is not supported.</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pl.xlf

@@ -43,10 +43,10 @@
         <note />
       </trans-unit>
       <trans-unit id="RuntimeOptionDescription">
-        <source>The target runtime to publish the application for.
+        <source>The target runtime to publish for. This is used when creating a self-contained deployment.
-The default is to publish a framework-dependent application without an executable.</source>
+The default is to publish a framework-dependent application.</source>
-        <target state="needs-review-translation">Docelowe środowisko uruchomieniowe na potrzeby publikacji. Ustawienie stosowane w przypadku tworzenia wdrożenia autonomicznego.
+        <target state="needs-review-translation">Docelowe środowisko uruchomieniowe, dla którego ma zostać opublikowana aplikacja.
-Ustawieniem domyślnym jest opublikowanie aplikacji zależnej od platformy.</target>
+Domyślnie aplikacja zależna od platformy jest publikowana bez pliku wykonywalnego.</target>
         <note />
       </trans-unit>
       <trans-unit id="ConfigurationOptionDescription">
@@ -54,34 +54,10 @@ Ustawieniem domyślnym jest opublikowanie aplikacji zależnej od platformy.</tar
         <target state="translated">Konfiguracja, dla której ma być wykonane publikowanie. W przypadku większości projektów ustawienie domyślne to „Debugowanie”.</target>
         <note />
       </trans-unit>
-      <trans-unit id="ModeOptionDescription">
+      <trans-unit id="SelfContainedOptionDescription">
-        <source>The mode to use when publishing the application.
+        <source>Publish the .NET Core runtime with your application so the runtime doesn't need to be installed on the target machine.
-The 'self-contained' mode publishes the application with the .NET Core runtime.
+The default is 'true' if a runtime identifier is specified.</source>
-The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable.
+        <target state="needs-review-translation">Opublikuj środowisko uruchomieniowe programu .NET Core z aplikacją, aby nie trzeba było go instalować na maszynie docelowej. Domyślnie jest ustawiona wartość „true” w przypadku określenia identyfikatora środowiska uruchomieniowego.</target>
-The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable.
-The default is 'fx-dependent-no-exe' when a target runtime is not specified.
-The default is 'self-contained' when a target runtime is specified.</source>
-        <target state="new">The mode to use when publishing the application.
-The 'self-contained' mode publishes the application with the .NET Core runtime.
-The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable.
-The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable.
-The default is 'fx-dependent-no-exe' when a target runtime is not specified.
-The default is 'self-contained' when a target runtime is specified.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ModeOptionName">
-        <source>MODE</source>
-        <target state="new">MODE</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="PublishModeAndSelfContainedOptionsConflict">
-        <source>The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options.</source>
-        <target state="new">The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UnsupportedPublishMode">
-        <source>The specified publish mode '{0}' is not supported.</source>
-        <target state="new">The specified publish mode '{0}' is not supported.</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pt-BR.xlf

@@ -43,10 +43,10 @@
         <note />
       </trans-unit>
       <trans-unit id="RuntimeOptionDescription">
-        <source>The target runtime to publish the application for.
+        <source>The target runtime to publish for. This is used when creating a self-contained deployment.
-The default is to publish a framework-dependent application without an executable.</source>
+The default is to publish a framework-dependent application.</source>
-        <target state="needs-review-translation">O tempo de execução de destino da publicação. Ele é usado ao criar uma implantação autossuficiente.
+        <target state="needs-review-translation">O tempo de execução de destino no qual publicar o aplicativo.
-O padrão é publicar um aplicativo dependente da estrutura.</target>
+O padrão é publicar um aplicativo dependente da estrutura sem um executável.</target>
         <note />
       </trans-unit>
       <trans-unit id="ConfigurationOptionDescription">
@@ -54,34 +54,10 @@ O padrão é publicar um aplicativo dependente da estrutura.</target>
         <target state="translated">A configuração para a qual a publicação ocorrerá. O padrão para a maioria dos projetos é 'Debug'.</target>
         <note />
       </trans-unit>
-      <trans-unit id="ModeOptionDescription">
+      <trans-unit id="SelfContainedOptionDescription">
-        <source>The mode to use when publishing the application.
+        <source>Publish the .NET Core runtime with your application so the runtime doesn't need to be installed on the target machine.
-The 'self-contained' mode publishes the application with the .NET Core runtime.
+The default is 'true' if a runtime identifier is specified.</source>
-The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable.
+        <target state="needs-review-translation">Publique o tempo de execução .NET Core com seu aplicativo para que o tempo de execução não precise ser instalado no computador de destino. Assumirá 'true' como padrão se um identificador de tempo de execução for especificado.</target>
-The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable.
-The default is 'fx-dependent-no-exe' when a target runtime is not specified.
-The default is 'self-contained' when a target runtime is specified.</source>
-        <target state="new">The mode to use when publishing the application.
-The 'self-contained' mode publishes the application with the .NET Core runtime.
-The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable.
-The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable.
-The default is 'fx-dependent-no-exe' when a target runtime is not specified.
-The default is 'self-contained' when a target runtime is specified.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ModeOptionName">
-        <source>MODE</source>
-        <target state="new">MODE</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="PublishModeAndSelfContainedOptionsConflict">
-        <source>The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options.</source>
-        <target state="new">The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UnsupportedPublishMode">
-        <source>The specified publish mode '{0}' is not supported.</source>
-        <target state="new">The specified publish mode '{0}' is not supported.</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ru.xlf

@@ -43,10 +43,10 @@
         <note />
       </trans-unit>
       <trans-unit id="RuntimeOptionDescription">
-        <source>The target runtime to publish the application for.
+        <source>The target runtime to publish for. This is used when creating a self-contained deployment.
-The default is to publish a framework-dependent application without an executable.</source>
+The default is to publish a framework-dependent application.</source>
-        <target state="needs-review-translation">Целевая среда выполнения публикации. Используется при создании автономного развертывания.
+        <target state="needs-review-translation">Целевая среда выполнения, для которой публикуется приложение.
-По умолчанию публикуется платформозависимое приложение.</target>
+Значение по умолчанию — публикация зависимого от платформы приложения без исполняемого файла.</target>
         <note />
       </trans-unit>
       <trans-unit id="ConfigurationOptionDescription">
@@ -54,34 +54,10 @@ The default is to publish a framework-dependent application without an executabl
         <target state="translated">Конфигурация для публикации. По умолчанию для большинства проектов используется "Debug".</target>
         <note />
       </trans-unit>
-      <trans-unit id="ModeOptionDescription">
+      <trans-unit id="SelfContainedOptionDescription">
-        <source>The mode to use when publishing the application.
+        <source>Publish the .NET Core runtime with your application so the runtime doesn't need to be installed on the target machine.
-The 'self-contained' mode publishes the application with the .NET Core runtime.
+The default is 'true' if a runtime identifier is specified.</source>
-The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable.
+        <target state="needs-review-translation">Опубликуйте среду выполнения .NET Core вместе с приложением, чтобы ее не нужно было устанавливать на целевом компьютере. Если идентификатор среды выполнения указан, значение по умолчанию — true.</target>
-The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable.
-The default is 'fx-dependent-no-exe' when a target runtime is not specified.
-The default is 'self-contained' when a target runtime is specified.</source>
-        <target state="new">The mode to use when publishing the application.
-The 'self-contained' mode publishes the application with the .NET Core runtime.
-The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable.
-The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable.
-The default is 'fx-dependent-no-exe' when a target runtime is not specified.
-The default is 'self-contained' when a target runtime is specified.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ModeOptionName">
-        <source>MODE</source>
-        <target state="new">MODE</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="PublishModeAndSelfContainedOptionsConflict">
-        <source>The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options.</source>
-        <target state="new">The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UnsupportedPublishMode">
-        <source>The specified publish mode '{0}' is not supported.</source>
-        <target state="new">The specified publish mode '{0}' is not supported.</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.tr.xlf

@@ -43,10 +43,10 @@
         <note />
       </trans-unit>
       <trans-unit id="RuntimeOptionDescription">
-        <source>The target runtime to publish the application for.
+        <source>The target runtime to publish for. This is used when creating a self-contained deployment.
-The default is to publish a framework-dependent application without an executable.</source>
+The default is to publish a framework-dependent application.</source>
-        <target state="needs-review-translation">Yayımlamanın yapılacağı hedef çalışma zamanı. Kendi içinde dağıtımlar oluşturulurken kullanılır. 
+        <target state="needs-review-translation">Uygulamanın yayımlanacağı hedef çalışma zamanı.
-Varsayılan seçenek, çerçeveye bağımlı bir proje yayımlamaktır.</target>
+Varsayılan seçenek, bir yürütülebilir dosya olmadan çerçeveye bağımlı bir uygulama yayımlamaktır.</target>
         <note />
       </trans-unit>
       <trans-unit id="ConfigurationOptionDescription">
@@ -54,34 +54,10 @@ Varsayılan seçenek, çerçeveye bağımlı bir proje yayımlamaktır.</target>
         <target state="translated">Yayımlanacak yapılandırma. Çoğu proje için varsayılan, ‘Hata Ayıklama’ seçeneğidir.</target>
         <note />
       </trans-unit>
-      <trans-unit id="ModeOptionDescription">
+      <trans-unit id="SelfContainedOptionDescription">
-        <source>The mode to use when publishing the application.
+        <source>Publish the .NET Core runtime with your application so the runtime doesn't need to be installed on the target machine.
-The 'self-contained' mode publishes the application with the .NET Core runtime.
+The default is 'true' if a runtime identifier is specified.</source>
-The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable.
+        <target state="needs-review-translation">Çalışma zamanının hedef makineye yüklenmesine gerek kalmaması için, .NET Core çalışma zamanını uygulamanızla birlikte yayımlayın. Bir çalışma zamanı tanımlayıcısı belirtilmişse, varsayılan olarak 'true' değerine ayarlanır.</target>
-The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable.
-The default is 'fx-dependent-no-exe' when a target runtime is not specified.
-The default is 'self-contained' when a target runtime is specified.</source>
-        <target state="new">The mode to use when publishing the application.
-The 'self-contained' mode publishes the application with the .NET Core runtime.
-The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable.
-The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable.
-The default is 'fx-dependent-no-exe' when a target runtime is not specified.
-The default is 'self-contained' when a target runtime is specified.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ModeOptionName">
-        <source>MODE</source>
-        <target state="new">MODE</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="PublishModeAndSelfContainedOptionsConflict">
-        <source>The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options.</source>
-        <target state="new">The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UnsupportedPublishMode">
-        <source>The specified publish mode '{0}' is not supported.</source>
-        <target state="new">The specified publish mode '{0}' is not supported.</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hans.xlf

@@ -43,10 +43,10 @@
         <note />
       </trans-unit>
       <trans-unit id="RuntimeOptionDescription">
-        <source>The target runtime to publish the application for.
+        <source>The target runtime to publish for. This is used when creating a self-contained deployment.
-The default is to publish a framework-dependent application without an executable.</source>
+The default is to publish a framework-dependent application.</source>
-        <target state="needs-review-translation">要发布的目标运行时。创建自包含部署时使用此项。
+        <target state="needs-review-translation">针对其发布应用程序的目标运行时。
-默认操作为发布依赖框架的应用程序。</target>
+默认发布不含可执行文件的依赖框架的应用程序。</target>
         <note />
       </trans-unit>
       <trans-unit id="ConfigurationOptionDescription">
@@ -54,34 +54,10 @@ The default is to publish a framework-dependent application without an executabl
         <target state="translated">要发布的配置。大多数项目的默认值是 "Debug"。</target>
         <note />
       </trans-unit>
-      <trans-unit id="ModeOptionDescription">
+      <trans-unit id="SelfContainedOptionDescription">
-        <source>The mode to use when publishing the application.
+        <source>Publish the .NET Core runtime with your application so the runtime doesn't need to be installed on the target machine.
-The 'self-contained' mode publishes the application with the .NET Core runtime.
+The default is 'true' if a runtime identifier is specified.</source>
-The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable.
+        <target state="needs-review-translation">随附应用程序发布 .NET Core 运行时，免除在目标计算机上安装运行时的需求。如果指定了运行时标识符，则默认为 “true”。</target>
-The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable.
-The default is 'fx-dependent-no-exe' when a target runtime is not specified.
-The default is 'self-contained' when a target runtime is specified.</source>
-        <target state="new">The mode to use when publishing the application.
-The 'self-contained' mode publishes the application with the .NET Core runtime.
-The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable.
-The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable.
-The default is 'fx-dependent-no-exe' when a target runtime is not specified.
-The default is 'self-contained' when a target runtime is specified.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ModeOptionName">
-        <source>MODE</source>
-        <target state="new">MODE</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="PublishModeAndSelfContainedOptionsConflict">
-        <source>The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options.</source>
-        <target state="new">The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UnsupportedPublishMode">
-        <source>The specified publish mode '{0}' is not supported.</source>
-        <target state="new">The specified publish mode '{0}' is not supported.</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hant.xlf

@@ -43,10 +43,10 @@
         <note />
       </trans-unit>
       <trans-unit id="RuntimeOptionDescription">
-        <source>The target runtime to publish the application for.
+        <source>The target runtime to publish for. This is used when creating a self-contained deployment.
-The default is to publish a framework-dependent application without an executable.</source>
+The default is to publish a framework-dependent application.</source>
-        <target state="needs-review-translation">對其進行發行的目標執行階段。建立獨立的部署時，將會使用。
+        <target state="needs-review-translation">要發佈應用程式的目標執行階段。
-預設會發行與架構相依的應用程式。</target>
+預設為發佈與 Framework 相依的應用程式，不含可執行檔。</target>
         <note />
       </trans-unit>
       <trans-unit id="ConfigurationOptionDescription">
@@ -54,34 +54,10 @@ The default is to publish a framework-dependent application without an executabl
         <target state="translated">要為其進行發行的組態。大部分的專案預設為「偵錯」。</target>
         <note />
       </trans-unit>
-      <trans-unit id="ModeOptionDescription">
+      <trans-unit id="SelfContainedOptionDescription">
-        <source>The mode to use when publishing the application.
+        <source>Publish the .NET Core runtime with your application so the runtime doesn't need to be installed on the target machine.
-The 'self-contained' mode publishes the application with the .NET Core runtime.
+The default is 'true' if a runtime identifier is specified.</source>
-The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable.
+        <target state="needs-review-translation">隨著應用程式一併發行 .NET Core 執行階段，因此不需要在目標電腦上安裝此執行階段。若指定了執行階段識別碼，則預設為 'true'。</target>
-The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable.
-The default is 'fx-dependent-no-exe' when a target runtime is not specified.
-The default is 'self-contained' when a target runtime is specified.</source>
-        <target state="new">The mode to use when publishing the application.
-The 'self-contained' mode publishes the application with the .NET Core runtime.
-The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable.
-The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable.
-The default is 'fx-dependent-no-exe' when a target runtime is not specified.
-The default is 'self-contained' when a target runtime is specified.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ModeOptionName">
-        <source>MODE</source>
-        <target state="new">MODE</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="PublishModeAndSelfContainedOptionsConflict">
-        <source>The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options.</source>
-        <target state="new">The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UnsupportedPublishMode">
-        <source>The specified publish mode '{0}' is not supported.</source>
-        <target state="new">The specified publish mode '{0}' is not supported.</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.cs.xlf

@@ -91,7 +91,7 @@ Jedná se o ekvivalent odstranění project.assets.json.</target>
       </trans-unit>
       <trans-unit id="CmdInteractiveRestoreOptionDescription">
         <source>Allows the command to stop and wait for user input or action (for example to complete authentication).</source>
-        <target state="new">Allows the command to stop and wait for user input or action (for example to complete authentication).</target>
+        <target state="translated">Umožňuje, aby se příkaz zastavil a počkal na vstup nebo akci uživatele (například na dokončení ověření).</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.de.xlf

@@ -91,7 +91,7 @@ Dies entspricht dem Löschen von "project.assets.json".</target>
       </trans-unit>
       <trans-unit id="CmdInteractiveRestoreOptionDescription">
         <source>Allows the command to stop and wait for user input or action (for example to complete authentication).</source>
-        <target state="new">Allows the command to stop and wait for user input or action (for example to complete authentication).</target>
+        <target state="translated">Hiermit wird zugelassen, dass der Befehl anhält und auf eine Benutzereingabe oder Aktion wartet (beispielsweise auf den Abschluss der Authentifizierung).</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.es.xlf

@@ -91,7 +91,7 @@ Esta acción es equivalente a eliminar project.assets.json.</target>
       </trans-unit>
       <trans-unit id="CmdInteractiveRestoreOptionDescription">
         <source>Allows the command to stop and wait for user input or action (for example to complete authentication).</source>
-        <target state="new">Allows the command to stop and wait for user input or action (for example to complete authentication).</target>
+        <target state="translated">Permite que el comando se detenga y espere la entrada o acción del usuario (por ejemplo, para autenticarse).</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.fr.xlf

@@ -91,7 +91,7 @@ Cela équivaut à supprimer project.assets.json.</target>
       </trans-unit>
       <trans-unit id="CmdInteractiveRestoreOptionDescription">
         <source>Allows the command to stop and wait for user input or action (for example to complete authentication).</source>
-        <target state="new">Allows the command to stop and wait for user input or action (for example to complete authentication).</target>
+        <target state="translated">Permet à la commande de s'arrêter et d'attendre une entrée ou une action de l'utilisateur (par exemple pour effectuer une authentification).</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.it.xlf

@@ -91,7 +91,7 @@ Equivale a eliminare project.assets.json.</target>
       </trans-unit>
       <trans-unit id="CmdInteractiveRestoreOptionDescription">
         <source>Allows the command to stop and wait for user input or action (for example to complete authentication).</source>
-        <target state="new">Allows the command to stop and wait for user input or action (for example to complete authentication).</target>
+        <target state="translated">Consente al comando di arrestare l'esecuzione e attendere l'input o l'azione dell'utente, ad esempio per completare l'autenticazione.</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ja.xlf

@@ -91,7 +91,7 @@ This is equivalent to deleting project.assets.json.</source>
       </trans-unit>
       <trans-unit id="CmdInteractiveRestoreOptionDescription">
         <source>Allows the command to stop and wait for user input or action (for example to complete authentication).</source>
-        <target state="new">Allows the command to stop and wait for user input or action (for example to complete authentication).</target>
+        <target state="translated">コマンドを停止して、ユーザーの入力またはアクション (認証の完了など) を待機できるようにします。</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ko.xlf

@@ -91,7 +91,7 @@ project.assets.json을 삭제하는 것과 동일합니다.</target>
       </trans-unit>
       <trans-unit id="CmdInteractiveRestoreOptionDescription">
         <source>Allows the command to stop and wait for user input or action (for example to complete authentication).</source>
-        <target state="new">Allows the command to stop and wait for user input or action (for example to complete authentication).</target>
+        <target state="translated">명령을 중지하고 사용자 입력 또는 작업을 기다리도록 허용합니다(예: 인증 완료).</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pl.xlf

@@ -91,7 +91,7 @@ Jest to równoważne usunięciu pliku project.assets.json.</target>
       </trans-unit>
       <trans-unit id="CmdInteractiveRestoreOptionDescription">
         <source>Allows the command to stop and wait for user input or action (for example to complete authentication).</source>
-        <target state="new">Allows the command to stop and wait for user input or action (for example to complete authentication).</target>
+        <target state="translated">Zezwala poleceniu na zatrzymanie działania i zaczekanie na wprowadzenie danych lub wykonanie akcji przez użytkownika (na przykład ukończenie uwierzytelniania).</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pt-BR.xlf

@@ -91,7 +91,7 @@ Isso equivale a excluir o project.assets.json.</target>
       </trans-unit>
       <trans-unit id="CmdInteractiveRestoreOptionDescription">
         <source>Allows the command to stop and wait for user input or action (for example to complete authentication).</source>
-        <target state="new">Allows the command to stop and wait for user input or action (for example to complete authentication).</target>
+        <target state="translated">Permite que o comando seja interrompido e aguarde a ação ou entrada do usuário (por exemplo, para concluir a autenticação).</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ru.xlf

@@ -91,7 +91,7 @@ This is equivalent to deleting project.assets.json.</source>
       </trans-unit>
       <trans-unit id="CmdInteractiveRestoreOptionDescription">
         <source>Allows the command to stop and wait for user input or action (for example to complete authentication).</source>
-        <target state="new">Allows the command to stop and wait for user input or action (for example to complete authentication).</target>
+        <target state="translated">Позволяет остановить команду и ожидать ввода или действия пользователя (например, для проверки подлинности).</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.tr.xlf

@@ -91,7 +91,7 @@ project.assets.json öğesini silmeyle eşdeğerdir.</target>
       </trans-unit>
       <trans-unit id="CmdInteractiveRestoreOptionDescription">
         <source>Allows the command to stop and wait for user input or action (for example to complete authentication).</source>
-        <target state="new">Allows the command to stop and wait for user input or action (for example to complete authentication).</target>
+        <target state="translated">Komutun durup kullanıcı girişini veya eylemini (örneğin, kimlik doğrulamasının tamamlanmasını) beklemesine izin verir .</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hans.xlf

@@ -91,7 +91,7 @@ This is equivalent to deleting project.assets.json.</source>
       </trans-unit>
       <trans-unit id="CmdInteractiveRestoreOptionDescription">
         <source>Allows the command to stop and wait for user input or action (for example to complete authentication).</source>
-        <target state="new">Allows the command to stop and wait for user input or action (for example to complete authentication).</target>
+        <target state="translated">允许命令停止和等待用户输入或操作(例如，用以完成身份验证)。</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hant.xlf

@@ -91,7 +91,7 @@ This is equivalent to deleting project.assets.json.</source>
       </trans-unit>
       <trans-unit id="CmdInteractiveRestoreOptionDescription">
         <source>Allows the command to stop and wait for user input or action (for example to complete authentication).</source>
-        <target state="new">Allows the command to stop and wait for user input or action (for example to complete authentication).</target>
+        <target state="translated">允許命令停止並等候使用者輸入或動作 (例如: 完成驗證)。</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.cs.xlf

@@ -69,7 +69,7 @@
       </trans-unit>
       <trans-unit id="RemoveProjectPathArgumentDescription">
         <source>The paths to the projects to remove from the solution.</source>
-        <target state="needs-review-translation">Cesty k projektům, které se mají odebrat z řešení</target>
+        <target state="translated">Cesty k projektům, které se mají z řešení odebrat</target>
         <note />
       </trans-unit>
       <trans-unit id="ProjectsHeader">

src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.de.xlf

@@ -69,7 +69,7 @@
       </trans-unit>
       <trans-unit id="RemoveProjectPathArgumentDescription">
         <source>The paths to the projects to remove from the solution.</source>
-        <target state="needs-review-translation">Die Pfade zu den Projekten, die von der Projektmappe entfernt werden sollen.</target>
+        <target state="translated">Die Pfade zu den Projekten, die aus der Projektmappe entfernt werden sollen.</target>
         <note />
       </trans-unit>
       <trans-unit id="ProjectsHeader">

src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.es.xlf

@@ -69,7 +69,7 @@
       </trans-unit>
       <trans-unit id="RemoveProjectPathArgumentDescription">
         <source>The paths to the projects to remove from the solution.</source>
-        <target state="needs-review-translation">Las rutas a los proyectos desde la solución.</target>
+        <target state="translated">Rutas de acceso de los proyectos que se van a quitar de la solución.</target>
         <note />
       </trans-unit>
       <trans-unit id="ProjectsHeader">

src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.fr.xlf

@@ -69,7 +69,7 @@
       </trans-unit>
       <trans-unit id="RemoveProjectPathArgumentDescription">
         <source>The paths to the projects to remove from the solution.</source>
-        <target state="needs-review-translation">Chemins des projets à supprimer de la solution.</target>
+        <target state="translated">Chemins des projets à supprimer de la solution.</target>
         <note />
       </trans-unit>
       <trans-unit id="ProjectsHeader">

src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.it.xlf

@@ -69,7 +69,7 @@
       </trans-unit>
       <trans-unit id="RemoveProjectPathArgumentDescription">
         <source>The paths to the projects to remove from the solution.</source>
-        <target state="needs-review-translation">Percorsi dei progetti da rimuovere dalla soluzione.</target>
+        <target state="translated">Percorsi dei progetti da rimuovere dalla soluzione.</target>
         <note />
       </trans-unit>
       <trans-unit id="ProjectsHeader">

src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.ja.xlf

@@ -69,7 +69,7 @@
       </trans-unit>
       <trans-unit id="RemoveProjectPathArgumentDescription">
         <source>The paths to the projects to remove from the solution.</source>
-        <target state="needs-review-translation">ソリューションから削除するプロジェクトへのパス。</target>
+        <target state="translated">ソリューションから削除するプロジェクトへのパス。</target>
         <note />
       </trans-unit>
       <trans-unit id="ProjectsHeader">

src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.ko.xlf

@@ -69,7 +69,7 @@
       </trans-unit>
       <trans-unit id="RemoveProjectPathArgumentDescription">
         <source>The paths to the projects to remove from the solution.</source>
-        <target state="needs-review-translation">솔루션에서 제거할 프로젝트의 경로입니다.</target>
+        <target state="translated">솔루션에서 제거할 프로젝트의 경로입니다.</target>
         <note />
       </trans-unit>
       <trans-unit id="ProjectsHeader">

src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.pl.xlf

@@ -69,7 +69,7 @@
       </trans-unit>
       <trans-unit id="RemoveProjectPathArgumentDescription">
         <source>The paths to the projects to remove from the solution.</source>
-        <target state="needs-review-translation">Ścieżki do projektów, które mają zostać usunięte z rozwiązania.</target>
+        <target state="translated">Ścieżki do projektów, które mają zostać usunięte z rozwiązania.</target>
         <note />
       </trans-unit>
       <trans-unit id="ProjectsHeader">

src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.pt-BR.xlf

@@ -69,7 +69,7 @@
       </trans-unit>
       <trans-unit id="RemoveProjectPathArgumentDescription">
         <source>The paths to the projects to remove from the solution.</source>
-        <target state="needs-review-translation">Os caminhos para os projetos da solução.</target>
+        <target state="translated">Os caminhos para os projetos a serem removidos da solução.</target>
         <note />
       </trans-unit>
       <trans-unit id="ProjectsHeader">

src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.ru.xlf

@@ -69,7 +69,7 @@
       </trans-unit>
       <trans-unit id="RemoveProjectPathArgumentDescription">
         <source>The paths to the projects to remove from the solution.</source>
-        <target state="needs-review-translation">Пути к проектам, которые необходимо удалить из решения.</target>
+        <target state="translated">Пути к проектам, которые необходимо удалить из решения.</target>
         <note />
       </trans-unit>
       <trans-unit id="ProjectsHeader">

src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.tr.xlf

@@ -69,7 +69,7 @@
       </trans-unit>
       <trans-unit id="RemoveProjectPathArgumentDescription">
         <source>The paths to the projects to remove from the solution.</source>
-        <target state="needs-review-translation">Çözümden kaldırılacak projelerin yolları.</target>
+        <target state="translated">Çözümden kaldırılacak projelerin yolları.</target>
         <note />
       </trans-unit>
       <trans-unit id="ProjectsHeader">

src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.zh-Hans.xlf

@@ -69,7 +69,7 @@
       </trans-unit>
       <trans-unit id="RemoveProjectPathArgumentDescription">
         <source>The paths to the projects to remove from the solution.</source>
-        <target state="needs-review-translation">从解决方案到项目的路径。</target>
+        <target state="translated">要从解决方案中删除的项目的路径。</target>
         <note />
       </trans-unit>
       <trans-unit id="ProjectsHeader">

src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.zh-Hant.xlf

@@ -69,7 +69,7 @@
       </trans-unit>
       <trans-unit id="RemoveProjectPathArgumentDescription">
         <source>The paths to the projects to remove from the solution.</source>
-        <target state="needs-review-translation">從解決方案到達要專案的路徑。</target>
+        <target state="translated">要從解決方案中移除的專案路徑。</target>
         <note />
       </trans-unit>
       <trans-unit id="ProjectsHeader">

src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.cs.xlf

@@ -65,11 +65,11 @@
                                         Log in trx format using a unique file name: --logger trx
                                         Log in trx format using the specified file name: --logger "trx;LogFileName=<TestResults.trx>"
                                         See https://aka.ms/vstest-report for more information on logger arguments.</source>
-        <target state="translated">Protokolovací nástroj, který se má použít pro výsledky testů. 
+        <target state="needs-review-translation">Protokolovací nástroj, který se použije pro výsledky testů.
                                         Příklady:
-                                        Protokol ve formátu trx s použitím jedinečného názvu souboru: --logger trx
+                                        Protokol ve formátu trx, který používá jedinečný název souboru: --logger trx
-                                        Protokol ve formátu trx s použitím zadaného názvu souboru: --logger "trx;LogFileName=&lt;TestResults.trx&gt;"
+                                        Protokol ve formátu trx, který používá zadaný název souboru: --logger "trx;LogFileName=&lt;TestResults.trx&gt;"
-                                        Další informace o podpoře argumentů protokolovacího nástroje: https://aka.ms/vstest-report</target>
+                                        Další informace o argumentech protokolovacího nástroje: https://aka.ms/vstest-report.</target>
         <note />
       </trans-unit>
       <trans-unit id="CmdOutputDir">

src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.de.xlf

@@ -65,11 +65,11 @@
                                         Log in trx format using a unique file name: --logger trx
                                         Log in trx format using the specified file name: --logger "trx;LogFileName=<TestResults.trx>"
                                         See https://aka.ms/vstest-report for more information on logger arguments.</source>
-        <target state="translated">Die für Testergebnisse zu verwendende Protokollierung.
+        <target state="needs-review-translation">Die für Testergebnisse zu verwendende Protokollierung.
                                         Beispiele:
                                         Hiermit werden Ergebnisse im TRX-Format mit eindeutigem Dateinamen protokolliert: --logger trx
-                                        Hiermit werden Ergebnisse im TRX-Format mit angegebenem Dateinamen protokolliert: --logger "trx;LogFileName=&lt;TestResults.trx&gt;"
+                                        Hiermit werden Ergebnisse im TRX-Format mit dem angegebenem Dateinamen protokolliert: --logger "trx;LogFileName=&lt;TestResults.trx&gt;"
-                                        Weitere Informationen zur Unterstützung von Argumenten des Protokollierers finden Sie unter https://aka.ms/vstest-report.</target>
+                                        Weitere Informationen zu den Argumenten der Protokollierung finden Sie unter https://aka.ms/vstest-report.</target>
         <note />
       </trans-unit>
       <trans-unit id="CmdOutputDir">

src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.es.xlf

@@ -65,11 +65,11 @@
                                         Log in trx format using a unique file name: --logger trx
                                         Log in trx format using the specified file name: --logger "trx;LogFileName=<TestResults.trx>"
                                         See https://aka.ms/vstest-report for more information on logger arguments.</source>
-        <target state="translated">El registrador que se utilizará para los resultados de la prueba.
+        <target state="needs-review-translation">Registrador que se utiliza para los resultados de las pruebas.
-                                        Ejemplo:
+                                        Ejemplos:
-                                        Inicie sesión en formato trx mediante un nombre de archivo único: --logger trx
+                                        Registrar en formato trx con un nombre de archivo único: --logger trx
-                                        Inicie sesión en formato trx mediante el nombre de archivo especificado: --logger "trx;LogFileName=&lt;TestResults.trx&gt;"
+                                        Registrar en formato trx con el nombre de archivo especificado: --logger "trx;LogFileName=&lt;TestResults.trx&gt;"
-                                        Consulte https://aka.ms/vstest-report para obtener más información sobre los argumentos del registrador.</target>
+                                        Vea https://aka.ms/vstest-report para obtener más información sobre argumentos de registrador.</target>
         <note />
       </trans-unit>
       <trans-unit id="CmdOutputDir">

src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.fr.xlf

@@ -65,11 +65,11 @@
                                         Log in trx format using a unique file name: --logger trx
                                         Log in trx format using the specified file name: --logger "trx;LogFileName=<TestResults.trx>"
                                         See https://aka.ms/vstest-report for more information on logger arguments.</source>
-        <target state="translated">Enregistreur d'événements à utiliser pour les résultats des tests.
+        <target state="needs-review-translation">Journaliseur à utiliser pour les résultats des tests.
                                         Exemples :
                                         Journal au format trx avec un nom de fichier unique : --logger trx
                                         Journal au format trx avec le nom de fichier spécifié : --logger "trx;LogFileName=&lt;TestResults.trx&gt;"
-                                        Pour plus d'informations sur les arguments de l'enregistreur d'événements, consultez https://aka.ms/vstest-report.</target>
+                                        Pour plus d'informations sur les arguments du journaliseur, consultez https://aka.ms/vstest-report.</target>
         <note />
       </trans-unit>
       <trans-unit id="CmdOutputDir">

src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pt-BR.xlf

@@ -65,11 +65,11 @@
                                         Log in trx format using a unique file name: --logger trx
                                         Log in trx format using the specified file name: --logger "trx;LogFileName=<TestResults.trx>"
                                         See https://aka.ms/vstest-report for more information on logger arguments.</source>
-        <target state="translated">O agente a ser usado para os resultados de teste.
+        <target state="needs-review-translation">O agente a ser usado para os resultados de teste.
                                         Exemplos:
                                         Registrar no formato trx usando um nome de arquivo exclusivo: --logger trx
                                         Registrar no formato trx usando um nome de arquivo especificado: --logger "trx;LogFileName=&lt;TestResults.trx&gt;"
-                                        Confira https://aka.ms/vstest-report para obter mais informações sobre os argumentos do agente.</target>
+                                        Veja https://aka.ms/vstest-report para obter mais informações sobre os argumentos do agente.</target>
         <note />
       </trans-unit>
       <trans-unit id="CmdOutputDir">

src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ru.xlf

@@ -65,10 +65,10 @@
                                         Log in trx format using a unique file name: --logger trx
                                         Log in trx format using the specified file name: --logger "trx;LogFileName=<TestResults.trx>"
                                         See https://aka.ms/vstest-report for more information on logger arguments.</source>
-        <target state="translated">Средство ведения журнала для результатов теста.
+        <target state="needs-review-translation">Средство ведения журнала для результатов теста.
                                         Примеры
-                                        Журнал TRX с уникальным именем файла: --logger trx
+                                        Журнал в формате TRX с уникальным именем файла: --logger trx
-                                        Журнал TRX с заданным именем файла: --logger "trx;LogFileName=&lt;результаты_теста.trx&gt;"
+                                        Журнал в формате TRX с заданным именем файла: --logger "trx;LogFileName=&lt;результаты_теста.trx&gt;"
                                         Дополнительные сведения об аргументах средства ведения журнала: https://aka.ms/vstest-report.</target>
         <note />
       </trans-unit>

src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.tr.xlf

@@ -65,10 +65,10 @@
                                         Log in trx format using a unique file name: --logger trx
                                         Log in trx format using the specified file name: --logger "trx;LogFileName=<TestResults.trx>"
                                         See https://aka.ms/vstest-report for more information on logger arguments.</source>
-        <target state="translated">Test sonuçları için kullanılacak günlükçü.
+        <target state="needs-review-translation">Test sonuçları için kullanılacak günlükçü.
                                         Örnekler:
-                                        Benzersiz dosya adı kullanarak trx biçiminde günlük kaydı: --logger trx
+                                        Benzersiz bir dosya adı kullanan trx biçiminde günlük kaydı: --logger trx
-                                        Belirtilen dosya adını kullanarak trx biçiminde günlük kaydı: --logger "trx;LogFileName=&lt;TestSonuçları.trx&gt;"
+                                        Belirtilen dosya adını kullanan trx biçiminde günlük kaydı: --logger "trx;LogFileName=&lt;TestSonuçları.trx&gt;"
                                         Günlükçü bağımsız değişkenleri hakkında daha fazla bilgi için bkz. https://aka.ms/vstest-report.</target>
         <note />
       </trans-unit>

src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hans.xlf

@@ -65,11 +65,11 @@
                                         Log in trx format using a unique file name: --logger trx
                                         Log in trx format using the specified file name: --logger "trx;LogFileName=<TestResults.trx>"
                                         See https://aka.ms/vstest-report for more information on logger arguments.</source>
-        <target state="translated">用于测试结果的记录器。
+        <target state="needs-review-translation">用于测试结果的记录器。
                                         示例:
-                                        使用唯一文件名按 trx 格式进行记录: --logger trx
+                                        使用唯一文件名以 trx 格式记录: --logger trx
-                                        使用指定的文件名按 trx 格式进行记录: --logger "trx;LogFileName=&lt;TestResults.trx&gt;"
+                                        使用指定文件名以 trx 格式记录: --logger "trx;LogFileName=&lt;TestResults.trx&gt;"
-                                        有关记录器参数的详细信息，请访问: https://aka.ms/vstest-report。</target>
+                                        有关记录器参数的详细信息，请参阅 https://aka.ms/vstest-report。</target>
         <note />
       </trans-unit>
       <trans-unit id="CmdOutputDir">

src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hant.xlf

@@ -65,9 +65,9 @@
                                         Log in trx format using a unique file name: --logger trx
                                         Log in trx format using the specified file name: --logger "trx;LogFileName=<TestResults.trx>"
                                         See https://aka.ms/vstest-report for more information on logger arguments.</source>
-        <target state="translated">為測試結果所使用的記錄器。
+        <target state="needs-review-translation">要用於測試結果的記錄器。
                                         範例:
-                                        使用不重複的檔案名稱，以 trx 格式記錄: --logger trx
+                                        使用唯一的檔案名稱，以 trx 格式記錄: --logger trx
                                         使用指定的檔案名稱，以 trx 格式記錄: --logger "trx;LogFileName=&lt;TestResults.trx&gt;"
                                         如需記錄器引數的詳細資訊，請參閱 https://aka.ms/vstest-report。</target>
         <note />

test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs

@@ -16,8 +16,10 @@ namespace EndToEnd
     {
         private const string AspNetTestProject = "TestWebAppSimple";
 
-        [Fact]
+        private const string PinnedAspNetCoreImplicitVersion = "2.1.1";
-        public void PortablePublishWithLatestTFMUsesBundledAspNetCoreAppVersion()
+
+        [Fact(Skip="https://github.com/dotnet/cli/issues/9687")]
+        public void PortablePublishWithLatestTFMUsesPinnedDownAspNetCoreAppVersion()
         {
             var _testInstance = TestAssets.Get(AspNetTestProject)
                 .CreateInstance(identifier: LatestSupportedAspNetCoreAppVersion)
@@ -48,10 +50,7 @@ namespace EndToEnd
             var restoredVersion = GetAspNetCoreAppVersion(assetsFile, portable: true);
             restoredVersion.Should().NotBeNull();
 
-            var bundledVersionPath = Path.Combine(projectDirectory, ".BundledAspNetCoreVersion");
+            restoredVersion.ToNormalizedString().Should().BeEquivalentTo(PinnedAspNetCoreImplicitVersion,
-            var bundledVersion = File.ReadAllText(bundledVersionPath).Trim();
-
-            restoredVersion.ToNormalizedString().Should().BeEquivalentTo(bundledVersion,
                 "The bundled aspnetcore versions set in Microsoft.NETCoreSdk.BundledVersions.props should be idenitical to the versions set in DependencyVersions.props." +
                 "Please update MSBuildExtensions.targets in this repo so these versions match.");
         }