Merge pull request dotnet#6 from Microsoft/master

Merge branch 'master'
nelak · Aug 26, 2016 · 6f83e7a · 6f83e7a
2 parents adfdad7 + 848c934
commit 6f83e7a
Show file tree

Hide file tree

Showing 170 changed files with 3,207 additions and 2,460 deletions.
diff --git a/README.md b/README.md
@@ -65,6 +65,7 @@ For F# 4.1 development
 - [Windows 7 SDK](http://www.microsoft.com/en-us/download/details.aspx?id=8279)
 - [Windows 8 SDK](http://msdn.microsoft.com/en-us/windows/desktop/hh852363.aspx)
 - [Windows 8.1 SDK](http://msdn.microsoft.com/en-us/library/windows/desktop/bg162891.aspx)
+- [Windows 10 SDK](https://developer.microsoft.com/en-US/windows/downloads/windows-10-sdk)
 
 ####Contributing
 

diff --git a/build-everything.proj b/build-everything.proj
@@ -42,32 +42,32 @@
   </ItemGroup>
 
   <Target Name="Build">
-    <MSBuild Projects="@(ProjectsWithDefaultFramework)"  Targets="Build" BuildInParallel="true"  Properties="Configuration=$(Configuration);SIGNTYPE=$(SIGNTYPE)" />
-    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable7;SIGNTYPE=$(SIGNTYPE)" />
-    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable47;SIGNTYPE=$(SIGNTYPE)" />
-    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable78;SIGNTYPE=$(SIGNTYPE)" />
-    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable259;SIGNTYPE=$(SIGNTYPE)" />
-    <MSBuild Projects="@(ProjectsWithCoreClr)"           Targets="Build" BuildInParallel="false" Properties="Configuration=$(Configuration);TargetFramework=coreclr;SIGNTYPE=$(SIGNTYPE)" />
-    <MSBuild Projects="@(SetupProjects)"                 Targets="Build" BuildInParallel="false" Properties="Configuration=$(Configuration);SIGNTYPE=$(SIGNTYPE)" />
+    <MSBuild Projects="@(ProjectsWithDefaultFramework)"  Targets="Build" BuildInParallel="true"  Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
+    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable7;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
+    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable47;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
+    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable78;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
+    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable259;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
+    <MSBuild Projects="@(ProjectsWithCoreClr)"           Targets="Build" BuildInParallel="false" Properties="Configuration=$(Configuration);TargetFramework=coreclr;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
+    <MSBuild Projects="@(SetupProjects)"                 Targets="Build" BuildInParallel="false" Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
   </Target>
 
   <Target Name="Rebuild">
-    <MSBuild Projects="@(ProjectsWithDefaultFramework)"  Targets="Rebuild" BuildInParallel="true"  Properties="Configuration=$(Configuration);SIGNTYPE=$(SIGNTYPE)" />
-    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Rebuild" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable7;SIGNTYPE=$(SIGNTYPE)" />
-    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Rebuild" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable47;SIGNTYPE=$(SIGNTYPE)" />
-    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Rebuild" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable78;SIGNTYPE=$(SIGNTYPE)" />
-    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Rebuild" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable259;SIGNTYPE=$(SIGNTYPE)" />
-    <MSBuild Projects="@(ProjectsWithCoreClr)"           Targets="Rebuild" BuildInParallel="false" Properties="Configuration=$(Configuration);TargetFramework=coreclr;SIGNTYPE=$(SIGNTYPE)" />
-    <MSBuild Projects="@(SetupProjects)"                 Targets="Rebuild" BuildInParallel="false" Properties="Configuration=$(Configuration);SIGNTYPE=$(SIGNTYPE)" />
+    <MSBuild Projects="@(ProjectsWithDefaultFramework)"  Targets="Rebuild" BuildInParallel="true"  Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
+    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Rebuild" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable7;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
+    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Rebuild" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable47;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
+    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Rebuild" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable78;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
+    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Rebuild" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable259;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
+    <MSBuild Projects="@(ProjectsWithCoreClr)"           Targets="Rebuild" BuildInParallel="false" Properties="Configuration=$(Configuration);TargetFramework=coreclr;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
+    <MSBuild Projects="@(SetupProjects)"                 Targets="Rebuild" BuildInParallel="false" Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
   </Target>
 
   <Target Name="Clean">
-    <MSBuild Projects="@(ProjectsWithDefaultFramework)"  Targets="Clean" BuildInParallel="true"  Properties="Configuration=$(Configuration);SIGNTYPE=$(SIGNTYPE)" />
-    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Clean" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable7;SIGNTYPE=$(SIGNTYPE)" />
-    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Clean" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable47;SIGNTYPE=$(SIGNTYPE)" />
-    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Clean" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable78;SIGNTYPE=$(SIGNTYPE)" />
-    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Clean" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable259;SIGNTYPE=$(SIGNTYPE)" />
-    <MSBuild Projects="@(ProjectsWithCoreClr)"           Targets="Clean" BuildInParallel="false" Properties="Configuration=$(Configuration);TargetFramework=coreclr;SIGNTYPE=$(SIGNTYPE)" />
-    <MSBuild Projects="@(SetupProjects)"                 Targets="Clean" BuildInParallel="false" Properties="Configuration=$(Configuration);SIGNTYPE=$(SIGNTYPE)" />
+    <MSBuild Projects="@(ProjectsWithDefaultFramework)"  Targets="Clean" BuildInParallel="true"  Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
+    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Clean" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable7;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
+    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Clean" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable47;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
+    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Clean" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable78;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
+    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Clean" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable259;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
+    <MSBuild Projects="@(ProjectsWithCoreClr)"           Targets="Clean" BuildInParallel="false" Properties="Configuration=$(Configuration);TargetFramework=coreclr;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
+    <MSBuild Projects="@(SetupProjects)"                 Targets="Clean" BuildInParallel="false" Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
   </Target>
 </Project>
diff --git a/build.cmd b/build.cmd
@@ -403,8 +403,8 @@ if '%BUILD_PROTO%' == '1' (
     @if ERRORLEVEL 1 echo Error: NGen of proto failed  && goto :failure
 )
 
-%_msbuildexe% %msbuildflags% build-everything.proj /p:Configuration=%BUILD_CONFIG% %BUILD_DIAG% /p:SIGNTYPE=%BUILD_PUBLICSIGN%
-@if ERRORLEVEL 1 echo Error: '%_msbuildexe% %msbuildflags% build-everything.proj /p:Configuration=%BUILD_CONFIG% %BUILD_DIAG%  /p:SIGNTYPE=%BUILD_PUBLICSIGN%' failed && goto :failure
+%_msbuildexe% %msbuildflags% build-everything.proj /p:Configuration=%BUILD_CONFIG% %BUILD_DIAG% /p:BUILD_PUBLICSIGN=%BUILD_PUBLICSIGN%
+@if ERRORLEVEL 1 echo Error: '%_msbuildexe% %msbuildflags% build-everything.proj /p:Configuration=%BUILD_CONFIG% %BUILD_DIAG%  /p:BUILD_PUBLICSIGN=%BUILD_PUBLICSIGN%' failed && goto :failure
 
 @echo on
 call src\update.cmd %BUILD_CONFIG_LOWERCASE% -ngen

diff --git a/packages.config b/packages.config
@@ -18,4 +18,6 @@
   <package id="Microsoft.VisualFSharp.Type.Providers.Redist" version="1.0.0" />
   <package id="Microsoft.VisualFSharp.Msbuild.15.0" version="1.0.1" />
   <package id="System.ValueTuple" version="4.0.0-rc3-24212-01" />
+  <package id="BenchmarkDotNet" version="0.9.8"/>
+  <package id="BenchmarkDotNet.Diagnostics.Windows" version="0.9.8"/>
 </packages>
diff --git a/setup/FSharp.SDK/FSharp.SDK.wixproj b/setup/FSharp.SDK/FSharp.SDK.wixproj
@@ -5,10 +5,10 @@
     <FSharpTreeRoot>$(MSBuildProjectDirectory)\..\..</FSharpTreeRoot>
     <SetupRootFolder>$(FSharpTreeRoot)\setup</SetupRootFolder>
   </PropertyGroup>
-  
+
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <Import Project="$(SetupRootFolder)\FSharp.Setup.props" />
-  
+
   <PropertyGroup>
     <OutputName>Microsoft.FSharp.SDK</OutputName>
     <ProjectGuid>da0da41f-0e00-4598-8eee-b29d31b0ca04</ProjectGuid>
@@ -19,7 +19,7 @@
     <ServiceByMajorUpgrade>true</ServiceByMajorUpgrade>
     <DefineSolutionProperties>false</DefineSolutionProperties>
   </PropertyGroup>
-  
+
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);LocaleCode=$(LocaleCode)</DefineConstants>
     <DefineConstants>$(DefineConstants);LocaleId=$(LocaleId)</DefineConstants>
@@ -30,7 +30,7 @@
     <DefineConstants>$(DefineConstants);FSharpTreeRoot=$(FSharpTreeRoot)</DefineConstants>
     <DefineConstants>$(DefineConstants);NugetPackagesDir=$(NugetPackagesDir)</DefineConstants>
   </PropertyGroup>
-    
+
   <ItemGroup>
     <WixExtension Include="WixNetFxExtension">
         <Name>WixNetFxExtension</Name>
@@ -40,28 +40,28 @@
       <HintPath>$(BinariesDir)\setup\FSharp.Wix.Extensions.dll</HintPath>
     </WixExtension>
   </ItemGroup>
-  
+
   <ItemGroup>
     <Compile Include="Common.Wix.Properties.wxs" />
-    
+
     <Compile Include="FSharp.SDK.wxs" />
 
     <Compile Condition="'$(IsLangPack)' != 'true'" Include="component-groups\Compiler_Redist.wxs" />
     <Compile Condition="'$(IsLangPack)' == 'true'" Include="component-groups\Compiler_LangPack.wxs" />
-    
+
     <Compile Condition="'$(IsLangPack)' != 'true'" Include="component-groups\Runtime_Redist.wxs" />
     <Compile Condition="'$(IsLangPack)' == 'true'" Include="component-groups\Runtime_LangPack.wxs" />
   </ItemGroup>
-  
+
   <ItemGroup>
       <FilesToSign Include="$(OutDir)$(OutputName).msi">
          <Authenticode>Microsoft400</Authenticode>
       </FilesToSign>
   </ItemGroup>
-  
+
   <Import Project="$(WixInstallPath)\wix.targets" />
   <Import Project="$(FSharpTreeRoot)\src\Microbuild.Settings.targets" />
-  
+
   <Target Name="CheckLocaleIsPassed" BeforeTargets="Build">
     <Error Condition="'$(LocaleCode)' == ''" Text="A 'LocaleCode' property must be passed to the project." />
     <Error Condition="'$(LocaleId)' == ''" Text="A 'LocaleId' property must be passed to the project." />

diff --git a/setup/FSharp.SDK/FSharp.SDK.wxs b/setup/FSharp.SDK/FSharp.SDK.wxs
@@ -2,40 +2,40 @@
 <!-- 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">
 
-	<?define ProductVersion = "4.1"?>
-	<?define ProductPlatform = "x86"?>
-	<?define ProductManufacturer = "Microsoft Corporation"?>
-	<?define ProductDescription = "Visual F# $(var.ProductVersion) SDK"?>
-	<?define ProductUpgradeCode = "$(fsharp.guid($(var.ProductDescription),$(var.ProductPlatform),$(var.LocaleId),$(var.ProductVersion)))" ?>
+  <?define ProductVersion = "4.1"?>
+  <?define ProductPlatform = "x86"?>
+  <?define ProductManufacturer = "Microsoft Corporation"?>
+  <?define ProductDescription = "Visual F# $(var.ProductVersion) SDK"?>
+  <?define ProductUpgradeCode = "$(fsharp.guid($(var.ProductDescription),$(var.ProductPlatform),$(var.LocaleId),$(var.ProductVersion)))" ?>
 
-	<Product Id="*" Name="$(var.ProductDescription)" Manufacturer="$(var.ProductManufacturer)" Version="$(var.ProductVersion)" Language="$(var.LocaleId)" UpgradeCode="$(var.ProductUpgradeCode)">	
+  <Product Id="*" Name="$(var.ProductDescription)" Manufacturer="$(var.ProductManufacturer)" Version="$(var.ProductVersion)" Language="$(var.LocaleId)" UpgradeCode="$(var.ProductUpgradeCode)">	
 
-		<Package Description="$(var.ProductDescription)" Platform="$(var.ProductPlatform)" Manufacturer="$(var.ProductManufacturer)" InstallerVersion="300" Compressed="yes" InstallScope="perMachine" />
-		<MajorUpgrade AllowDowngrades="no" DowngradeErrorMessage="A newer version of this product is already installed." Schedule="afterInstallInitialize" />
-		<MediaTemplate EmbedCab="yes" />
+    <Package Description="$(var.ProductDescription)" Platform="$(var.ProductPlatform)" Manufacturer="$(var.ProductManufacturer)" InstallerVersion="300" Compressed="yes" InstallScope="perMachine" />
+    <MajorUpgrade AllowDowngrades="no" DowngradeErrorMessage="A newer version of this product is already installed." Schedule="afterInstallInitialize" />
+    <MediaTemplate EmbedCab="yes" />
 
-		<Feature Id="Compiler_Feature"
-				 AllowAdvertise="no"
-				 Description="Installs the Visual F# programming language and all associated components."
-				 Title="Visual F#">
+    <Feature Id="Compiler_Feature"
+       AllowAdvertise="no"
+       Description="Installs the Visual F# programming language and all associated components."
+       Title="Visual F#">
 
-            <?if $(var.IsLangPack) = true ?>
-			<ComponentGroupRef Id="Compiler_LangPack" />
-            <?else ?>
-			<ComponentGroupRef Id="Compiler_Redist" />
-            <?endif ?>
-		</Feature>
-		
-        <Feature Id="Runtime_Feature"
-				 Title="Microsoft Visual F# Runtime for .NET"
-				 Description="Runtime components for F# compiled binaries."
-				 Display="hidden">
-				 
-            <?if $(var.IsLangPack) = true ?>
-            <ComponentGroupRef Id="Runtime_LangPack"   />
-            <?else ?>
-            <ComponentGroupRef Id="Runtime_Redist"   />
-            <?endif ?>
-        </Feature>
-	</Product>
+      <?if $(var.IsLangPack) = true ?>
+      <ComponentGroupRef Id="Compiler_LangPack" />
+      <?else ?>
+      <ComponentGroupRef Id="Compiler_Redist" />
+      <?endif ?>
+    </Feature>
+
+    <Feature Id="Runtime_Feature"
+       Title="Microsoft Visual F# Runtime for .NET"
+       Description="Runtime components for F# compiled binaries."
+       Display="hidden">
+
+      <?if $(var.IsLangPack) = true ?>
+      <ComponentGroupRef Id="Runtime_LangPack"   />
+      <?else ?>
+      <ComponentGroupRef Id="Runtime_Redist"   />
+      <?endif ?>
+    </Feature>
+  </Product>
 </Wix>