From 622eb4cf02462c07109f21453151a56339a9de05 Mon Sep 17 00:00:00 2001
From: "Christoph Bergmeister [MVP]" <c.bergmeister@gmail.com>
Date: Wed, 8 Apr 2020 01:39:51 +0100
Subject: [PATCH] Upgrade to .NET 5 Preview 2 (#12250)

---
 .devcontainer/Dockerfile                      |  2 +-
 assets/files.wxs                              | 16 +++++++--------
 global.json                                   |  2 +-
 ...soft.PowerShell.Commands.Management.csproj |  2 +-
 ...crosoft.PowerShell.Commands.Utility.csproj |  4 ++--
 .../commands/utility/Send-MailMessage.cs      | 10 +++++++---
 ...crosoft.PowerShell.CoreCLR.Eventing.csproj |  2 +-
 .../Microsoft.PowerShell.SDK.csproj           |  6 +++---
 .../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 ++--
 13 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index c94b049a89..a004c50f1c 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:5.0.0-preview.1.20120.5
+FROM mcr.microsoft.com/dotnet/core/sdk:5.0.100-preview.2
 
 # Avoid warnings by switching to noninteractive
 ENV DEBIAN_FRONTEND=noninteractive
diff --git a/assets/files.wxs b/assets/files.wxs
index 72f696336b..4a8bb67b80 100644
--- a/assets/files.wxs
+++ b/assets/files.wxs
@@ -403,9 +403,6 @@
       <Component Id="cmp04AC57A0E3245015D9DFB332698F3E26" Guid="{7C114DE5-9F1E-444C-B006-7960FAEB41D1}">
         <File Id="filD484411B6AE3B42F2DABD1739690E702" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Net.HttpListener.dll" />
       </Component>
-      <Component Id="cmp0F357D94252A1FB7D62206CE323D9140" Guid="{496BA278-8E4C-4F95-AC8B-F06ACBF3B285}">
-        <File Id="fil19787014F20A95670C67789A7C94ED40" KeyPath="yes" Source="$(env.ProductSourcePath)\mscorrc.debug.dll" />
-      </Component>
       <Component Id="cmp1E29A0D7860190642C2D8504982890F9" Guid="{30484938-6644-4F53-BB06-2BB1999AD637}">
         <File Id="filDAAF9305BBAD857AA9CAB6751F36659B" KeyPath="yes" Source="$(env.ProductSourcePath)\clrjit.dll" />
       </Component>
@@ -3089,15 +3086,18 @@
       <Component Id="cmp2E32A6E773F543F0A150B972F8D3E23A" Guid="{a43d0117-1193-4316-a0f6-fef892870f38}">
         <File Id="fil66411B8941CA492E93BF262EA72C6BE6" KeyPath="yes" Source="$(env.ProductSourcePath)\Microsoft.PowerShell.GraphicalHost.xml" />
       </Component>
-      <Component Id="cmp0535678883A44B4D81A04C8BA7B2068C" Guid="{9253aa88-ab71-4f6c-98c1-b305af57c18f}">
-        <File Id="fil3D9B499EC41D4B4D9C7139B86D8CC398" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_5.0.20.12005.dll" />
-      </Component>
       <Component Id="cmp874F51885AE34AD9AA37DC46A44B3194" Guid="{77932153-0935-4689-8b48-6d2e21ae4824}">
         <File Id="fil16005153CF144E458123E5989CCB3A0E" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Windows.Forms.Primitives.dll" />
       </Component>
       <Component Id="cmp798A4EE6784541FE9B13582E52C5A818" Guid="{ec646ea5-c60e-41d5-9fd0-36fb14b1fc28}">
         <File Id="fil8A6290BE106E416CB35FB2BEA982C3B8" KeyPath="yes" Source="$(env.ProductSourcePath)\Microsoft.VisualBasic.Forms.dll" />
       </Component>
+      <Component Id="cmp26F240CCDE054124A0DD455D7C97AA8B" Guid="{189dbe82-d5a7-4cf9-9f9c-2cfe62976a08}">
+        <File Id="fil63934499FF974EEEA1D37A9F5D16C470" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_5.0.20.16006.dll" />
+      </Component>
+      <Component Id="cmpBB705B2570064C99A71B6FA65CDF9DC8" Guid="{51c00292-f61c-4524-92a8-6b6171403839}">
+        <File Id="fil0F66F2502CDC47FF8C8626941746DF84" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Windows.Forms.Design.Editors.dll" />
+      </Component>
     </DirectoryRef>
   </Fragment>
   <Fragment>
@@ -3235,7 +3235,6 @@
       <ComponentRef Id="cmp67AFE3748590F117178E5617E219F1F8" />
       <ComponentRef Id="cmp734102C1EBBE0D4417B67AA90D416EC4" />
       <ComponentRef Id="cmp04AC57A0E3245015D9DFB332698F3E26" />
-      <ComponentRef Id="cmp0F357D94252A1FB7D62206CE323D9140" />
       <ComponentRef Id="cmp1E29A0D7860190642C2D8504982890F9" />
       <ComponentRef Id="cmp2FB548B56B09B010468883CA4073600D" />
       <ComponentRef Id="cmp4D3236B49B126CF9FFC5234678B3B302" />
@@ -4077,7 +4076,6 @@
       <ComponentRef Id="cmp0DA1B3EF85234C7BBA6DE35BBD1B45D2" />
       <ComponentRef Id="cmpA34D56794B9144A2BE67E7CDABCF5B4E" />
       <ComponentRef Id="cmpF4093A1E8AB94B43AB0F852EB647CE7F" />
-      <ComponentRef Id="cmp0535678883A44B4D81A04C8BA7B2068C" />
       <ComponentRef Id="cmp4CCDE73A2A9E4D7B90065639D9433178" />
       <ComponentRef Id="cmp874F51885AE34AD9AA37DC46A44B3194" />
       <ComponentRef Id="cmp5359C8369744482FBB5D56CDF3FA0DB0" />
@@ -4096,6 +4094,8 @@
       <ComponentRef Id="cmp38D8A48C68FB4CB399A0A7677FA428E4" />
       <ComponentRef Id="cmp26335B5D1FE94E87A6B6EBD56A22C2B9" />
       <ComponentRef Id="cmp57D197B18F1F4A6AAB704B28CF61B535" />
+      <ComponentRef Id="cmp26F240CCDE054124A0DD455D7C97AA8B" />
+      <ComponentRef Id="cmpBB705B2570064C99A71B6FA65CDF9DC8" />
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/global.json b/global.json
index 8696bf07de..ee1e3d9321 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "5.0.100-preview.1.20155.7"
+    "version": "5.0.100-preview.2.20176.6"
   }
 }
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 aafcb94a14..503b7c7c98 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="5.0.0-preview.1.20120.5" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0-preview.2.20160.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 52023d78fb..ad2ea2a2b5 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -32,8 +32,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.5.0" />
-    <PackageReference Include="System.Threading.AccessControl" Version="5.0.0-preview.1.20120.5" />
-    <PackageReference Include="System.Drawing.Common" Version="5.0.0-preview.1.20120.5" />
+    <PackageReference Include="System.Threading.AccessControl" Version="5.0.0-preview.2.20160.6" />
+    <PackageReference Include="System.Drawing.Common" Version="5.0.0-preview.2.20160.6" />
     <PackageReference Include="NJsonSchema" Version="10.1.12" />
   </ItemGroup>
 
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Send-MailMessage.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Send-MailMessage.cs
index b4582f788a..25da2e8025 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Send-MailMessage.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Send-MailMessage.cs
@@ -374,9 +374,13 @@ namespace Microsoft.PowerShell.Commands
                 ErrorRecord er = new ErrorRecord(ex, "AuthenticationException", ErrorCategory.InvalidOperation, _mSmtpClient);
                 WriteError(er);
             }
-
-            // If we don't dispose the attachments, the sender can't modify or use the files sent.
-            _mMailMessage.Attachments.Dispose();
+            finally
+            {
+                _mSmtpClient.Dispose();
+                
+                // If we don't dispose the attachments, the sender can't modify or use the files sent.
+                _mMailMessage.Attachments.Dispose();
+            }
         }
 
         #endregion
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 44e6378fb2..c2d8cfbd0a 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="5.0.0-preview.1.20120.5" />
+    <PackageReference Include="System.Diagnostics.EventLog" Version="5.0.0-preview.2.20160.6" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
index 2401ed3bc8..d4ad1f3629 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.1" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.IO.Packaging" Version="5.0.0-preview.1.20120.5" />
-    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="5.0.0-preview.1.20120.5" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="5.0.0-preview.1.20120.5" />
+    <PackageReference Include="System.IO.Packaging" Version="5.0.0-preview.2.20160.6" />
+    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="5.0.0-preview.2.20160.6" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="5.0.0-preview.2.20160.6" />
     <!-- the following package(s) are from https://github.com/dotnet/wcf -->
     <PackageReference Include="System.ServiceModel.Duplex" Version="4.7.0" />
     <PackageReference Include="System.ServiceModel.Http" Version="4.7.0" />
diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
index da504fc856..46fc389e1a 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="5.0.0-preview.1.20120.5" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0-preview.2.20160.6" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index fd612866b5..64cca263c9 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.13.1" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="5.0.0-preview.1.20120.5" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0-preview.1.20120.5" />
-    <PackageReference Include="System.DirectoryServices" Version="5.0.0-preview.1.20120.5" />
-    <PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0-preview.1.20120.5" />
-    <PackageReference Include="System.Management" Version="5.0.0-preview.1.20120.5" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-preview.1.20120.5" />
-    <PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.1.20120.5" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.0-preview.1.20120.5" />
-    <PackageReference Include="System.Security.Permissions" Version="5.0.0-preview.1.20120.5" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.1.20120.5" />
+    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="5.0.0-preview.2.20160.6" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0-preview.2.20160.6" />
+    <PackageReference Include="System.DirectoryServices" Version="5.0.0-preview.2.20160.6" />
+    <PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0-preview.2.20160.6" />
+    <PackageReference Include="System.Management" Version="5.0.0-preview.2.20160.6" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-preview.2.20160.6" />
+    <PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.2.20160.6" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.0-preview.2.20160.6" />
+    <PackageReference Include="System.Security.Permissions" Version="5.0.0-preview.2.20160.6" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.2.20160.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.0.0" />
diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj
index f26bdcb183..63c36611f7 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.1.2" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.1.20120.5" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.2.20160.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 940128ce0a..fa6a947bc1 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.3" />
-    <PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.1.20120.5" />
+    <PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.2.20160.6" />
   </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 00a4d777c4..542f33a747 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="5.0.0-preview.1.20120.5" />
-    <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0-preview.1.20120.5" />
+    <PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.2.20160.6" />
+    <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0-preview.2.20160.6" />
   </ItemGroup>
 </Project>