diff --git a/ext/win-ui-wrapper/ZeroTier One.exe b/ext/win-ui-wrapper/ZeroTier One.exe new file mode 100644 index 000000000..6abbc129f Binary files /dev/null and b/ext/win-ui-wrapper/ZeroTier One.exe differ diff --git a/windows/WebUIWrapper/Properties/AssemblyInfo.cs b/windows/WebUIWrapper/Properties/AssemblyInfo.cs index b097a358b..5573fc093 100644 --- a/windows/WebUIWrapper/Properties/AssemblyInfo.cs +++ b/windows/WebUIWrapper/Properties/AssemblyInfo.cs @@ -5,12 +5,12 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("WebUIWrapper")] -[assembly: AssemblyDescription("")] +[assembly: AssemblyTitle("ZeroTier One")] +[assembly: AssemblyDescription("UI Wrapper")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("WebUIWrapper")] -[assembly: AssemblyCopyright("Copyright © 2015")] +[assembly: AssemblyCompany("ZeroTier, Inc.")] +[assembly: AssemblyProduct("ZeroTier One")] +[assembly: AssemblyCopyright("Copyright ©2015")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/windows/WebUIWrapper/Properties/Resources.Designer.cs b/windows/WebUIWrapper/Properties/Resources.Designer.cs index 2419dce31..463c7ea32 100644 --- a/windows/WebUIWrapper/Properties/Resources.Designer.cs +++ b/windows/WebUIWrapper/Properties/Resources.Designer.cs @@ -8,10 +8,10 @@ // //------------------------------------------------------------------------------ -namespace WebUIWrapper.Properties -{ - - +namespace WebUIWrapper.Properties { + using System; + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -22,48 +22,40 @@ namespace WebUIWrapper.Properties [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 ((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("WebUIWrapper.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/windows/WebUIWrapper/Properties/Settings.Designer.cs b/windows/WebUIWrapper/Properties/Settings.Designer.cs index 8eb611667..8115e0155 100644 --- a/windows/WebUIWrapper/Properties/Settings.Designer.cs +++ b/windows/WebUIWrapper/Properties/Settings.Designer.cs @@ -8,21 +8,17 @@ // //------------------------------------------------------------------------------ -namespace WebUIWrapper.Properties -{ - - +namespace WebUIWrapper.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 - { - + 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/windows/WebUIWrapper/WebUIWrapper.csproj b/windows/WebUIWrapper/WebUIWrapper.csproj index c541bce97..44fef2632 100644 --- a/windows/WebUIWrapper/WebUIWrapper.csproj +++ b/windows/WebUIWrapper/WebUIWrapper.csproj @@ -97,6 +97,7 @@ True Resources.resx + True