Skip to content
This repository was archived by the owner on Sep 11, 2023. It is now read-only.

Commit 3c4985d

Browse files
committed
Revert "revert"
This reverts commit 556f9d7.
1 parent 556f9d7 commit 3c4985d

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

Spcode.csproj

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,20 @@
119119
<Reference Include="System.Xaml" />
120120
<Reference Include="System.XML" />
121121
<Reference Include="WindowsBase" />
122-
<Reference Include="Xceed.Wpf.AvalonDock, Version=2.9.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
123-
<HintPath>packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
124-
<Private>True</Private>
122+
<Reference Include="Xceed.Wpf.AvalonDock, Version=4.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
123+
<HintPath>packages\Extended.Wpf.Toolkit.4.0.2\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
125124
</Reference>
126-
<Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=2.9.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
127-
<HintPath>packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
128-
<Private>True</Private>
125+
<Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=4.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
126+
<HintPath>packages\Extended.Wpf.Toolkit.4.0.2\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
127+
</Reference>
128+
<Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=4.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
129+
<HintPath>packages\Extended.Wpf.Toolkit.4.0.2\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
130+
</Reference>
131+
<Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=4.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
132+
<HintPath>packages\Extended.Wpf.Toolkit.4.0.2\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
133+
</Reference>
134+
<Reference Include="Xceed.Wpf.Toolkit, Version=4.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
135+
<HintPath>packages\Extended.Wpf.Toolkit.4.0.2\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
129136
</Reference>
130137
</ItemGroup>
131138
<ItemGroup>

packages.config

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="AvalonEdit" version="6.0.1" targetFramework="net45" />
4-
<package id="MahApps.Metro" version="1.6.5" targetFramework="net45" />
54
<package id="ControlzEx" version="3.0.2.4" targetFramework="net45" />
6-
<<<<<<< HEAD
75
<package id="DiscordRichPresence" version="1.0.175" targetFramework="net48" />
86
<package id="Extended.Wpf.Toolkit" version="4.0.2" targetFramework="net48" />
97
<package id="MahApps.Metro" version="1.6.5" targetFramework="net45" />
10-
=======
11-
<package id="DiscordRichPresence" version="1.0.150" targetFramework="net45" />
12-
<package id="Extended.Wpf.Toolkit" version="2.9" targetFramework="net45" />
13-
>>>>>>> parent of 898acf8... nuget update - extended wpf toolkit
148
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net45" />
159
<package id="Octokit" version="0.48.0" targetFramework="net48" />
1610
<package id="SSH.NET" version="2020.0.1" targetFramework="net48" />

0 commit comments

Comments
 (0)