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

Merge pull request #1001 from sharwell/cecil-packagereference 

Reference Mono.Cecil using a PackageReference
pull/1278/head
Siegfried Pammer 8 years ago committed by GitHub
parent
98dfd95d8f ed345b8f32
commit
3acb21b18c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 5 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj
  2. 8
      ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
  3. 5
      ICSharpCode.Decompiler/ICSharpCode.Decompiler.nuspec.template
  4. 2
      ILSpy.AddIn/ILSpy.AddIn.csproj
  5. 1
      ILSpy.BamlDecompiler.Tests/ILSpy.BamlDecompiler.Tests.csproj
  6. 3
      ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj
  7. 2
      ILSpy/ILSpy.csproj
  8. 1
      TestPlugin/TestPlugin.csproj
  9. 2
      cecil
  10. 3
      clean.bat
  11. 4
      debugbuild.bat
  12. 3
      releasebuild.bat

1
ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj
Unescape View File

@ -39,7 +39,6 @@ @@ -39,7 +39,6 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\cecil\Mono.Cecil.csproj" AdditionalProperties="NuGetRestoreTargets=;ResolveNuGetPackages=false" />
<ProjectReference Include="..\ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj" />
</ItemGroup>

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

@ -50,14 +50,11 @@ @@ -50,14 +50,11 @@
<ItemGroup>
<PackageReference Include="Humanizer.Core" Version="2.2.0" />
<PackageReference Include="Mono.Cecil" Version="0.10.0-beta7" />
<PackageReference Include="System.Collections.Immutable" Version="1.3.1" />
<PackageReference Include="System.ValueTuple" Version="4.3.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\cecil\Mono.Cecil.csproj" AdditionalProperties="NuGetRestoreTargets=;ResolveNuGetPackages=false" />
</ItemGroup>
<ItemGroup>
<Compile Include="CSharp\Annotations.cs" />
<Compile Include="CSharp\CallBuilder.cs" />
@ -565,7 +562,8 @@ @@ -565,7 +562,8 @@
<Compile Include="Util\ReferenceComparer.cs" />
<Compile Include="Util\TreeTraversal.cs" />
<Compile Include="Util\UnionFind.cs" />
<None Include="ICSharpCode.Decompiler.nuspec" />
<None Include="ICSharpCode.Decompiler.nuspec" DependentUpon="ICSharpCode.Decompiler.nuspec.template" />
<None Include="ICSharpCode.Decompiler.nuspec.template" />
<None Include="ICSharpCode.Decompiler.ruleset" />
<None Include="ICSharpCode.Decompiler.snk" />
<None Include="IL\ILOpCodes.tt">

5
ICSharpCode.Decompiler/ICSharpCode.Decompiler.nuspec.template
Unescape View File

@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
<tags>C# Decompiler ILSpy</tags>
<dependencies>
<dependency id="Humanizer.Core" version="2.2.0" />
<dependency id="Mono.Cecil" version="0.10.0-beta7" />
<dependency id="System.Collections.Immutable" version="1.3.1" />
<dependency id="System.ValueTuple" version="4.3.0" />
</dependencies>
@ -23,12 +24,8 @@ @@ -23,12 +24,8 @@
<files>
<file src="bin\$Configuration$\net46\ICSharpCode.Decompiler.dll" target="lib\net46" />
<file src="bin\$Configuration$\net46\ICSharpCode.Decompiler.pdb" target="lib\net46" />
<file src="bin\$Configuration$\net46\Mono.Cecil.dll" target="lib\net46" />
<file src="bin\$Configuration$\net46\Mono.Cecil.pdb" target="lib\net46" />
<file src="bin\$Configuration$\netstandard2.0\ICSharpCode.Decompiler.dll" target="lib\netstandard2.0" />
<file src="bin\$Configuration$\netstandard2.0\ICSharpCode.Decompiler.pdb" target="lib\netstandard2.0" />
<file src="bin\$Configuration$\netstandard2.0\Mono.Cecil.dll" target="lib\netstandard2.0" />
<file src="bin\$Configuration$\netstandard2.0\Mono.Cecil.pdb" target="lib\netstandard2.0" />
</files>
</package>

2
ILSpy.AddIn/ILSpy.AddIn.csproj
Unescape View File

@ -51,8 +51,6 @@ @@ -51,8 +51,6 @@
<ProjectReference Include="..\ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj" />
<ProjectReference Include="..\ILSpy.BamlDecompiler\ILSpy.BamlDecompiler.csproj" />
<ProjectReference Include="..\ILSpy\ILSpy.csproj" />
<ProjectReference Include="..\cecil\Mono.Cecil.csproj" AdditionalProperties="NuGetRestoreTargets=;ResolveNuGetPackages=false" />
<ProjectReference Include="..\cecil\symbols\pdb\Mono.Cecil.Pdb.csproj" AdditionalProperties="NuGetRestoreTargets=;ResolveNuGetPackages=false" />
<ProjectReference Include="..\SharpTreeView\ICSharpCode.TreeView.csproj" />
</ItemGroup>

1
ILSpy.BamlDecompiler.Tests/ILSpy.BamlDecompiler.Tests.csproj
Unescape View File

@ -37,7 +37,6 @@ @@ -37,7 +37,6 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\cecil\Mono.Cecil.csproj" AdditionalProperties="NuGetRestoreTargets=;ResolveNuGetPackages=false" />
<ProjectReference Include="..\ICSharpCode.Decompiler.Tests\ICSharpCode.Decompiler.Tests.csproj" />
<ProjectReference Include="..\ILSpy\ILSpy.csproj" />
<ProjectReference Include="..\SharpTreeView\ICSharpCode.TreeView.csproj" />

3
ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj
Unescape View File

@ -46,9 +46,6 @@ @@ -46,9 +46,6 @@
<ProjectReference Include="..\ILSpy\ILSpy.csproj">
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\cecil\Mono.Cecil.csproj" AdditionalProperties="NuGetRestoreTargets=;ResolveNuGetPackages=false">
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\SharpTreeView\ICSharpCode.TreeView.csproj">
<Private>False</Private>
</ProjectReference>

2
ILSpy/ILSpy.csproj
Unescape View File

@ -54,8 +54,6 @@ @@ -54,8 +54,6 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\cecil\Mono.Cecil.csproj" AdditionalProperties="NuGetRestoreTargets=;ResolveNuGetPackages=false" />
<ProjectReference Include="..\cecil\symbols\pdb\Mono.Cecil.Pdb.csproj" AdditionalProperties="NuGetRestoreTargets=;ResolveNuGetPackages=false" />
<ProjectReference Include="..\ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj" />
<ProjectReference Include="..\SharpTreeView\ICSharpCode.TreeView.csproj" />
</ItemGroup>

1
TestPlugin/TestPlugin.csproj
Unescape View File

@ -35,7 +35,6 @@ @@ -35,7 +35,6 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\cecil\Mono.Cecil.csproj" AdditionalProperties="NuGetRestoreTargets=;ResolveNuGetPackages=false" />
<ProjectReference Include="..\ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj" />
<ProjectReference Include="..\ILSpy\ILSpy.csproj" />
<ProjectReference Include="..\SharpTreeView\ICSharpCode.TreeView.csproj" />

2
cecil

@ -1 +1 @@ @@ -1 +1 @@
Subproject commit d419d591b97f6c161372c985b32fdae7d93d6e68
Subproject commit 14e6162ae535afacb69eb6df399bbc46779a4587

3
clean.bat
Unescape View File

@ -1,6 +1,3 @@ @@ -1,6 +1,3 @@
@if not exist "cecil\Mono.Cecil.csproj" (
git submodule update --init || exit /b 1
)
@setlocal enabledelayedexpansion
@set MSBUILD=
@for /D %%M in ("%ProgramFiles(x86)%\Microsoft Visual Studio\2017"\*) do (

4
debugbuild.bat
Unescape View File

@ -1,7 +1,3 @@ @@ -1,7 +1,3 @@
@if not exist "cecil\Mono.Cecil.csproj" (
git submodule update --init || exit /b 1
git submodule update --remote ILSpy-tests || exit /b 1
)
@setlocal enabledelayedexpansion
@set MSBUILD=
@for /D %%M in ("%ProgramFiles(x86)%\Microsoft Visual Studio\2017"\*) do (

3
releasebuild.bat
Unescape View File

@ -1,6 +1,3 @@ @@ -1,6 +1,3 @@
@if not exist "cecil\Mono.Cecil.csproj" (
git submodule update --init || exit /b 1
)
@setlocal enabledelayedexpansion
@set MSBUILD=
@for /D %%M in ("%ProgramFiles(x86)%\Microsoft Visual Studio\2017"\*) do (

Write Preview
Loading…
Cancel
Save