Remove *.ts and *.js extension check code duplication

.gitattributes

@@ -1,17 +1,5 @@
-# Set the default behavior, in case people don't have core.autocrlf set.
-* text=auto
-
-# Denote all files that are truly binary and should not be modified.
-*.bmp binary
-*.png binary
-*.ico binary
-*.chm binary
-*.cub binary
-*.dll binary
-*.eot binary
-*.exe binary
-*.msi binary
-*.snk binary
-*.sqlite binary
-*.wixlib binary
-*.woff binary
+# Do not normalize line endings from CR LF to LF, regardless of core.autocrlf.
+* -text
+
+# Normalize C# source files to use CR LF line endings.
+*.cs text eol=crlf

.gitignore

@@ -33,7 +33,6 @@ x64/
 *.tli
 *.tlh
 *.tmp
-*.tmp_proj
 *.log
 *.vspscc
 *.vssscc

Build/BuildReleaseHelpers.psm1

@@ -69,16 +69,13 @@ function begin_sign_files {
             $job.Keywords = $jobKeywords
 
             if ($certificates -match "authenticode") {
-                $job.SelectCertificate("401")  # Authenticode
-            }
-            if ($certificates -match "msi") {
-                $job.SelectCertificate("400")  # Authenticode
+                $job.SelectCertificate("10006")  # Authenticode
             }
             if ($certificates -match "strongname") {
                 $job.SelectCertificate("67")     # StrongName key
             }
-            if ($certificates -match "vsix") {
-                $job.SelectCertificate("10040160")     # Microsoft OPC Publisher (VSIX)
+            if ($certificates -match "opc") {
+                $job.SelectCertificate("160")     # Microsoft OPC Publisher (VSIX)
             }
 
             foreach ($approver in $approvers) {

Build/BuildReleaseMockHelpers.psm1

@@ -77,23 +77,16 @@ job.Keywords:     $jobKeywords"
 
     if ($certificates -match "authenticode") {
         $msg = "$msg
-job.SelectCertificate(401)"
-        $job.SelectCertificate("401")  # Authenticode
-    }
-    if ($certificates -match "msi") {
-        $msg = "$msg
-job.SelectCertificate(400)"
-        $job.SelectCertificate("400")   # Authenticode for MSI
+job.SelectCertificate(10006)"
+        $job.SelectCertificate("10006")  # Authenticode
     }
     if ($certificates -match "strongname") {
         $msg = "$msg
 job.SelectCertificate(67)"
         $job.SelectCertificate("67")     # StrongName key
     }
-    if ($certificates -match "vsix") {
-        $msg = "$msg
-job.SelectCertificate(100040160)"
-        $job.SelectCertificate("100040160")   # Microsoft OPC Publisher (VSIX)
+    if ($certificates -match "opc") {
+        $job.SelectCertificate("160")     # Microsoft OPC Publisher (VSIX)
     }
 
     foreach ($approver in $approvers) {

Common/Product/ReplWindow/GlobalSuppressions.cs

@@ -1,25 +1,25 @@
-/* ****************************************************************************
- *
- * Copyright (c) Microsoft Corporation. 
- *
- * This source code is subject to terms and conditions of the Apache License, Version 2.0. A 
- * copy of the license can be found in the License.html file at the root of this distribution. If 
- * you cannot locate the Apache License, Version 2.0, please send an email to 
- * vspython@microsoft.com. By using this source code in any fashion, you are agreeing to be bound 
- * by the terms of the Apache License, Version 2.0.
- *
- * You must not remove this notice, or any other, from this software.
- *
- * ***************************************************************************/
-
-// This file is used by Code Analysis to maintain SuppressMessage
-// attributes that are applied to this project. Project-level
-// suppressions either have no target or are given a specific target
-// and scoped to a namespace, type, member, etc.
-//
-// To add a suppression to this file, right-click the message in the
-// Error List, point to "Suppress Message(s)", and click "In Project
-// Suppression File". You do not need to add suppressions to this
-// file manually.
-
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1017:MarkAssembliesWithComVisible")]
+/* ****************************************************************************
+ *
+ * Copyright (c) Microsoft Corporation. 
+ *
+ * This source code is subject to terms and conditions of the Apache License, Version 2.0. A 
+ * copy of the license can be found in the License.html file at the root of this distribution. If 
+ * you cannot locate the Apache License, Version 2.0, please send an email to 
+ * vspython@microsoft.com. By using this source code in any fashion, you are agreeing to be bound 
+ * by the terms of the Apache License, Version 2.0.
+ *
+ * You must not remove this notice, or any other, from this software.
+ *
+ * ***************************************************************************/
+
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project. Project-level
+// suppressions either have no target or are given a specific target
+// and scoped to a namespace, type, member, etc.
+//
+// To add a suppression to this file, right-click the message in the
+// Error List, point to "Suppress Message(s)", and click "In Project
+// Suppression File". You do not need to add suppressions to this
+// file manually.
+
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1017:MarkAssembliesWithComVisible")]

Common/Product/ReplWindow/Guids.cs

@@ -1,34 +1,34 @@
-/* ****************************************************************************
- *
- * Copyright (c) Microsoft Corporation. 
- *
- * This source code is subject to terms and conditions of the Apache License, Version 2.0. A 
- * copy of the license can be found in the License.html file at the root of this distribution. If 
- * you cannot locate the Apache License, Version 2.0, please send an email to 
- * vspython@microsoft.com. By using this source code in any fashion, you are agreeing to be bound 
- * by the terms of the Apache License, Version 2.0.
- *
- * You must not remove this notice, or any other, from this software.
- *
- * ***************************************************************************/
-
-// Guids.cs
-// MUST match guids.h
-using System;
-
-#if NTVS_FEATURE_INTERACTIVEWINDOW
-namespace Microsoft.NodejsTools.Repl {
-#else
-namespace Microsoft.VisualStudio.Repl {
-#endif
-    static class Guids {
-#if NTVS_FEATURE_INTERACTIVEWINDOW
-        public const string guidReplWindowPkgString = "29102E6C-34F2-4FF1-BA2F-C02ADE3846E8";
-        public const string guidReplWindowCmdSetString = "220C57E5-228F-46B5-AF80-D0AB55A44902";        
-#else
-        public const string guidReplWindowPkgString = "ce8d8e55-ad29-423e-aca2-810d0b16cdc4";
-        public const string guidReplWindowCmdSetString = "68cb76e6-98c5-464a-aba9-9f2db66fa0fd";
-#endif
-        public static readonly Guid guidReplWindowCmdSet = new Guid(guidReplWindowCmdSetString);
-    };
+/* ****************************************************************************
+ *
+ * Copyright (c) Microsoft Corporation. 
+ *
+ * This source code is subject to terms and conditions of the Apache License, Version 2.0. A 
+ * copy of the license can be found in the License.html file at the root of this distribution. If 
+ * you cannot locate the Apache License, Version 2.0, please send an email to 
+ * vspython@microsoft.com. By using this source code in any fashion, you are agreeing to be bound 
+ * by the terms of the Apache License, Version 2.0.
+ *
+ * You must not remove this notice, or any other, from this software.
+ *
+ * ***************************************************************************/
+
+// Guids.cs
+// MUST match guids.h
+using System;
+
+#if NTVS_FEATURE_INTERACTIVEWINDOW
+namespace Microsoft.NodejsTools.Repl {
+#else
+namespace Microsoft.VisualStudio.Repl {
+#endif
+    static class Guids {
+#if NTVS_FEATURE_INTERACTIVEWINDOW
+        public const string guidReplWindowPkgString = "29102E6C-34F2-4FF1-BA2F-C02ADE3846E8";
+        public const string guidReplWindowCmdSetString = "220C57E5-228F-46B5-AF80-D0AB55A44902";        
+#else
+        public const string guidReplWindowPkgString = "ce8d8e55-ad29-423e-aca2-810d0b16cdc4";
+        public const string guidReplWindowCmdSetString = "68cb76e6-98c5-464a-aba9-9f2db66fa0fd";
+#endif
+        public static readonly Guid guidReplWindowCmdSet = new Guid(guidReplWindowCmdSetString);
+    };
 }

Common/Product/ReplWindow/PkgCmdID.cs

@@ -1,38 +1,38 @@
-/* ****************************************************************************
- *
- * Copyright (c) Microsoft Corporation. 
- *
- * This source code is subject to terms and conditions of the Apache License, Version 2.0. A 
- * copy of the license can be found in the License.html file at the root of this distribution. If 
- * you cannot locate the Apache License, Version 2.0, please send an email to 
- * vspython@microsoft.com. By using this source code in any fashion, you are agreeing to be bound 
- * by the terms of the Apache License, Version 2.0.
- *
- * You must not remove this notice, or any other, from this software.
- *
- * ***************************************************************************/
-
-// PkgCmdID.cs
-// MUST match PkgCmdID.h
-
-#if NTVS_FEATURE_INTERACTIVEWINDOW
-namespace Microsoft.NodejsTools.Repl {
-#else
-namespace Microsoft.VisualStudio.Repl {
-#endif
-    static class PkgCmdIDList {
-        public const uint cmdidSmartExecute = 0x103;
-        public const uint cmdidBreakRepl = 0x104;
-        public const uint cmdidResetRepl = 0x105;
-        public const uint cmdidReplHistoryNext = 0x0106;
-        public const uint cmdidReplHistoryPrevious = 0x0107;
-        public const uint cmdidReplClearScreen = 0x0108;
-        public const uint cmdidBreakLine = 0x0109;
-        public const uint cmdidReplSearchHistoryNext = 0x010A;
-        public const uint cmdidReplSearchHistoryPrevious = 0x010B;
-        public const uint menuIdReplToolbar = 0x2000;
-
-        public const uint comboIdReplScopes = 0x3000;
-        public const uint comboIdReplScopesGetList = 0x3001;
-    };
+/* ****************************************************************************
+ *
+ * Copyright (c) Microsoft Corporation. 
+ *
+ * This source code is subject to terms and conditions of the Apache License, Version 2.0. A 
+ * copy of the license can be found in the License.html file at the root of this distribution. If 
+ * you cannot locate the Apache License, Version 2.0, please send an email to 
+ * vspython@microsoft.com. By using this source code in any fashion, you are agreeing to be bound 
+ * by the terms of the Apache License, Version 2.0.
+ *
+ * You must not remove this notice, or any other, from this software.
+ *
+ * ***************************************************************************/
+
+// PkgCmdID.cs
+// MUST match PkgCmdID.h
+
+#if NTVS_FEATURE_INTERACTIVEWINDOW
+namespace Microsoft.NodejsTools.Repl {
+#else
+namespace Microsoft.VisualStudio.Repl {
+#endif
+    static class PkgCmdIDList {
+        public const uint cmdidSmartExecute = 0x103;
+        public const uint cmdidBreakRepl = 0x104;
+        public const uint cmdidResetRepl = 0x105;
+        public const uint cmdidReplHistoryNext = 0x0106;
+        public const uint cmdidReplHistoryPrevious = 0x0107;
+        public const uint cmdidReplClearScreen = 0x0108;
+        public const uint cmdidBreakLine = 0x0109;
+        public const uint cmdidReplSearchHistoryNext = 0x010A;
+        public const uint cmdidReplSearchHistoryPrevious = 0x010B;
+        public const uint menuIdReplToolbar = 0x2000;
+
+        public const uint comboIdReplScopes = 0x3000;
+        public const uint comboIdReplScopesGetList = 0x3001;
+    };
 }