diff --git a/TypeClipboard.sln b/TypeClipboard.sln index 7adc458..bce7b8d 100644 --- a/TypeClipboard.sln +++ b/TypeClipboard.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30011.22 +# Visual Studio Version 17 +VisualStudioVersion = 17.14.36202.13 d17.14 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TypeClipboard", "TypeClipboard\TypeClipboard.csproj", "{AFF27396-3E91-471E-B46B-2D2DA30FE6DB}" EndProject diff --git a/TypeClipboard/App.config b/TypeClipboard/App.config index bb5e701..3b9306f 100644 --- a/TypeClipboard/App.config +++ b/TypeClipboard/App.config @@ -1,4 +1,4 @@ - + @@ -6,7 +6,7 @@ - + @@ -18,4 +18,4 @@ - + \ No newline at end of file diff --git a/TypeClipboard/Form1.Designer.cs b/TypeClipboard/Form1.Designer.cs index c5d8e0c..72dcf20 100644 --- a/TypeClipboard/Form1.Designer.cs +++ b/TypeClipboard/Form1.Designer.cs @@ -29,6 +29,8 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.textBox1 = new System.Windows.Forms.TextBox(); this.button1 = new System.Windows.Forms.Button(); this.chkHotkey = new System.Windows.Forms.CheckBox(); diff --git a/TypeClipboard/Form1.resx b/TypeClipboard/Form1.resx deleted file mode 100644 index 69363bf..0000000 --- a/TypeClipboard/Form1.resx +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 17, 17 - - - 17, 17 - - - 17, 17 - - \ No newline at end of file diff --git a/TypeClipboard/Program.cs b/TypeClipboard/Program.cs index c311030..1811be6 100644 --- a/TypeClipboard/Program.cs +++ b/TypeClipboard/Program.cs @@ -1,9 +1,12 @@ using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; using System.Windows.Forms; namespace TypeClipboard { - static class Program + internal static class Program { /// /// The main entry point for the application. diff --git a/TypeClipboard/Properties/AssemblyInfo.cs b/TypeClipboard/Properties/AssemblyInfo.cs index ef149dd..3bd3fc4 100644 --- a/TypeClipboard/Properties/AssemblyInfo.cs +++ b/TypeClipboard/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.5.0.0")] -[assembly: AssemblyFileVersion("1.5.0.0")] +[assembly: AssemblyVersion("1.6.0.0")] +[assembly: AssemblyFileVersion("1.6.0.0")] diff --git a/TypeClipboard/Properties/Resources.Designer.cs b/TypeClipboard/Properties/Resources.Designer.cs index d77065e..d7e8b07 100644 --- a/TypeClipboard/Properties/Resources.Designer.cs +++ b/TypeClipboard/Properties/Resources.Designer.cs @@ -8,10 +8,10 @@ // //------------------------------------------------------------------------------ -namespace TypeClipboard.Properties { - using System; - - +namespace TypeClipboard.Properties +{ + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -19,43 +19,51 @@ namespace TypeClipboard.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", "16.0.0.0")] + [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 { - + 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 (object.ReferenceEquals(resourceMan, null)) { + internal static global::System.Resources.ResourceManager ResourceManager + { + get + { + if ((resourceMan == null)) + { global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TypeClipboard.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/TypeClipboard/Properties/Settings.Designer.cs b/TypeClipboard/Properties/Settings.Designer.cs index b0cb55d..720e543 100644 --- a/TypeClipboard/Properties/Settings.Designer.cs +++ b/TypeClipboard/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace TypeClipboard.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.2.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.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/TypeClipboard/TypeClipboard.csproj b/TypeClipboard/TypeClipboard.csproj index 64ddfc3..aab0711 100644 --- a/TypeClipboard/TypeClipboard.csproj +++ b/TypeClipboard/TypeClipboard.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,6 @@ 512 true true - false publish\ true @@ -25,9 +24,10 @@ false true 0 - 1.5.0.0 + 1.6.0.0 false true + AnyCPU @@ -37,19 +37,16 @@ bin\Debug\ DEBUG;TRACE prompt - 0 - false + 4 AnyCPU pdbonly true bin\Release\ - - + TRACE prompt 4 - false typeclipboard.ico @@ -80,9 +77,6 @@ - - Form1.cs - ResXFileCodeGenerator Resources.Designer.cs @@ -91,7 +85,6 @@ True Resources.resx - True SettingsSingleFileGenerator @@ -110,9 +103,9 @@ - + False - Microsoft .NET Framework 4.6.1 %28x86 and x64%29 + Microsoft .NET Framework 4.7.2 %28x86 and x64%29 true diff --git a/TypeClipboardAppx/Package.appxmanifest b/TypeClipboardAppx/Package.appxmanifest index 1205d47..38012f0 100644 --- a/TypeClipboardAppx/Package.appxmanifest +++ b/TypeClipboardAppx/Package.appxmanifest @@ -9,7 +9,7 @@ + Version="1.6.0.0" /> TypeClipboard diff --git a/TypeClipboardAppx/TypeClipboardAppx.wapproj b/TypeClipboardAppx/TypeClipboardAppx.wapproj index bbdbb53..6f897f9 100644 --- a/TypeClipboardAppx/TypeClipboardAppx.wapproj +++ b/TypeClipboardAppx/TypeClipboardAppx.wapproj @@ -51,49 +51,12 @@ d041bcc6-3c9d-4bdc-8443-2bec9b290d1a - 10.0.18362.0 + 10.0.26100.0 10.0.17763.0 en-US True - ..\TypeClipboard\TypeClipboard.csproj - False - SHA256 - False - False - neutral - C:\temp - 0 - TypeClipboardAppx_TemporaryKey.pfx - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always + $(NoWarn);NU1702 + FEEF43DFCBAB446B040886D53A9FF02C8C201CBA @@ -111,8 +74,8 @@ - - - + + + \ No newline at end of file diff --git a/global.json b/global.json deleted file mode 100644 index 5d14fe4..0000000 --- a/global.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "sdk": { - "version": "4.7.1" - } -} \ No newline at end of file