From 0f0c46dfe51440470b86f67b258e14aea32fa0aa Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Fri, 21 Sep 2018 13:25:03 -0700
Subject: [PATCH] Update to .NET Core 2.1.4 with SDK 2.1.402 (#7834)

---
 PowerShell.Common.props                          |  2 +-
 appveyor.yml                                     |  2 +-
 assets/files.wxs                                 | 16 ++++++++--------
 global.json                                      |  2 +-
 .../Microsoft.PowerShell.Commands.Utility.csproj |  2 +-
 test/Test.Common.props                           |  2 +-
 test/tools/WebListener/WebListener.csproj        |  2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/PowerShell.Common.props b/PowerShell.Common.props
index 541fb47842..5e7f015cd7 100644
--- a/PowerShell.Common.props
+++ b/PowerShell.Common.props
@@ -94,7 +94,7 @@
     <Copyright>(c) Microsoft Corporation. All rights reserved.</Copyright>
 
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <RuntimeFrameworkVersion>2.1.3</RuntimeFrameworkVersion>
+    <RuntimeFrameworkVersion>2.1.4</RuntimeFrameworkVersion>
     <LangVersion>Latest</LangVersion>
 
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/appveyor.yml b/appveyor.yml
index 3280027a68..62b5e1c47c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,7 +9,7 @@ environment:
   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
     Purpose: ElevatedPesterTests_xUnit_Packaging
 
-# cache version - netcoreapp.2.1-sdk.2.1.401
+# cache version - netcoreapp.2.1-sdk.2.1.402
 cache:
   - '%HOMEDRIVE%%HOMEPATH%\.nuget\packages -> appveyor.yml'
 
diff --git a/assets/files.wxs b/assets/files.wxs
index 233af491d1..b981a166c0 100644
--- a/assets/files.wxs
+++ b/assets/files.wxs
@@ -187,9 +187,6 @@
       <Component Id="cmp2B60F4AC2E8D95A558C3E121A6252D37" Guid="{C361734D-C0E0-47E2-B867-82878D0F0E4C}">
         <File Id="fil8E8E3BF1C97D92DFEB4FC97D778F238F" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Runtime.CompilerServices.VisualC.dll" />
       </Component>
-      <Component Id="cmpf65fc69858294501b4f61951193b392c" Guid="{09C9310D-56AD-4F7A-90C8-DF0F7E8A7251}">
-        <File Id="filDDE80F6ACEC54B56BA33E587A072DE27" KeyPath="yes" Source="$(env.ProductSourcePath)\sos_$(var.FileArchitecture)_$(var.FileArchitecture)_4.6.26725.06.dll" />
-      </Component>
       <Component Id="cmp5977DC14DE00AD6E597A2FEBB8C3B58B" Guid="{8E01E3C2-0596-46D8-95DD-BCA308A88941}">
         <File Id="filEE7925E7A712381B024DAE39831F7AEB" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Threading.dll" />
       </Component>
@@ -484,9 +481,6 @@
       <Component Id="cmp644DFED4A59040568D091F0EA5F691E6" Guid="{C63BB7F7-682A-4EF4-AEFE-5A7BE5475AAA}">
         <File Id="fil69EA4231E04E7B76EE0676A3C7EB4F91" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Security.Cryptography.Pkcs.dll" />
       </Component>
-      <Component Id="cmp47ff9204b9544467a6f71e951716f8a4" Guid="{8B8505AA-27B2-4244-A1C3-1E5952D64B64}">
-        <File Id="fil87A274531F374FB186928D7A3B28F54F" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.6.26725.06.dll" />
-      </Component>
       <Component Id="cmpCC989C2FC3319628C5A0897A9CDB4C7D" Guid="{2FC1414C-925B-4653-B376-0DC7114DAA4C}">
         <File Id="fil2FBB26045517B5A73BF6024C55539694" KeyPath="yes" Source="$(env.ProductSourcePath)\api-ms-win-core-processthreads-l1-1-0.dll" />
       </Component>
@@ -2023,6 +2017,12 @@
           <File Id="fil3779A5AC06BDD2A3AB680DBA83FEAFD1" KeyPath="yes" Source="$(env.ProductSourcePath)\zh-Hant\Microsoft.CodeAnalysis.resources.dll" />
         </Component>
       </Directory>
+      <Component Id="cmp235BDA01BE4144BE9F2BFBA3AE1A00CD" Guid="{03a98239-8d0d-4ee9-82d9-6466fc763c2e}">
+        <File Id="fil4233B53B90A84FC88FA51A8B976747FB" KeyPath="yes" Source="$(env.ProductSourcePath)\sos_$(var.FileArchitecture)_$(var.FileArchitecture)_4.6.26814.03.dll" />
+      </Component>
+      <Component Id="cmp5BCFD9C11FB34654B14B795494C7B51D" Guid="{0ebb07c1-0089-4639-85c2-eaed0acffdb2}">
+        <File Id="fil8EBB2AB7056C492495580A5B63F35348" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.6.26814.03.dll" />
+      </Component>
     </DirectoryRef>
   </Fragment>
   <Fragment>
@@ -2089,7 +2089,6 @@
       <ComponentRef Id="cmp23FD946C6681D6747F1B638ECBE8C8BC" />
       <ComponentRef Id="cmp4B935A8190C2D7D1F0E0DB9E5AAD7F30" />
       <ComponentRef Id="cmp2B60F4AC2E8D95A558C3E121A6252D37" />
-      <ComponentRef Id="cmpf65fc69858294501b4f61951193b392c" />
       <ComponentRef Id="cmp5977DC14DE00AD6E597A2FEBB8C3B58B" />
       <ComponentRef Id="cmp689C7CE34E0246D8B56D370E898354CE" />
       <ComponentRef Id="cmp634E012FEF6122735D91DE4B1BCC1116" />
@@ -2188,7 +2187,6 @@
       <ComponentRef Id="cmpE66ABF016916C709133CA0DB9366469F" />
       <ComponentRef Id="cmpECCD26D8C540FA35F5C633B318EB742E" />
       <ComponentRef Id="cmp644DFED4A59040568D091F0EA5F691E6" />
-      <ComponentRef Id="cmp47ff9204b9544467a6f71e951716f8a4" />
       <ComponentRef Id="cmpCC989C2FC3319628C5A0897A9CDB4C7D" />
       <ComponentRef Id="cmpC9085D713FC071587C61ACFE51384BDD" />
       <ComponentRef Id="cmpB942FEF3BC11F835DF30CDDD845486AD" />
@@ -2672,6 +2670,8 @@
       <ComponentRef Id="cmpC0582B8F392548248FA3DE3080069F68" />
       <ComponentRef Id="cmp3D4940617EE5426384A6BF086E79CC63" />
       <ComponentRef Id="cmpF13D9769FBE945B09326776DC9877740" />
+      <ComponentRef Id="cmp235BDA01BE4144BE9F2BFBA3AE1A00CD" />
+      <ComponentRef Id="cmp5BCFD9C11FB34654B14B795494C7B51D" />
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/global.json b/global.json
index 079ebc9415..8a567cfb39 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "2.1.401"
+    "version": "2.1.402"
   }
 }
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 d38c28cccf..eba6c62c09 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -67,7 +67,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.9.0" />
-    <PackageReference Include="NJsonSchema" Version="9.10.73" />
+    <PackageReference Include="NJsonSchema" Version="9.10.74" />
   </ItemGroup>
 
 </Project>
diff --git a/test/Test.Common.props b/test/Test.Common.props
index a2c69c9f74..063d67d19d 100644
--- a/test/Test.Common.props
+++ b/test/Test.Common.props
@@ -5,7 +5,7 @@
     <Copyright>(c) Microsoft Corporation. All rights reserved.</Copyright>
 
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <RuntimeFrameworkVersion>2.1.3</RuntimeFrameworkVersion>
+    <RuntimeFrameworkVersion>2.1.4</RuntimeFrameworkVersion>
 
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj
index 0f37d398b7..c98757acba 100644
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.3" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.4" />
   </ItemGroup>
 
   <ItemGroup>