From 63994834f6a1dc53b223c57f07463fcfb51ab86f Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <c.bergmeister@gmail.com>
Date: Wed, 4 Sep 2019 21:43:29 +0100
Subject: [PATCH 1/4] Upgrade to .Net Core 3.0-preview9

---
 .devcontainer/Dockerfile                      |  2 +-
 .devcontainer/devcontainer.json               |  2 +-
 global.json                                   |  2 +-
 ...soft.PowerShell.Commands.Management.csproj |  2 +-
 ...crosoft.PowerShell.Commands.Utility.csproj |  2 +-
 ...crosoft.PowerShell.CoreCLR.Eventing.csproj |  2 +-
 .../Microsoft.PowerShell.SDK.csproj           | 10 +++++-----
 .../Microsoft.WSMan.Management.csproj         |  2 +-
 .../System.Management.Automation.csproj       | 20 +++++++++----------
 test/tools/WebListener/WebListener.csproj     |  2 +-
 ...crosoft.PowerShell.Commands.Utility.csproj |  2 +-
 .../System.Management.Automation.csproj       |  4 ++--
 12 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index ab9dd52ad5d..f200c0124ae 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
 #-------------------------------------------------------------------------------------------------------------
 
-FROM mcr.microsoft.com/dotnet/core/sdk:3.0.100-preview8
+FROM mcr.microsoft.com/dotnet/core/sdk:3.0.100-preview9
 
 # Avoid warnings by switching to noninteractive
 ENV DEBIAN_FRONTEND=noninteractive
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 4574e9ef709..e8691bfd782 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 // See https://aka.ms/vscode-remote/devcontainer.json for format details.
 {
-	"name": ".NET Core 3.0-preview8, including pwsh (Debian 10)",
+	"name": ".NET Core 3.0-preview9, including pwsh (Debian 10)",
 	"dockerFile": "Dockerfile",
 
 	// Uncomment the next line to run commands after the container is created.
diff --git a/global.json b/global.json
index 4201a8ffdf7..79a76ed5191 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "3.0.100-preview8-013656"
+    "version": "3.0.100-preview9-014004"
   }
 }
diff --git a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
index 1d851a24af4..997a9617e23 100644
--- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
+++ b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
@@ -57,7 +57,7 @@
 
   <ItemGroup>
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.ServiceProcess.ServiceController" Version="4.6.0-preview8.19405.3" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="4.6.0-preview9.19421.4" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index 6ceadabe013..b517dfbe11d 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -56,7 +56,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.2.1" />
-    <PackageReference Include="System.Threading.AccessControl" Version="4.6.0-preview8.19405.3" />
+    <PackageReference Include="System.Threading.AccessControl" Version="4.6.0-preview9.19421.4" />
     <PackageReference Include="NJsonSchema" Version="10.0.23" />
   </ItemGroup>
 
diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
index 307d115ae4d..77a1074693d 100644
--- a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
+++ b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.Diagnostics.EventLog" Version="4.6.0-preview8.19405.3" />
+    <PackageReference Include="System.Diagnostics.EventLog" Version="4.6.0-preview9.19421.4" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
index 439c57da49b..52e945d5d12 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -16,11 +16,11 @@
 
   <ItemGroup>
     <!-- the following package(s) are from https://github.com/dotnet/fxdac -->
-    <PackageReference Include="System.Data.SqlClient" Version="4.7.0-preview8.19405.3" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.7.0-preview9.19421.4" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.IO.Packaging" Version="4.6.0-preview8.19405.3" />
-    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.6.0-preview8.19405.3" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="4.6.0-preview8.19405.3" />
+    <PackageReference Include="System.IO.Packaging" Version="4.6.0-preview9.19421.4" />
+    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.6.0-preview9.19421.4" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="4.6.0-preview9.19421.4" />
     <!-- the following package(s) are from https://github.com/dotnet/wcf -->
     <PackageReference Include="System.ServiceModel.Duplex" Version="4.6.0-preview8.final" />
     <PackageReference Include="System.ServiceModel.Http" Version="4.6.0-preview8.final" />
@@ -30,7 +30,7 @@
     <PackageReference Include="System.Private.ServiceModel" Version="4.6.0-preview8.final" />
     <!-- the source could not be found for the following package(s) -->
     <PackageReference Include="Microsoft.NETCore.Windows.ApiSets" Version="1.0.1" />
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="3.0.0-preview8.19405.3" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="3.0.0-preview9.19421.4" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
index 281623fc86d..ca18e4cf611 100644
--- a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
+++ b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
@@ -9,7 +9,7 @@
     <ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
     <ProjectReference Include="..\Microsoft.WSMan.Runtime\Microsoft.WSMan.Runtime.csproj" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.ServiceProcess.ServiceController" Version="4.6.0-preview8.19405.3" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="4.6.0-preview9.19421.4" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index 6700e342a5d..8e998919eb8 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -16,16 +16,16 @@
     <!-- the Application Insights package -->
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.10.0" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="4.6.0-preview8.19405.3" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.6.0-preview8.19405.3" />
-    <PackageReference Include="System.DirectoryServices" Version="4.6.0-preview8.19405.3" />
-    <PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.6.0-preview8.19405.3" />
-    <PackageReference Include="System.Management" Version="4.6.0-preview8.19405.3" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.6.0-preview8.19405.3" />
-    <PackageReference Include="System.Security.AccessControl" Version="4.6.0-preview8.19405.3" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.6.0-preview8.19405.3" />
-    <PackageReference Include="System.Security.Permissions" Version="4.6.0-preview8.19405.3" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0-preview8.19405.3" />
+    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="4.6.0-preview9.19421.4" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.6.0-preview9.19421.4" />
+    <PackageReference Include="System.DirectoryServices" Version="4.6.0-preview9.19421.4" />
+    <PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.6.0-preview9.19421.4" />
+    <PackageReference Include="System.Management" Version="4.6.0-preview9.19421.4" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.6.0-preview9.19421.4" />
+    <PackageReference Include="System.Security.AccessControl" Version="4.6.0-preview9.19421.4" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.6.0-preview9.19421.4" />
+    <PackageReference Include="System.Security.Permissions" Version="4.6.0-preview9.19421.4" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0-preview9.19421.4" />
     <!-- the following package(s) are from the powershell org -->
     <PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0-preview.2" />
     <PackageReference Include="Microsoft.PowerShell.Native" Version="7.0.0-preview.1" />
diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj
index 7cdd410f8aa..24a5665238f 100644
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0-preview6.19307.2" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0-preview8.19405.3" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0-preview9.19421.4" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index 8d5290e057f..102e8b89551 100644
--- a/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -14,6 +14,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
-    <PackageReference Include="System.Security.AccessControl" Version="4.6.0-preview8.19405.3" />
+    <PackageReference Include="System.Security.AccessControl" Version="4.6.0-preview9.19421.4" />
   </ItemGroup>
 </Project>
diff --git a/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj b/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
index e2c512b59d3..6bb80f93a2b 100644
--- a/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
+++ b/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Management.Infrastructure" Version="1.0.0" />
-    <PackageReference Include="System.Security.AccessControl" Version="4.6.0-preview8.19405.3" />
-    <PackageReference Include="System.Security.Principal.Windows" Version="4.6.0-preview8.19405.3" />
+    <PackageReference Include="System.Security.AccessControl" Version="4.6.0-preview9.19421.4" />
+    <PackageReference Include="System.Security.Principal.Windows" Version="4.6.0-preview9.19421.4" />
   </ItemGroup>
 </Project>

From f67e61fb5bfbb69c58f09217d15eacbe0831b492 Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <c.bergmeister@gmail.com>
Date: Wed, 4 Sep 2019 22:11:44 +0100
Subject: [PATCH 2/4] Update WiX installer with new version of mscordaccore dll

---
 assets/files.wxs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/assets/files.wxs b/assets/files.wxs
index 78984cd748a..45cccee9671 100644
--- a/assets/files.wxs
+++ b/assets/files.wxs
@@ -3048,8 +3048,8 @@
       <Component Id="cmp827B25EEC28D4699BB29042B273C8CBF" Guid="{f7ccc70c-5aaf-4e6b-bf9f-c59f4e631f9c}">
         <File Id="filEF6B07EDBC8F43AE8DF88CFDF798FC22" KeyPath="yes" Source="$(env.ProductSourcePath)\System.ComponentModel.Composition.Registration.dll" />
       </Component>
-      <Component Id="cmp45C246DB0A6548B88F0ECFAE7E04DDF9" Guid="{c0aa34fa-b8b3-4fdd-8ea9-0a7b552fd62a}">
-        <File Id="fil03DDF9C95E914AB68AE38D7B8AEF4BE9" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.700.19.37902.dll" />
+      <Component Id="cmp712842BFA391403DA3F21B2A4C729ED3" Guid="{e141999c-71cc-4c7f-9f2b-11b1005bd5dc}">
+        <File Id="filDB5CFCFC242B419586E36CD5B281216A" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.700.19.42102.dll" />
       </Component>
     </DirectoryRef>
   </Fragment>
@@ -3887,7 +3887,7 @@
       <ComponentRef Id="cmpAD1A205D445C43588868B205091DD390" />
       <ComponentRef Id="cmpD7A187ADE66347E5A7550B96BA10D493" />
       <ComponentRef Id="cmp827B25EEC28D4699BB29042B273C8CBF" />
-      <ComponentRef Id="cmp45C246DB0A6548B88F0ECFAE7E04DDF9" />
+      <ComponentRef Id="cmp712842BFA391403DA3F21B2A4C729ED3" />
     </ComponentGroup>
   </Fragment>
 </Wix>

From 3cf313f7bac7fdace53d69ad497015bc16869f4b Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <c.bergmeister@gmail.com>
Date: Thu, 5 Sep 2019 13:31:52 +0100
Subject: [PATCH 3/4] Update preview.8.final packages to preview.9.final

---
 .../Microsoft.PowerShell.SDK.csproj                  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
index 52e945d5d12..f8fa606e553 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -22,12 +22,12 @@
     <PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.6.0-preview9.19421.4" />
     <PackageReference Include="System.Text.Encodings.Web" Version="4.6.0-preview9.19421.4" />
     <!-- the following package(s) are from https://github.com/dotnet/wcf -->
-    <PackageReference Include="System.ServiceModel.Duplex" Version="4.6.0-preview8.final" />
-    <PackageReference Include="System.ServiceModel.Http" Version="4.6.0-preview8.final" />
-    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.6.0-preview8.final" />
-    <PackageReference Include="System.ServiceModel.Primitives" Version="4.6.0-preview8.final" />
-    <PackageReference Include="System.ServiceModel.Security" Version="4.6.0-preview8.final" />
-    <PackageReference Include="System.Private.ServiceModel" Version="4.6.0-preview8.final" />
+    <PackageReference Include="System.ServiceModel.Duplex" Version="4.6.0-preview9.final" />
+    <PackageReference Include="System.ServiceModel.Http" Version="4.6.0-preview9.final" />
+    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.6.0-preview9.final" />
+    <PackageReference Include="System.ServiceModel.Primitives" Version="4.6.0-preview9.final" />
+    <PackageReference Include="System.ServiceModel.Security" Version="4.6.0-preview9.final" />
+    <PackageReference Include="System.Private.ServiceModel" Version="4.6.0-preview9.final" />
     <!-- the source could not be found for the following package(s) -->
     <PackageReference Include="Microsoft.NETCore.Windows.ApiSets" Version="1.0.1" />
     <PackageReference Include="Microsoft.Windows.Compatibility" Version="3.0.0-preview9.19421.4" />

From 473c89c473366995dd953317d867b9955045aff7 Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <c.bergmeister@gmail.com>
Date: Thu, 5 Sep 2019 13:33:24 +0100
Subject: [PATCH 4/4] Update NuGet package
 Microsoft.AspNetCore.Mvc.NewtonsoftJson used for testing only to
 3.0.0-preview9.19424.4

---
 test/tools/WebListener/WebListener.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj
index 24a5665238f..3b8669a17ad 100644
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0-preview6.19307.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0-preview9.19424.4" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0-preview9.19421.4" />
   </ItemGroup>