Skip to content

Commit 2ea2f0d

Browse files
JulienKlugeJulienKluge
committed
Update all UI Components
1 parent 977c641 commit 2ea2f0d

File tree

4 files changed

+29
-21
lines changed

4 files changed

+29
-21
lines changed

‎App/AssemblyInfo1.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
// Revision
3232
//
3333
#if (DEBUG)
34-
[assembly: AssemblyVersion("1.12.*")]
34+
[assembly: AssemblyVersion("1.13.*")]
3535
#else
36-
[assembly: AssemblyVersion("1.2.0.2")]
36+
[assembly: AssemblyVersion("1.2.0.3")]
3737
#endif

‎Spedit.csproj

+23-15
Original file line numberDiff line numberDiff line change
@@ -75,17 +75,14 @@
7575
<None Include="Resources\Misc\Templates\TFTemplate.sp" />
7676
</ItemGroup>
7777
<ItemGroup>
78+
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
79+
<HintPath>packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
80+
</Reference>
7881
<Reference Include="ICSharpCode.AvalonEdit, Version=5.0.3.0, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
79-
<HintPath>packages\AvalonEdit.5.0.3\lib\Net40\ICSharpCode.AvalonEdit.dll</HintPath>
80-
<Private>True</Private>
82+
<HintPath>packages\AvalonEdit.5.0.4\lib\Net40\ICSharpCode.AvalonEdit.dll</HintPath>
8183
</Reference>
82-
<Reference Include="MahApps.Metro, Version=1.3.0.0, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL">
83-
<HintPath>packages\MahApps.Metro.1.3.0\lib\net45\MahApps.Metro.dll</HintPath>
84-
<Private>True</Private>
85-
</Reference>
86-
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
87-
<HintPath>packages\MahApps.Metro.1.3.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
88-
<Private>True</Private>
84+
<Reference Include="MahApps.Metro, Version=1.6.5.1, Culture=neutral, processorArchitecture=MSIL">
85+
<HintPath>packages\MahApps.Metro.1.6.5\lib\net45\MahApps.Metro.dll</HintPath>
8986
</Reference>
9087
<Reference Include="PresentationCore" />
9188
<Reference Include="PresentationFramework" />
@@ -99,16 +96,27 @@
9996
<Reference Include="System.Drawing" />
10097
<Reference Include="System.Management" />
10198
<Reference Include="System.Windows.Forms" />
99+
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
100+
<HintPath>packages\ControlzEx.3.0.2.4\lib\net45\System.Windows.Interactivity.dll</HintPath>
101+
<Private>True</Private>
102+
</Reference>
102103
<Reference Include="System.Xaml" />
103104
<Reference Include="System.XML" />
104105
<Reference Include="WindowsBase" />
105-
<Reference Include="Xceed.Wpf.AvalonDock, Version=2.9.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
106-
<HintPath>packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
107-
<Private>True</Private>
106+
<Reference Include="Xceed.Wpf.AvalonDock, Version=3.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
107+
<HintPath>packages\Extended.Wpf.Toolkit.3.5.0\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
108108
</Reference>
109-
<Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=2.9.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
110-
<HintPath>packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
111-
<Private>True</Private>
109+
<Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=3.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
110+
<HintPath>packages\Extended.Wpf.Toolkit.3.5.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
111+
</Reference>
112+
<Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=3.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
113+
<HintPath>packages\Extended.Wpf.Toolkit.3.5.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
114+
</Reference>
115+
<Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=3.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
116+
<HintPath>packages\Extended.Wpf.Toolkit.3.5.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
117+
</Reference>
118+
<Reference Include="Xceed.Wpf.Toolkit, Version=3.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
119+
<HintPath>packages\Extended.Wpf.Toolkit.3.5.0\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
112120
</Reference>
113121
</ItemGroup>
114122
<ItemGroup>

‎UI/Windows/ConfigWindow.xaml

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<controls:MetroWindow x:Class="Spedit.UI.Windows.ConfigWindow"
22
xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
3-
xmlns:textBoxControls="clr-namespace:MahApps.Metro.Native;assembly=MahApps.Metro"
43
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
54
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
65
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

‎packages.config

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AvalonEdit" version="5.0.3" targetFramework="net45" />
4-
<package id="Extended.Wpf.Toolkit" version="2.9" targetFramework="net45" />
5-
<package id="MahApps.Metro" version="1.3.0" targetFramework="net45" />
3+
<package id="AvalonEdit" version="5.0.4" targetFramework="net45" />
4+
<package id="ControlzEx" version="3.0.2.4" targetFramework="net45" />
5+
<package id="Extended.Wpf.Toolkit" version="3.5.0" targetFramework="net45" />
6+
<package id="MahApps.Metro" version="1.6.5" targetFramework="net45" />
67
</packages>

0 commit comments

Comments
 (0)