Refactored

madskristensen · 499d1876947d5a648ccdd3a3488eb92d65adcc35 · madskristensen committed Feb 24, 2016 · Feb 24, 2016 · 499d187
1 parent 239143a
commit 499d1876947d5a648ccdd3a3488eb92d65adcc35
diff --git a/CONTRIBUTING.md → .github/CONTRIBUTING.md b/CONTRIBUTING.md → .github/CONTRIBUTING.md
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,18 @@
+### Installed product versions
+- Visual Studio: [example 2015 Professional]
+- This extension: [example 1.1.21]
+
+### Description
+Replace this text with a short description
+
+### Steps to recreate
+1. Replace this
+2. text with 
+3. the steps
+4. to recreate
+
+### Current behavior
+Explain what it's doing and why it's wrong
+
+### Expected behavior
+Explain what it should be doing after it's fixed.
diff --git a/BundlerMinifier.sln b/BundlerMinifier.sln
@@ -11,7 +11,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BundlerMinifierTest", "src\
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E9E392DE-6C44-4AD2-858C-D73AD3016E6E}"
 	ProjectSection(SolutionItems) = preProject
-		.gitignore = .gitignore
 		appveyor.yml = appveyor.yml
 		CHANGELOG.md = CHANGELOG.md
 		README.md = README.md
diff --git a/art/build-menu.png b/art/build-menu.png
diff --git a/art/contextmenu-bundleonbuild.png b/art/contextmenu-bundleonbuild.png
diff --git a/art/contextmenu-createbundle.png b/art/contextmenu-createbundle.png
diff --git a/art/contextmenu-minify.png b/art/contextmenu-minify.png
diff --git a/art/task-runner-bindings.png b/art/task-runner-bindings.png
diff --git a/art/task-runner-explorer.png b/art/task-runner-explorer.png
diff --git a/logo.png b/logo.png
diff --git a/src/BundlerMinifierVsix/BundleService.cs b/src/BundlerMinifierVsix/BundleService.cs
@@ -102,7 +102,7 @@ public static void Process(string conigFile)
                 catch (Exception ex)
                 {
                     Logger.Log(ex);
-                    MessageBox.Show($"There is an error in the {Constants.CONFIG_FILENAME} file. This could be due to a change in the format after this extension was updated.", Constants.VSIX_NAME, MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    MessageBox.Show($"There is an error in the {Constants.CONFIG_FILENAME} file. This could be due to a change in the format after this extension was updated.", Vsix.Name, MessageBoxButtons.OK, MessageBoxIcon.Information);
                 }
             });
         }
@@ -118,7 +118,7 @@ public static void SourceFileChanged(string configFile, string sourceFile)
                 catch (Exception ex)
                 {
                     Logger.Log(ex);
-                    MessageBox.Show($"There is an error in the {Constants.CONFIG_FILENAME} file. This could be due to a change in the format after this extension was updated.", Constants.VSIX_NAME, MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    MessageBox.Show($"There is an error in the {Constants.CONFIG_FILENAME} file. This could be due to a change in the format after this extension was updated.", Vsix.Name, MessageBoxButtons.OK, MessageBoxIcon.Information);
                 }
             });
         }
diff --git a/src/BundlerMinifierVsix/BundlerMinifierPackage.cs b/src/BundlerMinifierVsix/BundlerMinifierPackage.cs
@@ -16,7 +16,7 @@ namespace BundlerMinifierVsix
     [ProvideMenuResource("Menus.ctmenu", 1)]
     [Guid(PackageGuids.guidBundlerPackageString)]
     [ProvideAutoLoad(UIContextGuids80.SolutionExists)]
-    [ProvideOptionPage(typeof(Options), "Web", Constants.VSIX_NAME, 101, 100, true, new[] { "bundleconfig.json" }, ProvidesLocalizedCategoryName = false)]
+    [ProvideOptionPage(typeof(Options), "Web", Vsix.Name, 101, 100, true, new[] { "bundleconfig.json" }, ProvidesLocalizedCategoryName = false)]
     public sealed class BundlerMinifierPackage : Package
     {
         public static DTE2 _dte;
@@ -32,7 +32,7 @@ protected override void Initialize()
             Package = this;
             Options = (Options)GetDialogPage(typeof(Options));
 
-            Logger.Initialize(this, Constants.VSIX_NAME);
+            Logger.Initialize(this, Vsix.Name);
             Telemetry.SetDeviceName(_dte.Edition);
 
             Events2 events = _dte.Events as Events2;
diff --git a/src/BundlerMinifierVsix/BundlerMinifierVsix.csproj b/src/BundlerMinifierVsix/BundlerMinifierVsix.csproj
@@ -76,6 +76,9 @@
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="source.extension.cs">
+      <DependentUpon>source.extension.vsixmanifest</DependentUpon>
+    </Compile>
     <Compile Include="TaskRunner\TaskRunnerConfig.cs" />
     <Compile Include="TaskRunner\WebCompilerTaskRunner.cs" />
     <Compile Include="VSPackage.cs">
@@ -102,10 +105,15 @@
     <Content Include="JSON\bundleconfig-schema.json">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
+    <Content Include="source.extension.ico">
+      <DependentUpon>source.extension.vsixmanifest</DependentUpon>
+    </Content>
     <None Include="JSON\bundleconfig.json" />
     <None Include="packages.config" />
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
+      <Generator>VsixManifestGenerator</Generator>
+      <LastGenOutput>source.extension.resx</LastGenOutput>
     </None>
   </ItemGroup>
   <ItemGroup>
@@ -117,13 +125,14 @@
     <Content Include="Resources\icon.png">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="Resources\Package.ico" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="VSPackage.resx">
+    <EmbeddedResource Include="source.extension.resx">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>source.extension.vsixmanifest</DependentUpon>
       <MergeWithCTO>true</MergeWithCTO>
       <ManifestResourceName>VSPackage</ManifestResourceName>
-      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/BundlerMinifierVsix/Commands/BundleOnBuild.cs b/src/BundlerMinifierVsix/Commands/BundleOnBuild.cs
@@ -93,7 +93,7 @@ private void EnableCompileOnBuild(object sender, EventArgs e)
 
             if (!_isInstalled)
             {
-                var question = MessageBox.Show("A NuGet package will be installed to augment the MSBuild process, but no files will be added to the project.\rThis may require an internet connection.\r\rDo you want to continue?", Constants.VSIX_NAME, MessageBoxButtons.YesNo, MessageBoxIcon.Question);
+                var question = MessageBox.Show("A NuGet package will be installed to augment the MSBuild process, but no files will be added to the project.\rThis may require an internet connection.\r\rDo you want to continue?", Vsix.Name, MessageBoxButtons.YesNo, MessageBoxIcon.Question);
 
                 if (question == DialogResult.No)
                     return;
diff --git a/src/BundlerMinifierVsix/Commands/RemoveBundle.cs b/src/BundlerMinifierVsix/Commands/RemoveBundle.cs
@@ -82,7 +82,7 @@ public static void Initialize(Package package)
 
         private void RemoveConfig(object sender, EventArgs e)
         {
-            var question = MessageBox.Show($"This will remove the file from {Constants.CONFIG_FILENAME}.\r\rDo you want to continue?", Constants.VSIX_NAME, MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
+            var question = MessageBox.Show($"This will remove the file from {Constants.CONFIG_FILENAME}.\r\rDo you want to continue?", Vsix.Name, MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
 
             if (question == DialogResult.Cancel)
                 return;
diff --git a/src/BundlerMinifierVsix/Constants.cs b/src/BundlerMinifierVsix/Constants.cs
@@ -3,7 +3,6 @@
     class Constants
     {
         public const string CONFIG_FILENAME = "bundleconfig.json";
-        public const string VSIX_NAME = "Bundler & Minifier";
         public const string NUGET_ID = "BuildBundlerMinifier";
     }
 }
diff --git a/src/BundlerMinifierVsix/Properties/AssemblyInfo.cs b/src/BundlerMinifierVsix/Properties/AssemblyInfo.cs
@@ -2,12 +2,12 @@
 using System.Runtime.InteropServices;
 using BundlerMinifierVsix;
 
-[assembly: AssemblyTitle(Constants.VSIX_NAME)]
-[assembly: AssemblyDescription("Adds support for bundling and minifying JavaScript, CSS and HTML files in any project")]
+[assembly: AssemblyTitle(Vsix.Name)]
+[assembly: AssemblyDescription(Vsix.Description)]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Mads Kristensen")]
-[assembly: AssemblyProduct(Constants.VSIX_NAME)]
-[assembly: AssemblyCopyright("Mads Kristensen")]
+[assembly: AssemblyCompany(Vsix.Author)]
+[assembly: AssemblyProduct(Vsix.Name)]
+[assembly: AssemblyCopyright(Vsix.Author)]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("en-US")]
 [assembly: ComVisible(false)]
diff --git a/src/BundlerMinifierVsix/Resources/Package.ico b/src/BundlerMinifierVsix/Resources/Package.ico
diff --git a/src/BundlerMinifierVsix/Resources/icon.png b/src/BundlerMinifierVsix/Resources/icon.png
diff --git a/src/BundlerMinifierVsix/Resources/logo.png b/src/BundlerMinifierVsix/Resources/logo.png
diff --git a/src/BundlerMinifierVsix/Resources/preview.png b/src/BundlerMinifierVsix/Resources/preview.png
diff --git a/src/BundlerMinifierVsix/TaskRunner/WebCompilerTaskRunner.cs b/src/BundlerMinifierVsix/TaskRunner/WebCompilerTaskRunner.cs
@@ -44,7 +44,7 @@ public List<ITaskRunnerOption> Options
 
         private ITaskRunnerNode LoadHierarchy(string configPath)
         {
-            ITaskRunnerNode root = new TaskRunnerNode(Constants.VSIX_NAME);
+            ITaskRunnerNode root = new TaskRunnerNode(Vsix.Name);
             TaskRunnerNode tasks = new TaskRunnerNode("All files", true)
             {
                 Description = $"Bundles all files listed in {Constants.CONFIG_FILENAME}",
diff --git a/src/BundlerMinifierVsix/source.extension.cs b/src/BundlerMinifierVsix/source.extension.cs
@@ -0,0 +1,12 @@
+namespace BundlerMinifierVsix
+{
+	static class Vsix
+	{
+		public const string Id = "a0ae318b-4f07-4f71-93cb-f21d3f03c6d3";
+		public const string Name = "Bundler & Minifier";
+		public const string Description = "Adds support for bundling and minifying JavaScript, CSS and HTML files in any project.";
+		public const string Version = "1.8";
+		public const string Author = "Mads Kristensen";
+		public const string Tags = "bundle, bundling, minify, minification, js, css, html";
+	}
+}
diff --git a/src/BundlerMinifierVsix/source.extension.ico b/src/BundlerMinifierVsix/source.extension.ico
diff --git a/src/BundlerMinifierVsix/VSPackage.resx → ...BundlerMinifierVsix/source.extension.resx b/src/BundlerMinifierVsix/VSPackage.resx → ...BundlerMinifierVsix/source.extension.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -121,10 +121,10 @@
     <value>Bundler &amp; Minifier</value>
   </data>
   <data name="112" xml:space="preserve">
-    <value>Adds support for bundling and minifying JavaScript, CSS and HTML files in any project</value>
+    <value>Adds support for bundling and minifying JavaScript, CSS and HTML files in any project.</value>
   </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="400" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Resources\Package.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>source.extension.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>