From 3fbcba8081769144f9f7d20f48192e869a01069c Mon Sep 17 00:00:00 2001
From: Mikhail Arkhipov <mikhaila@outlook.com>
Date: Tue, 20 Dec 2016 15:19:48 -0800
Subject: [PATCH] Dev14/Dev15 compat

---
 .gitignore                                    |  1 +
 .../Impl/ExecutionTracing/RExecutionTracer.cs |  4 +-
 src/Languages/Core/Impl/Tokens/TokenStream.cs |  4 +-
 src/Package/Impl/Package.vsct                 | 69 +++++++++++++------
 ...eractiveWindowComponentContainerFactory.cs | 12 ++--
 .../ViewModel/RPackageSourceViewModel.cs      |  8 ++-
 src/UnitTests/Core/Impl/Paths.cs              |  4 +-
 7 files changed, 71 insertions(+), 31 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6936ef497..4ef060dfe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -122,3 +122,4 @@ TestFiles/
 *.vstman
 *.db-wal
 *.db-shm
+*.ipch
diff --git a/src/Host/Client/Impl/ExecutionTracing/RExecutionTracer.cs b/src/Host/Client/Impl/ExecutionTracing/RExecutionTracer.cs
index c8b950287..e0552dbbc 100644
--- a/src/Host/Client/Impl/ExecutionTracing/RExecutionTracer.cs
+++ b/src/Host/Client/Impl/ExecutionTracing/RExecutionTracer.cs
@@ -48,7 +48,9 @@ namespace Microsoft.R.ExecutionTracing {
         }
 
         internal RExecutionTracer(IRSession session) {
-            session = session ?? throw new ArgumentNullException(nameof(session));
+            if (session == null) {
+                throw new ArgumentNullException(nameof(session));
+            }
 
             Session = session;
             Session.Connected += RSession_Connected;
diff --git a/src/Languages/Core/Impl/Tokens/TokenStream.cs b/src/Languages/Core/Impl/Tokens/TokenStream.cs
index b147242be..9004ac7b5 100644
--- a/src/Languages/Core/Impl/Tokens/TokenStream.cs
+++ b/src/Languages/Core/Impl/Tokens/TokenStream.cs
@@ -22,7 +22,9 @@ namespace Microsoft.Languages.Core.Tokens {
         private bool _isEndOfStream;
 
         public TokenStream(IReadOnlyTextRangeCollection<T> tokens, T endOfStreamToken) {
-            tokens = tokens ?? throw new ArgumentNullException(nameof(tokens));
+            if (tokens == null) {
+                throw new ArgumentNullException(nameof(tokens));
+            }
 
             _index = 0;
             _tokens = tokens;
diff --git a/src/Package/Impl/Package.vsct b/src/Package/Impl/Package.vsct
index 69a7dcff7..a23551a1f 100644
--- a/src/Package/Impl/Package.vsct
+++ b/src/Package/Impl/Package.vsct
@@ -67,7 +67,7 @@
       </Menu>
 
       <!-- REPL window toolbar -->
-      <Menu guid="guidRToolsCmdSet" id="replWindowToolBarId" type="ToolWindowToolbar" priority="0x100">
+      <Menu Condition="Defined(VS15)" guid="guidRToolsCmdSet" id="replWindowToolBarId" type="ToolWindowToolbar" priority="0x100">
         <Parent guid="guidRToolsCmdSet" id="0" />
         <CommandFlag>DefaultDocked</CommandFlag>
         <CommandFlag>NoToolbarClose</CommandFlag>
@@ -453,10 +453,21 @@
         <Parent guid="guidRToolsCmdSet" id="sessionSubMenu"/>
       </Group>
 
-      <Group guid="guidRToolsCmdSet" id="sessionSubMenuRInteractiveGroup" />
-      <Group guid="guidRToolsCmdSet" id="sessionRDebugGroup" />
+      <!-- Dev14 groups -->
+      <Group guid="guidRToolsCmdSet" id="sessionSubMenuRInteractiveGroup" priority="0x0300" Condition="Defined(VS14)">
+        <Parent guid="guidRToolsCmdSet" id="sessionSubMenu"/>
+      </Group>
+      <Group guid="guidRToolsCmdSet" id="sessionRDebugGroup" priority="0x0310" Condition="Defined(VS14)">
+        <Parent guid="guidRToolsCmdSet" id="sessionSubMenu"/>
+      </Group>
+      <!-- End Dev14 groups -->
 
-        <Group guid="guidRToolsCmdSet" id="sessionSubMenuResetGroup" priority="0x0320">
+      <!-- Dev15 groups -->
+      <Group guid="guidRToolsCmdSet" id="sessionSubMenuRInteractiveGroup" Condition="Defined(VS15)" />
+      <Group guid="guidRToolsCmdSet" id="sessionRDebugGroup" Condition="Defined(VS15)" />
+      <!-- End Dev15 groups -->
+
+      <Group guid="guidRToolsCmdSet" id="sessionSubMenuResetGroup" priority="0x0320">
         <Parent guid="guidRToolsCmdSet" id="sessionSubMenu"/>
       </Group>
 
@@ -575,14 +586,29 @@
       <Group guid="guidRToolsCmdSet" id="historyCopySelectedGroup" priority="0x100">
       </Group>
 
-      <!-- InteractiveWindow -->
-      <Group guid="guidRToolsCmdSet" id="replGroup" priority="0x0100" >
+      <!-- InteractiveWindow Dev15 -->
+      <Group guid="guidRToolsCmdSet" id="replGroup" priority="0x0100" Condition="Defined(VS15)">
         <Parent guid="guidRToolsCmdSet" id="replWindowToolBarId"/>
       </Group>
+      <Group guid="guidRToolsCmdSet" id="sessionToolbarDirectoryGroup" priority="0x0650" Condition="Defined(VS15)">
+        <Parent guid="guidRToolsCmdSet" id="replWindowToolBarId"/>
+      </Group>
+      <!-- End InteractiveWindow Dev15 -->
 
-      <Group guid="guidRToolsCmdSet" id="sessionToolbarDirectoryGroup" priority="0x0650">
-        <Parent guid="guidRToolsCmdSet" id="replWindowToolBarId"/>
+      <!-- InteractiveWindow Dev14 -->
+      <Group guid="guidRToolsCmdSet" id="sessionSubMenuFileGroup" priority="0x0510" Condition="Defined(VS14)">
+        <Parent guid="guidInteractiveWindowCmdSet" id="menuIdInteractiveToolbar"/>
       </Group>
+      <Group guid="guidRToolsCmdSet" id="sessionSubMenuRInteractiveGroup" priority="0x0520" Condition="Defined(VS14)">
+        <Parent guid="guidInteractiveWindowCmdSet" id="menuIdInteractiveToolbar"/>
+      </Group>
+      <Group guid="guidRToolsCmdSet" id="sessionRDebugGroup" priority="0x0530" Condition="Defined(VS14)">
+        <Parent guid="guidInteractiveWindowCmdSet" id="menuIdInteractiveToolbar"/>
+      </Group>
+      <Group guid="guidRToolsCmdSet" id="sessionToolbarDirectoryGroup" priority="0x0650" Condition="Defined(VS14)">
+        <Parent guid="guidInteractiveWindowCmdSet" id="menuIdInteractiveToolbar"/>
+      </Group>
+      <!-- End InteractiveWindow Dev14 -->
 
       <Group guid="guidRToolsCmdSet" id="projectNodeContextMenuGroup" priority="0x300" />
       <Group guid="guidRToolsCmdSet" id="projectAddItemContextMenuGroup" priority="0x310" />
@@ -619,7 +645,7 @@
         </Strings>
       </Button>
 
-      <Button guid="guidRToolsCmdSet" id="icmdPrevHistoryRepl" priority="0x0120" type="Button">
+      <Button guid="guidRToolsCmdSet" id="icmdPrevHistoryRepl" priority="0x0120" type="Button" Condition="Defined(VS15)">
         <Icon guid="ImageCatalogGuid" id="MoveUp"/>
         <CommandFlag>IconIsMoniker</CommandFlag>
         <CommandFlag>DefaultInvisible</CommandFlag>
@@ -630,7 +656,7 @@
         </Strings>
       </Button>
 
-      <Button guid="guidRToolsCmdSet" id="icmdNextHistoryRepl" priority="0x0130" type="Button">
+      <Button guid="guidRToolsCmdSet" id="icmdNextHistoryRepl" priority="0x0130" type="Button" Condition="Defined(VS15)">
         <Icon guid="ImageCatalogGuid" id="MoveDown"/>
         <CommandFlag>IconIsMoniker</CommandFlag>
         <CommandFlag>DefaultInvisible</CommandFlag>
@@ -2431,36 +2457,36 @@
       <Parent guid="guidRToolsCmdSet" id="directorySelectSubMenuGroup"/>
     </CommandPlacement>
 
-    <CommandPlacement guid="guidRToolsCmdSet" id="sessionRDebugGroup" priority="0x0310">
+    <CommandPlacement guid="guidRToolsCmdSet" id="sessionRDebugGroup" priority="0x0310" Condition="Defined(VS15)">
       <Parent guid="guidRToolsCmdSet" id="sessionSubMenu"/>
     </CommandPlacement>
-    <CommandPlacement guid="guidRToolsCmdSet" id="sessionSubMenuFileGroup" priority="0x0500">
+    <CommandPlacement guid="guidRToolsCmdSet" id="sessionSubMenuFileGroup" priority="0x0500" Condition="Defined(VS15)">
       <Parent guid="guidRToolsCmdSet" id="sessionSubMenu"/>
     </CommandPlacement>
 
-    <CommandPlacement guid="guidRToolsCmdSet" id="icmdResetRepl" priority="0x0100">
+    <CommandPlacement guid="guidRToolsCmdSet" id="icmdResetRepl" priority="0x0100" Condition="Defined(VS15)">
       <Parent guid="guidRToolsCmdSet" id="replGroup"/>
     </CommandPlacement>
-    <CommandPlacement guid="guidRToolsCmdSet" id="icmdClearRepl" priority="0x0110">
+    <CommandPlacement guid="guidRToolsCmdSet" id="icmdClearRepl" priority="0x0110" Condition="Defined(VS15)">
       <Parent guid="guidRToolsCmdSet" id="replGroup"/>
     </CommandPlacement>
-    <CommandPlacement guid="guidRToolsCmdSet" id="icmdPrevHistoryRepl" priority="0x0120">
+    <CommandPlacement guid="guidRToolsCmdSet" id="icmdPrevHistoryRepl" priority="0x0120" Condition="Defined(VS15)">
       <Parent guid="guidRToolsCmdSet" id="replGroup"/>
     </CommandPlacement>
-    <CommandPlacement guid="guidRToolsCmdSet" id="icmdNextHistoryRepl" priority="0x0130">
+    <CommandPlacement guid="guidRToolsCmdSet" id="icmdNextHistoryRepl" priority="0x0130" Condition="Defined(VS15)">
       <Parent guid="guidRToolsCmdSet" id="replGroup"/>
     </CommandPlacement>
-    <CommandPlacement guid="guidRToolsCmdSet" id="sessionSubMenuFileGroup" priority="0x0140">
+    <CommandPlacement guid="guidRToolsCmdSet" id="sessionSubMenuFileGroup" priority="0x0140" Condition="Defined(VS15)">
       <Parent guid="guidRToolsCmdSet" id="replWindowToolBarId"/>
     </CommandPlacement>
-    <CommandPlacement guid="guidRToolsCmdSet" id="sessionSubMenuRInteractiveGroup" priority="0x0150">
+    <CommandPlacement guid="guidRToolsCmdSet" id="sessionSubMenuRInteractiveGroup" priority="0x0150" Condition="Defined(VS15)">
       <Parent guid="guidRToolsCmdSet" id="replWindowToolBarId"/>
     </CommandPlacement>
-    <CommandPlacement guid="guidRToolsCmdSet" id="sessionRDebugGroup" priority="0x0160">
+    <CommandPlacement guid="guidRToolsCmdSet" id="sessionRDebugGroup" priority="0x0160" Condition="Defined(VS15)">
       <Parent guid="guidRToolsCmdSet" id="replWindowToolBarId"/>
     </CommandPlacement>
 
-    <CommandPlacement guid="guidRToolsCmdSet" id="sessionSubMenuRInteractiveGroup" priority="0x0300">
+    <CommandPlacement guid="guidRToolsCmdSet" id="sessionSubMenuRInteractiveGroup" priority="0x0300" Condition="Defined(VS15)">
       <Parent guid="guidRToolsCmdSet" id="sessionSubMenu"/>
     </CommandPlacement>
 
@@ -2948,6 +2974,9 @@
     <!-- InteractiveWindow Guid -->
     <GuidSymbol name="guidInteractiveWindowCmdSet" value="{00B8868B-F9F5-4970-A048-410B05508506}">
       <!-- https://github.com/dotnet/roslyn/blob/master/src/InteractiveWindow/VisualStudio/InteractiveWindow.vsct -->
+      <!-- VS14 only -->
+      <IDSymbol name="menuIdInteractiveToolbar" value="0x2000"/>
+      <!-- End of VS14 only -->
       <IDSymbol name="menuIdInteractiveContextMenu" value="0x2100" />
       <IDSymbol name="cmdidReset" value="0x0105"/>
       <IDSymbol name="cmdidHistoryNext" value="0x0106"/>
diff --git a/src/Package/Impl/Repl/VsRInteractiveWindowComponentContainerFactory.cs b/src/Package/Impl/Repl/VsRInteractiveWindowComponentContainerFactory.cs
index ceff27825..5800c62bc 100644
--- a/src/Package/Impl/Repl/VsRInteractiveWindowComponentContainerFactory.cs
+++ b/src/Package/Impl/Repl/VsRInteractiveWindowComponentContainerFactory.cs
@@ -37,13 +37,13 @@ namespace Microsoft.VisualStudio.R.Package.Repl {
             VsAppShell.Current.AssertIsOnMainThread();
 
             IVsInteractiveWindow vsWindow;
+#if VS14
+            vsWindow = _vsInteractiveWindowFactoryLazy.Value.Create(RGuidList.ReplInteractiveWindowProviderGuid, instanceId, string.Empty, evaluator);
+#else
             var vsf2 = _vsInteractiveWindowFactoryLazy.Value as IVsInteractiveWindowFactory2; // Temporary for VS 2017 RC2
-            if (vsf2 != null) {
-                vsWindow = vsf2.Create(RGuidList.ReplInteractiveWindowProviderGuid, instanceId, string.Empty, evaluator, 
-                                      0, RGuidList.RCmdSetGuid, RPackageCommandId.replWindowToolBarId, null);
-            } else {
-                vsWindow = _vsInteractiveWindowFactoryLazy.Value.Create(RGuidList.ReplInteractiveWindowProviderGuid, instanceId, string.Empty, evaluator);
-            }
+            vsWindow = vsf2.Create(RGuidList.ReplInteractiveWindowProviderGuid, instanceId, string.Empty, evaluator, 
+                                   0, RGuidList.RCmdSetGuid, RPackageCommandId.replWindowToolBarId, null);
+#endif
 
             var contentType = _contentTypeRegistryService.GetContentType(RContentTypeDefinition.ContentType);
             vsWindow.SetLanguage(RGuidList.RLanguageServiceGuid, contentType);
diff --git a/src/R/Components/Impl/PackageManager/Implementation/ViewModel/RPackageSourceViewModel.cs b/src/R/Components/Impl/PackageManager/Implementation/ViewModel/RPackageSourceViewModel.cs
index 452a42474..151ba93df 100644
--- a/src/R/Components/Impl/PackageManager/Implementation/ViewModel/RPackageSourceViewModel.cs
+++ b/src/R/Components/Impl/PackageManager/Implementation/ViewModel/RPackageSourceViewModel.cs
@@ -15,8 +15,12 @@ namespace Microsoft.R.Components.PackageManager.Implementation.ViewModel {
         public RPackageSourceViewModel(string source, string name) : this(source, name, isEnabled: true) { }
 
         public RPackageSourceViewModel(string source, string name, bool isEnabled) {
-            source = source ?? throw new ArgumentNullException(nameof(source));
-            name = name ?? throw new ArgumentNullException(nameof(name));
+            if (source == null) {
+                throw new ArgumentNullException(nameof(source));
+            }
+            if (name == null) {
+                throw new ArgumentNullException(nameof(name));
+            }
 
             Name = name;
             Source = source;
diff --git a/src/UnitTests/Core/Impl/Paths.cs b/src/UnitTests/Core/Impl/Paths.cs
index 177570574..ea4207f51 100644
--- a/src/UnitTests/Core/Impl/Paths.cs
+++ b/src/UnitTests/Core/Impl/Paths.cs
@@ -5,6 +5,8 @@ using System;
 using System.IO;
 using System.Text;
 using Microsoft.Common.Core;
+using Microsoft.Win32;
+using static System.FormattableString;
 
 namespace Microsoft.UnitTests.Core {
     public static class Paths {
@@ -26,8 +28,8 @@ namespace Microsoft.UnitTests.Core {
                     }
 
                     _vsRoot = testRunnerFolder.Substring(0, index + ideFolder.Length);
-                }
 #endif
+                }
                 return _vsRoot;
             }
         }