Merge branch 'future' into buildNumberGenerationV2

paulvanbrenk · web-flow · commit 0e02dc984578 · 2017-05-09T17:52:00.000-07:00
diff --git a/Common/Product/SharedProject/CommonPropertyPage.cs b/Common/Product/SharedProject/CommonPropertyPage.cs
@@ -19,9 +19,9 @@ namespace Microsoft.VisualStudioTools.Project
     /// </summary>
     public abstract class CommonPropertyPage : IPropertyPage
     {
-        private IPropertyPageSite _site;
-        private bool _dirty, _loading;
+        private IPropertyPageSite site;
         private CommonProjectNode _project;
+        private bool dirty;
 
         public abstract Control Control
         {
@@ -236,40 +236,48 @@ private void SetUserPropertyUnderCondition(string propertyName, string propertyV
             newGroup.AddProperty(propertyName, propertyValue);
         }
 
-        public bool Loading
-        {
-            get
-            {
-                return this._loading;
-            }
-            set
-            {
-                this._loading = value;
-            }
-        }
+        public bool Loading { get; set; }
 
         public bool IsDirty
         {
             get
             {
-                return this._dirty;
+                return this.dirty;
             }
             set
             {
-                if (this._dirty != value && !this.Loading)
+                if (this.dirty != value && !this.Loading)
                 {
-                    this._dirty = value;
-                    if (this._site != null)
+                    this.dirty = value;
+                    if (this.site != null)
                     {
-                        this._site.OnStatusChange((uint)(this._dirty ? PropPageStatus.Dirty : PropPageStatus.Clean));
+                        this.site.OnStatusChange((uint)(this.dirty ? PropPageStatus.Dirty : PropPageStatus.Clean));
                     }
                 }
             }
         }
 
         void IPropertyPage.Activate(IntPtr hWndParent, RECT[] pRect, int bModal)
         {
-            NativeMethods.SetParent(this.Control.Handle, hWndParent);
+            this.Control.Visible = false;
+
+            // suspend to reduce flashing
+            this.Control.SuspendLayout();
+
+            try
+            {
+                var parent = Control.FromHandle(hWndParent);
+                this.Control.Parent = parent;
+
+                // move to final location
+                ((IPropertyPage)this).Move(pRect);
+            }
+            finally
+            {
+                this.Control.ResumeLayout();
+                this.Control.Visible = true;
+                this.Control.Focus();
+            }
         }
 
         int IPropertyPage.Apply()
@@ -309,6 +317,7 @@ void IPropertyPage.GetPageInfo(PROPPAGEINFO[] pPageInfo)
 
         void IPropertyPage.Help(string pszHelpDir)
         {
+            // not implemented
         }
 
         int IPropertyPage.IsPageDirty()
@@ -374,13 +383,23 @@ void IPropertyPage.SetObjects(uint count, object[] punk)
 
         void IPropertyPage.SetPageSite(IPropertyPageSite pPageSite)
         {
-            this._site = pPageSite;
+            this.site = pPageSite;
         }
 
         void IPropertyPage.Show(uint nCmdShow)
         {
-            this.Control.Visible = true; // TODO: pass SW_SHOW* flags through      
-            this.Control.Show();
+            const int SW_HIDE = 0;
+
+            if (nCmdShow != SW_HIDE)
+            {
+                this.Control.Visible = true;
+                this.Control.Show();
+            }
+            else
+            {
+                this.Control.Visible = false;
+                this.Control.Hide();
+            }
         }
 
         int IPropertyPage.TranslateAccelerator(MSG[] pMsg)
@@ -389,12 +408,20 @@ int IPropertyPage.TranslateAccelerator(MSG[] pMsg)
 
             var msg = pMsg[0];
 
-            if ((msg.message < NativeMethods.WM_KEYFIRST || msg.message > NativeMethods.WM_KEYLAST) && (msg.message < NativeMethods.WM_MOUSEFIRST || msg.message > NativeMethods.WM_MOUSELAST))
+            var message = Message.Create(msg.hwnd, (int)msg.message, msg.wParam, msg.lParam);
+
+            var target = Control.FromChildHandle(message.HWnd);
+            if (target != null && target.PreProcessMessage(ref message))
             {
-                return VSConstants.S_FALSE;
+                // handled the message
+                pMsg[0].message = (uint)message.Msg;
+                pMsg[0].wParam = message.WParam;
+                pMsg[0].lParam = message.LParam;
+
+                return VSConstants.S_OK;
             }
 
-            return (NativeMethods.IsDialogMessageA(this.Control.Handle, ref msg)) ? VSConstants.S_OK : VSConstants.S_FALSE;
+            return VSConstants.S_FALSE;
         }
     }
 }
diff --git a/Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.cs.resx b/Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.cs.resx
@@ -549,6 +549,9 @@
   <data name="_browsePath.Text" xml:space="preserve">
     <value>...</value>
   </data>
+  <data name="_browsePath.AccessibleName" xml:space="preserve">
+    <value>Browse for node.exe</value>
+  </data>
   <data name="&gt;&gt;_browsePath.Name" xml:space="preserve">
     <value>_browsePath</value>
   </data>
@@ -585,6 +588,9 @@
   <data name="_browseDirectory.Text" xml:space="preserve">
     <value>...</value>
   </data>
+  <data name="_browseDirectory.AccessibleName" xml:space="preserve">
+    <value>Browse for working directory</value>
+  </data>
   <data name="&gt;&gt;_browseDirectory.Name" xml:space="preserve">
     <value>_browseDirectory</value>
   </data>
diff --git a/Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.de.resx b/Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.de.resx
@@ -549,6 +549,9 @@
   <data name="_browsePath.Text" xml:space="preserve">
     <value>...</value>
   </data>
+  <data name="_browsePath.AccessibleName" xml:space="preserve">
+    <value>Browse for node.exe</value>
+  </data>
   <data name="&gt;&gt;_browsePath.Name" xml:space="preserve">
     <value>_browsePath</value>
   </data>
@@ -585,6 +588,9 @@
   <data name="_browseDirectory.Text" xml:space="preserve">
     <value>...</value>
   </data>
+  <data name="_browseDirectory.AccessibleName" xml:space="preserve">
+    <value>Browse for working directory</value>
+  </data>
   <data name="&gt;&gt;_browseDirectory.Name" xml:space="preserve">
     <value>_browseDirectory</value>
   </data>
diff --git a/Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.en.resx b/Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.en.resx
@@ -549,6 +549,9 @@
   <data name="_browsePath.Text" xml:space="preserve">
     <value>...</value>
   </data>
+  <data name="_browsePath.AccessibleName" xml:space="preserve">
+    <value>Browse for node.exe</value>
+  </data>
   <data name="&gt;&gt;_browsePath.Name" xml:space="preserve">
     <value>_browsePath</value>
   </data>
@@ -585,6 +588,9 @@
   <data name="_browseDirectory.Text" xml:space="preserve">
     <value>...</value>
   </data>
+  <data name="_browseDirectory.AccessibleName" xml:space="preserve">
+    <value>Browse for working directory</value>
+  </data>
   <data name="&gt;&gt;_browseDirectory.Name" xml:space="preserve">
     <value>_browseDirectory</value>
   </data>
diff --git a/Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.es.resx b/Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.es.resx
@@ -549,6 +549,9 @@
   <data name="_browsePath.Text" xml:space="preserve">
     <value>...</value>
   </data>
+  <data name="_browsePath.AccessibleName" xml:space="preserve">
+    <value>Browse for node.exe</value>
+  </data>
   <data name="&gt;&gt;_browsePath.Name" xml:space="preserve">
     <value>_browsePath</value>
   </data>
@@ -585,6 +588,9 @@
   <data name="_browseDirectory.Text" xml:space="preserve">
     <value>...</value>
   </data>
+  <data name="_browseDirectory.AccessibleName" xml:space="preserve">
+    <value>Browse for working directory</value>
+  </data>
   <data name="&gt;&gt;_browseDirectory.Name" xml:space="preserve">
     <value>_browseDirectory</value>
   </data>
diff --git a/Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.fr.resx b/Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.fr.resx
@@ -549,6 +549,9 @@
   <data name="_browsePath.Text" xml:space="preserve">
     <value>...</value>
   </data>
+  <data name="_browsePath.AccessibleName" xml:space="preserve">
+    <value>Browse for node.exe</value>
+  </data>
   <data name="&gt;&gt;_browsePath.Name" xml:space="preserve">
     <value>_browsePath</value>
   </data>
@@ -585,6 +588,9 @@
   <data name="_browseDirectory.Text" xml:space="preserve">
     <value>...</value>
   </data>
+  <data name="_browseDirectory.AccessibleName" xml:space="preserve">
+    <value>Browse for working directory</value>
+  </data>
   <data name="&gt;&gt;_browseDirectory.Name" xml:space="preserve">
     <value>_browseDirectory</value>
   </data>
diff --git a/Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.it.resx b/Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.it.resx
@@ -549,6 +549,9 @@
   <data name="_browsePath.Text" xml:space="preserve">
     <value>...</value>
   </data>
+  <data name="_browsePath.AccessibleName" xml:space="preserve">
+    <value>Browse for node.exe</value>
+  </data>
   <data name="&gt;&gt;_browsePath.Name" xml:space="preserve">
     <value>_browsePath</value>
   </data>
@@ -585,6 +588,9 @@
   <data name="_browseDirectory.Text" xml:space="preserve">
     <value>...</value>
   </data>
+  <data name="_browseDirectory.AccessibleName" xml:space="preserve">
+    <value>Browse for working directory</value>
+  </data>
   <data name="&gt;&gt;_browseDirectory.Name" xml:space="preserve">
     <value>_browseDirectory</value>
   </data>
diff --git a/Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.ja.resx b/Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.ja.resx
@@ -549,6 +549,9 @@
   <data name="_browsePath.Text" xml:space="preserve">
     <value>...</value>
   </data>
+  <data name="_browsePath.AccessibleName" xml:space="preserve">
+    <value>Browse for node.exe</value>
+  </data>
   <data name="&gt;&gt;_browsePath.Name" xml:space="preserve">
     <value>_browsePath</value>
   </data>
@@ -585,6 +588,9 @@
   <data name="_browseDirectory.Text" xml:space="preserve">
     <value>...</value>
   </data>
+  <data name="_browseDirectory.AccessibleName" xml:space="preserve">
+    <value>Browse for working directory</value>
+  </data>
   <data name="&gt;&gt;_browseDirectory.Name" xml:space="preserve">
     <value>_browseDirectory</value>
   </data>
diff --git a/Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.ko.resx b/Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.ko.resx
@@ -549,6 +549,9 @@
   <data name="_browsePath.Text" xml:space="preserve">
     <value>...</value>
   </data>
+  <data name="_browsePath.AccessibleName" xml:space="preserve">
+    <value>Browse for node.exe</value>
+  </data>
   <data name="&gt;&gt;_browsePath.Name" xml:space="preserve">
     <value>_browsePath</value>
   </data>
@@ -585,6 +588,9 @@
   <data name="_browseDirectory.Text" xml:space="preserve">
     <value>...</value>
   </data>
+  <data name="_browseDirectory.AccessibleName" xml:space="preserve">
+    <value>Browse for working directory</value>
+  </data>
   <data name="&gt;&gt;_browseDirectory.Name" xml:space="preserve">
     <value>_browseDirectory</value>
   </data>
diff --git a/Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.pl.resx b/Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.pl.resx
@@ -549,6 +549,9 @@
   <data name="_browsePath.Text" xml:space="preserve">
     <value>...</value>
   </data>
+  <data name="_browsePath.AccessibleName" xml:space="preserve">
+    <value>Browse for node.exe</value>
+  </data>
   <data name="&gt;&gt;_browsePath.Name" xml:space="preserve">
     <value>_browsePath</value>
   </data>
@@ -585,6 +588,9 @@
   <data name="_browseDirectory.Text" xml:space="preserve">
     <value>...</value>
   </data>
+  <data name="_browseDirectory.AccessibleName" xml:space="preserve">
+    <value>Browse for working directory</value>
+  </data>
   <data name="&gt;&gt;_browseDirectory.Name" xml:space="preserve">
     <value>_browseDirectory</value>
   </data>
diff --git a/Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.pt-BR.resx b/Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.pt-BR.resx
@@ -549,6 +549,9 @@
   <data name="_browsePath.Text" xml:space="preserve">
     <value>...</value>
   </data>
+  <data name="_browsePath.AccessibleName" xml:space="preserve">
+    <value>Browse for node.exe</value>
+  </data>
   <data name="&gt;&gt;_browsePath.Name" xml:space="preserve">
     <value>_browsePath</value>
   </data>
@@ -585,6 +588,9 @@
   <data name="_browseDirectory.Text" xml:space="preserve">
     <value>...</value>
   </data>
+  <data name="_browseDirectory.AccessibleName" xml:space="preserve">
+    <value>Browse for working directory</value>
+  </data>
   <data name="&gt;&gt;_browseDirectory.Name" xml:space="preserve">
     <value>_browseDirectory</value>
   </data>
diff --git a/Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.ru.resx b/Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.ru.resx
@@ -549,6 +549,9 @@
   <data name="_browsePath.Text" xml:space="preserve">
     <value>...</value>
   </data>
+  <data name="_browsePath.AccessibleName" xml:space="preserve">
+    <value>Browse for node.exe</value>
+  </data>
   <data name="&gt;&gt;_browsePath.Name" xml:space="preserve">
     <value>_browsePath</value>
   </data>
@@ -585,6 +588,9 @@
   <data name="_browseDirectory.Text" xml:space="preserve">
     <value>...</value>
   </data>
+  <data name="_browseDirectory.AccessibleName" xml:space="preserve">
+    <value>Browse for working directory</value>
+  </data>
   <data name="&gt;&gt;_browseDirectory.Name" xml:space="preserve">
     <value>_browseDirectory</value>
   </data>
diff --git a/Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.tr.resx b/Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.tr.resx
@@ -549,6 +549,9 @@
   <data name="_browsePath.Text" xml:space="preserve">
     <value>...</value>
   </data>
+  <data name="_browsePath.AccessibleName" xml:space="preserve">
+    <value>Browse for node.exe</value>
+  </data>
   <data name="&gt;&gt;_browsePath.Name" xml:space="preserve">
     <value>_browsePath</value>
   </data>
@@ -585,6 +588,9 @@
   <data name="_browseDirectory.Text" xml:space="preserve">
     <value>...</value>
   </data>
+  <data name="_browseDirectory.AccessibleName" xml:space="preserve">
+    <value>Browse for working directory</value>
+  </data>
   <data name="&gt;&gt;_browseDirectory.Name" xml:space="preserve">
     <value>_browseDirectory</value>
   </data>
diff --git a/Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.zh-Hans.resx b/Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.zh-Hans.resx
@@ -549,6 +549,9 @@
   <data name="_browsePath.Text" xml:space="preserve">
     <value>...</value>
   </data>
+  <data name="_browsePath.AccessibleName" xml:space="preserve">
+    <value>Browse for node.exe</value>
+  </data>
   <data name="&gt;&gt;_browsePath.Name" xml:space="preserve">
     <value>_browsePath</value>
   </data>
@@ -585,6 +588,9 @@
   <data name="_browseDirectory.Text" xml:space="preserve">
     <value>...</value>
   </data>
+  <data name="_browseDirectory.AccessibleName" xml:space="preserve">
+    <value>Browse for working directory</value>
+  </data>
   <data name="&gt;&gt;_browseDirectory.Name" xml:space="preserve">
     <value>_browseDirectory</value>
   </data>
diff --git a/Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.zh-Hant.resx b/Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.zh-Hant.resx
diff --git a/Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs b/Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs
diff --git a/appveyor.yml b/appveyor.yml

Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,9 @@ namespace Microsoft.VisualStudioTools.Project`
`19`	`19`	`/// </summary>`
`20`	`20`	`public abstract class CommonPropertyPage : IPropertyPage`
`21`	`21`	`{`
`22`		`- private IPropertyPageSite _site;`
`23`		`- private bool _dirty, _loading;`
	`22`	`+ private IPropertyPageSite site;`
`24`	`23`	`private CommonProjectNode _project;`
	`24`	`+ private bool dirty;`
`25`	`25`
`26`	`26`	`public abstract Control Control`
`27`	`27`	`{`
`@@ -236,40 +236,48 @@ private void SetUserPropertyUnderCondition(string propertyName, string propertyV`
`236`	`236`	`newGroup.AddProperty(propertyName, propertyValue);`
`237`	`237`	`}`
`238`	`238`
`239`		`- public bool Loading`
`240`		`- {`
`241`		`- get`
`242`		`- {`
`243`		`- return this._loading;`
`244`		`- }`
`245`		`- set`
`246`		`- {`
`247`		`- this._loading = value;`
`248`		`- }`
`249`		`- }`
	`239`	`+ public bool Loading { get; set; }`
`250`	`240`
`251`	`241`	`public bool IsDirty`
`252`	`242`	`{`
`253`	`243`	`get`
`254`	`244`	`{`
`255`		`- return this._dirty;`
	`245`	`+ return this.dirty;`
`256`	`246`	`}`
`257`	`247`	`set`
`258`	`248`	`{`
`259`		`- if (this._dirty != value && !this.Loading)`
	`249`	`+ if (this.dirty != value && !this.Loading)`
`260`	`250`	`{`
`261`		`- this._dirty = value;`
`262`		`- if (this._site != null)`
	`251`	`+ this.dirty = value;`
	`252`	`+ if (this.site != null)`
`263`	`253`	`{`
`264`		`- this._site.OnStatusChange((uint)(this._dirty ? PropPageStatus.Dirty : PropPageStatus.Clean));`
	`254`	`+ this.site.OnStatusChange((uint)(this.dirty ? PropPageStatus.Dirty : PropPageStatus.Clean));`
`265`	`255`	`}`
`266`	`256`	`}`
`267`	`257`	`}`
`268`	`258`	`}`
`269`	`259`
`270`	`260`	`void IPropertyPage.Activate(IntPtr hWndParent, RECT[] pRect, int bModal)`
`271`	`261`	`{`
`272`		`- NativeMethods.SetParent(this.Control.Handle, hWndParent);`
	`262`	`+ this.Control.Visible = false;`
	`263`	`+`
	`264`	`+ // suspend to reduce flashing`
	`265`	`+ this.Control.SuspendLayout();`
	`266`	`+`
	`267`	`+ try`
	`268`	`+ {`
	`269`	`+ var parent = Control.FromHandle(hWndParent);`
	`270`	`+ this.Control.Parent = parent;`
	`271`	`+`
	`272`	`+ // move to final location`
	`273`	`+ ((IPropertyPage)this).Move(pRect);`
	`274`	`+ }`
	`275`	`+ finally`
	`276`	`+ {`
	`277`	`+ this.Control.ResumeLayout();`
	`278`	`+ this.Control.Visible = true;`
	`279`	`+ this.Control.Focus();`
	`280`	`+ }`
`273`	`281`	`}`
`274`	`282`
`275`	`283`	`int IPropertyPage.Apply()`
`@@ -309,6 +317,7 @@ void IPropertyPage.GetPageInfo(PROPPAGEINFO[] pPageInfo)`
`309`	`317`
`310`	`318`	`void IPropertyPage.Help(string pszHelpDir)`
`311`	`319`	`{`
	`320`	`+ // not implemented`
`312`	`321`	`}`
`313`	`322`
`314`	`323`	`int IPropertyPage.IsPageDirty()`
`@@ -374,13 +383,23 @@ void IPropertyPage.SetObjects(uint count, object[] punk)`
`374`	`383`
`375`	`384`	`void IPropertyPage.SetPageSite(IPropertyPageSite pPageSite)`
`376`	`385`	`{`
`377`		`- this._site = pPageSite;`
	`386`	`+ this.site = pPageSite;`
`378`	`387`	`}`
`379`	`388`
`380`	`389`	`void IPropertyPage.Show(uint nCmdShow)`
`381`	`390`	`{`
`382`		`- this.Control.Visible = true; // TODO: pass SW_SHOW* flags through`
`383`		`- this.Control.Show();`
	`391`	`+ const int SW_HIDE = 0;`
	`392`	`+`
	`393`	`+ if (nCmdShow != SW_HIDE)`
	`394`	`+ {`
	`395`	`+ this.Control.Visible = true;`
	`396`	`+ this.Control.Show();`
	`397`	`+ }`
	`398`	`+ else`
	`399`	`+ {`
	`400`	`+ this.Control.Visible = false;`
	`401`	`+ this.Control.Hide();`
	`402`	`+ }`
`384`	`403`	`}`
`385`	`404`
`386`	`405`	`int IPropertyPage.TranslateAccelerator(MSG[] pMsg)`
`@@ -389,12 +408,20 @@ int IPropertyPage.TranslateAccelerator(MSG[] pMsg)`
`389`	`408`
`390`	`409`	`var msg = pMsg[0];`
`391`	`410`
`392`		`- if ((msg.message < NativeMethods.WM_KEYFIRST \|\| msg.message > NativeMethods.WM_KEYLAST) && (msg.message < NativeMethods.WM_MOUSEFIRST \|\| msg.message > NativeMethods.WM_MOUSELAST))`
	`411`	`+ var message = Message.Create(msg.hwnd, (int)msg.message, msg.wParam, msg.lParam);`
	`412`	`+`
	`413`	`+ var target = Control.FromChildHandle(message.HWnd);`
	`414`	`+ if (target != null && target.PreProcessMessage(ref message))`
`393`	`415`	`{`
`394`		`- return VSConstants.S_FALSE;`
	`416`	`+ // handled the message`
	`417`	`+ pMsg[0].message = (uint)message.Msg;`
	`418`	`+ pMsg[0].wParam = message.WParam;`
	`419`	`+ pMsg[0].lParam = message.LParam;`
	`420`	`+`
	`421`	`+ return VSConstants.S_OK;`
`395`	`422`	`}`
`396`	`423`
`397`		`- return (NativeMethods.IsDialogMessageA(this.Control.Handle, ref msg)) ? VSConstants.S_OK : VSConstants.S_FALSE;`
	`424`	`+ return VSConstants.S_FALSE;`
`398`	`425`	`}`
`399`	`426`	`}`
`400`	`427`	`}`