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 #2309 from icsharpcode/update-nugets 

Update nuget packages
pull/2316/head
Christoph Wille 4 years ago committed by GitHub
parent
d055dc784b 43143a0cb7
commit
3d0ac99c5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 18 additions and 16 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. 2
      ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj
  2. 2
      ILSpy/Docking/DockLayoutSettings.cs
  3. 9
      ILSpy/Docking/DockWorkspace.cs
  4. 10
      ILSpy/ILSpy.csproj
  5. 2
      ILSpy/MainWindow.xaml
  6. 4
      ILSpy/MainWindow.xaml.cs
  7. 2
      TestPlugin/Properties/launchSettings.json
  8. 3
      packages.props

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

@ -39,7 +39,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AvalonEdit" Version="$(AvalonEditVersion)" /> <PackageReference Include="AvalonEdit" Version="$(AvalonEditVersion)" />
<PackageReference Include="System.Composition" Version="1.3.0" /> <PackageReference Include="System.Composition" Version="$(SystemCompositionVersion)" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
ILSpy/Docking/DockLayoutSettings.cs
Unescape View File

@ -22,7 +22,7 @@ using System.Linq;
using System.Xml; using System.Xml;
using System.Xml.Linq; using System.Xml.Linq;
using Xceed.Wpf.AvalonDock.Layout.Serialization; using AvalonDock.Layout.Serialization;
namespace ICSharpCode.ILSpy.Docking namespace ICSharpCode.ILSpy.Docking
{ {

9
ILSpy/Docking/DockWorkspace.cs
Unescape View File

@ -29,13 +29,14 @@ using System.Threading.Tasks;
using System.Windows.Navigation; using System.Windows.Navigation;
using System.Windows.Threading; using System.Windows.Threading;
using AvalonDock;
using AvalonDock.Layout;
using AvalonDock.Layout.Serialization;
using ICSharpCode.AvalonEdit.Highlighting; using ICSharpCode.AvalonEdit.Highlighting;
using ICSharpCode.ILSpy.TextView; using ICSharpCode.ILSpy.TextView;
using ICSharpCode.ILSpy.ViewModels; using ICSharpCode.ILSpy.ViewModels;
using Xceed.Wpf.AvalonDock.Layout;
using Xceed.Wpf.AvalonDock.Layout.Serialization;
namespace ICSharpCode.ILSpy.Docking namespace ICSharpCode.ILSpy.Docking
{ {
public class DockWorkspace : INotifyPropertyChanged, ILayoutUpdateStrategy public class DockWorkspace : INotifyPropertyChanged, ILayoutUpdateStrategy
@ -109,7 +110,7 @@ namespace ICSharpCode.ILSpy.Docking
} }
} }
public void InitializeLayout(Xceed.Wpf.AvalonDock.DockingManager manager) public void InitializeLayout(DockingManager manager)
{ {
manager.LayoutUpdateStrategy = this; manager.LayoutUpdateStrategy = this;
XmlLayoutSerializer serializer = new XmlLayoutSerializer(manager); XmlLayoutSerializer serializer = new XmlLayoutSerializer(manager);

10
ILSpy/ILSpy.csproj
Unescape View File

@ -54,13 +54,13 @@
<PackageReference Include="AvalonEdit" Version="$(AvalonEditVersion)" /> <PackageReference Include="AvalonEdit" Version="$(AvalonEditVersion)" />
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" /> <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemCompilerServicesUnsafeVersion)" /> <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemCompilerServicesUnsafeVersion)" />
<PackageReference Include="Dirkster.AvalonDock" Version="3.6.1" /> <PackageReference Include="Dirkster.AvalonDock" Version="4.50.1" />
<PackageReference Include="Microsoft.VisualStudio.Composition" Version="16.9.6-alpha" /> <PackageReference Include="Microsoft.VisualStudio.Composition" Version="16.9.6-alpha" />
<PackageReference Include="System.Composition" Version="1.3.0" /> <PackageReference Include="System.Composition" Version="$(SystemCompositionVersion)" />
<PackageReference Include="Mono.Cecil" Version="$(MonoCecilVersion)" /> <PackageReference Include="Mono.Cecil" Version="$(MonoCecilVersion)" />
<PackageReference Include="OSVersionHelper" Version="1.0.11" /> <PackageReference Include="OSVersionHelper" Version="1.1.24" />
<PackageReference Include="DataGridExtensions" Version="2.1.1" /> <PackageReference Include="DataGridExtensions" Version="2.5.0" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.19" /> <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.31" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
ILSpy/MainWindow.xaml
Unescape View File

@ -4,7 +4,7 @@
x:ClassModifier="public" x:ClassModifier="public"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:tv="clr-namespace:ICSharpCode.TreeView;assembly=ICSharpCode.TreeView" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:tv="clr-namespace:ICSharpCode.TreeView;assembly=ICSharpCode.TreeView"
xmlns:local="clr-namespace:ICSharpCode.ILSpy" xmlns:local="clr-namespace:ICSharpCode.ILSpy"
xmlns:avalondock="http://schemas.xceed.com/wpf/xaml/avalondock" xmlns:avalondock="https://github.com/Dirkster99/AvalonDock"
xmlns:controls="clr-namespace:ICSharpCode.ILSpy.Controls" xmlns:controls="clr-namespace:ICSharpCode.ILSpy.Controls"
xmlns:docking="clr-namespace:ICSharpCode.ILSpy.Docking" xmlns:docking="clr-namespace:ICSharpCode.ILSpy.Docking"
xmlns:textview="clr-namespace:ICSharpCode.ILSpy.TextView" xmlns:textview="clr-namespace:ICSharpCode.ILSpy.TextView"

4
ILSpy/MainWindow.xaml.cs
Unescape View File

@ -36,6 +36,8 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation; using System.Windows.Navigation;
using System.Windows.Threading; using System.Windows.Threading;
using AvalonDock.Layout.Serialization;
using ICSharpCode.Decompiler; using ICSharpCode.Decompiler;
using ICSharpCode.Decompiler.Documentation; using ICSharpCode.Decompiler.Documentation;
using ICSharpCode.Decompiler.Metadata; using ICSharpCode.Decompiler.Metadata;
@ -52,8 +54,6 @@ using Microsoft.Win32;
using OSVersionHelper; using OSVersionHelper;
using Xceed.Wpf.AvalonDock.Layout.Serialization;
namespace ICSharpCode.ILSpy namespace ICSharpCode.ILSpy
{ {
class MainWindowDataContext class MainWindowDataContext

2
TestPlugin/Properties/launchSettings.json
Unescape View File

@ -2,7 +2,7 @@
"profiles": { "profiles": {
"TestPlugin": { "TestPlugin": {
"commandName": "Executable", "commandName": "Executable",
"executablePath": "$(OutDir)ILSpy.exe", "executablePath": ".\\ILSpy.exe",
"commandLineArgs": "/separate" "commandLineArgs": "/separate"
} }
} }

3
packages.props
Unescape View File

@ -8,9 +8,10 @@
<SystemCollectionsImmutableVersion>5.0.0</SystemCollectionsImmutableVersion> <SystemCollectionsImmutableVersion>5.0.0</SystemCollectionsImmutableVersion>
<SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion> <SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion>
<SystemCompilerServicesUnsafeVersion>5.0.0</SystemCompilerServicesUnsafeVersion> <SystemCompilerServicesUnsafeVersion>5.0.0</SystemCompilerServicesUnsafeVersion>
<SystemCompositionVersion>5.0.1</SystemCompositionVersion>
<ILAsmVersion>5.0.0</ILAsmVersion> <!-- Microsoft.NETCore.ILAsm --> <ILAsmVersion>5.0.0</ILAsmVersion> <!-- Microsoft.NETCore.ILAsm -->
<RoslynVersion>3.8.0</RoslynVersion> <!-- Microsoft.CodeAnalysis.* --> <RoslynVersion>3.8.0</RoslynVersion> <!-- Microsoft.CodeAnalysis.* -->
<MonoCecilVersion>0.10.3</MonoCecilVersion> <MonoCecilVersion>0.11.3</MonoCecilVersion>
<AvalonEditVersion>6.1.0-preview1</AvalonEditVersion> <AvalonEditVersion>6.1.0-preview1</AvalonEditVersion>
<NUnitVersion>3.12.0</NUnitVersion> <NUnitVersion>3.12.0</NUnitVersion>
<NUnitAdapterVersion>3.13.0</NUnitAdapterVersion> <NUnitAdapterVersion>3.13.0</NUnitAdapterVersion>

Write Preview
Loading…
Cancel
Save