From 86a0d8f95e14a202d1e13cb60128c9d913f711b0 Mon Sep 17 00:00:00 2001 From: Alexander Zeier Date: Sat, 25 Apr 2020 11:07:13 -0700 Subject: [PATCH] Upgrade to .NET Framework 4.7.2 --- HDTTests/HDTTests.csproj | 4 +- HDTTests/app.config | 14 +++ HDTUninstaller/App.config | 6 +- HDTUninstaller/HDTUninstaller.csproj | 3 +- .../Properties/Resources.Designer.cs | 114 ++++++++---------- .../Properties/Settings.Designer.cs | 36 +++--- HDTUpdate/App.config | 6 +- HDTUpdate/HDTUpdate.csproj | 5 +- HearthWatcher.Test/HearthWatcher.Test.csproj | 2 +- HearthWatcher/HearthWatcher.csproj | 2 +- Hearthstone Deck Tracker/App.config | 4 +- .../Hearthstone Deck Tracker.csproj | 5 +- .../Properties/Settings.Designer.cs | 4 +- ResourceGenerator/App.config | 14 ++- ResourceGenerator/ResourceGenerator.csproj | 3 +- build-scripts/full.ps1 | 2 +- build-scripts/hdt.nuspec | 4 +- 17 files changed, 122 insertions(+), 106 deletions(-) create mode 100644 HDTTests/app.config diff --git a/HDTTests/HDTTests.csproj b/HDTTests/HDTTests.csproj index d194e5d27f..7d410a0bae 100644 --- a/HDTTests/HDTTests.csproj +++ b/HDTTests/HDTTests.csproj @@ -8,7 +8,7 @@ Properties HDTTests HDTTests - v4.5 + v4.7.2 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 10.0 @@ -16,6 +16,7 @@ $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages False UnitTest + true @@ -133,6 +134,7 @@ + diff --git a/HDTTests/app.config b/HDTTests/app.config new file mode 100644 index 0000000000..eaeff896ab --- /dev/null +++ b/HDTTests/app.config @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/HDTUninstaller/App.config b/HDTUninstaller/App.config index 8e15646352..ecdcf8a54d 100644 --- a/HDTUninstaller/App.config +++ b/HDTUninstaller/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/HDTUninstaller/HDTUninstaller.csproj b/HDTUninstaller/HDTUninstaller.csproj index ead9d62178..1328e3a711 100644 --- a/HDTUninstaller/HDTUninstaller.csproj +++ b/HDTUninstaller/HDTUninstaller.csproj @@ -9,10 +9,11 @@ Properties HDTUninstaller HDTUninstaller - v4.5 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 + AnyCPU diff --git a/HDTUninstaller/Properties/Resources.Designer.cs b/HDTUninstaller/Properties/Resources.Designer.cs index 09f391c3f1..8b10a32a6f 100644 --- a/HDTUninstaller/Properties/Resources.Designer.cs +++ b/HDTUninstaller/Properties/Resources.Designer.cs @@ -1,71 +1,63 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34014 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // //------------------------------------------------------------------------------ -namespace HDTUninstaller.Properties -{ - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // 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.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - 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() - { - } - - /// - /// 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)) - { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("HDTUninstaller.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 - { - return resourceCulture; - } - set - { - resourceCulture = value; - } - } - } +namespace HDTUninstaller.Properties { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // 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", "16.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + 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() { + } + + /// + /// 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 (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("HDTUninstaller.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 { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + } } diff --git a/HDTUninstaller/Properties/Settings.Designer.cs b/HDTUninstaller/Properties/Settings.Designer.cs index feaf99b31e..946bc47644 100644 --- a/HDTUninstaller/Properties/Settings.Designer.cs +++ b/HDTUninstaller/Properties/Settings.Designer.cs @@ -1,30 +1,26 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34014 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // //------------------------------------------------------------------------------ -namespace HDTUninstaller.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 - { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { - return defaultInstance; - } - } - } +namespace HDTUninstaller.Properties { + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.5.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 { + return defaultInstance; + } + } + } } diff --git a/HDTUpdate/App.config b/HDTUpdate/App.config index 8e15646352..ecdcf8a54d 100644 --- a/HDTUpdate/App.config +++ b/HDTUpdate/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/HDTUpdate/HDTUpdate.csproj b/HDTUpdate/HDTUpdate.csproj index af71e2eb6a..67ff70c9ce 100644 --- a/HDTUpdate/HDTUpdate.csproj +++ b/HDTUpdate/HDTUpdate.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,7 +9,7 @@ Properties HDTUpdate HDTUpdate - v4.5 + v4.7.2 512 publish\ true @@ -26,6 +26,7 @@ false false true + AnyCPU diff --git a/HearthWatcher.Test/HearthWatcher.Test.csproj b/HearthWatcher.Test/HearthWatcher.Test.csproj index 5a76d83d7f..f8df68119c 100644 --- a/HearthWatcher.Test/HearthWatcher.Test.csproj +++ b/HearthWatcher.Test/HearthWatcher.Test.csproj @@ -8,7 +8,7 @@ Properties HearthWatcher.Test HearthWatcher.Test - v4.5 + v4.7.2 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 10.0 diff --git a/HearthWatcher/HearthWatcher.csproj b/HearthWatcher/HearthWatcher.csproj index 590c0b0d46..6f403db61d 100644 --- a/HearthWatcher/HearthWatcher.csproj +++ b/HearthWatcher/HearthWatcher.csproj @@ -9,7 +9,7 @@ Properties HearthWatcher HearthWatcher - v4.5 + v4.7.2 512 diff --git a/Hearthstone Deck Tracker/App.config b/Hearthstone Deck Tracker/App.config index 00605ba87c..9f69f63a1e 100644 --- a/Hearthstone Deck Tracker/App.config +++ b/Hearthstone Deck Tracker/App.config @@ -14,6 +14,6 @@ - + - \ No newline at end of file + diff --git a/Hearthstone Deck Tracker/Hearthstone Deck Tracker.csproj b/Hearthstone Deck Tracker/Hearthstone Deck Tracker.csproj index 4c59b54f9d..951babe1e2 100644 --- a/Hearthstone Deck Tracker/Hearthstone Deck Tracker.csproj +++ b/Hearthstone Deck Tracker/Hearthstone Deck Tracker.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,7 +9,7 @@ Properties Hearthstone_Deck_Tracker HearthstoneDeckTracker - v4.5 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 @@ -28,6 +28,7 @@ 1.0.0.%2a false true + AnyCPU diff --git a/Hearthstone Deck Tracker/Properties/Settings.Designer.cs b/Hearthstone Deck Tracker/Properties/Settings.Designer.cs index d27e66c1ff..fe3dca4ff7 100644 --- a/Hearthstone Deck Tracker/Properties/Settings.Designer.cs +++ b/Hearthstone Deck Tracker/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18449 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -12,7 +12,7 @@ namespace Hearthstone_Deck_Tracker.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.5.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/ResourceGenerator/App.config b/ResourceGenerator/App.config index 88fa4027bd..db9bc3793f 100644 --- a/ResourceGenerator/App.config +++ b/ResourceGenerator/App.config @@ -1,6 +1,14 @@ - + - + - \ No newline at end of file + + + + + + + + + diff --git a/ResourceGenerator/ResourceGenerator.csproj b/ResourceGenerator/ResourceGenerator.csproj index ff064a8e5e..103ad420d3 100644 --- a/ResourceGenerator/ResourceGenerator.csproj +++ b/ResourceGenerator/ResourceGenerator.csproj @@ -9,7 +9,7 @@ Properties ResourceGenerator ResourceGenerator - v4.5.2 + v4.7.2 512 true publish\ @@ -27,6 +27,7 @@ false false true + true diff --git a/build-scripts/full.ps1 b/build-scripts/full.ps1 index 31dd0c133f..46fad375f3 100644 --- a/build-scripts/full.ps1 +++ b/build-scripts/full.ps1 @@ -105,7 +105,7 @@ nuget pack "$PSScriptRoot\hdt.nuspec" -Version $packageVersion -Properties Confi $icon = "$buildDir\Squirrel\Images\HearthstoneDeckTracker.ico" $nupkg = "$buildDir\SquirrelNu\HearthstoneDeckTracker.$packageVersion.nupkg" $certInfo = "/tr http://timestamp.digicert.com /a /f $cert /p $Env:CERT_PASSWORD" -& $squirrel --releasify $nupkg --releaseDir=$output --setupIcon=$icon --icon=$icon --no-msi -n $certInfo | Out-Default +& $squirrel --releasify $nupkg --releaseDir=$output --setupIcon=$icon --icon=$icon --no-msi -n $certInfo --framework-version=net472 | Out-Default & $signtool sign /tr "http://timestamp.digicert.com" /a /f $cert /p $Env:CERT_PASSWORD "$output\Setup.exe" | Out-Default Move-Item "$output\Setup.exe" "$output\HDT-Installer.exe" diff --git a/build-scripts/hdt.nuspec b/build-scripts/hdt.nuspec index f8a5c91598..f006f15d67 100644 --- a/build-scripts/hdt.nuspec +++ b/build-scripts/hdt.nuspec @@ -12,7 +12,7 @@ - - + + \ No newline at end of file