Browse Source

Disable parallel builds and move build dependencies to netstd project.

pull/835/merge
Siegfried Pammer 8 years ago
parent
commit
aabb226788
  1. 6
      ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
  2. 14
      ICSharpCode.Decompiler/ICSharpCode.Decompiler.netstd.csproj
  3. 2
      appveyor.yml

6
ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj

@ -546,13 +546,17 @@ @@ -546,13 +546,17 @@
<LastGenOutput>Instructions.cs</LastGenOutput>
</None>
<None Include="packages.config" />
<None Include="Properties\AssemblyInfo.template.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\cecil\Mono.Cecil.csproj">
<Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
<Name>Mono.Cecil</Name>
</ProjectReference>
<ProjectReference Include="ICSharpCode.Decompiler.netstd.csproj">
<Project>{fd56f486-a0c3-4469-b6d3-d2bae23ce2a0}</Project>
<Name>ICSharpCode.Decompiler.netstd</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />

14
ICSharpCode.Decompiler/ICSharpCode.Decompiler.netstd.csproj

@ -39,4 +39,18 @@ @@ -39,4 +39,18 @@
<Folder Include="Properties\" />
</ItemGroup>
<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
<PropertyGroup>
<UpdateAssemblyInfo>UpdateAssemblyInfo.exe</UpdateAssemblyInfo>
<UpdateAssemblyInfo Condition="$(OS)=='Unix'">mono $(UpdateAssemblyInfo)</UpdateAssemblyInfo>
</PropertyGroup>
<MSBuild Projects="$(MSBuildProjectDirectory)\..\BuildTools\UpdateAssemblyInfo\UpdateAssemblyInfo.csproj" Targets="Build" Properties="Configuration=Debug" />
<Exec WorkingDirectory="$(MSBuildProjectDirectory)\..\BuildTools\UpdateAssemblyInfo\bin\Debug" Command="$(UpdateAssemblyInfo) --branchname $(BranchName)" Timeout="60000" Condition=" '$(BranchName)' != '' " />
<Exec WorkingDirectory="$(MSBuildProjectDirectory)\..\BuildTools\UpdateAssemblyInfo\bin\Debug" Command="$(UpdateAssemblyInfo)" Timeout="60000" Condition=" '$(BranchName)' == '' " />
</Target>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="del /F /S /Q $(ProjectDir)\obj" />
</Target>
</Project>

2
appveyor.yml

@ -9,7 +9,7 @@ before_build: @@ -9,7 +9,7 @@ before_build:
- nuget restore ILSpy.sln
build:
project: ILSpy.sln
parallel: true
parallel: false
verbosity: minimal
test:
assemblies:

Loading…
Cancel
Save