From e2ed6e0fb8d4481cde70f8f9e4f514816b21be17 Mon Sep 17 00:00:00 2001 From: dexy Date: Mon, 24 Feb 2020 21:25:52 +1100 Subject: [PATCH] Update all projects to .net 4.7.2. Updated all nuget packages to latest version. Removed packages.config from CodeWalker.Core --- App.config | 31 ++++++------ CodeWalker.Core/CodeWalker.Core.csproj | 17 +++---- .../Properties/Resources.Designer.cs | 2 +- CodeWalker.Core/packages.config | 5 -- CodeWalker.ErrorReport/App.config | 6 +-- .../CodeWalker.ErrorReport.csproj | 4 +- .../Properties/Resources.Designer.cs | 44 +++++++---------- .../Properties/Settings.Designer.cs | 22 ++++----- CodeWalker.Peds/CodeWalker.Peds.csproj | 7 ++- .../Properties/Resources.Designer.cs | 44 +++++++---------- CodeWalker.Peds/app.config | 3 ++ .../CodeWalker.RPFExplorer.csproj | 5 +- .../Properties/Resources.Designer.cs | 2 +- CodeWalker.RPFExplorer/app.config | 3 ++ .../CodeWalker.Vehicles.csproj | 7 ++- .../Properties/Resources.Designer.cs | 44 +++++++---------- CodeWalker.Vehicles/app.config | 3 ++ .../CodeWalker.WinForms.csproj | 15 +++--- CodeWalker.WinForms/app.config | 8 ++-- CodeWalker.WinForms/packages.config | 5 -- CodeWalker.csproj | 47 +++++++------------ Properties/Resources.Designer.cs | 2 +- Properties/Settings.Designer.cs | 2 +- packages.config | 22 ++++----- 24 files changed, 162 insertions(+), 188 deletions(-) delete mode 100644 CodeWalker.Core/packages.config create mode 100644 CodeWalker.Peds/app.config create mode 100644 CodeWalker.RPFExplorer/app.config create mode 100644 CodeWalker.Vehicles/app.config delete mode 100644 CodeWalker.WinForms/packages.config diff --git a/App.config b/App.config index acaa339..88f9f89 100644 --- a/App.config +++ b/App.config @@ -1,38 +1,38 @@ - + -
+
- + - + C:\Program Files (x86)\Steam\SteamApps\common\Grand Theft Auto V - + - + - + - + - + - + False @@ -149,12 +149,11 @@ False - + - + Move Forwards: W Move Backwards: S Move Left: A @@ -219,9 +218,9 @@ - - + + - \ No newline at end of file + diff --git a/CodeWalker.Core/CodeWalker.Core.csproj b/CodeWalker.Core/CodeWalker.Core.csproj index 045ff6e..67b2eb9 100644 --- a/CodeWalker.Core/CodeWalker.Core.csproj +++ b/CodeWalker.Core/CodeWalker.Core.csproj @@ -9,7 +9,7 @@ Properties CodeWalker.Core CodeWalker.Core - v4.5.2 + v4.7.2 512 @@ -31,12 +31,6 @@ 4 - - ..\packages\SharpDX.4.0.1\lib\net45\SharpDX.dll - - - ..\packages\SharpDX.Mathematics.4.0.1\lib\net45\SharpDX.Mathematics.dll - @@ -158,7 +152,6 @@ - @@ -167,5 +160,13 @@ Resources.Designer.cs + + + 4.2.0 + + + 4.2.0 + + \ No newline at end of file diff --git a/CodeWalker.Core/Properties/Resources.Designer.cs b/CodeWalker.Core/Properties/Resources.Designer.cs index 252a5db..fdfb473 100644 --- a/CodeWalker.Core/Properties/Resources.Designer.cs +++ b/CodeWalker.Core/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace CodeWalker.Core.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/CodeWalker.Core/packages.config b/CodeWalker.Core/packages.config deleted file mode 100644 index 92b7713..0000000 --- a/CodeWalker.Core/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/CodeWalker.ErrorReport/App.config b/CodeWalker.ErrorReport/App.config index 88fa402..ecdcf8a 100644 --- a/CodeWalker.ErrorReport/App.config +++ b/CodeWalker.ErrorReport/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/CodeWalker.ErrorReport/CodeWalker.ErrorReport.csproj b/CodeWalker.ErrorReport/CodeWalker.ErrorReport.csproj index 2501e55..763667f 100644 --- a/CodeWalker.ErrorReport/CodeWalker.ErrorReport.csproj +++ b/CodeWalker.ErrorReport/CodeWalker.ErrorReport.csproj @@ -8,9 +8,10 @@ WinExe CodeWalker.ErrorReport CodeWalker Error Report Tool - v4.5.2 + v4.7.2 512 true + AnyCPU @@ -67,6 +68,7 @@ True Resources.resx + True SettingsSingleFileGenerator diff --git a/CodeWalker.ErrorReport/Properties/Resources.Designer.cs b/CodeWalker.ErrorReport/Properties/Resources.Designer.cs index c53a407..46ec2eb 100644 --- a/CodeWalker.ErrorReport/Properties/Resources.Designer.cs +++ b/CodeWalker.ErrorReport/Properties/Resources.Designer.cs @@ -8,10 +8,10 @@ // //------------------------------------------------------------------------------ -namespace CodeWalker.ErrorReport.Properties -{ - - +namespace CodeWalker.ErrorReport.Properties { + using System; + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -19,51 +19,43 @@ namespace CodeWalker.ErrorReport.Properties // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - + internal class Resources { + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { + internal Resources() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CodeWalker.ErrorReport.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { + internal static global::System.Globalization.CultureInfo Culture { + get { return resourceCulture; } - set - { + set { resourceCulture = value; } } diff --git a/CodeWalker.ErrorReport/Properties/Settings.Designer.cs b/CodeWalker.ErrorReport/Properties/Settings.Designer.cs index f7cede3..f9a1b2a 100644 --- a/CodeWalker.ErrorReport/Properties/Settings.Designer.cs +++ b/CodeWalker.ErrorReport/Properties/Settings.Designer.cs @@ -8,21 +8,17 @@ // //------------------------------------------------------------------------------ -namespace CodeWalker.ErrorReport.Properties -{ - - +namespace CodeWalker.ErrorReport.Properties { + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { + + public static Settings Default { + get { return defaultInstance; } } diff --git a/CodeWalker.Peds/CodeWalker.Peds.csproj b/CodeWalker.Peds/CodeWalker.Peds.csproj index e69684e..760d62b 100644 --- a/CodeWalker.Peds/CodeWalker.Peds.csproj +++ b/CodeWalker.Peds/CodeWalker.Peds.csproj @@ -8,10 +8,11 @@ WinExe CodeWalker.Peds CodeWalker Ped Viewer - v4.5.2 + v4.7.2 512 true true + AnyCPU @@ -59,6 +60,7 @@ True Resources.resx + True @@ -74,5 +76,8 @@ CodeWalker + + + \ No newline at end of file diff --git a/CodeWalker.Peds/Properties/Resources.Designer.cs b/CodeWalker.Peds/Properties/Resources.Designer.cs index 67f6e71..3955c76 100644 --- a/CodeWalker.Peds/Properties/Resources.Designer.cs +++ b/CodeWalker.Peds/Properties/Resources.Designer.cs @@ -8,10 +8,10 @@ // //------------------------------------------------------------------------------ -namespace CodeWalker.Peds.Properties -{ - - +namespace CodeWalker.Peds.Properties { + using System; + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -19,51 +19,43 @@ namespace CodeWalker.Peds.Properties // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - + internal class Resources { + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { + internal Resources() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CodeWalker.Peds.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { + internal static global::System.Globalization.CultureInfo Culture { + get { return resourceCulture; } - set - { + set { resourceCulture = value; } } diff --git a/CodeWalker.Peds/app.config b/CodeWalker.Peds/app.config new file mode 100644 index 0000000..312bb3f --- /dev/null +++ b/CodeWalker.Peds/app.config @@ -0,0 +1,3 @@ + + + diff --git a/CodeWalker.RPFExplorer/CodeWalker.RPFExplorer.csproj b/CodeWalker.RPFExplorer/CodeWalker.RPFExplorer.csproj index 8bbf6ff..29893f2 100644 --- a/CodeWalker.RPFExplorer/CodeWalker.RPFExplorer.csproj +++ b/CodeWalker.RPFExplorer/CodeWalker.RPFExplorer.csproj @@ -8,7 +8,7 @@ WinExe CodeWalker.RPFExplorer CodeWalker RPF Explorer - v4.5.2 + v4.7.2 512 true true @@ -104,5 +104,8 @@ false + + + \ No newline at end of file diff --git a/CodeWalker.RPFExplorer/Properties/Resources.Designer.cs b/CodeWalker.RPFExplorer/Properties/Resources.Designer.cs index ff9d3a7..b8a423b 100644 --- a/CodeWalker.RPFExplorer/Properties/Resources.Designer.cs +++ b/CodeWalker.RPFExplorer/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace CodeWalker.RPFExplorer.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/CodeWalker.RPFExplorer/app.config b/CodeWalker.RPFExplorer/app.config new file mode 100644 index 0000000..312bb3f --- /dev/null +++ b/CodeWalker.RPFExplorer/app.config @@ -0,0 +1,3 @@ + + + diff --git a/CodeWalker.Vehicles/CodeWalker.Vehicles.csproj b/CodeWalker.Vehicles/CodeWalker.Vehicles.csproj index e607289..5f0671a 100644 --- a/CodeWalker.Vehicles/CodeWalker.Vehicles.csproj +++ b/CodeWalker.Vehicles/CodeWalker.Vehicles.csproj @@ -8,10 +8,11 @@ WinExe CodeWalker.Vehicles CodeWalker Vehicle Viewer - v4.5.2 + v4.7.2 512 true true + AnyCPU @@ -59,6 +60,7 @@ True Resources.resx + True @@ -74,5 +76,8 @@ + + + \ No newline at end of file diff --git a/CodeWalker.Vehicles/Properties/Resources.Designer.cs b/CodeWalker.Vehicles/Properties/Resources.Designer.cs index a7005d5..57a9a0f 100644 --- a/CodeWalker.Vehicles/Properties/Resources.Designer.cs +++ b/CodeWalker.Vehicles/Properties/Resources.Designer.cs @@ -8,10 +8,10 @@ // //------------------------------------------------------------------------------ -namespace CodeWalker.Vehicles.Properties -{ - - +namespace CodeWalker.Vehicles.Properties { + using System; + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -19,51 +19,43 @@ namespace CodeWalker.Vehicles.Properties // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - + internal class Resources { + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { + internal Resources() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CodeWalker.Vehicles.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { + internal static global::System.Globalization.CultureInfo Culture { + get { return resourceCulture; } - set - { + set { resourceCulture = value; } } diff --git a/CodeWalker.Vehicles/app.config b/CodeWalker.Vehicles/app.config new file mode 100644 index 0000000..312bb3f --- /dev/null +++ b/CodeWalker.Vehicles/app.config @@ -0,0 +1,3 @@ + + + diff --git a/CodeWalker.WinForms/CodeWalker.WinForms.csproj b/CodeWalker.WinForms/CodeWalker.WinForms.csproj index 4e73fa3..5f1b610 100644 --- a/CodeWalker.WinForms/CodeWalker.WinForms.csproj +++ b/CodeWalker.WinForms/CodeWalker.WinForms.csproj @@ -9,8 +9,9 @@ Properties CodeWalker.WinForms CodeWalker.WinForms - v4.5.2 + v4.7.2 512 + true @@ -40,12 +41,6 @@ - - ..\packages\DockPanelSuite.3.0.6\lib\net40\WeifenLuo.WinFormsUI.Docking.dll - - - ..\packages\DockPanelSuite.ThemeVS2015.3.0.6\lib\net40\WeifenLuo.WinFormsUI.Docking.ThemeVS2015.dll - @@ -110,7 +105,11 @@ - + + + + 3.0.6 +