From f26105052bdd692a648a185e29a1e7d4a0624325 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Fri, 12 Mar 2021 11:05:22 -0800
Subject: [PATCH 1/2] Update .NET to version 6.0.100-preview.2.21155.3

---
 assets/wix/files.wxs                          | 10 +++++++---
 global.json                                   |  2 +-
 ...soft.PowerShell.Commands.Management.csproj |  2 +-
 ...crosoft.PowerShell.Commands.Utility.csproj |  6 +++---
 ...crosoft.PowerShell.CoreCLR.Eventing.csproj |  2 +-
 .../Microsoft.PowerShell.SDK.csproj           |  8 ++++----
 .../Microsoft.WSMan.Management.csproj         |  2 +-
 .../System.Management.Automation.csproj       | 20 +++++++++----------
 test/tools/TestService/TestService.csproj     |  2 +-
 test/tools/WebListener/WebListener.csproj     |  4 ++--
 ...crosoft.PowerShell.Commands.Utility.csproj |  2 +-
 .../System.Management.Automation.csproj       |  4 ++--
 12 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index 05a7446573a..9db382b921c 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -3063,8 +3063,11 @@
       <Component Id="cmp2BB002B115C247FFB3353C80CAAC10B3">
         <File Id="filF1771BA6F8A140FFB77E7558D035A0F2" KeyPath="yes" Source="$(var.ProductSourcePath)\System.IO.Compression.Native.dll" />
       </Component>
-      <Component Id="cmpD9AA61B3F5F44A7B99E535A712E8310D">
-        <File Id="fil16547FB6A5EC4C6791FFFF5D561F2D31" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.21.10212.dll" />
+      <Component Id="cmp3547A55EA9D04784B4CF2FC717447E16">
+        <File Id="fil463DDA419769417A8D5A34C433E194F2" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Speech.dll" />
+      </Component>
+      <Component Id="cmp5FDF8631A090425A90B27344B4C2A62A">
+        <File Id="fil97828F3C973A46BDB0EF08D17F630D73" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.21.15406.dll" />
       </Component>
     </DirectoryRef>
   </Fragment>
@@ -4053,7 +4056,8 @@
       <ComponentRef Id="cmp834F3E0C83664E92B0D115A39A8FAACB" />
       <ComponentRef Id="cmp2BB002B115C247FFB3353C80CAAC10B3" />
       <ComponentRef Id="cmp68158D010ECB439582D041355BFACCBB" />
-      <ComponentRef Id="cmpD9AA61B3F5F44A7B99E535A712E8310D" />
+      <ComponentRef Id="cmp3547A55EA9D04784B4CF2FC717447E16" />
+      <ComponentRef Id="cmp5FDF8631A090425A90B27344B4C2A62A" />
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/global.json b/global.json
index 45db27a6952..2c34319a232 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "6.0.100-preview.1.21103.13"
+    "version": "6.0.100-preview.2.21155.3"
   }
 }
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 16cdf5f48d4..31e6536380f 100644
--- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
+++ b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
@@ -47,7 +47,7 @@
 
   <ItemGroup>
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-preview.1.21102.12" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-preview.2.21154.6" />
   </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 70eebd4bdb8..5676cdb9987 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -31,9 +31,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.9.0" />
-    <PackageReference Include="System.Threading.AccessControl" Version="6.0.0-preview.1.21102.12" />
-    <PackageReference Include="System.Drawing.Common" Version="6.0.0-preview.1.21102.12" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.10.0-1.final" />
+    <PackageReference Include="System.Threading.AccessControl" Version="6.0.0-preview.2.21154.6" />
+    <PackageReference Include="System.Drawing.Common" Version="6.0.0-preview.2.21154.6" />
     <PackageReference Include="NJsonSchema" Version="10.3.10" />
   </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 8be5faddce8..81c8fc4e9dd 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="6.0.0-preview.1.21102.12" />
+    <PackageReference Include="System.Diagnostics.EventLog" Version="6.0.0-preview.2.21154.6" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
index 654ed9ef9c0..b6d7fa7f936 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -18,9 +18,9 @@
     <!-- the following package(s) are from https://github.com/dotnet/fxdac -->
     <PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.IO.Packaging" Version="6.0.0-preview.1.21102.12" />
-    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="6.0.0-preview.1.21102.12" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="6.0.0-preview.1.21102.12" />
+    <PackageReference Include="System.IO.Packaging" Version="6.0.0-preview.2.21154.6" />
+    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="6.0.0-preview.2.21154.6" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="6.0.0-preview.2.21154.6" />
     <!-- the following package(s) are from https://github.com/dotnet/wcf -->
     <PackageReference Include="System.ServiceModel.Duplex" Version="4.8.1" />
     <PackageReference Include="System.ServiceModel.Http" Version="4.8.1" />
@@ -30,7 +30,7 @@
     <PackageReference Include="System.Private.ServiceModel" Version="4.8.1" />
     <!-- 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="5.0.1" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0-preview.2.21154.6" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
index 45d4d4b2bad..84fc158cc0f 100644
--- a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
+++ b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
@@ -10,7 +10,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="6.0.0-preview.1.21102.12" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-preview.2.21154.6" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index a62c9089dca..ba1e36ff102 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.17.0" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="6.0.0-preview.1.21102.12" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0-preview.1.21102.12" />
-    <PackageReference Include="System.DirectoryServices" Version="6.0.0-preview.1.21102.12" />
-    <PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.1.21102.12" />
-    <PackageReference Include="System.Management" Version="6.0.0-preview.1.21102.12" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-preview.1.21102.12" />
-    <PackageReference Include="System.Security.AccessControl" Version="6.0.0-preview.1.21102.12" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.1" />
-    <PackageReference Include="System.Security.Permissions" Version="6.0.0-preview.1.21102.12" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-preview.1.21102.12" />
+    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="6.0.0-preview.2.21154.6" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0-preview.2.21154.6" />
+    <PackageReference Include="System.DirectoryServices" Version="6.0.0-preview.2.21154.6" />
+    <PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.2.21154.6" />
+    <PackageReference Include="System.Management" Version="6.0.0-preview.2.21154.6" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-preview.2.21154.6" />
+    <PackageReference Include="System.Security.AccessControl" Version="6.0.0-preview.2.21154.6" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.0-preview.2.21154.6" />
+    <PackageReference Include="System.Security.Permissions" Version="6.0.0-preview.2.21154.6" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-preview.2.21154.6" />
     <!-- the following package(s) are from the powershell org -->
     <PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
     <PackageReference Include="Microsoft.PowerShell.Native" Version="7.1.0" />
diff --git a/test/tools/TestService/TestService.csproj b/test/tools/TestService/TestService.csproj
index 21d0fc76962..32f8b6e2612 100644
--- a/test/tools/TestService/TestService.csproj
+++ b/test/tools/TestService/TestService.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.1" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0-preview.2.21154.6" />
   </ItemGroup>
 
 </Project>
diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj
index de62702c6e2..699bbe7ee85 100644
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.2" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-preview.1.21102.12" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0-preview.2.21154.6" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-preview.2.21154.6" />
   </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 1360181e9bc..21da844d60e 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,7 +14,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="System.Security.AccessControl" Version="6.0.0-preview.1.21102.12" />
+    <PackageReference Include="System.Security.AccessControl" Version="6.0.0-preview.2.21154.6" />
     <PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.0-preview.2" />
   </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 76baeb19619..2b142ecfbbc 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="2.0.0" />
-    <PackageReference Include="System.Security.AccessControl" Version="6.0.0-preview.1.21102.12" />
-    <PackageReference Include="System.Security.Principal.Windows" Version="6.0.0-preview.1.21102.12" />
+    <PackageReference Include="System.Security.AccessControl" Version="6.0.0-preview.2.21154.6" />
+    <PackageReference Include="System.Security.Principal.Windows" Version="6.0.0-preview.2.21154.6" />
   </ItemGroup>
 </Project>

From 35ad3a61be4b25754c96c1e24b37753e759b07af Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Fri, 12 Mar 2021 12:11:41 -0800
Subject: [PATCH 2/2] Apply the suggestion to use null coalesce as per IDE0031

---
 .../engine/hostifaces/PowerShell.cs                             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/engine/hostifaces/PowerShell.cs b/src/System.Management.Automation/engine/hostifaces/PowerShell.cs
index a76dbe1c0b1..3829634c8c8 100644
--- a/src/System.Management.Automation/engine/hostifaces/PowerShell.cs
+++ b/src/System.Management.Automation/engine/hostifaces/PowerShell.cs
@@ -5316,7 +5316,7 @@ private void RemoveFromRemoteRunspaceRunningList()
         private RemoteRunspacePoolInternal GetRemoteRunspacePoolInternal()
         {
             RunspacePool runspacePool = _rsConnection as RunspacePool;
-            return (runspacePool != null) ? (runspacePool.RemoteRunspacePoolInternal) : null;
+            return runspacePool?.RemoteRunspacePoolInternal;
         }
 
         #endregion