|
4 | 4 | <Link>roslyn\%(RecursiveDir)%(Filename)%(Extension)</Link> |
5 | 5 | </RoslyCompilerFiles> |
6 | 6 | </ItemGroup> |
7 | | - <Target Name="IncludeRoslynCompilerFilesToItemGroup" AfterTargets="ResolveAssemblyReferences" > |
| 7 | + <Target Name="RoslynCompilerFilesToPublish"> |
8 | 8 | <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> |
13 | 13 | </ItemGroup> |
14 | 14 | </Target> |
| 15 | + <PropertyGroup> |
| 16 | + <CopyAllFilesToSingleFolderForPackageDependsOn> |
| 17 | + RoslynCompilerFilesToPublish; |
| 18 | + $(CopyAllFilesToSingleFolderForPackageDependsOn); |
| 19 | + </CopyAllFilesToSingleFolderForPackageDependsOn> |
| 20 | + </PropertyGroup> |
15 | 21 | <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" /> |
17 | 23 | </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" /> |
20 | 27 | </Target> |
21 | 28 | <UsingTask TaskName="KillProcess" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll"> |
22 | 29 | <ParameterGroup> |
|
0 commit comments