Skip to content

Commit bab3400

Browse files
committed
fixing issue #2
1 parent 181db2e commit bab3400

1 file changed

Lines changed: 15 additions & 8 deletions

File tree

src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/build/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,26 @@
44
<Link>roslyn\%(RecursiveDir)%(Filename)%(Extension)</Link>
55
</RoslyCompilerFiles>
66
</ItemGroup>
7-
<Target Name="IncludeRoslynCompilerFilesToItemGroup" AfterTargets="ResolveAssemblyReferences" >
7+
<Target Name="RoslynCompilerFilesToPublish">
88
<ItemGroup>
9-
<None Include="@(RoslyCompilerFiles)" Condition="">
10-
<Link>%(RoslyCompilerFiles.Link)</Link>
11-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
12-
</None>
9+
<_RoslynFiles Include="@(RoslyCompilerFiles)" />
10+
<FilesForPackagingFromProject Include="%(_RoslynFiles.Identity)">
11+
<DestinationRelativePath>bin\roslyn\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
12+
</FilesForPackagingFromProject>
1313
</ItemGroup>
1414
</Target>
15+
<PropertyGroup>
16+
<CopyAllFilesToSingleFolderForPackageDependsOn>
17+
RoslynCompilerFilesToPublish;
18+
$(CopyAllFilesToSingleFolderForPackageDependsOn);
19+
</CopyAllFilesToSingleFolderForPackageDependsOn>
20+
</PropertyGroup>
1521
<Target Name="CopyRoslynCompilerFilesToOutputDirectory" AfterTargets="CopyFilesToOutputDirectory">
16-
<Copy SourceFiles="@(RoslyCompilerFiles)" DestinationFolder="$(OutDir)roslyn" ContinueOnError="true" SkipUnchangedFiles="true" />
22+
<Copy SourceFiles="@(RoslyCompilerFiles)" DestinationFolder="$(WebProjectOutputDir)\bin\roslyn" ContinueOnError="true" SkipUnchangedFiles="true" Retries="0" />
1723
</Target>
18-
<Target Name = "KillVBCSCompiler" BeforeTargets="_CopyOutOfDateSourceItemsToOutputDirectory">
19-
<KillProcess ProcessName="VBCSCompiler" ImagePath="$(MSBuildProjectDirectory)" />
24+
<Target Name = "KillVBCSCompilerAndRetryCopy" AfterTargets="CopyRoslynCompilerFilesToOutputDirectory" Condition="'$(MSBuildLastTaskResult)' == 'False'" >
25+
<KillProcess ProcessName="VBCSCompiler" ImagePath="$(WebProjectOutputDir)" />
26+
<Copy SourceFiles="@(RoslyCompilerFiles)" DestinationFolder="$(WebProjectOutputDir)\bin\roslyn" ContinueOnError="true" SkipUnchangedFiles="true" />
2027
</Target>
2128
<UsingTask TaskName="KillProcess" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
2229
<ParameterGroup>

0 commit comments

Comments
 (0)