Merge pull request #14 from aspnet/dev_fixissue#13

Fix issue #13
aspnet · Aug 16, 2017 · 033e592 · 033e592
2 parents abf5072 + 8412a32
commit 033e592
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/...ers.DotNetCompilerPlatform/build/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props b/...ers.DotNetCompilerPlatform/build/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props
@@ -4,20 +4,15 @@
       <Link>roslyn\%(RecursiveDir)%(Filename)%(Extension)</Link>
     </RoslyCompilerFiles>
   </ItemGroup>
- <Target Name="RoslynCompilerFilesToPublish">
+  <Target Name="IncludeRoslynCompilerFilesToFilesForPackagingFromProject" BeforeTargets="PrepareForRun" >
     <ItemGroup>
-      <_RoslynFiles Include="@(RoslyCompilerFiles)" />
-      <FilesForPackagingFromProject Include="%(_RoslynFiles.Identity)">
+      <FilesForPackagingFromProject Include="@(RoslyCompilerFiles)">
         <DestinationRelativePath>bin\roslyn\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+        <FromTarget>IncludeRoslynCompilerFilesToFilesForPackagingFromProject</FromTarget>
+        <Category>Run</Category>
       </FilesForPackagingFromProject>
     </ItemGroup>
   </Target>
-  <PropertyGroup>
-    <CopyAllFilesToSingleFolderForPackageDependsOn>
-      RoslynCompilerFilesToPublish;
-      $(CopyAllFilesToSingleFolderForPackageDependsOn);
-    </CopyAllFilesToSingleFolderForPackageDependsOn>
-  </PropertyGroup>
   <Target Name="CopyRoslynCompilerFilesToOutputDirectory" AfterTargets="CopyFilesToOutputDirectory">
     <Copy SourceFiles="@(RoslyCompilerFiles)" DestinationFolder="$(WebProjectOutputDir)\bin\roslyn" ContinueOnError="true" SkipUnchangedFiles="true" Retries="0" />
   </Target>

diff --git a/...s/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/net45/web.config.install.xdt b/...s/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.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+        type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.7.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.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+        type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
         warningLevel="4"
         compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"
         xdt:Transform="Insert" />

diff --git a/...s/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/net46/web.config.install.xdt b/...s/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.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+        type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.7.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.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+        type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.7.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
@@ -6,7 +6,7 @@
         <VersionStartYear>2014</VersionStartYear>
         <VersionMajor>1</VersionMajor>
         <VersionMinor>0</VersionMinor>
-        <VersionRelease>6</VersionRelease>
+        <VersionRelease>7</VersionRelease>
         <VersionRelease Condition="'$(BuildQuality)' != 'rtm'">$(VersionRelease)-$(BuildQuality)</VersionRelease>
     </PropertyGroup>