From 6e749dff788123608263e923f95f298cdb3f2d30 Mon Sep 17 00:00:00 2001
From: iSazonov <darpa@yandex.ru>
Date: Wed, 3 Oct 2018 17:17:00 +0500
Subject: [PATCH 1/2] Update to .NET Core 2.1.5 with SDK 2.1.403

---
 PowerShell.Common.props                   | 2 +-
 appveyor.yml                              | 2 +-
 global.json                               | 2 +-
 test/Test.Common.props                    | 2 +-
 test/tools/WebListener/WebListener.csproj | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/PowerShell.Common.props b/PowerShell.Common.props
index 5e7f015cd7f..d25ddac462b 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.4</RuntimeFrameworkVersion>
+    <RuntimeFrameworkVersion>2.1.5</RuntimeFrameworkVersion>
     <LangVersion>Latest</LangVersion>
 
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/appveyor.yml b/appveyor.yml
index 62b5e1c47c4..45bda6488b4 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.402
+# cache version - netcoreapp.2.1-sdk.2.1.403
 cache:
   - '%HOMEDRIVE%%HOMEPATH%\.nuget\packages -> appveyor.yml'
 
diff --git a/global.json b/global.json
index 8a567cfb397..55e448dfe00 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "2.1.402"
+    "version": "2.1.403"
   }
 }
diff --git a/test/Test.Common.props b/test/Test.Common.props
index 063d67d19da..11b20a9fed7 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.4</RuntimeFrameworkVersion>
+    <RuntimeFrameworkVersion>2.1.5</RuntimeFrameworkVersion>
 
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj
index c98757acba9..a24e519ac4f 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.4" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.5" />
   </ItemGroup>
 
   <ItemGroup>

From caf16edd64e5fb8c593ebc7770b9adfa4d3993b9 Mon Sep 17 00:00:00 2001
From: iSazonov <darpa@yandex.ru>
Date: Wed, 3 Oct 2018 18:08:14 +0500
Subject: [PATCH 2/2] Fix files.wxs

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

diff --git a/assets/files.wxs b/assets/files.wxs
index b981a166c02..a7e70612a50 100644
--- a/assets/files.wxs
+++ b/assets/files.wxs
@@ -2017,11 +2017,11 @@
           <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 Id="cmp7641086BD8244AFAAA244FAB40CE60BC" Guid="{2dc3fc9a-086e-4bae-85a4-03322c6a682f}">
+        <File Id="fil65BC2FC2686842A4B38CCBF9F54B2DD3" KeyPath="yes" Source="$(env.ProductSourcePath)\sos_$(var.FileArchitecture)_$(var.FileArchitecture)_4.6.26919.02.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 Id="cmp2B1B284B631547EEB86D29E84D2E9611" Guid="{1d6e6de9-0af0-4669-9cf8-d731d43f3e8a}">
+        <File Id="fil1B414FC15B084BD9B4F5B1ACC5EC5084" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.6.26919.02.dll" />
       </Component>
     </DirectoryRef>
   </Fragment>
@@ -2670,8 +2670,8 @@
       <ComponentRef Id="cmpC0582B8F392548248FA3DE3080069F68" />
       <ComponentRef Id="cmp3D4940617EE5426384A6BF086E79CC63" />
       <ComponentRef Id="cmpF13D9769FBE945B09326776DC9877740" />
-      <ComponentRef Id="cmp235BDA01BE4144BE9F2BFBA3AE1A00CD" />
-      <ComponentRef Id="cmp5BCFD9C11FB34654B14B795494C7B51D" />
+      <ComponentRef Id="cmp7641086BD8244AFAAA244FAB40CE60BC" />
+      <ComponentRef Id="cmp2B1B284B631547EEB86D29E84D2E9611" />
     </ComponentGroup>
   </Fragment>
 </Wix>