Merge pull request #1261 from otawfik-ms/modern

F# 4.1 Insertion into VS 15.0
dotnet · Jun 16, 2016 · 3ccf46a · 3ccf46a
2 parents 7ff92d4 + e8ec49b
commit 3ccf46a
Show file tree

Hide file tree

Showing 35 changed files with 443 additions and 419 deletions.
diff --git a/build-everything.proj b/build-everything.proj
@@ -21,6 +21,7 @@
     <ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-src-build.proj" />
     <ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-project-templates-build.proj" />
     <ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-item-templates-build.proj" />
+    <ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-vsix-build.proj" />
   </ItemGroup>
 
   <ItemGroup>
@@ -37,7 +38,6 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(BUILD_SETUP)'=='1' or '$(BUILD_ALL)'=='1'">
-    <SetupProjects Include="vsintegration/fsharp-vsintegration-vsix-build.proj" />
     <SetupProjects Include="setup/fsharp-setup-build.proj" />
   </ItemGroup>
 

diff --git a/setup/Common.Wix.Properties.wxs → setup/FSharp.SDK/Common.Wix.Properties.wxs b/setup/Common.Wix.Properties.wxs → setup/FSharp.SDK/Common.Wix.Properties.wxs
@@ -2,58 +2,15 @@
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
-	<!-- Common Properties -->
-	<Fragment>
-		<PropertyRef Id="NETFRAMEWORK40FULLINSTALLROOTDIR"/>
-		<Condition Message="This application requires .NET Framework. Please install the .NET Framework then run this installer again.">
-			<![CDATA[Installed OR NETFRAMEWORK40FULLINSTALLROOTDIR]]>
-		</Condition>
-	</Fragment>
-
 	<!-- Common Variables -->
 	<Fragment>
 		<?define LangLCID = $(fsharp.localeToId($(var.Lang))) ?>
 		<?define LangCulture = $(fsharp.localeToCulture($(var.Lang))) ?>
 	</Fragment>
 
-	<!-- Common Registry Keys -->
-	<Fragment>
-		<Property Id="VS15_ROOT_FOLDER" Secure="yes">
-			<RegistrySearch Id="SearchForVS15RootPath" Root="HKLM" Key="Software\Microsoft\VisualStudio\SxS\VS7" Name="15.0" Type="raw" />
-		</Property>
-		<Condition Message="Visual Studio 15.0 Installation not found">
-			<![CDATA[VS15_ROOT_FOLDER]]>
-		</Condition>
-
-		<Property Id="MSBUILD15_ROOT_FOLDER" Secure="yes">
-			<RegistrySearch Id="SearchForMSBUILD15RootPath" Root="HKLM" Key="Software\Microsoft\MSBuild\ToolsVersions\15.0" Name="MSBuildToolsRoot" Type="raw" />
-		</Property>
-		<Condition Message="MSBuild 15.0 Installation not found">
-			<![CDATA[MSBUILD15_ROOT_FOLDER]]>
-		</Condition>
-	</Fragment>
-
 	<!-- Common Folders -->
 	<Fragment>	
 		<Directory Id="TARGETDIR" Name="SourceDir">
-			<Directory Id="VS15_ROOT_FOLDER" Name="VS15_ROOT_FOLDER">
-				<Directory Id="VS15_Common7" Name="Common7">
-					<Directory Id="VS15_Common7_IDE" Name="IDE">
-						<Directory Id="VS15_Common7_IDE_PublicAssemblies" Name="PublicAssemblies" />
-					</Directory>
-				</Directory>
-			</Directory>
-
-			<Directory Id="MSBUILD15_ROOT_FOLDER" Name="MSBUILD15_ROOT_FOLDER">
-				<Directory Id="MSBuild_Microsoft" Name="Microsoft">
-					<Directory Id="MSBuild_Microsoft_VisualStudio" Name="VisualStudio">
-						<Directory Id="MSBuild_Microsoft_VisualStudio_v15.0" Name="v15.0">
-							<Directory Id="MSBuild_Microsoft_VisualStudio_v15.0_FSharp" Name="FSharp" />
-						</Directory>
-					</Directory>
-				</Directory>
-			</Directory>
-
 			<Directory Id="ProgramFilesFolder" Name="Program Files">
 				<Directory Id="ReferenceAssemblies" Name="Reference Assemblies">
 					<Directory Id="ReferenceAssemblies_Microsoft" Name="Microsoft">

diff --git a/setup/FSharp.SDK/FSharp.SDK.wixproj b/setup/FSharp.SDK/FSharp.SDK.wixproj
@@ -39,14 +39,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="$(SetupRootFolder)\Common.Wix.Properties.wxs" />
+    <Compile Include="Common.Wix.Properties.wxs" />
 
     <Compile Include="FSharp.SDK.wxs" />
 
     <Compile Include="component-groups\Redist_ManagedFiles.wxs" />
     <Compile Include="component-groups\Compiler_SDK.wxs" />
     <Compile Include="component-groups\Compiler_OtherResources.wxs" />
-    <Compile Include="component-groups\Compiler_PublicAssemblies.wxs" />
     <Compile Include="component-groups\Langpack_ManagedFiles.wxs" />
   </ItemGroup>
 
@@ -68,6 +67,6 @@
         <MsiPath Include="$(OutDir)$(OutputName).msi" />
     </ItemGroup>
 
-    <Copy SourceFiles="@(MsiPath)" DestinationFiles="@(MsiPath->'$(SetupRootFolder)\..\$(Configuration)\insertion\msi\$(Lang)\%(Filename)%(Extension)')" />
+    <Copy SourceFiles="@(MsiPath)" DestinationFiles="@(MsiPath->'$(SetupRootFolder)\..\$(Configuration)\msi\%(Filename).$(Lang)%(Extension)')" />
   </Target>
 </Project>
diff --git a/setup/FSharp.SDK/FSharp.SDK.wxs b/setup/FSharp.SDK/FSharp.SDK.wxs
@@ -29,7 +29,6 @@
 
 			<ComponentGroupRef Id="Compiler_SDK" />
 			<ComponentGroupRef Id="Compiler_OtherResources" />
-			<ComponentGroupRef Id="Compiler_PublicAssemblies" />
 		</Feature>
 
         <Feature Id="Langpack_Feature"

diff --git a/setup/FSharp.SDK/component-groups/Compiler_OtherResources.wxs b/setup/FSharp.SDK/component-groups/Compiler_OtherResources.wxs
@@ -3,28 +3,14 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
 	<Fragment>
-		<PropertyRef Id="VS15_ROOT_FOLDER" />
-		<PropertyRef Id="MSBUILD15_ROOT_FOLDER" />
-
 		<ComponentGroup Id="Compiler_OtherResources">
 
-			<ComponentRef Id="Compiler_OtherResources_Microsoft.FSharp.Shim.targets" />
-			<ComponentRef Id="Compiler_OtherResources_Microsoft.Portable.FSharp.Shim.targets" />
 			<ComponentRef Id="Compiler_OtherResources_Redist.txt" />
 			<ComponentRef Id="Compiler_OtherResources_ThirdPartyNotices.txt" />
 			<ComponentRef Id="Compiler_OtherResources_FSharp_eula.$(var.Lang).rtf" />
 
 		</ComponentGroup>
-
-        <DirectoryRef Id="MSBuild_Microsoft_VisualStudio_v15.0_FSharp">		
-            <Component Id="Compiler_OtherResources_Microsoft.FSharp.Shim.targets" Guid="$(fsharp.guid(Compiler_OtherResources_Microsoft.FSharp.Shim.targets, $(var.Lang)))">
-                <File Id="Compiler_OtherResources_Microsoft.FSharp.Shim.targets" Name="Microsoft.FSharp.targets" Source="$(var.BinariesDir)\setup\resources\Microsoft.FSharp.Shim.targets" />
-            </Component>			
-            <Component Id="Compiler_OtherResources_Microsoft.Portable.FSharp.Shim.targets" Guid="$(fsharp.guid(Compiler_OtherResources_Microsoft.Portable.FSharp.Shim.targets, $(var.Lang)))">
-                <File Id="Compiler_OtherResources_Microsoft.Portable.FSharp.Shim.targets" Name="Microsoft.Portable.FSharp.targets" Source="$(var.BinariesDir)\setup\resources\Microsoft.Portable.FSharp.Shim.targets" />
-            </Component>			
-        </DirectoryRef>
-
+
         <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp">
             <Component Id="Compiler_OtherResources_Redist.txt" Guid="$(fsharp.guid(Compiler_OtherResources_Redist.txt, $(var.Lang)))">
                 <File Id="Compiler_OtherResources_Redist.txt" Source="$(var.FSharpCoreRedistDir)\content\Redist.txt" />

diff --git a/setup/FSharp.SDK/component-groups/Compiler_PublicAssemblies.wxs b/setup/FSharp.SDK/component-groups/Compiler_PublicAssemblies.wxs
diff --git a/setup/FSharp.SDK/component-groups/Compiler_SDK.wxs b/setup/FSharp.SDK/component-groups/Compiler_SDK.wxs
@@ -3,9 +3,6 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:NetFx="http://schemas.microsoft.com/wix/NetFxExtension">
 
 	<Fragment>
-		<PropertyRef Id="VS15_ROOT_FOLDER" />
-		<PropertyRef Id="MSBUILD15_ROOT_FOLDER" />
-
 		<ComponentGroup Id="Compiler_SDK">
 
 			<ComponentRef Id="Compiler_SDK_FSharp.Core.dll" />

diff --git a/setup/FSharp.SDK/component-groups/Langpack_ManagedFiles.wxs b/setup/FSharp.SDK/component-groups/Langpack_ManagedFiles.wxs
@@ -3,9 +3,6 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
 	<Fragment>
-		<PropertyRef Id="VS15_ROOT_FOLDER" />
-		<PropertyRef Id="MSBUILD15_ROOT_FOLDER" />
-
 		<?define LangLCID = $(fsharp.localeToId($(var.Lang))) ?>
 		<?define LangCulture = $(fsharp.localeToCulture($(var.Lang))) ?>
 

diff --git a/setup/FSharp.SDK/component-groups/Redist_ManagedFiles.wxs b/setup/FSharp.SDK/component-groups/Redist_ManagedFiles.wxs
@@ -3,9 +3,6 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
 	<Fragment>
-		<PropertyRef Id="VS15_ROOT_FOLDER" />
-		<PropertyRef Id="MSBUILD15_ROOT_FOLDER" />
-
 		<ComponentGroup Id="Redist_ManagedFiles">
 
 			<!-- F# 4.1 -->

diff --git a/setup/Insertion/VisualFSharpVSIX/VisualFSharpVSIX.swixproj b/setup/Insertion/VisualFSharpVSIX/VisualFSharpVSIX.swixproj
diff --git a/setup/Insertion/VisualFSharpVSIX/VisualFSharpVSIX.swr b/setup/Insertion/VisualFSharpVSIX/VisualFSharpVSIX.swr
diff --git a/.../Insertion/FSharp.SDK/FSharp.SDK.swixproj → setup/Swix/FSharp.SDK/FSharp.SDK.swixproj b/.../Insertion/FSharp.SDK/FSharp.SDK.swixproj → setup/Swix/FSharp.SDK/FSharp.SDK.swixproj
@@ -7,16 +7,17 @@
     <OutputType>manifest</OutputType>
     <IsPackage>true</IsPackage>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\insertion\json</OutputPath>
+    <BinariesFolder>$(FSharpSourcesRoot)\..\$(Configuration)</BinariesFolder>
+    <OutputPath>$(BinariesFolder)\insertion</OutputPath>
   </PropertyGroup>
 
   <Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
 
   <PropertyGroup>
-    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);InsertionFolder=$(FSharpSourcesRoot)\..\$(Configuration)\insertion</PackagePreprocessorDefinitions>
+    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BinariesFolder=$(BinariesFolder)</PackagePreprocessorDefinitions>
   </PropertyGroup>
 
   <ItemGroup>
-    <Package Include="FSharp.SDK.swr" />
+    <Package Include="Files.swr" />
   </ItemGroup>
 </Project>
diff --git a/setup/Insertion/FSharp.SDK/FSharp.SDK.swr → setup/Swix/FSharp.SDK/Files.swr b/setup/Insertion/FSharp.SDK/FSharp.SDK.swr → setup/Swix/FSharp.SDK/Files.swr
@@ -1,6 +1,6 @@
 use vs
 
-package name=Microsoft.FSharp
+package name=Microsoft.FSharp.Msi
         version=4.1
         vs.package.type=msi
         vs.package.chip=neutral
@@ -12,4 +12,4 @@ vs.localizedResources
                        description="Deploy Visual F# Tools templates to Visual Studio"
 
 vs.payloads
-  vs.payload source=$(InsertionFolder)\msi\ENU\FSharp.SDK.msi
+  vs.payload source=$(BinariesFolder)\msi\FSharp.SDK.ENU.msi
diff --git a/setup/Insertion/Insertion.vsmanproj → setup/Swix/Microsoft.FSharp.vsmanproj b/setup/Insertion/Insertion.vsmanproj → setup/Swix/Microsoft.FSharp.vsmanproj
@@ -5,13 +5,15 @@
     <FinalizeManifest>true</FinalizeManifest>
     <FinalizeSkipLayout>true</FinalizeSkipLayout>
     <IsPackage>true</IsPackage>
-    <OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\insertion\json</OutputPath>
+    <OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\insertion</OutputPath>
   </PropertyGroup>
 
   <Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
 
+  <!-- Only inserting ENU msi and Professional vsix for now -->
+
   <ItemGroup>
-    <MergeManifest Include="$(OutputPath)\VisualFSharpVSIX.json" />
+    <MergeManifest Include="$(OutputPath)\VisualFSharpVSIX.Professional.json" />
     <MergeManifest Include="$(OutputPath)\FSharp.SDK.json" />
   </ItemGroup>
 </Project>
diff --git a/setup/Swix/VisualFSharpVSIX/CommonFiles.swr b/setup/Swix/VisualFSharpVSIX/CommonFiles.swr
@@ -0,0 +1,51 @@
+use vs
+
+package name=Microsoft.FSharp.Vsix
+        version=4.1
+        vs.package.chip=neutral
+        vs.package.language=en-us
+
+vs.localizedResources
+  vs.localizedResource language=en-us
+                       title="Visual F# Tools"
+                       description="Deploy Visual F# Tools templates to Visual Studio"
+
+folder "InstallDir:MSBuild\Microsoft\VisualStudio\v15.0\FSharp"
+  file "Microsoft.FSharp.targets" source="$(BinariesFolder)\setup\resources\Microsoft.FSharp.Shim.targets"
+  file "Microsoft.Portable.FSharp.targets" source="$(BinariesFolder)\setup\resources\Microsoft.Portable.FSharp.Shim.targets"
+
+folder "InstallDir:Common7\IDE\PublicAssemblies"
+  file source="$(BinariesFolder)\net40\bin\FSharp.Core.dll" vs.file.ngen=yes
+  file source="$(BinariesFolder)\net40\bin\FSharp.Core.optdata"
+  file source="$(BinariesFolder)\net40\bin\FSharp.Core.sigdata"
+
+folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp"
+  file source="$(BinariesFolder)\net40\bin\FSharp.Compiler.dll" vs.file.ngen=yes
+  file source="$(BinariesFolder)\net40\bin\FSharp.Compiler.Interactive.Settings.dll" vs.file.ngen=yes
+  file source="$(BinariesFolder)\net40\bin\FSharp.Compiler.Server.Shared.dll" vs.file.ngen=yes
+  file source="$(BinariesFolder)\net40\bin\FSharp.Core.dll" vs.file.ngen=yes
+  file source="$(BinariesFolder)\net40\bin\FSharp.Editor.dll" vs.file.ngen=yes
+  file source="$(BinariesFolder)\net40\bin\FSharp.LanguageService.Base.dll" vs.file.ngen=yes
+  file source="$(BinariesFolder)\net40\bin\FSharp.LanguageService.Compiler.dll" vs.file.ngen=yes
+  file source="$(BinariesFolder)\net40\bin\FSharp.LanguageService.dll" vs.file.ngen=yes
+  file source="$(BinariesFolder)\net40\bin\FSharp.ProjectSystem.Base.dll" vs.file.ngen=yes
+  file source="$(BinariesFolder)\net40\bin\FSharp.ProjectSystem.FSharp.dll" vs.file.ngen=yes
+  file source="$(BinariesFolder)\net40\bin\FSharp.ProjectSystem.PropertyPages.dll" vs.file.ngen=yes
+  file source="$(BinariesFolder)\net40\bin\FSharp.VS.FSI.dll" vs.file.ngen=yes
+  file source="$(BinariesFolder)\net40\bin\fsi.exe" vs.file.ngen=yes
+  file source="$(BinariesFolder)\net40\bin\FsiAnyCPU.exe" vs.file.ngen=yes
+  file source="$(BinariesFolder)\net40\bin\FSharp.Core.optdata"
+  file source="$(BinariesFolder)\net40\bin\FSharp.Core.sigdata"
+  file source="$(BinariesFolder)\net40\bin\fsi.exe.config"
+  file source="$(BinariesFolder)\net40\bin\fsiAnyCpu.exe.config"
+  file source="$(BinariesFolder)\..\License.txt"
+  file source="$(BinariesFolder)\net40\bin\RegisterFsharpPackage.pkgdef"
+  file source="$(BinariesFolder)\net40\bin\FSharp.Compiler.Server.Shared.pkgdef"
+  file source="$(BinariesFolder)\net40\bin\FSharp.Editor.pkgdef"
+  file source="$(BinariesFolder)\net40\bin\FSharp.LanguageService.Base.pkgdef"
+  file source="$(BinariesFolder)\net40\bin\FSharp.LanguageService.Compiler.pkgdef"
+  file source="$(BinariesFolder)\net40\bin\FSharp.LanguageService.pkgdef"
+  file source="$(BinariesFolder)\net40\bin\FSharp.ProjectSystem.Base.pkgdef"
+  file source="$(BinariesFolder)\net40\bin\FSharp.ProjectSystem.FSharp.pkgdef"
+  file source="$(BinariesFolder)\net40\bin\FSharp.ProjectSystem.PropertyPages.pkgdef"
+  file source="$(BinariesFolder)\net40\bin\FSharp.VS.FSI.pkgdef"