Merge pull request #599 from mousetraps/i598

#598 remove docker publish hooks
microsoft · Nov 18, 2015 · e1bf02c · e1bf02c
2 parents 0643875 + e1abd72
commit e1bf02c
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 41 deletions.
diff --git a/Nodejs/Product/Nodejs/Nodejs.csproj b/Nodejs/Product/Nodejs/Nodejs.csproj
@@ -901,10 +901,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <ZipItem Include="Templates\Files\DockerfileTemplate\Dockerfile" />
-    <VSIXSourceItem Include="Templates\Files\DockerfileTemplate\Dockerfile">
-      <VSIXSubPath>FileTemplates\ReferenceFiles\Dockerfile</VSIXSubPath>
-    </VSIXSourceItem>
     <None Include="Theme\contrast.vstheme">
       <SubType>Designer</SubType>
     </None>
@@ -1305,9 +1301,6 @@
       <SubType>Designer</SubType>
     </ZipItem>
     <ZipItem Include="Templates\Files\UnitTest\UnitTest.js" />
-    <ZipItem Include="Templates\Files\DockerfileTemplate\Dockerfile.vstemplate">
-      <SubType>Designer</SubType>
-    </ZipItem>
     <Content Include="TestFrameworks\find_tests.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
@@ -1331,6 +1324,10 @@
     <ZipItem Include="Templates\Files\TypeScriptUnitTest\UnitTest.vstemplate">
       <SubType>Designer</SubType>
     </ZipItem>
+    <ZipItem Include="Templates\Files\DockerfileTemplate\Dockerfile" />
+    <ZipItem Include="Templates\Files\DockerfileTemplate\Dockerfile.vstemplate">
+      <SubType>Designer</SubType>
+    </ZipItem>
     <None Include="Theme\Microsoft.NodejsTools.theme.v11.0.pkgdef" />
     <None Include="Theme\Microsoft.NodejsTools.theme.v12.0.pkgdef" />
     <None Include="Theme\Microsoft.NodejsTools.theme.v14.0.pkgdef" />
@@ -1756,7 +1753,6 @@
   </Target>
   <PropertyGroup>
     <PostBuildEvent>
-      echo f | xcopy /y $(ProjectDir)Templates\Files\DockerfileTemplate\Dockerfile $(OutDir)FileTemplates\ReferenceFiles\Dockerfile
       copy /y $(OutDir)..\WebRole\Microsoft.NodejsTools.WebRole.dll $(OutDir)Debugger\RemoteDebug\
     </PostBuildEvent>
   </PropertyGroup>

diff --git a/Nodejs/Product/Nodejs/Project/NodejsProjectNode.cs b/Nodejs/Product/Nodejs/Project/NodejsProjectNode.cs
@@ -379,25 +379,6 @@ public NodejsProjectNode(NodejsProjectPackage package)
             return new NodejsProjectNodeProperties(this);
         }
 
-        public override int GetPropertyValue(string propertyName, string configName, uint storage, out string propertyValue) {
-            propertyValue = null;
-            switch (propertyName) {
-                case "DockerLinuxDockerfileContents":
-                    propertyValue = DockerfileWizardExtension.GetDockerfileWithReplacements(
-                        File.ReadAllText(@"FileTemplates\ReferenceFiles\Dockerfile"),
-                        DTE
-                    );
-                    return VSConstants.S_OK;
-                case "DockerAppType":
-                    propertyValue = "Node.js";
-                    return VSConstants.S_OK;
-                case "DockerDefaultPublishContainerPort":
-                    propertyValue = "8080";
-                    return VSConstants.S_OK;
-            }
-            return base.GetPropertyValue(propertyName, configName, storage, out propertyValue);
-        }
-
         protected override Stream ProjectIconsImageStripStream {
             get {
                 return typeof(ProjectNode).Assembly.GetManifestResourceStream("Microsoft.VisualStudioTools.Resources.Icons.SharedProjectImageList.bmp");

diff --git a/Nodejs/Product/ProjectWizard/DockerfileWizardExtension.cs b/Nodejs/Product/ProjectWizard/DockerfileWizardExtension.cs
@@ -16,13 +16,9 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using EnvDTE;
 using Microsoft.VisualStudio.TemplateWizard;
 using Microsoft.VisualStudioTools;
-using System.IO;
-using System.Windows.Forms;
-using System.Text.RegularExpressions;
 
 namespace Microsoft.NodejsTools.ProjectWizard {
     /// <summary>
@@ -51,11 +47,6 @@ public sealed class DockerfileWizardExtension : IWizard {
             replacementsDictionary.Add("$nodearguments$", arguments);
         }
 
-        public static string GetDockerfileWithReplacements(string dockerFileContents, DTE dte) {
-            string arguments = GetFullNodeArguments(dte);
-            return dockerFileContents.Replace("$nodearguments$", arguments);
-        }
-
         private static string GetFullNodeArguments(object automationObject) {
             string arguments = null;
             if (automationObject is DTE) {

diff --git a/Nodejs/Setup/NodejsTools/NodejsTools.wxs b/Nodejs/Setup/NodejsTools/NodejsTools.wxs
@@ -11,7 +11,6 @@
         <DirectoryRef Id="Dir_$(var.key)InstallLocation">
             <Directory Id="Dir_$(var.key)InstallLocationFileTemplates" Name="FileTemplates">
                 <Directory Id="Dir_$(var.key)FileTemplatesNewItem" Name="NewItem" />
-                <Directory Id="Dir_$(var.key)FileTemplatesReferenceFiles" Name="ReferenceFiles" />
             </Directory>
             <Directory Id="Dir_$(var.key)TestFrameworks" Name="TestFrameworks">
                 <Directory Id="Dir_$(var.key)TestFrameworksExportRunner" Name="ExportRunner" />

diff --git a/Nodejs/Setup/NodejsTools/NodejsToolsFiles.proj b/Nodejs/Setup/NodejsTools/NodejsToolsFiles.proj
@@ -55,10 +55,6 @@
 
             <InstallDirectory>FileTemplatesNewItem</InstallDirectory>
         </File>
-
-        <File Include="FileTemplates\ReferenceFiles\Dockerfile">
-            <InstallDirectory>FileTemplatesReferenceFiles</InstallDirectory>
-        </File>
 
         <ItemTemplate Include="ItemTemplates\JavaScript\UnitTest.zip;
                                ItemTemplates\JavaScript\MochaUnitTest.zip;