From 84302289563d7fd7b3128b42eaf3f5d33cefa6ca Mon Sep 17 00:00:00 2001
From: Matt Fei <mattfei@microsoft.com>
Date: Fri, 29 Sep 2017 16:42:53 -0700
Subject: [PATCH 1/3] fix OctoPack issue

---
 ...Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props | 6 ++++++
 .../content/net45/web.config.install.xdt                    | 4 ++--
 .../content/net46/web.config.install.xdt                    | 4 ++--
 tools/RoslynCodeProvider.settings.targets                   | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/build/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props b/src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/build/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props
index 7443672..91a9882 100644
--- a/src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/build/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props
+++ b/src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/build/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props
@@ -15,10 +15,16 @@
   </Target>
   <Target Name="CopyRoslynCompilerFilesToOutputDirectory" AfterTargets="CopyFilesToOutputDirectory">
     <Copy SourceFiles="@(RoslyCompilerFiles)" DestinationFolder="$(WebProjectOutputDir)\bin\roslyn" ContinueOnError="true" SkipUnchangedFiles="true" Retries="0" />
+    <ItemGroup  Condition="'$(MSBuildLastTaskResult)' == 'True'" >
+      <FileWrites Include="$(WebProjectOutputDir)\bin\roslyn\*" />
+    </ItemGroup>
   </Target>
   <Target Name = "KillVBCSCompilerAndRetryCopy" AfterTargets="CopyRoslynCompilerFilesToOutputDirectory" Condition="'$(MSBuildLastTaskResult)' == 'False'" >
     <KillProcess ProcessName="VBCSCompiler" ImagePath="$(WebProjectOutputDir)" />
     <Copy SourceFiles="@(RoslyCompilerFiles)" DestinationFolder="$(WebProjectOutputDir)\bin\roslyn" ContinueOnError="true" SkipUnchangedFiles="true" />
+    <ItemGroup>
+      <FileWrites Include="$(WebProjectOutputDir)\bin\roslyn\*" />
+    </ItemGroup>
   </Target>
   <UsingTask TaskName="KillProcess" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
     <ParameterGroup>
diff --git a/src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/net45/web.config.install.xdt b/src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/net45/web.config.install.xdt
index 0b7bc6d..8bf1474 100644
--- a/src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/net45/web.config.install.xdt
+++ b/src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/net45/web.config.install.xdt
@@ -26,7 +26,7 @@
       <compiler
         language="c#;cs;csharp"
         extension=".cs"
-        type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+        type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.8.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
         warningLevel="4"
         compilerOptions="/langversion:6 /nowarn:1659;1699;1701"
         xdt:Transform="Insert" />
@@ -49,7 +49,7 @@
       <compiler
         language="vb;vbs;visualbasic;vbscript"
         extension=".vb"
-        type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+        type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.8.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
         warningLevel="4"
         compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"
         xdt:Transform="Insert" />
diff --git a/src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/net46/web.config.install.xdt b/src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/net46/web.config.install.xdt
index 8f95055..b64a64b 100644
--- a/src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/net46/web.config.install.xdt
+++ b/src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/net46/web.config.install.xdt
@@ -26,7 +26,7 @@
       <compiler
         language="c#;cs;csharp"
         extension=".cs"
-        type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+        type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.8.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
         warningLevel="4"
         compilerOptions="/langversion:default /nowarn:1659;1699;1701"
         xdt:Transform="Insert" />
@@ -49,7 +49,7 @@
       <compiler
         language="vb;vbs;visualbasic;vbscript"
         extension=".vb"
-        type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+        type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.8.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
         warningLevel="4"
         compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"
         xdt:Transform="Insert" />
diff --git a/tools/RoslynCodeProvider.settings.targets b/tools/RoslynCodeProvider.settings.targets
index 431bc47..a67e7dc 100644
--- a/tools/RoslynCodeProvider.settings.targets
+++ b/tools/RoslynCodeProvider.settings.targets
@@ -6,7 +6,7 @@
         <VersionStartYear>2014</VersionStartYear>
         <VersionMajor>1</VersionMajor>
         <VersionMinor>0</VersionMinor>
-        <VersionRelease>7</VersionRelease>
+        <VersionRelease>8</VersionRelease>
         <VersionRelease Condition="'$(BuildQuality)' != 'rtm'">$(VersionRelease)-$(BuildQuality)</VersionRelease>
     </PropertyGroup>
 

From a34b2fe02129bec0336b662277c02105951835ca Mon Sep 17 00:00:00 2001
From: Matt Fei <mattfei@microsoft.com>
Date: Fri, 6 Oct 2017 16:58:54 -0700
Subject: [PATCH 2/3] fix issue caused by double publishing

---
 .../Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/build/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props b/src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/build/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props
index 91a9882..bec1f37 100644
--- a/src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/build/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props
+++ b/src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/build/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props
@@ -4,7 +4,7 @@
       <Link>roslyn\%(RecursiveDir)%(Filename)%(Extension)</Link>
     </RoslyCompilerFiles>
   </ItemGroup>
-  <Target Name="IncludeRoslynCompilerFilesToFilesForPackagingFromProject" BeforeTargets="PrepareForRun" >
+  <Target Name="IncludeRoslynCompilerFilesToFilesForPackagingFromProject" BeforeTargets="PipelineCollectFilesPhase" >
     <ItemGroup>
       <FilesForPackagingFromProject Include="@(RoslyCompilerFiles)">
         <DestinationRelativePath>bin\roslyn\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>

From 50b4dd04d4c2f04ac408833dfc100ba2f81a3e3c Mon Sep 17 00:00:00 2001
From: Matt Fei <mattfei@microsoft.com>
Date: Mon, 16 Oct 2017 14:07:10 -0700
Subject: [PATCH 3/3] update ref Roslyn nupkg version

---
 tools/RoslynCodeProvider.settings.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/RoslynCodeProvider.settings.targets b/tools/RoslynCodeProvider.settings.targets
index a67e7dc..f682f27 100644
--- a/tools/RoslynCodeProvider.settings.targets
+++ b/tools/RoslynCodeProvider.settings.targets
@@ -12,7 +12,7 @@
 
     <PropertyGroup Label="NuGet package dependencies">
         <MSNetCompilersNuGetPackageVersion>1.3.2</MSNetCompilersNuGetPackageVersion>
-        <MSNetCompilersNuGetPackageLatestVersion>2.1.0</MSNetCompilersNuGetPackageLatestVersion>
+        <MSNetCompilersNuGetPackageLatestVersion>2.4.0</MSNetCompilersNuGetPackageLatestVersion>
     </PropertyGroup>
 
     <!-- Default properties -->