From ce29ec42e830627ca1d2ed0ff4cfd1ff66b45b34 Mon Sep 17 00:00:00 2001
From: dotnet-bot <dotnet-bot@microsoft.com>
Date: Tue, 10 Oct 2017 22:28:57 +0000
Subject: [PATCH 1/2] Update CoreSetup to preview1-25810-02

---
 build/DependencyVersions.props | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index f8d0d4365..06f15daa3 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <CLI_SharedFrameworkVersion>2.1.0-preview1-25806-02</CLI_SharedFrameworkVersion>
+    <CLI_SharedFrameworkVersion>2.1.0-preview1-25810-02</CLI_SharedFrameworkVersion>
     <CLI_MSBuild_Version>15.5.0-preview-000090-0999971</CLI_MSBuild_Version>
     <CLI_Roslyn_Version>2.3.2-beta1-61921-05</CLI_Roslyn_Version>
     <CLI_Roslyn_Satellites_Version>2.3.0-pre-20170727-1</CLI_Roslyn_Satellites_Version>
@@ -25,8 +25,8 @@
     <TemplateEngineVersion>1.0.0-beta2-20170828-305</TemplateEngineVersion>
     <TemplateEngineTemplateVersion>1.0.0-beta2-20170828-305</TemplateEngineTemplateVersion>
     <TemplateEngineTemplate2_0Version>1.0.0-beta2-20170828-305</TemplateEngineTemplate2_0Version>
-    <PlatformAbstractionsVersion>2.1.0-preview1-25806-02</PlatformAbstractionsVersion>
-    <DependencyModelVersion>2.1.0-preview1-25806-02</DependencyModelVersion>
+    <PlatformAbstractionsVersion>2.1.0-preview1-25810-02</PlatformAbstractionsVersion>
+    <DependencyModelVersion>2.1.0-preview1-25810-02</DependencyModelVersion>
     <CliCommandLineParserVersion>0.1.1-alpha-167</CliCommandLineParserVersion>
     <CliMigrateVersion>1.2.1-alpha-002133</CliMigrateVersion>
     <MicroBuildVersion>0.2.0</MicroBuildVersion>

From 484714df1bf672f412a5ff79627667421262abe0 Mon Sep 17 00:00:00 2001
From: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Wed, 11 Oct 2017 12:52:31 -0500
Subject: [PATCH 2/2] Exclude Desktop framework assemblies in the "Extensions"
 folder from crossgen.

Work around MSBuild globbing bug in a Target by just excluding the one assembly.

See https://github.com/Microsoft/msbuild/issues/2631
---
 src/redist/redist.csproj | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index a7f7a7672..a0f28a266 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -199,7 +199,8 @@
           AfterTargets="PublishMSBuildExtensions">
     <ItemGroup>
       <!-- Removing Full CLR built TestHost assemblies from getting Crossgen as it is throwing error -->
-      <SdkFiles Include="$(PublishDir)/**/*" Exclude="$(PublishDir)/TestHost*/**/*;$(PublishDir)/Sdks/**/*" />
+      <SdkFiles Include="$(PublishDir)/**/*"
+                Exclude="$(PublishDir)/TestHost*/**/*;$(PublishDir)/Sdks/**/*;$(PublishDir)/**/Microsoft.TestPlatform.Extensions.EventLogCollector.dll" />
 
       <!-- Don't try to CrossGen .NET Framework support assemblies for .NET Standard -->
       <SdkFiles Remove="$(PublishDir)/Microsoft\Microsoft.NET.Build.Extensions\net*\**\*" />