VS 2017 support

kochetkov · kochetkov · commit d0777b677c50 · 2017-03-21T00:48:20.000+03:00
diff --git a/.gitmodules b/.gitmodules
@@ -9,4 +9,4 @@
 	url = https://github.com/someone-with-default-username/wix36.git
 [submodule "ExternalDependences/wix311"]
 	path = ExternalDependences/wix311
-	url = git@github.com:rsdn/wix311.git
+	url = https://github.com/rsdn/wix311.git
diff --git a/misc/packages/wix/Includes/Variables.wxi b/misc/packages/wix/Includes/Variables.wxi
@@ -140,13 +140,21 @@
   <?define Comp_VS2013_ProjectTemplates_Guid         = "4AA4725A-3BB1-4061-B462-36B07FFE2D65" ?>
   <?define Comp_VS2013_Resources_Guid                = "AB12A281-D59F-4484-9223-DB18743B9629" ?>
 
-  <?define Comp_VS2015_Manifest_Guid                 = "CC1D1417-0E16-47C0-AB4B-6A922CEBAD53" ?>
-  <?define Comp_VS2015_Package_Guid                  = "0A8414C1-A35D-4CC0-802C-0AC228CCA050" ?>
-  <?define Comp_VS2015_SnippetsIndex_Guid            = "4765157D-C001-4DA6-9B17-9A1D279CCC07" ?>
-  <?define Comp_VS2015_Snippets_Guid                 = "48B716D2-ADE8-4A2F-AD70-CD2A2580AF1A" ?>
-  <?define Comp_VS2015_ItemTemplates_Guid            = "AEAB1A9C-37A9-4242-BFBD-367E266B04E3" ?>
-  <?define Comp_VS2015_ProjectTemplates_Guid         = "4AA4125A-3BB1-4061-B462-36B02FFE2D65" ?>
-  <?define Comp_VS2015_Resources_Guid                = "AB121281-D59F-4484-9223-DB18243B9629" ?>
+  <?define Comp_VS2015_Manifest_Guid                 = "7b698719-5837-4d13-a8b0-e62f93098b44" ?>
+  <?define Comp_VS2015_Package_Guid                  = "68b782f1-3cac-4e6b-9b84-3bbf2dbabb99" ?>
+  <?define Comp_VS2015_SnippetsIndex_Guid            = "096c2345-2c84-4c08-aa97-db6280f0528f" ?>
+  <?define Comp_VS2015_Snippets_Guid                 = "1abfa705-ea0e-4f0f-a258-26c7b18d1084" ?>
+  <?define Comp_VS2015_ItemTemplates_Guid            = "f26efbe6-565d-438e-8137-1c65e72f1baf" ?>
+  <?define Comp_VS2015_ProjectTemplates_Guid         = "bf2b3643-0ae9-4ad1-b014-481e0e674e61" ?>
+  <?define Comp_VS2015_Resources_Guid                = "be845086-1a50-47d6-a5e7-ce97e57d311e" ?>
+
+  <?define Comp_VS2017_Manifest_Guid                 = "beb1ac47-f4dc-46bd-8f45-21736f1897d5" ?>
+  <?define Comp_VS2017_Package_Guid                  = "74374266-5911-4b97-a5ba-038181a731fc" ?>
+  <?define Comp_VS2017_SnippetsIndex_Guid            = "69a7dd87-e66c-4e50-8073-ab55be082696" ?>
+  <?define Comp_VS2017_Snippets_Guid                 = "11be58fc-cc8b-4cb1-9612-3c72a3954d7d" ?>
+  <?define Comp_VS2017_ItemTemplates_Guid            = "76c93f4c-78f3-4085-b373-e940dc35168a" ?>
+  <?define Comp_VS2017_ProjectTemplates_Guid         = "a1960d40-0412-45ab-9a06-1996de98f995" ?>
+  <?define Comp_VS2017_Resources_Guid                = "0aee5c22-5f9f-436e-92b2-985c0b9d875e" ?>
   
 <?else?>
   <?error NVer must be defined?>
diff --git a/misc/packages/wix/Sources/PkgDefPatcher.js b/misc/packages/wix/Sources/PkgDefPatcher.js
@@ -194,6 +194,55 @@ function VS2015() {
   writeStream.Close();
 }
 
+function VS2017() {
+  if (!Session) return;
+
+  var args        = ParseArguments("VS2017");
+  var pkgdefFile  = GetPkgDefFile(args);
+  var text        = ReadPkgDefFile(pkgdefFile);
+  var newText     = SubstitutePaths(args, text);
+  var writeStream = pkgdefFile.OpenAsTextStream(2, -2);
+  writeStream.Write(newText);
+
+  if (newText.indexOf('[$RootKey$\\RuntimeConfiguration\\dependentAssembly\\bindingRedirection\\{FE369FD8-C6DB-433B-907B-05A115708416}]') < 0) {
+    writeStream.WriteLine('[$RootKey$\\RuntimeConfiguration\\dependentAssembly\\bindingRedirection\\{FE369FD8-C6DB-433B-907B-05A115708416}]');
+    writeStream.WriteLine('"name"="Nemerle.VisualStudio"'                                                                                   );
+    writeStream.WriteLine('"publicKeyToken"="c4c0f22444bf4088"'                                                                             );
+    writeStream.WriteLine('"culture"="neutral"'                                                                                             );
+    writeStream.WriteLine('"oldVersion"="1.0.0.0-' + args.NemerleVisualStudioVersion + '"'                                                  );
+    writeStream.WriteLine('"newVersion"="' + args.NemerleVisualStudioVersion + '"'                                                          );
+  }
+
+  if (newText.indexOf('[$RootKey$\\RuntimeConfiguration\\dependentAssembly\\bindingRedirection\\{BD1D3C51-E157-4DE0-A535-E94130D1970A}]') < 0) {
+    writeStream.WriteLine('[$RootKey$\\RuntimeConfiguration\\dependentAssembly\\bindingRedirection\\{BD1D3C51-E157-4DE0-A535-E94130D1970A}]');
+    writeStream.WriteLine('"name"="Microsoft.Windows.Design.Host"'                                                                          );
+    writeStream.WriteLine('"publicKeyToken"="b03f5f7f11d50a3a"'                                                                             );
+    writeStream.WriteLine('"culture"="neutral"'                                                                                             );
+    writeStream.WriteLine('"oldVersion"="4.0.0.0-4.2.0.0"'                                                                                  );
+    writeStream.WriteLine('"newVersion"="4.3.0.0"'                                                                                          );
+  }
+
+  if (newText.indexOf('[$RootKey$\\RuntimeConfiguration\\dependentAssembly\\bindingRedirection\\{5978995F-FBA0-4DCC-8556-19AB2EB19D36}]') < 0) {
+    writeStream.WriteLine('[$RootKey$\\RuntimeConfiguration\\dependentAssembly\\bindingRedirection\\{5978995F-FBA0-4DCC-8556-19AB2EB19D36}]');
+    writeStream.WriteLine('"name"="Microsoft.Windows.Design.Interaction"'                                                                   );
+    writeStream.WriteLine('"publicKeyToken"="b03f5f7f11d50a3a"'                                                                             );
+    writeStream.WriteLine('"culture"="neutral"'                                                                                             );
+    writeStream.WriteLine('"oldVersion"="4.0.0.0-4.2.0.0"'                                                                                  );
+    writeStream.WriteLine('"newVersion"="4.3.0.0"'                                                                                          );
+  }
+
+  if (newText.indexOf('[$RootKey$\\RuntimeConfiguration\\dependentAssembly\\bindingRedirection\\{F604D514-4F33-422E-BA44-E4F22381F044}]') < 0) {
+    writeStream.WriteLine('[$RootKey$\\RuntimeConfiguration\\dependentAssembly\\bindingRedirection\\{F604D514-4F33-422E-BA44-E4F22381F044}]');
+    writeStream.WriteLine('"name"="Microsoft.VisualStudio.Web.Application"'                                                                 );
+    writeStream.WriteLine('"publicKeyToken"="b03f5f7f11d50a3a"'                                                                             );
+    writeStream.WriteLine('"culture"="neutral"'                                                                                             );
+    writeStream.WriteLine('"oldVersion"="10.0.0.0-12.0.0.0"'                                                                                );
+    writeStream.WriteLine('"newVersion"="14.0.0.0"'                                                                                         );
+  }
+
+  writeStream.Close();
+}
+
 function UpdateFileTimestamp() {
   var filePath   = Session.Property("CustomActionData");
   var fso        = new ActiveXObject("Scripting.FileSystemObject");
diff --git a/misc/packages/wix/Sources/Product.wxs b/misc/packages/wix/Sources/Product.wxs
@@ -35,6 +35,7 @@
     <PropertyRef Id="VS2012DEVENV" />
     <PropertyRef Id="VS2013DEVENV" />
     <PropertyRef Id="VS2015DEVENV" />
+    <PropertyRef Id="VS2017DEVENV" />
 <?else?>
     <PropertyRef Id="VS90DEVENV" />
     <PropertyRef Id="VS90SHELL" />
@@ -100,6 +101,10 @@
         <Condition Level="1">VS2015DEVENV</Condition>
         <ComponentGroupRef Id="CompGroup_VS2015Extension" />
       </Feature>
+      <Feature Id="Feature_VS2017" Title="Visual Studio 2017 Integration" Description="Nemerle Project and IntelliSense for Visual Studio 2017" AllowAdvertise="no" Display="expand" InstallDefault="local" Level="0" TypicalDefault="install">
+        <Condition Level="1">VS2017DEVENV</Condition>
+        <ComponentGroupRef Id="CompGroup_VS2017Extension" />
+      </Feature>
 <?endif?>
 
 <?if $(var.NVer) = "net-3.5" ?>
@@ -146,6 +151,11 @@
       <Custom Action="VS2015PatchPkgDef"          Before="VS2015UpdateExtensionsInit"><![CDATA[&Feature_VS2015 > 2]]></Custom>
       <Custom Action="VS2015UpdateExtensionsInit" Before="VS2015UpdateExtensions"    ><![CDATA[&Feature_VS2015 > 1]]></Custom>
       <Custom Action="VS2015UpdateExtensions"     Before="InstallFinalize"           ><![CDATA[&Feature_VS2015 > 1]]></Custom>
+ 
+      <Custom Action="VS2017PatchPkgDefInit"      Before="VS2017PatchPkgDef"         ><![CDATA[&Feature_VS2017 > 2]]></Custom>
+      <Custom Action="VS2017PatchPkgDef"          Before="VS2017UpdateExtensionsInit"><![CDATA[&Feature_VS2017 > 2]]></Custom>
+      <Custom Action="VS2017UpdateExtensionsInit" Before="VS2017UpdateExtensions"    ><![CDATA[&Feature_VS2017 > 1]]></Custom>
+      <Custom Action="VS2017UpdateExtensions"     Before="InstallFinalize"           ><![CDATA[&Feature_VS2017 > 1]]></Custom>
 <?endif?>
 
 <?if $(var.NVer) = "net-3.5" ?>
@@ -179,9 +189,12 @@
 
       <ProgressText Action="VS2013PatchPkgdef"      Template="[1]">Updating Visual Studio 2013 registration</ProgressText>
       <ProgressText Action="VS2013UpdateExtensions" Template="[1]">Updating Visual Studio 2013 registration</ProgressText>
-	  
-	  <ProgressText Action="VS2015PatchPkgdef"      Template="[1]">Updating Visual Studio 2015 registration</ProgressText>
+
+      <ProgressText Action="VS2015PatchPkgdef"      Template="[1]">Updating Visual Studio 2015 registration</ProgressText>
       <ProgressText Action="VS2015UpdateExtensions" Template="[1]">Updating Visual Studio 2015 registration</ProgressText>
+
+      <ProgressText Action="VS2017PatchPkgdef"      Template="[1]">Updating Visual Studio 2017 registration</ProgressText>
+      <ProgressText Action="VS2017UpdateExtensions" Template="[1]">Updating Visual Studio 2017 registration</ProgressText>
 <?endif?>
 <?if $(var.NVer) = "net-3.5" ?>
       <ProgressText Action="VS90Setup" Template="[1]">Updating Visual Studio 2008 registration</ProgressText>
diff --git a/misc/packages/wix/Sources/Vs2010_Extension.wxs b/misc/packages/wix/Sources/Vs2010_Extension.wxs
@@ -4,7 +4,7 @@
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
   <Fragment>
-    <?foreach ide in VS2010;VS2012;VS2013;VS2015 ?>
+    <?foreach ide in VS2010;VS2012;VS2013;VS2015;VS2017?>
 
     <PropertyRef Id="$(var.ide)_ROOT_FOLDER" />
 
@@ -300,5 +300,56 @@
       </Component>
     </DirectoryRef>
 
+    <!-- VS2017 Specific components -->
+
+    <DirectoryRef Id="VS2017EXTENSIONDIR" FileSource="$(var.DistPath)\vs-plugin">
+      <Component Id="Comp_VS2017_Manifest" DiskId="1" Guid="$(var.Comp_VS2017_Manifest_Guid)">
+        <File Id="File_VS2017_extension.vsixmanifest" Name="extension.vsixmanifest" KeyPath="yes"/>
+        <util:XmlFile Id="Xml_VS2017_extension.vsixmanifest_1" File="[VS2017EXTENSIONDIR]extension.vsixmanifest" SelectionLanguage="XPath"
+                      Action="setValue" ElementPath="//*[\[]local-name()='InstalledByMsi'[\]]" Value="true" />
+        <util:XmlFile Id="Xml_VS2017_extension.vsixmanifest_2" File="[VS2017EXTENSIONDIR]extension.vsixmanifest" SelectionLanguage="XPath"
+                      Action="setValue" ElementPath="//*[\[]local-name()='MefComponent' and contains(text(), 'Nemerle.VisualStudio.dll')[\]]" Value="[Dir_Nver]Nemerle.VisualStudio.dll" />
+      </Component>
+    </DirectoryRef>
+
+    <DirectoryRef Id="VS2017EXTENSIONDIR" FileSource="$(var.DistPath)\vs-plugin">
+      <Component Id="Comp_VS2017_Package" DiskId="1" Guid="$(var.Comp_VS2017_Package_Guid)">
+        <File Id="File_VS2017_Nemerle.VisualStudio.pkgdef" Name="Nemerle.VisualStudio.pkgdef" KeyPath="yes"/>
+      </Component>
+    </DirectoryRef>
+
+    <DirectoryRef Id="VS2017_Resources_Folder" FileSource="$(var.DistPath)\vs-plugin\Resources">
+      <Component Id="Comp_VS2017_Resources" DiskId="1" Guid="$(var.Comp_VS2017_Resources_Guid)">
+        <File Id="File_VS2017_Nemerle.ico" Name="Nemerle.ico" KeyPath="yes"/>
+      </Component>
+    </DirectoryRef>
+
+    <DirectoryRef Id="VS2017_CodeSnippets_Folder" FileSource="$(var.DistPath)\vs-plugin\CodeSnippets">
+      <Component Id="Comp_VS2017_SnippetsIndex" DiskId="1" Guid="$(var.Comp_VS2017_SnippetsIndex_Guid)">
+        <File Id="File_VS2017_SnippetsIndex.xml" Name="SnippetsIndex.xml" KeyPath="yes"/>
+      </Component>
+    </DirectoryRef>
+
+    <DirectoryRef Id="VS2017_CodeSnippets_Snippets_Folder" FileSource="$(var.DistPath)\vs-plugin\CodeSnippets\Snippets">
+      <Component Id="Comp_VS2017_Snippets" DiskId="1" Guid="$(var.Comp_VS2017_Snippets_Guid)">
+        <?define ide = VS2017?>
+        <?include ..\Includes\VsSnippets.wxi ?>
+      </Component>
+    </DirectoryRef>
+
+    <DirectoryRef Id="VS2017_ItemTemplates_Nemerle_Folder" FileSource="$(var.DistPath)\vs-plugin\ItemTemplates\Nemerle">
+      <Component Id="Comp_VS2017_ItemTemplates" DiskId="1" Guid="$(var.Comp_VS2017_ItemTemplates_Guid)">
+        <?define ide = VS2017?>
+        <?include ..\Includes\VsItemTemplates.wxi ?>
+      </Component>
+    </DirectoryRef>
+
+    <DirectoryRef Id="VS2017_ProjectTemplates_Nemerle_Folder" FileSource="$(var.DistPath)\vs-plugin\ProjectTemplates\Nemerle">
+      <Component Id="Comp_VS2017_ProjectTemplates" DiskId="1" Guid="$(var.Comp_VS2017_ProjectTemplates_Guid)">
+        <?define ide = VS2017?>
+        <?include ..\Includes\VsProjectTemplates.wxi ?>
+      </Component>
+    </DirectoryRef>
+
   </Fragment>
 </Wix>
diff --git a/misc/packages/wix/nemerle.wixproj b/misc/packages/wix/nemerle.wixproj
@@ -11,7 +11,7 @@
     <IntermediateOutputPath>$(IntermediateOutputPath)\$(Configuration)\</IntermediateOutputPath>
     <DistPath>$(IntermediateOutputPath)\Dist\</DistPath>
     <NRoot>$(MSBuildProjectDirectory)\..\..\..</NRoot>
-    <WixVersion Condition=" '$(WixVersion)' == '' ">wix310</WixVersion>
+    <WixVersion Condition=" '$(WixVersion)' == '' ">wix311</WixVersion>
     <WixVersion Condition=" '$(NVer)' == 'net-3.5' ">wix36</WixVersion>
     <WixToolPath>$(NRoot)\ExternalDependences\$(WixVersion)\</WixToolPath>
     <WixTargetsPath>$(WixToolPath)Wix.targets</WixTargetsPath>
diff --git a/snippets/VS2010/Nemerle.VisualStudio/Project/NetFrameworkProjectConstants.cs b/snippets/VS2010/Nemerle.VisualStudio/Project/NetFrameworkProjectConstants.cs
@@ -6,6 +6,7 @@ namespace Nemerle.VisualStudio.Project
 {
   static class NetFrameworkProjectConstants
   {
+    private const string FrameworkVersion462 = "4.6.2";
     private const string FrameworkVersion461 = "4.6.1";
     private const string FrameworkVersion46 = "4.6";
     private const string FrameworkVersion452 = "4.5.2";
@@ -40,6 +41,7 @@ public static string GetDefaultTargetFrameworkVersion()
         case 11: return "v" + FrameworkVersion45;
         case 12: return "v" + FrameworkVersion451;
         case 14: return "v" + FrameworkVersion46;
+        case 15: return "v" + FrameworkVersion462;
         default: return "v" + FrameworkVersion40;
       }
     }
@@ -52,6 +54,7 @@ public static string GetDefaultTargetFrameworkVersion()
       "v" + FrameworkVersion452,
       "v" + FrameworkVersion46,
       "v" + FrameworkVersion461,
+      "v" + FrameworkVersion462,
     };
 
     public static int VisualStudioVersion = Process.GetCurrentProcess().MainModule.FileVersionInfo.FileMajorPart;
diff --git a/snippets/VS2010/Nemerle.VisualStudio/source.extension.vsixmanifest b/snippets/VS2010/Nemerle.VisualStudio/source.extension.vsixmanifest
@@ -27,7 +27,7 @@
       </VisualStudio>
       <IsolatedShell Version="1.0">NemerleStudio</IsolatedShell>
     </SupportedProducts>
-    <SupportedFrameworkRuntimeEdition MinVersion="4.0" MaxVersion="4.6" />
+    <SupportedFrameworkRuntimeEdition MinVersion="4.0" MaxVersion="4.6.2" />
     <AllUsers>true</AllUsers>
   </Identifier>
   <References>

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ namespace Nemerle.VisualStudio.Project`
`6`	`6`	`{`
`7`	`7`	`static class NetFrameworkProjectConstants`
`8`	`8`	`{`
	`9`	`+ private const string FrameworkVersion462 = "4.6.2";`
`9`	`10`	`private const string FrameworkVersion461 = "4.6.1";`
`10`	`11`	`private const string FrameworkVersion46 = "4.6";`
`11`	`12`	`private const string FrameworkVersion452 = "4.5.2";`
`@@ -40,6 +41,7 @@ public static string GetDefaultTargetFrameworkVersion()`
`40`	`41`	`case 11: return "v" + FrameworkVersion45;`
`41`	`42`	`case 12: return "v" + FrameworkVersion451;`
`42`	`43`	`case 14: return "v" + FrameworkVersion46;`
	`44`	`+ case 15: return "v" + FrameworkVersion462;`
`43`	`45`	`default: return "v" + FrameworkVersion40;`
`44`	`46`	`}`
`45`	`47`	`}`
`@@ -52,6 +54,7 @@ public static string GetDefaultTargetFrameworkVersion()`
`52`	`54`	`"v" + FrameworkVersion452,`
`53`	`55`	`"v" + FrameworkVersion46,`
`54`	`56`	`"v" + FrameworkVersion461,`
	`57`	`+ "v" + FrameworkVersion462,`
`55`	`58`	`};`
`56`	`59`
`57`	`60`	`public static int VisualStudioVersion = Process.GetCurrentProcess().MainModule.FileVersionInfo.FileMajorPart;`