Browse Source

Reference Mono.Cecil using a package reference instead of a submodule

pull/1001/head
Sam Harwell 8 years ago
parent
commit
a31b74da75
  1. 1
      ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj
  2. 5
      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

1
ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj

@ -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>

5
ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj

@ -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" />

5
ICSharpCode.Decompiler/ICSharpCode.Decompiler.nuspec.template

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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
Loading…
Cancel
Save