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

Commit 556f9d7

Browse files
committed
revert
1 parent eff49c7 commit 556f9d7

File tree

2 files changed

+12
-13
lines changed

2 files changed

+12
-13
lines changed

Spcode.csproj

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -119,20 +119,13 @@
119119
<Reference Include="System.Xaml" />
120120
<Reference Include="System.XML" />
121121
<Reference Include="WindowsBase" />
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>
124-
</Reference>
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>
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>
133125
</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>
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>
136129
</Reference>
137130
</ItemGroup>
138131
<ItemGroup>

packages.config

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
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" />
45
<package id="ControlzEx" version="3.0.2.4" targetFramework="net45" />
6+
<<<<<<< HEAD
57
<package id="DiscordRichPresence" version="1.0.175" targetFramework="net48" />
68
<package id="Extended.Wpf.Toolkit" version="4.0.2" targetFramework="net48" />
79
<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
814
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net45" />
915
<package id="Octokit" version="0.48.0" targetFramework="net48" />
1016
<package id="SSH.NET" version="2020.0.1" targetFramework="net48" />

0 commit comments

Comments
 (0)