pimhwang
/
ILSpy
mirror of https://github.com/icsharpcode/ILSpy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Disable parallel builds and move build dependencies to netstd project.

pull/835/merge
Siegfried Pammer 8 years ago
parent
dbcf2e7b43
commit
aabb226788
3 changed files with 58 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
  2. 90
      ICSharpCode.Decompiler/ICSharpCode.Decompiler.netstd.csproj
  3. 2
      appveyor.yml

6
ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
Unescape View File

@ -546,13 +546,17 @@
<LastGenOutput>Instructions.cs</LastGenOutput> <LastGenOutput>Instructions.cs</LastGenOutput>
</None> </None>
<None Include="packages.config" /> <None Include="packages.config" />
<None Include="Properties\AssemblyInfo.template.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\cecil\Mono.Cecil.csproj"> <ProjectReference Include="..\cecil\Mono.Cecil.csproj">
<Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project> <Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
<Name>Mono.Cecil</Name> <Name>Mono.Cecil</Name>
</ProjectReference> </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>
<ItemGroup> <ItemGroup>
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" /> <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />

90
ICSharpCode.Decompiler/ICSharpCode.Decompiler.netstd.csproj
Unescape View File

@ -1,42 +1,56 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>
<AssemblyName>ICSharpCode.Decompiler</AssemblyName> <AssemblyName>ICSharpCode.Decompiler</AssemblyName>
<RootNamespace>ICSharpCode.Decompiler</RootNamespace> <RootNamespace>ICSharpCode.Decompiler</RootNamespace>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo> <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<SignAssembly>true</SignAssembly> <SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>ICSharpCode.Decompiler.snk</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>ICSharpCode.Decompiler.snk</AssemblyOriginatorKeyFile>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Remove="Ast\**" /> <Compile Remove="Ast\**" />
<EmbeddedResource Remove="Ast\**" /> <EmbeddedResource Remove="Ast\**" />
<None Remove="Ast\**" /> <None Remove="Ast\**" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Remove="CodeMappings.cs" /> <Compile Remove="CodeMappings.cs" />
<Compile Remove="CSharp\Transforms\CombineQueryExpressions.cs" /> <Compile Remove="CSharp\Transforms\CombineQueryExpressions.cs" />
<Compile Remove="CSharp\Transforms\ExpressionTreeConverter.cs" /> <Compile Remove="CSharp\Transforms\ExpressionTreeConverter.cs" />
<Compile Remove="CSharp\Transforms\FlattenSwitchBlocks.cs" /> <Compile Remove="CSharp\Transforms\FlattenSwitchBlocks.cs" />
<Compile Remove="CSharp\Transforms\IntroduceQueryExpressions.cs" /> <Compile Remove="CSharp\Transforms\IntroduceQueryExpressions.cs" />
<Compile Remove="DecompilerException.cs" /> <Compile Remove="DecompilerException.cs" />
<Compile Remove="Properties\AssemblyInfo.template.cs" /> <Compile Remove="Properties\AssemblyInfo.template.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="System.Collections.Immutable" Version="1.4.0" /> <PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
<PackageReference Include="System.ValueTuple" Version="4.4.0" /> <PackageReference Include="System.ValueTuple" Version="4.4.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\cecil\Mono.Cecil.csproj" /> <ProjectReference Include="..\cecil\Mono.Cecil.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="Properties\" /> <Folder Include="Properties\" />
</ItemGroup> </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> </Project>

2
appveyor.yml
Unescape View File

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

Write Preview
Loading…
Cancel
Save