From 0be7da612cbec500bbe31063bb1663fa07d67eba Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Mon, 29 Jan 2018 14:20:16 -0800
Subject: [PATCH 1/8] Updating Roslyn to 2.7.0-beta3-62529-06.

---
 build/DependencyVersions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 22bc3d9cf..8efbf317c 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -10,7 +10,7 @@
     <MicrosoftBuildLocalizationPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildLocalizationPackageVersion>
     <MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
     <MicrosoftFSharpCompilerPackageVersion>4.2.0-rtm-171122-0</MicrosoftFSharpCompilerPackageVersion>
-    <MicrosoftCodeAnalysisCSharpPackageVersion>2.7.0-beta3-62419-03</MicrosoftCodeAnalysisCSharpPackageVersion>
+    <MicrosoftCodeAnalysisCSharpPackageVersion>2.7.0-beta3-62529-06</MicrosoftCodeAnalysisCSharpPackageVersion>
     <MicrosoftNETCoreCompilersPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftNETCoreCompilersPackageVersion>
     <MicrosoftCodeAnalysisBuildTasksPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftCodeAnalysisBuildTasksPackageVersion>
     <MicrosoftNetCompilersNetcorePackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftNetCompilersNetcorePackageVersion>

From a52bd1a205a56d5b1cba5d619626ede2b84f85b8 Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Tue, 30 Jan 2018 14:02:40 -0800
Subject: [PATCH 2/8] Excluding shared framework assemblies from the Roslyn
 folder in the SDK.

---
 src/redist/redist.csproj | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index 4823a5ebc..9b5208eee 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -83,6 +83,7 @@
       <RoslynDeps Include="$(RoslynDirectory)/bincore/vbc.deps.json" />
       <RoslynDeps Include="$(RoslynDirectory)/bincore/VBCSCompiler.deps.json" />
       <RoslynSatelliteDeps Include="$(RoslynDirectory)/bincore/tool_roslyn_satellites.deps.json" />
+      <RoslynFrameworkAssemblies Include="$(RoslynDirectory)/System.*.dll;$(RoslynDirectory)/runtimes/**/System.*.dll" Exclude="$(RoslynDirectory)/runtimes/**/System.IO.Pipes.AccessControl.dll"/>
     </ItemGroup>
     <PropertyGroup>
       <ReplacementPattern>"version": ".*"</ReplacementPattern>
@@ -98,7 +99,7 @@
       Configuration="$(Configuration)"
       ProjectPath="$(SrcDirectory)/tool_roslyn_satellites/tool_roslyn_satellites.csproj" />
     <AddToDeps TargetDeps="@(RoslynDeps)" AdditionalDeps="@(RoslynSatelliteDeps)" />
-    <Delete Files="@(RoslynSatelliteDeps)" />
+    <Delete Files="@(RoslynSatelliteDeps);@(RoslynFrameworkAssemblies)" />
   </Target>
 
   <Target Name="PublishFSharp"

From b1c780550fed4fd9e3baea14074f4ee2173e7f76 Mon Sep 17 00:00:00 2001
From: Javier Calvarro Nelson <jacalvar@microsoft.com>
Date: Tue, 30 Jan 2018 12:44:49 -0800
Subject: [PATCH 3/8] [Fixes #8511] Update ASP.NET Core certificate
 installation message

---
 src/Microsoft.DotNet.Configurer/LocalizableStrings.resx     | 4 +++-
 .../xlf/LocalizableStrings.cs.xlf                           | 6 ++++--
 .../xlf/LocalizableStrings.de.xlf                           | 6 ++++--
 .../xlf/LocalizableStrings.es.xlf                           | 6 ++++--
 .../xlf/LocalizableStrings.fr.xlf                           | 6 ++++--
 .../xlf/LocalizableStrings.it.xlf                           | 6 ++++--
 .../xlf/LocalizableStrings.ja.xlf                           | 6 ++++--
 .../xlf/LocalizableStrings.ko.xlf                           | 6 ++++--
 .../xlf/LocalizableStrings.pl.xlf                           | 6 ++++--
 .../xlf/LocalizableStrings.pt-BR.xlf                        | 6 ++++--
 .../xlf/LocalizableStrings.ru.xlf                           | 6 ++++--
 .../xlf/LocalizableStrings.tr.xlf                           | 6 ++++--
 .../xlf/LocalizableStrings.zh-Hans.xlf                      | 6 ++++--
 .../xlf/LocalizableStrings.zh-Hant.xlf                      | 6 ++++--
 14 files changed, 55 insertions(+), 27 deletions(-)

diff --git a/src/Microsoft.DotNet.Configurer/LocalizableStrings.resx b/src/Microsoft.DotNet.Configurer/LocalizableStrings.resx
index dd7715bb8..3b46d09d5 100644
--- a/src/Microsoft.DotNet.Configurer/LocalizableStrings.resx
+++ b/src/Microsoft.DotNet.Configurer/LocalizableStrings.resx
@@ -150,6 +150,8 @@ Here are some options to fix this error:
   <data name="AspNetCertificateInstalled" xml:space="preserve">
     <value>ASP.NET Core
 ------------
-Installed ASP.NET Core HTTPS development certificate. For more information go to https://go.microsoft.com/fwlink/?linkid=84805</value>
+Successfully installed the ASP.NET Core HTTPS Development Certificate.
+To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.cs.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.cs.xlf
index a466f6a43..52d1e0afb 100644
--- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.cs.xlf
+++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.cs.xlf
@@ -61,8 +61,10 @@ Tuto chybu můžete opravit pomocí některé z těchto možností:
       <trans-unit id="AspNetCertificateInstalled">
         <source>ASP.NET Core
 ------------
-Installed ASP.NET Core HTTPS development certificate. For more information go to https://go.microsoft.com/fwlink/?linkid=84805</source>
-        <target state="translated">ASP.NET Core
+Successfully installed the ASP.NET Core HTTPS Development Certificate.
+To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
+        <target state="needs-review-translation">ASP.NET Core
 ------------
 Nainstaloval se vývojový certifikát ASP.NET Core HTTPS. Další informace najdete na https://go.microsoft.com/fwlink/?linkid=84805</target>
         <note />
diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.de.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.de.xlf
index fead00672..60943a88f 100644
--- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.de.xlf
+++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.de.xlf
@@ -61,8 +61,10 @@ Im Folgenden finden Sie einige Optionen, um diesen Fehler zu beheben:
       <trans-unit id="AspNetCertificateInstalled">
         <source>ASP.NET Core
 ------------
-Installed ASP.NET Core HTTPS development certificate. For more information go to https://go.microsoft.com/fwlink/?linkid=84805</source>
-        <target state="translated">ASP.NET Core
+Successfully installed the ASP.NET Core HTTPS Development Certificate.
+To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
+        <target state="needs-review-translation">ASP.NET Core
 ------------
 Installiertes ASP.NET Core-HTTPS-Entwicklungszertifikat. Weitere Informationen finden Sie unter https://go.microsoft.com/fwlink/?linkid=84805</target>
         <note />
diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf
index 9e7dbc30f..9d71f4883 100644
--- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf
+++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf
@@ -60,8 +60,10 @@ Estas son algunas opciones para corregir este error:
       <trans-unit id="AspNetCertificateInstalled">
         <source>ASP.NET Core
 ------------
-Installed ASP.NET Core HTTPS development certificate. For more information go to https://go.microsoft.com/fwlink/?linkid=84805</source>
-        <target state="translated">ASP.NET Core
+Successfully installed the ASP.NET Core HTTPS Development Certificate.
+To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
+        <target state="needs-review-translation">ASP.NET Core
 ------------
 Se instaló el certificado de desarrollo HTTPS de ASP.NET Core. Para más información, vaya a https://go.microsoft.com/fwlink/?linkid=84805</target>
         <note />
diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.fr.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.fr.xlf
index 2b9a829b9..041cede23 100644
--- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.fr.xlf
+++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.fr.xlf
@@ -61,8 +61,10 @@ Voici quelques options pour corriger cette erreur :
       <trans-unit id="AspNetCertificateInstalled">
         <source>ASP.NET Core
 ------------
-Installed ASP.NET Core HTTPS development certificate. For more information go to https://go.microsoft.com/fwlink/?linkid=84805</source>
-        <target state="translated">ASP.NET Core
+Successfully installed the ASP.NET Core HTTPS Development Certificate.
+To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
+        <target state="needs-review-translation">ASP.NET Core
 ------------
 Certificat de développement HTTPS ASP.NET Core installé. Pour plus d’informations, accédez à https://go.microsoft.com/fwlink/?linkid=84805</target>
         <note />
diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.it.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.it.xlf
index e396f2bd9..9608daf2e 100644
--- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.it.xlf
+++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.it.xlf
@@ -61,8 +61,10 @@ Ecco alcune opzioni per correggere questo errore:
       <trans-unit id="AspNetCertificateInstalled">
         <source>ASP.NET Core
 ------------
-Installed ASP.NET Core HTTPS development certificate. For more information go to https://go.microsoft.com/fwlink/?linkid=84805</source>
-        <target state="translated">ASP.NET Core
+Successfully installed the ASP.NET Core HTTPS Development Certificate.
+To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
+        <target state="needs-review-translation">ASP.NET Core
 ------------
 Il certificato di sviluppo HTTPS di ASP.NET Core è stato installato. Per altre informazioni, vedere https://go.microsoft.com/fwlink/?linkid=84805</target>
         <note />
diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ja.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ja.xlf
index 1f7bdf510..33589ba3a 100644
--- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ja.xlf
+++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ja.xlf
@@ -61,8 +61,10 @@ Here are some options to fix this error:
       <trans-unit id="AspNetCertificateInstalled">
         <source>ASP.NET Core
 ------------
-Installed ASP.NET Core HTTPS development certificate. For more information go to https://go.microsoft.com/fwlink/?linkid=84805</source>
-        <target state="translated">ASP.NET Core
+Successfully installed the ASP.NET Core HTTPS Development Certificate.
+To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
+        <target state="needs-review-translation">ASP.NET Core
 ------------
 ASP.NET Core HTTPS 開発証明書をインストールしました。詳しくは、https://go.microsoft.com/fwlink/?linkid=84805 をご覧ください</target>
         <note />
diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ko.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ko.xlf
index 980d4a6e7..b59e79ae4 100644
--- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ko.xlf
+++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ko.xlf
@@ -61,8 +61,10 @@ Here are some options to fix this error:
       <trans-unit id="AspNetCertificateInstalled">
         <source>ASP.NET Core
 ------------
-Installed ASP.NET Core HTTPS development certificate. For more information go to https://go.microsoft.com/fwlink/?linkid=84805</source>
-        <target state="translated">ASP.NET Core
+Successfully installed the ASP.NET Core HTTPS Development Certificate.
+To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
+        <target state="needs-review-translation">ASP.NET Core
 ------------
 설치된 ASP.NET Core HTTPS 개발 인증서. 자세한 내용은 https://go.microsoft.com/fwlink/?linkid=84805을(를) 참조하세요.</target>
         <note />
diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pl.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pl.xlf
index 9faf233a1..bb510b666 100644
--- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pl.xlf
+++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pl.xlf
@@ -61,8 +61,10 @@ Oto kilka opcji naprawiania tego błędu:
       <trans-unit id="AspNetCertificateInstalled">
         <source>ASP.NET Core
 ------------
-Installed ASP.NET Core HTTPS development certificate. For more information go to https://go.microsoft.com/fwlink/?linkid=84805</source>
-        <target state="translated">ASP.NET Core
+Successfully installed the ASP.NET Core HTTPS Development Certificate.
+To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
+        <target state="needs-review-translation">ASP.NET Core
 ------------
 Zainstalowany certyfikat programistyczny HTTPS ASP.NET Core. Aby uzyskać więcej informacji, przejdź na adres https://go.microsoft.com/fwlink/?linkid=84805</target>
         <note />
diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pt-BR.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pt-BR.xlf
index ecdf3d825..d11e6847a 100644
--- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pt-BR.xlf
+++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pt-BR.xlf
@@ -61,8 +61,10 @@ Aqui estão algumas opções para corrigir este erro:
       <trans-unit id="AspNetCertificateInstalled">
         <source>ASP.NET Core
 ------------
-Installed ASP.NET Core HTTPS development certificate. For more information go to https://go.microsoft.com/fwlink/?linkid=84805</source>
-        <target state="translated">ASP.NET Core
+Successfully installed the ASP.NET Core HTTPS Development Certificate.
+To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
+        <target state="needs-review-translation">ASP.NET Core
 ------------
 Certificado de desenvolvimento de HTTPS do ASP.NET Core instalado. Para obter mais informações, vá para https://go.microsoft.com/fwlink/?linkid=84805</target>
         <note />
diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ru.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ru.xlf
index ec75775b4..e6574a137 100644
--- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ru.xlf
+++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ru.xlf
@@ -61,8 +61,10 @@ Here are some options to fix this error:
       <trans-unit id="AspNetCertificateInstalled">
         <source>ASP.NET Core
 ------------
-Installed ASP.NET Core HTTPS development certificate. For more information go to https://go.microsoft.com/fwlink/?linkid=84805</source>
-        <target state="translated">ASP.NET Core
+Successfully installed the ASP.NET Core HTTPS Development Certificate.
+To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
+        <target state="needs-review-translation">ASP.NET Core
 ------------
 Установлен сертификат для HTTPS-разработки на ASP.NET Core. Дополнительные сведения: https://go.microsoft.com/fwlink/?linkid=84805</target>
         <note />
diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.tr.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.tr.xlf
index c79ef1b15..226a088d1 100644
--- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.tr.xlf
+++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.tr.xlf
@@ -61,8 +61,10 @@ Bu hatayı düzeltmek için bazı seçenekler:
       <trans-unit id="AspNetCertificateInstalled">
         <source>ASP.NET Core
 ------------
-Installed ASP.NET Core HTTPS development certificate. For more information go to https://go.microsoft.com/fwlink/?linkid=84805</source>
-        <target state="translated">ASP.NET Core
+Successfully installed the ASP.NET Core HTTPS Development Certificate.
+To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
+        <target state="needs-review-translation">ASP.NET Core
 ------------
 ASP.NET Core HTTPS geliştirme sertifikası yüklendi. Daha fazla bilgi için bkz. https://go.microsoft.com/fwlink/?linkid=84805</target>
         <note />
diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hans.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hans.xlf
index 20c1a912c..658777121 100644
--- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hans.xlf
+++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hans.xlf
@@ -61,8 +61,10 @@ Here are some options to fix this error:
       <trans-unit id="AspNetCertificateInstalled">
         <source>ASP.NET Core
 ------------
-Installed ASP.NET Core HTTPS development certificate. For more information go to https://go.microsoft.com/fwlink/?linkid=84805</source>
-        <target state="translated">ASP.NET Core
+Successfully installed the ASP.NET Core HTTPS Development Certificate.
+To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
+        <target state="needs-review-translation">ASP.NET Core
 ------------
 安装 ASP.NET Core HTTPS 开发证书。有关详细信息，请转到 https://go.microsoft.com/fwlink/?linkid=84805</target>
         <note />
diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hant.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hant.xlf
index 958f7ef75..29c171d68 100644
--- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hant.xlf
+++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hant.xlf
@@ -61,8 +61,10 @@ Here are some options to fix this error:
       <trans-unit id="AspNetCertificateInstalled">
         <source>ASP.NET Core
 ------------
-Installed ASP.NET Core HTTPS development certificate. For more information go to https://go.microsoft.com/fwlink/?linkid=84805</source>
-        <target state="translated">ASP.NET Core
+Successfully installed the ASP.NET Core HTTPS Development Certificate.
+To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
+        <target state="needs-review-translation">ASP.NET Core
 ------------
 已安裝 ASP.NET Core HTTPS 開發憑證。如需詳細資訊，請前往 https://go.microsoft.com/fwlink/?linkid=84805</target>
         <note />

From 494c61f864bc36e33e31efa5d88e663379607a51 Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Fri, 2 Feb 2018 08:56:12 -0800
Subject: [PATCH 4/8] Update the branch info to be correct for 2.1

---
 build/BranchInfo.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/BranchInfo.props b/build/BranchInfo.props
index f62c8fd00..961d6d290 100644
--- a/build/BranchInfo.props
+++ b/build/BranchInfo.props
@@ -1,6 +1,6 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <Channel>master</Channel>
-    <BranchName>master</BranchName>
+    <Channel>release/2.1.3xx</Channel>
+    <BranchName>release/2.1.3xx</BranchName>
   </PropertyGroup>
 </Project>

From cecc2331d61123851fb74a7ae1b788b5f2d379e6 Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Fri, 2 Feb 2018 09:07:11 -0800
Subject: [PATCH 5/8] Update BranchInfo.props

---
 build/BranchInfo.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/BranchInfo.props b/build/BranchInfo.props
index 961d6d290..0879a9028 100644
--- a/build/BranchInfo.props
+++ b/build/BranchInfo.props
@@ -1,6 +1,6 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <Channel>release/2.1.3xx</Channel>
+    <Channel>release/2.1</Channel>
     <BranchName>release/2.1.3xx</BranchName>
   </PropertyGroup>
 </Project>

From e260e7922940000ab2255199b1067a8102adb54d Mon Sep 17 00:00:00 2001
From: John Beisner <johnbeisner@users.noreply.github.com>
Date: Mon, 5 Feb 2018 10:38:53 -0800
Subject: [PATCH 6/8] Fixing the recent CLI test failures around ASP.NETcore in
 the orchestrated build: adding a 'dotnet-corefxlab' feed. (#8536)

---
 build/NugetConfigFile.targets                      | 5 ++---
 test/dotnet-new.Tests/GivenThatIWantANewApp.cs     | 2 +-
 test/dotnet-new.Tests/NuGet.tempaspnetpatch.config | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets
index 128a68954..8e1c1e069 100644
--- a/build/NugetConfigFile.targets
+++ b/build/NugetConfigFile.targets
@@ -28,9 +28,8 @@
     <add key="xunit" value="https://www.myget.org/F/xunit/api/v3/index.json" />
     <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="vstest" value="https://dotnet.myget.org/F/vstest/api/v3/index.json" />
-    <add key="web-api" value="https://dotnet.myget.org/F/dotnet-web/api/v3/index.json" />
-    <add key="symreader-native" value="https://dotnet.myget.org/F/symreader-native/api/v3/index.json" />
-    <add key="nuget-build" value="https://dotnet.myget.org/F/nuget-build/api/v3/index.json" /> 
+    <add key="nuget-build" value="https://dotnet.myget.org/F/nuget-build/api/v3/index.json" />
+    <add key="dotnet-corefxlab" value="https://dotnet.myget.org/F/dotnet-corefxlab/api/v3/index.json" /> 
         ]]>
       </NugetConfigCLIFeeds>
 
diff --git a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs
index 247d5e4a5..0ffdf83e8 100644
--- a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs
+++ b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs
@@ -47,7 +47,7 @@ namespace Microsoft.DotNet.New.Tests
             // For testing the 2.1 templates - some of their packages are currently only in private feeds.
             var configFile = Path.Combine(rootPath, "NuGet.Config");
             AspNetNuGetConfiguration.WriteNuGetConfigWithAspNetPrivateFeeds(configFile);
-			      // For "normal" builds, once the packages needed for 2.1 templates are in the public feeds
+            // For "normal" builds, once the packages needed for 2.1 templates are in the public feeds
             //var configFile = Path.Combine(RepoDirectoriesProvider.RepoRoot, "NuGet.Config");
 
             foreach (string cSharpTemplate in cSharpTemplates)
diff --git a/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config b/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config
index f2758d9d5..5383ef159 100644
--- a/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config
+++ b/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config
@@ -6,5 +6,6 @@
     <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="DotnetCore" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
     <add key="aspnetcore-dev" value="https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json" />
+    <add key="dotnet-corefxlab" value="https://dotnet.myget.org/F/dotnet-corefxlab/api/v3/index.json" />
   </packageSources>
 </configuration>

From 47da51331333a0ca7f002e0b0226eaef9758fab9 Mon Sep 17 00:00:00 2001
From: John Beisner <johnbeisner@users.noreply.github.com>
Date: Mon, 5 Feb 2018 15:50:50 -0800
Subject: [PATCH 7/8] Infrastructure updates: CLI:master -> release/2.1.3xx
 (#8541)

* Repairing the first pass call to 'dotnet msbuild'; CLI:master (#8488)

* '$ExtraParametersNoTargets', which is used on the first pass call to 'dotnet msbuild', currently is of type 'string' not 'List'1' as is '$ExtraParameters'. This results in the non-honoring of any parameter other than parameter one. Solution: Make a copy of '$ExtraParameters' to '$ExtraParametersNoTargets' of type 'List'1' and remove the targets from the list.

* Swallow the boolean output from '$ExtraParametersNoTargets.Remove'

* Specifically capture "/t:" or "/target:" only.

* The "${arg,,}" syntax works well on dev and Jenkins OSX machines but does not work correctly on VSO build machines [likely a lower version of bash on VSO machines]. Therefore, using 'awk' to transforming to lower case. (#8497)

* Orchestrated final publish; CLI:master (#8504)

* Orchestrated final publish: https://github.com/dotnet/core-eng/issues/2407

* Changes per code review...

* The orchestrated "PackageVersion" type variables should not be used in any of the 'proj' files of the built build tools under: "build_projects"
---
 build/AzureInfo.props                                   | 5 +++--
 build/DependencyVersions.props                          | 2 +-
 build/Publish.targets                                   | 1 +
 build/publish/PublishContent.targets                    | 2 ++
 build/publish/PublishNupkgToBlobFeed.targets            | 1 +
 build_projects/dotnet-cli-build/dotnet-cli-build.csproj | 2 +-
 run-build.ps1                                           | 8 ++++----
 run-build.sh                                            | 5 +++--
 8 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/build/AzureInfo.props b/build/AzureInfo.props
index c5dc4a579..6e1739c62 100644
--- a/build/AzureInfo.props
+++ b/build/AzureInfo.props
@@ -1,9 +1,10 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
+    <Product>Sdk</Product>
     <IsNotOrchestratedPublish>true</IsNotOrchestratedPublish>
     <IsNotOrchestratedPublish Condition="'$(PB_PublishBlobFeedUrl)' != ''">false</IsNotOrchestratedPublish>
-    <BlobStoragePartialRelativePath>Sdk</BlobStoragePartialRelativePath>
-    <BlobStoragePartialRelativePath Condition="'$(IsNotOrchestratedPublish)' == 'false'">assets/$(BlobStoragePartialRelativePath)</BlobStoragePartialRelativePath>
+    <BlobStoragePartialRelativePath>$(Product)</BlobStoragePartialRelativePath>
+    <BlobStoragePartialRelativePath Condition="'$(IsNotOrchestratedPublish)' == 'false'">assets/$(Product)</BlobStoragePartialRelativePath>
     
     <!-- Values related to the download of assets from blob storage -->
     <DefaultCoreSetupBlobRootUrl>https://dotnetcli.azureedge.net/dotnet/</DefaultCoreSetupBlobRootUrl>
diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 2fb3a2ed9..998f5d3d3 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -68,7 +68,7 @@
   <PropertyGroup>
     <VersionToolsVersion>2.1.0-prerelease-02411-04</VersionToolsVersion>
     <DotnetDebToolVersion>2.0.0-preview2-25331-01</DotnetDebToolVersion>
-    <BuildTasksFeedToolVersion>2.1.0-prerelease-02411-04</BuildTasksFeedToolVersion>
+    <BuildTasksFeedToolVersion>2.1.0-prerelease-02430-04</BuildTasksFeedToolVersion>
   </PropertyGroup>
 
 </Project>
diff --git a/build/Publish.targets b/build/Publish.targets
index a98d7171f..d64388410 100644
--- a/build/Publish.targets
+++ b/build/Publish.targets
@@ -84,6 +84,7 @@
                     ManifestBuildId="$(FullNugetVersion)"
                     ManifestCommit="$(CommitHash)"
                     ManifestName="$(BuildName)"
+                    ManifestBuildData="ProductVersion=$(FullNugetVersion)"
                     Overwrite="false" 
                     PublishFlatContainer="true" 
                     SkipCreateManifest="$(IsNotOrchestratedPublish)" />
diff --git a/build/publish/PublishContent.targets b/build/publish/PublishContent.targets
index d18d57238..41b7886a8 100644
--- a/build/publish/PublishContent.targets
+++ b/build/publish/PublishContent.targets
@@ -33,6 +33,7 @@
                     ManifestBuildId="$(FullNugetVersion)"
                     ManifestCommit="$(CommitHash)"
                     ManifestName="$(BuildName)"
+                    ManifestBuildData="ProductVersion=$(FullNugetVersion)"
                     Overwrite="$(OverwriteOnPublish)" 
                     PublishFlatContainer="true" 
                     SkipCreateManifest="$(IsNotOrchestratedPublish)" />
@@ -51,6 +52,7 @@
                     ManifestBuildId="$(FullNugetVersion)"
                     ManifestCommit="$(CommitHash)"
                     ManifestName="$(BuildName)"
+                    ManifestBuildData="ProductVersion=$(FullNugetVersion)"
                     Overwrite="$(OverwriteOnPublish)" 
                     PublishFlatContainer="true" 
                     SkipCreateManifest="$(IsNotOrchestratedPublish)" />
diff --git a/build/publish/PublishNupkgToBlobFeed.targets b/build/publish/PublishNupkgToBlobFeed.targets
index a214c3b52..23fddc46d 100644
--- a/build/publish/PublishNupkgToBlobFeed.targets
+++ b/build/publish/PublishNupkgToBlobFeed.targets
@@ -17,6 +17,7 @@
                     ManifestBuildId="$(FullNugetVersion)"
                     ManifestCommit="$(CommitHash)"
                     ManifestName="$(BuildName)"
+                    ManifestBuildData="ProductVersion=$(FullNugetVersion)"
                     Overwrite="true"
                     PublishFlatContainer="false"
                     SkipCreateManifest="$(IsNotOrchestratedPublish)" />
diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj
index 779806a94..4a9a444c4 100644
--- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj
+++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreAppPackageVersion)" />
+    <PackageReference Include="Microsoft.NETCore.App" Version="2.1.0-preview1-26116-04" />
     <PackageReference Include="Microsoft.Build" Version="15.4.8" />
     <PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.4.8" />
     <PackageReference Include="Microsoft.CSharp" Version="4.0.1" />
diff --git a/run-build.ps1 b/run-build.ps1
index e7e5f7fb6..c92b91b6d 100644
--- a/run-build.ps1
+++ b/run-build.ps1
@@ -29,14 +29,14 @@ if($Help)
 
 # The first 'pass' call to "dotnet msbuild build.proj" has a hard-coded "WriteDynamicPropsToStaticPropsFiles" target
 #    therefore, this call should not have other targets defined. Remove all targets passed in as 'extra parameters'.
-$ExtraParametersNoTargets = ""
 if ($ExtraParameters)
 {
-    foreach ($param in $ExtraParameters.split())
+    $ExtraParametersNoTargets = $ExtraParameters.GetRange(0,$ExtraParameters.Count)
+    foreach ($param in $ExtraParameters)
     {
-        if((-not $param.StartsWith("/t")) -and (-not $param.StartsWith("/T")))
+        if(($param.StartsWith("/t:", [StringComparison]::OrdinalIgnoreCase)) -or ($param.StartsWith("/target:", [StringComparison]::OrdinalIgnoreCase)))
         {
-            $ExtraParametersNoTargets += "{0} " -f $param
+            $ExtraParametersNoTargets.Remove("$param") | Out-Null
         }
     }
 }
diff --git a/run-build.sh b/run-build.sh
index cce2ed49f..7d383f86f 100755
--- a/run-build.sh
+++ b/run-build.sh
@@ -130,8 +130,9 @@ done
 argsnotargets=( )
 for arg in ${args[@]} 
 do  
-  if [[ $arg != '/t'* ]] && [[ $arg != '/T'* ]]; then    
-    argsnotargets+=($arg)  
+  arglower="$(echo $arg | awk '{print tolower($0)}')"
+  if [[ $arglower != '/t:'* ]] && [[ $arglower != '/target:'* ]]; then
+    argsnotargets+=($arg)
   fi
 done
 

From c9cfa933c8b7180907d56c9893591dbdf96c468d Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Mon, 5 Feb 2018 15:57:49 -0800
Subject: [PATCH 8/8] Reverting the channel and branchname to master.

---
 build/BranchInfo.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/BranchInfo.props b/build/BranchInfo.props
index 0879a9028..f62c8fd00 100644
--- a/build/BranchInfo.props
+++ b/build/BranchInfo.props
@@ -1,6 +1,6 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <Channel>release/2.1</Channel>
-    <BranchName>release/2.1.3xx</BranchName>
+    <Channel>master</Channel>
+    <BranchName>master</BranchName>
   </PropertyGroup>
 </Project>