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

Extract package version numbers to packages.props.

pull/2178/head
Daniel Grunwald 5 years ago
parent
e64010540c
commit
0eb5469374
11 changed files with 67 additions and 26 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. 4
      ICSharpCode.Decompiler.Console/ICSharpCode.Decompiler.Console.csproj
  2. 4
      ICSharpCode.Decompiler.PdbProvider.Cecil/ICSharpCode.Decompiler.PdbProvider.Cecil.csproj
  3. 4
      ICSharpCode.Decompiler.PowerShell/ICSharpCode.Decompiler.PowerShell.csproj
  4. 16
      ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj
  5. 14
      ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
  6. 5
      ILSpy.AddIn/ILSpy.AddIn.csproj
  7. 4
      ILSpy.BamlDecompiler.Tests/ILSpy.BamlDecompiler.Tests.csproj
  8. 4
      ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj
  9. 16
      ILSpy.Tests/ILSpy.Tests.csproj
  10. 6
      ILSpy/ILSpy.csproj
  11. 16
      packages.props

4
ICSharpCode.Decompiler.Console/ICSharpCode.Decompiler.Console.csproj
Unescape View File

@ -27,6 +27,8 @@
<WarningsAsErrors>NU1605</WarningsAsErrors> <WarningsAsErrors>NU1605</WarningsAsErrors>
</PropertyGroup> </PropertyGroup>
<Import Project="..\packages.props" />
<ItemGroup> <ItemGroup>
<Compile Include="..\ICSharpCode.Decompiler.PdbProvider.Cecil\MonoCecilDebugInfoProvider.cs" Link="MonoCecilDebugInfoProvider.cs" /> <Compile Include="..\ICSharpCode.Decompiler.PdbProvider.Cecil\MonoCecilDebugInfoProvider.cs" Link="MonoCecilDebugInfoProvider.cs" />
<Compile Include="..\ILSpy\DebugInfo\PortableDebugInfoProvider.cs" Link="PortableDebugInfoProvider.cs" /> <Compile Include="..\ILSpy\DebugInfo\PortableDebugInfoProvider.cs" Link="PortableDebugInfoProvider.cs" />
@ -52,7 +54,7 @@
<PackageReference Include="System.Runtime.Handles" Version="4.3.0" /> <PackageReference Include="System.Runtime.Handles" Version="4.3.0" />
<PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" /> <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
<PackageReference Include="System.Text.Encoding.Extensions" Version="4.3.0" /> <PackageReference Include="System.Text.Encoding.Extensions" Version="4.3.0" />
<PackageReference Include="Mono.Cecil" Version="0.10.3" /> <PackageReference Include="Mono.Cecil" Version="$(MonoCecilVersion)" />
</ItemGroup> </ItemGroup>
</Project> </Project>

4
ICSharpCode.Decompiler.PdbProvider.Cecil/ICSharpCode.Decompiler.PdbProvider.Cecil.csproj
Unescape View File

@ -6,8 +6,10 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup> </PropertyGroup>
<Import Project="..\packages.props" />
<ItemGroup> <ItemGroup>
<PackageReference Include="Mono.Cecil" Version="0.10.3" /> <PackageReference Include="Mono.Cecil" Version="$(MonoCecilVersion)" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

4
ICSharpCode.Decompiler.PowerShell/ICSharpCode.Decompiler.PowerShell.csproj
Unescape View File

@ -7,9 +7,11 @@
<RootNamespace>ICSharpCode.Decompiler.PowerShell</RootNamespace> <RootNamespace>ICSharpCode.Decompiler.PowerShell</RootNamespace>
</PropertyGroup> </PropertyGroup>
<Import Project="..\packages.props" />
<ItemGroup> <ItemGroup>
<PackageReference Include="PowerShellStandard.Library" Version="5.1.0" /> <PackageReference Include="PowerShellStandard.Library" Version="5.1.0" />
<PackageReference Include="Mono.Cecil" Version="0.10.3" /> <PackageReference Include="Mono.Cecil" Version="$(MonoCecilVersion)" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(Configuration)' == 'Debug'"> <ItemGroup Condition="'$(Configuration)' == 'Debug'">

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

@ -39,16 +39,20 @@
<DefineConstants>TRACE;NET46;ROSLYN;CS60;CS70;CS71;CS72;CS73</DefineConstants> <DefineConstants>TRACE;NET46;ROSLYN;CS60;CS70;CS71;CS72;CS73</DefineConstants>
</PropertyGroup> </PropertyGroup>
<Import Project="..\packages.props" />
<ItemGroup> <ItemGroup>
<PackageReference Include="DiffLib" Version="2017.7.26.1241" /> <PackageReference Include="DiffLib" Version="$(DiffLibVersion)" />
<PackageReference Include="Microsoft.Build.Locator" Version="1.2.2" /> <PackageReference Include="Microsoft.Build.Locator" Version="1.2.2" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.8.0-3.final" /> <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="3.8.0-3.final" /> <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(RoslynVersion)" />
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="$(RoslynVersion)" />
<PackageReference Include="Microsoft.DiaSymReader.Converter.Xml" Version="1.1.0-beta1-63314-01" /> <PackageReference Include="Microsoft.DiaSymReader.Converter.Xml" Version="1.1.0-beta1-63314-01" />
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" /> <PackageReference Include="NUnit3TestAdapter" Version="$(NUnitAdapterVersion)" />
<PackageReference Include="NUnit" Version="3.12.0" /> <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
<PackageReference Include="System.Memory" Version="4.5.4" /> <PackageReference Include="System.Memory" Version="4.5.4" />
<PackageReference Include="Mono.Cecil" Version="0.10.3" /> <PackageReference Include="Mono.Cecil" Version="$(MonoCecilVersion)" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

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

@ -20,7 +20,7 @@
<AssemblyOriginatorKeyFile>ICSharpCode.Decompiler.snk</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>ICSharpCode.Decompiler.snk</AssemblyOriginatorKeyFile>
<NoWarn>1701;1702;1591;1573</NoWarn> <NoWarn>1701;1702;1591;1573</NoWarn>
</PropertyGroup> </PropertyGroup>
<!-- HACK: Disable package generation on Unix due to tooling issues. --> <!-- HACK: Disable package generation on Unix due to tooling issues. -->
<PropertyGroup Condition=" '$(OS)' == 'Windows_NT' "> <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
<GeneratePackageOnBuild>true</GeneratePackageOnBuild> <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@ -46,10 +46,12 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup> </PropertyGroup>
<Import Project="..\packages.props" />
<ItemGroup> <ItemGroup>
<PackageReference Include="Humanizer.Core" Version="2.2.0" /> <PackageReference Include="Humanizer.Core" Version="$(HumanizerVersion)" />
<PackageReference Include="System.Collections.Immutable" Version="5.0.0-preview.8.20371.14" /> <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
<PackageReference Include="System.Reflection.Metadata" Version="5.0.0-preview.8.20371.14" /> <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0"> <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@ -661,5 +663,5 @@
<Exec WorkingDirectory=".." Command="$(UpdateAssemblyInfo)" Timeout="60000" Condition="'$(CommitHash)'!='$(LastCommitHash)'" /> <Exec WorkingDirectory=".." Command="$(UpdateAssemblyInfo)" Timeout="60000" Condition="'$(CommitHash)'!='$(LastCommitHash)'" />
<WriteLinesToFile Lines="$(CommitHash)" File="@(UpdateAssemblyInfoStamp)" Overwrite="true" Condition="'$(CommitHash)'!='$(LastCommitHash)'" /> <WriteLinesToFile Lines="$(CommitHash)" File="@(UpdateAssemblyInfoStamp)" Overwrite="true" Condition="'$(CommitHash)'!='$(LastCommitHash)'" />
</Target> </Target>
</Project> </Project>

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

@ -41,12 +41,15 @@
<Reference Include="System.Design" /> <Reference Include="System.Design" />
</ItemGroup> </ItemGroup>
<Import Project="..\packages.props" />
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.VisualStudio.SDK " Version="15.9.3" /> <PackageReference Include="Microsoft.VisualStudio.SDK " Version="15.9.3" />
<!-- Intentionally using an old Roslyn version in the AddIn, so that we stay compatible with old VS versions. -->
<PackageReference Include="Microsoft.CodeAnalysis" Version="2.4.0" /> <PackageReference Include="Microsoft.CodeAnalysis" Version="2.4.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.4.0" /> <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.4.0" />
<PackageReference Include="Microsoft.VisualStudio.LanguageServices" Version="2.4.0" /> <PackageReference Include="Microsoft.VisualStudio.LanguageServices" Version="2.4.0" />
<PackageReference Include="Mono.Cecil" Version="0.10.3" /> <PackageReference Include="Mono.Cecil" Version="$(MonoCecilVersion)" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

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

@ -34,8 +34,10 @@
<Reference Include="WindowsBase" /> <Reference Include="WindowsBase" />
</ItemGroup> </ItemGroup>
<Import Project="..\packages.props" />
<ItemGroup> <ItemGroup>
<PackageReference Include="NUnit" Version="3.12.0" /> <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

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

@ -35,8 +35,10 @@
<Reference Include="WindowsBase" /> <Reference Include="WindowsBase" />
</ItemGroup> </ItemGroup>
<Import Project="..\packages.props" />
<ItemGroup> <ItemGroup>
<PackageReference Include="AvalonEdit" Version="6.1.0-preview1" /> <PackageReference Include="AvalonEdit" Version="$(AvalonEditVersion)" />
<PackageReference Include="System.Composition" Version="1.3.0" /> <PackageReference Include="System.Composition" Version="1.3.0" />
</ItemGroup> </ItemGroup>

16
ILSpy.Tests/ILSpy.Tests.csproj
Unescape View File

@ -44,13 +44,17 @@
<Compile Include="Stub.cs" /> <Compile Include="Stub.cs" />
</ItemGroup> </ItemGroup>
<Import Project="..\packages.props" />
<ItemGroup> <ItemGroup>
<PackageReference Include="DiffLib" Version="2017.7.26.1241" /> <PackageReference Include="DiffLib" Version="$(DiffLibVersion)" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.8.0-3.final" /> <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="3.8.0-3.final" /> <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" /> <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(RoslynVersion)" />
<PackageReference Include="NUnit" Version="3.11.0" /> <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="$(RoslynVersion)" />
<PackageReference Include="Moq" Version="4.14.1" /> <PackageReference Include="NUnit3TestAdapter" Version="$(NUnitAdapterVersion)" />
<PackageReference Include="NUnit" Version="$(NUnitVersion)" />
<PackageReference Include="Moq" Version="$(MoqVersion)" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

6
ILSpy/ILSpy.csproj
Unescape View File

@ -48,12 +48,14 @@
<Reference Include="WindowsBase" /> <Reference Include="WindowsBase" />
</ItemGroup> </ItemGroup>
<Import Project="..\packages.props" />
<ItemGroup> <ItemGroup>
<PackageReference Include="AvalonEdit" Version="6.1.0-preview1" /> <PackageReference Include="AvalonEdit" Version="$(AvalonEditVersion)" />
<PackageReference Include="Dirkster.AvalonDock" Version="3.6.1" /> <PackageReference Include="Dirkster.AvalonDock" Version="3.6.1" />
<PackageReference Include="Microsoft.VisualStudio.Composition" Version="16.3.7" /> <PackageReference Include="Microsoft.VisualStudio.Composition" Version="16.3.7" />
<PackageReference Include="System.Composition" Version="1.3.0" /> <PackageReference Include="System.Composition" Version="1.3.0" />
<PackageReference Include="Mono.Cecil" Version="0.10.3" /> <PackageReference Include="Mono.Cecil" Version="$(MonoCecilVersion)" />
<PackageReference Include="OSVersionHelper" Version="1.0.11" /> <PackageReference Include="OSVersionHelper" Version="1.0.11" />
<PackageReference Include="DataGridExtensions" Version="2.1.1" /> <PackageReference Include="DataGridExtensions" Version="2.1.1" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.19" /> <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.19" />

16
packages.props
Unescape View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<!-- Centrally define the versions of the NuGet packages we use -->
<PropertyGroup>
<HumanizerVersion>2.2.0</HumanizerVersion>
<SystemCollectionsImmutableVersion>5.0.0-preview.8.20407.11</SystemCollectionsImmutableVersion>
<SystemReflectionMetadataVersion>5.0.0-preview.8.20407.11</SystemReflectionMetadataVersion>
<RoslynVersion>3.8.0-3.final</RoslynVersion>
<MonoCecilVersion>0.10.3</MonoCecilVersion>
<AvalonEditVersion>6.1.0-preview1</AvalonEditVersion>
<NUnitVersion>3.12.0</NUnitVersion>
<NUnitAdapterVersion>3.13.0</NUnitAdapterVersion>
<MoqVersion>4.14.1</MoqVersion>
<DiffLibVersion>2017.7.26.1241</DiffLibVersion>
</PropertyGroup>
</Project>
Write Preview
Loading…
Cancel
Save