diff --git a/MakeDistWPF/App.config b/MakeDist/App.config similarity index 100% rename from MakeDistWPF/App.config rename to MakeDist/App.config diff --git a/MakeDistWPF/App.xaml b/MakeDist/App.xaml similarity index 74% rename from MakeDistWPF/App.xaml rename to MakeDist/App.xaml index 199bec8..6d10cc1 100644 --- a/MakeDistWPF/App.xaml +++ b/MakeDist/App.xaml @@ -1,7 +1,7 @@ - diff --git a/MakeDistWPF/App.xaml.cs b/MakeDist/App.xaml.cs similarity index 92% rename from MakeDistWPF/App.xaml.cs rename to MakeDist/App.xaml.cs index 166f0cc..13cbc91 100644 --- a/MakeDistWPF/App.xaml.cs +++ b/MakeDist/App.xaml.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Threading.Tasks; using System.Windows; -namespace MakeDistWPF { +namespace MakeDist { /// /// Interaction logic for App.xaml /// diff --git a/MakeDistWPF/CopyProgress.xaml b/MakeDist/CopyProgress.xaml similarity index 94% rename from MakeDistWPF/CopyProgress.xaml rename to MakeDist/CopyProgress.xaml index 174c070..f2f688b 100644 --- a/MakeDistWPF/CopyProgress.xaml +++ b/MakeDist/CopyProgress.xaml @@ -14,12 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. --> - /// Show progress log while copying files. /// diff --git a/MakeDistWPF/FileCopier.cs b/MakeDist/FileCopier.cs similarity index 99% rename from MakeDistWPF/FileCopier.cs rename to MakeDist/FileCopier.cs index 4f46a61..f212a89 100644 --- a/MakeDistWPF/FileCopier.cs +++ b/MakeDist/FileCopier.cs @@ -20,7 +20,7 @@ using System.IO; using System.Text.RegularExpressions; using System.Windows.Media; -namespace MakeDistWPF { +namespace MakeDist { public class FileCopier { private const string SOURCEGEN_DIRNAME = "SourceGen"; diff --git a/MakeDistWPF/MainWindow.xaml b/MakeDist/MainWindow.xaml similarity index 96% rename from MakeDistWPF/MainWindow.xaml rename to MakeDist/MainWindow.xaml index 41342da..d271c92 100644 --- a/MakeDistWPF/MainWindow.xaml +++ b/MakeDist/MainWindow.xaml @@ -14,12 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. --> - diff --git a/MakeDistWPF/MainWindow.xaml.cs b/MakeDist/MainWindow.xaml.cs similarity index 99% rename from MakeDistWPF/MainWindow.xaml.cs rename to MakeDist/MainWindow.xaml.cs index 608fb52..3b12976 100644 --- a/MakeDistWPF/MainWindow.xaml.cs +++ b/MakeDist/MainWindow.xaml.cs @@ -19,7 +19,7 @@ using System.Diagnostics; using System.Runtime.CompilerServices; using System.Windows; -namespace MakeDistWPF { +namespace MakeDist { /// /// Distribution maker. /// diff --git a/MakeDistWPF/MakeDistWPF.csproj b/MakeDist/MakeDist.csproj similarity index 97% rename from MakeDistWPF/MakeDistWPF.csproj rename to MakeDist/MakeDist.csproj index acb3ec2..eb761ef 100644 --- a/MakeDistWPF/MakeDistWPF.csproj +++ b/MakeDist/MakeDist.csproj @@ -6,8 +6,8 @@ AnyCPU {D9A0BD5E-8CA8-4207-81C8-DDF4BE6AB02A} WinExe - MakeDistWPF - MakeDistWPF + MakeDist + MakeDist v4.6.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/MakeDistWPF/Properties/AssemblyInfo.cs b/MakeDist/Properties/AssemblyInfo.cs similarity index 96% rename from MakeDistWPF/Properties/AssemblyInfo.cs rename to MakeDist/Properties/AssemblyInfo.cs index adf056c..2d351fe 100644 --- a/MakeDistWPF/Properties/AssemblyInfo.cs +++ b/MakeDist/Properties/AssemblyInfo.cs @@ -7,11 +7,11 @@ using System.Windows; // 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("MakeDistWPF")] +[assembly: AssemblyTitle("MakeDist")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("MakeDistWPF")] +[assembly: AssemblyProduct("MakeDist")] [assembly: AssemblyCopyright("Copyright © 2019")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/MakeDistWPF/Properties/Resources.Designer.cs b/MakeDist/Properties/Resources.Designer.cs similarity index 87% rename from MakeDistWPF/Properties/Resources.Designer.cs rename to MakeDist/Properties/Resources.Designer.cs index db03a52..fc2c07f 100644 --- a/MakeDistWPF/Properties/Resources.Designer.cs +++ b/MakeDist/Properties/Resources.Designer.cs @@ -8,9 +8,10 @@ // //------------------------------------------------------------------------------ -namespace MakeDistWPF.Properties { - - +namespace MakeDist.Properties { + using System; + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -18,33 +19,33 @@ namespace MakeDistWPF.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", "15.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("MakeDistWPF.Properties.Resources", typeof(Resources).Assembly); + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MakeDist.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. diff --git a/MakeDistWPF/Properties/Resources.resx b/MakeDist/Properties/Resources.resx similarity index 100% rename from MakeDistWPF/Properties/Resources.resx rename to MakeDist/Properties/Resources.resx diff --git a/MakeDistWPF/Properties/Settings.Designer.cs b/MakeDist/Properties/Settings.Designer.cs similarity index 92% rename from MakeDistWPF/Properties/Settings.Designer.cs rename to MakeDist/Properties/Settings.Designer.cs index 971a028..2f70d3f 100644 --- a/MakeDistWPF/Properties/Settings.Designer.cs +++ b/MakeDist/Properties/Settings.Designer.cs @@ -8,15 +8,15 @@ // //------------------------------------------------------------------------------ -namespace MakeDistWPF.Properties { - - +namespace MakeDist.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", "15.9.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/MakeDistWPF/Properties/Settings.settings b/MakeDist/Properties/Settings.settings similarity index 100% rename from MakeDistWPF/Properties/Settings.settings rename to MakeDist/Properties/Settings.settings diff --git a/WorkBench.sln b/WorkBench.sln index 0497e64..d13dc13 100644 --- a/WorkBench.sln +++ b/WorkBench.sln @@ -32,7 +32,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceGenWPF", "SourceGenWP EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommonWPF", "CommonWPF\CommonWPF.csproj", "{1299AA2E-606D-4F3E-B3A9-3F9421E44667}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MakeDistWPF", "MakeDistWPF\MakeDistWPF.csproj", "{D9A0BD5E-8CA8-4207-81C8-DDF4BE6AB02A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MakeDist", "MakeDist\MakeDist.csproj", "{D9A0BD5E-8CA8-4207-81C8-DDF4BE6AB02A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution