diff --git a/App.xaml.cs b/App.xaml.cs index 6729b69..a9cc55f 100644 --- a/App.xaml.cs +++ b/App.xaml.cs @@ -11,7 +11,7 @@ public partial class App : Application { private void AutoUpdater(object sender, StartupEventArgs e) { - string currentVersion = Version.version; + string currentVersion = Utilities.Version.version; string version; using (WebClient client = new WebClient()) diff --git a/MainWindow.xaml b/MainWindow.xaml index 843f5a0..55845e0 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -6,6 +6,7 @@ xmlns:local="clr-namespace:TFT_Overlay" xmlns:p="clr-namespace:TFT_Overlay.Properties" xmlns:vm="clr-namespace:TFT_Overlay.ViewModel" + xmlns:u="clr-namespace:TFT_Overlay.Utilities" mc:Ignorable="d" DataContext="{StaticResource Locator}" ResizeMode="CanResizeWithGrip" @@ -29,7 +30,7 @@ - + @@ -121,7 +122,7 @@ - + @@ -233,7 +234,7 @@ - + diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs index d46ae46..96dbff1 100644 --- a/MainWindow.xaml.cs +++ b/MainWindow.xaml.cs @@ -5,6 +5,7 @@ using System.Windows.Controls; using System.Windows.Input; using TFT_Overlay.Properties; +using TFT_Overlay.Utilities; namespace TFT_Overlay { @@ -17,7 +18,7 @@ public partial class MainWindow : Window private readonly Cursor LoLPointer = CustomCursor.FromByteArray(Properties.Resources.LoLPointer); private readonly Cursor LoLHover = CustomCursor.FromByteArray(Properties.Resources.LoLHover); - private string CurrentVersion { get; } = Version.version; + private string CurrentVersion { get; } = Utilities.Version.version; private bool OnTop { get; set; } = true; private bool canDrag; diff --git a/TFT Overlay.csproj b/TFT Overlay.csproj index b7ecf79..54be85e 100644 --- a/TFT Overlay.csproj +++ b/TFT Overlay.csproj @@ -1,6 +1,6 @@  - + Debug @@ -93,8 +93,8 @@ true - - packages\Costura.Fody.4.0.0\lib\net40\Costura.dll + + packages\Costura.Fody.3.3.3\lib\net40\Costura.dll packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.dll @@ -515,12 +515,12 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + \ No newline at end of file diff --git a/Utilities/ProcessHelper.cs b/Utilities/ProcessHelper.cs index 9a654a6..38371ef 100644 --- a/Utilities/ProcessHelper.cs +++ b/Utilities/ProcessHelper.cs @@ -2,7 +2,7 @@ using System.Diagnostics; using System.Runtime.InteropServices; -namespace TFT_Overlay +namespace TFT_Overlay.Utilities { public static class ProcessHelper { diff --git a/Utilities/RadioConverter.cs b/Utilities/RadioConverter.cs index ad45810..0eebfba 100644 --- a/Utilities/RadioConverter.cs +++ b/Utilities/RadioConverter.cs @@ -4,7 +4,7 @@ using System.Windows.Controls; using System.Windows.Data; -namespace TFT_Overlay +namespace TFT_Overlay.Utilities { public class RadioConverter : IValueConverter { diff --git a/Utilities/Version.cs b/Utilities/Version.cs index 66aa20c..2af7650 100644 --- a/Utilities/Version.cs +++ b/Utilities/Version.cs @@ -1,4 +1,4 @@ -namespace TFT_Overlay +namespace TFT_Overlay.Utilities { class Version { diff --git a/packages.config b/packages.config index b4acede..ddf8f0d 100644 --- a/packages.config +++ b/packages.config @@ -1,8 +1,8 @@  - - + +