From 60ab54d737d62a5651273e8e19ca74f5116ebadf Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 19 Feb 2019 10:45:40 -0800
Subject: [PATCH] Port DotNet fixes from 6.1.3 (#8914)

Addresses CVE-2019-0657
---
 PowerShell.Common.props                   |  2 +-
 assets/files.wxs                          | 12 ++++++------
 global.json                               |  2 +-
 test/Test.Common.props                    |  2 +-
 test/tools/WebListener/WebListener.csproj |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/PowerShell.Common.props b/PowerShell.Common.props
index bb56e46894..53d2351f82 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.7</RuntimeFrameworkVersion>
+    <RuntimeFrameworkVersion>2.1.8</RuntimeFrameworkVersion>
     <LangVersion>Latest</LangVersion>
 
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/assets/files.wxs b/assets/files.wxs
index 7841e2a04b..cc34b41934 100644
--- a/assets/files.wxs
+++ b/assets/files.wxs
@@ -2134,11 +2134,11 @@
           </Component>
         </Directory>
       </Directory>
-      <Component Id="cmp4E7DFAA0FFC64A2086B5E85167A999CA" Guid="{81b42f7d-6762-40c2-9d60-6556237257bb}">
-        <File Id="fil3656BAD514F342A1851A7B407BF26FF2" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.6.27129.04.dll" />
+      <Component Id="cmp1C78A4CD2802400AA5186E43EE693932" Guid="{99c8d421-8cd6-4d21-b08b-241e79720472}">
+        <File Id="fil6EC5BFD4E1D942E98238A226EBA676F8" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.6.27317.03.dll" />
       </Component>
-      <Component Id="cmp31ACA290CAB14FC7BBE32FA6A742DC1F" Guid="{cd6a9423-1a98-4770-a760-6685c93df590}">
-        <File Id="filE94DF8CA4F8C4B948FF884E2114A3EF9" KeyPath="yes" Source="$(env.ProductSourcePath)\sos_$(var.FileArchitecture)_$(var.FileArchitecture)_4.6.27129.04.dll" />
+      <Component Id="cmpF6C01816BDA347B5AEDCDCA5C96C1E99" Guid="{dceee766-c481-4f78-bf39-80e29e19348d}">
+        <File Id="fil2CA15D006B044FEFB7A061A9F1ED6CF8" KeyPath="yes" Source="$(env.ProductSourcePath)\sos_$(var.FileArchitecture)_$(var.FileArchitecture)_4.6.27317.03.dll" />
       </Component>
     </DirectoryRef>
   </Fragment>
@@ -2819,8 +2819,6 @@
       <ComponentRef Id="cmpED253ABCC1354C58A65CD4D41F7ABB3A" />
       <ComponentRef Id="cmp074868368CB24A33962BC4DB7B809C4F" />
       <ComponentRef Id="cmpFF8643F8CC97462CAC20815F6071203B" />
-      <ComponentRef Id="cmp4E7DFAA0FFC64A2086B5E85167A999CA" />
-      <ComponentRef Id="cmp31ACA290CAB14FC7BBE32FA6A742DC1F" />
       <ComponentRef Id="cmp819F1885245B46C0982FFDD7301BFC21" />
       <ComponentRef Id="cmpE0A78C8CA25E4D20AAB3E64A1AA55E07" />
       <ComponentRef Id="cmp0F685BFF00054470A02D82A5237DD4D2" />
@@ -2828,6 +2826,8 @@
       <ComponentRef Id="cmpE4A3A9C6EBE34E9AAF4EB02937545542" />
       <ComponentRef Id="cmp5297F3A0CC784D5FB179A2C5128882BA" />
       <ComponentRef Id="cmpA5AD020C2A054BD299EA1D2439947B22" />
+      <ComponentRef Id="cmp1C78A4CD2802400AA5186E43EE693932" />
+      <ComponentRef Id="cmpF6C01816BDA347B5AEDCDCA5C96C1E99" />
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/global.json b/global.json
index 05f4d3751c..4ac738bc32 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "2.1.503"
+    "version": "2.1.504"
   }
 }
diff --git a/test/Test.Common.props b/test/Test.Common.props
index dd5c967091..e87a213c4e 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.7</RuntimeFrameworkVersion>
+    <RuntimeFrameworkVersion>2.1.8</RuntimeFrameworkVersion>
     <LangVersion>Latest</LangVersion>
 
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj
index 9c558815ed..50fc0964d5 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.7" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.8" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.1" />
   </ItemGroup>