Utilities stuff, downgraded Fody

Just2good · Jul 13, 2019 · 3421379 · 3421379
1 parent 83dc23a
commit 3421379
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 16 deletions.
diff --git 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
@@ -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 @@
                     <!--IfChecked = Visible, Unchecked = Hidden-->
                     <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
                     <!--RadioButton Converter (Group Across All Tabs)-->
-                    <local:RadioConverter x:Key="RadioConverter"/>
+                    <u:RadioConverter x:Key="RadioConverter"/>
                 </DataTemplate.Resources>
                 <!-- The Buttons and Tabs that make up the Bar.  The Hypothetical Plate! -->
                 <Viewbox HorizontalAlignment="Left" VerticalAlignment="Top">
@@ -121,7 +122,7 @@
                             <Slider Name="OpacitySlider" Margin="8 0 0 0" HorizontalAlignment="Left" VerticalAlignment="Center" Grid.Row="0" Minimum="0.01" Maximum="1" Orientation="Horizontal" Value="{Binding Source={x:Static p:Settings.Default}, Path=Opacity, Mode=TwoWay}" Style="{DynamicResource Custom_Slider}" ToolTip="Opacity"></Slider>
                             <ResizeGrip Grid.Column="0" Grid.Row="1" HorizontalAlignment="Right" VerticalAlignment="Top" Visibility="{Binding IsChecked, ElementName=ResizeLock, Converter={StaticResource BooleanToVisibilityConverter}}" Style="{DynamicResource VisibleResizeGrip}" Cursor="{DynamicResource LoLNormal}"/>
                             <!--Start of Tabs-->
-                            <local:TabControlRadio Background="Transparent" BorderThickness="0" x:Name="RadioTabs" Grid.Row="1">
+                            <u:TabControlRadio Background="Transparent" BorderThickness="0" x:Name="RadioTabs" Grid.Row="1">
                                 <!-- Main Tab -->
                                 <TabItem x:Name="MainTab" Header="MAIN" Style="{DynamicResource Tabstyle}">
                                     <WrapPanel>
@@ -233,7 +234,7 @@
                                         <local:ItemsCounter x:Name="SpatulaCounter" MaxValue="10" MinValue="0" />
                                     </WrapPanel>
                                 </TabItem>
-                            </local:TabControlRadio>
+                            </u:TabControlRadio>
                             <!--2nd Frame and Linking Multiple Elements (Modifier)-->
                             <local:OptionalRadioButton Height="0" Width="0" x:Name="Modifier"></local:OptionalRadioButton>
                             <Frame Grid.Column="0" Grid.Row="2" x:Name="Frame" Height="Auto" Width="Auto" HorizontalAlignment="Center" VerticalAlignment="Top"/>

diff --git 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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="packages\Costura.Fody.4.0.0\build\Costura.Fody.props" Condition="Exists('packages\Costura.Fody.4.0.0\build\Costura.Fody.props')" />
+  <Import Project="packages\Costura.Fody.3.3.3\build\Costura.Fody.props" Condition="Exists('packages\Costura.Fody.3.3.3\build\Costura.Fody.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -93,8 +93,8 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Costura, Version=4.0.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
-      <HintPath>packages\Costura.Fody.4.0.0\lib\net40\Costura.dll</HintPath>
+    <Reference Include="Costura, Version=3.3.3.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
+      <HintPath>packages\Costura.Fody.3.3.3\lib\net40\Costura.dll</HintPath>
     </Reference>
     <Reference Include="GalaSoft.MvvmLight, Version=5.3.0.19026, Culture=neutral, PublicKeyToken=e7570ab207bcb616, processorArchitecture=MSIL">
       <HintPath>packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.dll</HintPath>
@@ -515,12 +515,12 @@
     <Resource Include="Images\Rounds\carousel.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="packages\Fody.5.0.0\build\Fody.targets" Condition="Exists('packages\Fody.5.0.0\build\Fody.targets')" />
+  <Import Project="packages\Fody.4.2.1\build\Fody.targets" Condition="Exists('packages\Fody.4.2.1\build\Fody.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>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}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('packages\Fody.5.0.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Fody.5.0.0\build\Fody.targets'))" />
-    <Error Condition="!Exists('packages\Costura.Fody.4.0.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Costura.Fody.4.0.0\build\Costura.Fody.props'))" />
+    <Error Condition="!Exists('packages\Fody.4.2.1\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Fody.4.2.1\build\Fody.targets'))" />
+    <Error Condition="!Exists('packages\Costura.Fody.3.3.3\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Costura.Fody.3.3.3\build\Costura.Fody.props'))" />
   </Target>
 </Project>
diff --git 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
@@ -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
@@ -1,4 +1,4 @@
-namespace TFT_Overlay
+namespace TFT_Overlay.Utilities
 {
     class Version
     {

diff --git a/packages.config b/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CommonServiceLocator" version="1.3" targetFramework="net461" />
-  <package id="Costura.Fody" version="4.0.0" targetFramework="net461" />
-  <package id="Fody" version="5.0.0" targetFramework="net461" developmentDependency="true" />
+  <package id="Costura.Fody" version="3.3.3" targetFramework="net461" />
+  <package id="Fody" version="4.2.1" targetFramework="net461" developmentDependency="true" />
   <package id="Microsoft.VisualStudio.Utilities" version="16.1.28917.181" targetFramework="net461" />
   <package id="MvvmLight" version="5.3.0.0" targetFramework="net461" />
   <package id="MvvmLightLibs" version="5.3.0.0" targetFramework="net461" />