fix build for mono packaging

Author: dsyme

FSharp.sln

@@ -31,7 +31,7 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Tests.FSharpSuite",
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler.UnitTests", "tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj", "{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Core.UnitTests", "tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj", "{88E2D422-6852-46E3-A740-83E391DC7973}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Core.UnitTests", "tests\FSharp.Core.UnitTests\FSharp.Core.Unittests.fsproj", "{88E2D422-6852-46E3-A740-83E391DC7973}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Compiler", "Compiler", "{3881429D-A97A-49EB-B7AE-A82BA5FE9C77}"
 EndProject

Makefile

@@ -1,6 +1,6 @@
 include $(topsrcdir)mono/config.make
 
-.PHONY: restore
+.PHONY: restore build
 
 restore:
 	MONO_ENV_OPTIONS=$(monoopts) mono .nuget/NuGet.exe restore packages.config -PackagesDirectory packages -ConfigFile .nuget/NuGet.Config
@@ -27,7 +27,7 @@ build:
 	MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj
 	MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/fsi/Fsi.fsproj
 	MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj
-	MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj
+	MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 tests/FSharp.Core.UnitTests/FSharp.Core.Unittests.fsproj
 	mkdir -p $(Configuration)/fsharp30/net40/bin
 	mkdir -p $(Configuration)/fsharp31/net40/bin
 	mkdir -p $(Configuration)/fsharp40/net40/bin

build-everything.proj

@@ -54,12 +54,12 @@
   <!-- +++++++++++++++++++++++ Project selection for testing +++++++++++++++++++++++++++++++ -->
 
   <ItemGroup Condition="'$(TEST_NET40_COREUNIT_SUITE)'=='1'" >
-    <ProjectsWithNet40 Include="tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj"/>
+    <ProjectsWithNet40 Include="tests/FSharp.Core.UnitTests/FSharp.Core.Unittests.fsproj"/>
     <ProjectsWithNet40 Include="tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj"/>
   </ItemGroup>
 
   <ItemGroup Condition="'$(TEST_CORECLR_COREUNIT_SUITE)'=='1'">
-    <ProjectsWithCoreClr Include="tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj"/>
+    <ProjectsWithCoreClr Include="tests/FSharp.Core.UnitTests/FSharp.Core.Unittests.fsproj"/>
     <ProjectsWithCoreClr Include="tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj"/>
   </ItemGroup>
 

build.sh

@@ -361,15 +361,15 @@ if [ "$BUILD_PROTO" = "1" ]; then
 #        { printeval "$_ngenexe install Proto/net40/bin/fsc-proto.exe /nologo"; } || failwith "NGen of proto failed"
     else
         # Build proto-compiler and libs
-        { printeval "$_msbuildexe $msbuildflags src/fsharp-proto-build.proj /p:UseMonoPackaging=true /p:Configuration=Proto /p:DisableLocalization=true"; } || failwith "compiler proto build failed"
+        { printeval "$_msbuildexe $msbuildflags src/fsharp-proto-build.proj /p:MonoPackaging=true /p:Configuration=Proto /p:DisableLocalization=true"; } || failwith "compiler proto build failed"
     fi
 fi
 
 
 build_status "Done with proto, starting build"
 
 if [ "$BUILD_PHASE" = "1" ]; then
-    cmd="$_msbuildexe $msbuildflags build-everything.proj /p:UseMonoPackaging=true /p:Configuration=$BUILD_CONFIG $BUILD_DIAG /p:BUILD_PUBLICSIGN=$BUILD_PUBLICSIGN"
+    cmd="$_msbuildexe $msbuildflags build-everything.proj /p:MonoPackaging=true /p:Configuration=$BUILD_CONFIG $BUILD_DIAG /p:BUILD_PUBLICSIGN=$BUILD_PUBLICSIGN"
     { printeval "$cmd"; } || failwith "'$cmd' failed"
 fi
 

build/targets/GitHash.props

@@ -5,7 +5,7 @@
 Copied from RepoToolset. Might be slightly modified to adjust for the current F# build system specifics if necessary.
 -->
 
-<Project>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!--
 
   Defines the following properties:

mono/appveyor.ps1

@@ -1,6 +1,6 @@
 
 # the version under development, update after a release
-$version = '4.1.28'
+$version = '4.1.31'
 
 function isVersionTag($tag){
     $v = New-Object Version

packages.config

@@ -20,7 +20,10 @@
   <package id="Microsoft.DiaSymReader.PortablePdb" version="1.2.0"  />
   <package id="Microsoft.DiaSymReader" version="1.1.0" />
   <package id="System.ValueTuple" version="4.3.1" />
-  <package id="Microsoft.VisualFSharp.Msbuild.15.0" version="1.0.1" />
+  <package id="Microsoft.Build" version="14.3.0" />
+  <package id="Microsoft.Build.Framework" version="14.3.0" />
+  <package id="Microsoft.Build.Utilities.Core" version="14.3.0" />
+  <package id="Microsoft.Build.Tasks.Core" version="14.3.0" />
 
   <!-- Testing -->
   <package id="FsCheck" version="2.6.2" />

src/FSharpSource.Profiles.targets

@@ -3,6 +3,7 @@
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup Condition="'$(TargetDotnetProfile)'=='net40'">
+    <DefineConstants Condition="'$(MonoPackaging)' == 'true'">$(DefineConstants);CROSS_PLATFORM_COMPILER</DefineConstants>
     <DefineConstants>$(DefineConstants);PREFERRED_UI_LANG</DefineConstants>
     <DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
     <DefineConstants>$(DefineConstants);BE_SECURITY_TRANSPARENT</DefineConstants>

src/FSharpSource.Settings.targets

@@ -103,14 +103,18 @@
     <XliffTasksVersion>0.2.0-beta-000076</XliffTasksVersion>
   </PropertyGroup>
 
+  <!-- Default setting. Some get modified later in FSharpSource.targets -->
   <PropertyGroup>
+    <SkipSigning>false</SkipSigning>
+    <UseOpenSourceSign>true</UseOpenSourceSign>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(FSharpSourcesRoot)\fsharp\msft.pubkey</AssemblyOriginatorKeyFile>
     <StrongNames>true</StrongNames>
     <DelaySign>true</DelaySign>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(OS)' != 'Unix'">
+  <!-- On windows, VS packaging -->
+  <PropertyGroup Condition="'$(MonoPackaging)' != 'true' AND '$(OS)' != 'Unix'">
     <UseMicroBuild>true</UseMicroBuild> 
     <UseSourceLink Condition = " '$(UseSourceLink)' == '' AND '$(Configuration)'=='Release' ">false</UseSourceLink>
     <UseGatherBinaries>true</UseGatherBinaries>
@@ -130,6 +134,7 @@
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <!-- Settings for Debug mode        -->
     <DebugType>full</DebugType>
+    <DebugType Condition="'$(OS)' == 'Unix'">portable</DebugType> <!-- no longer use MDB on Mono --> 
 
     <Optimize Condition=" '$(Optimize)' == '' ">false</Optimize>
     <ErrorReport Condition=" '$(ErrorReport)' == '' ">prompt</ErrorReport>
@@ -142,6 +147,7 @@
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <!-- Flags used for Release mode.		-->
     <DebugType>pdbonly</DebugType>
+    <DebugType Condition="'$(OS)' == 'Unix'">portable</DebugType> <!-- no longer use MDB on Mono --> 
 
     <Optimize Condition=" '$(Optimize)' == '' ">true</Optimize>
     <EmbedAllSource>false</EmbedAllSource>
@@ -153,6 +159,7 @@
   <PropertyGroup Condition="'$(Configuration)'=='Proto'">
     <!-- Flags used when running the Proto compiler.		-->
     <DebugType Condition=" '$(DebugType)' == '' ">full</DebugType>
+    <DebugType Condition="'$(OS)' == 'Unix'">portable</DebugType> <!-- no longer use MDB on Mono --> 
     <Optimize>true</Optimize>
     <DefineConstants>DEBUG;NO_STRONG_NAMES;$(DefineConstants)</DefineConstants>
   </PropertyGroup>
@@ -196,17 +203,23 @@
     <!-- FSharp.Compiler.Tools is currently only used to get a working FSI.EXE to execute some scripts during the build -->
     <!-- The LKG FSI.EXE requires MSBuild 15 to be installed, which is painful -->
     <FsiToolPath>$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools</FsiToolPath>
+
+
+    <!-- The version of MSBuild assumed byt the F# compiler in the Mono packaging of F# -->
+    <MonoPackagingMSBuildVersionFull>14.0.0.0</MonoPackagingMSBuildVersionFull>	  
+
   </PropertyGroup>
 
+<!--
   <Import Project="$(MSBuildThisFileDirectory)..\packages\XliffTasks.$(XliffTasksVersion)\build\XliffTasks.props" Condition="'$(DisableLocalization)' != 'true'" />
 
   <PropertyGroup>
-    <!-- in addition to the standard xlf languages, also provide a baseline en->en file -->
     <XlfLanguages>en;$(XlfLanguages)</XlfLanguages>
   </PropertyGroup>
 
   <Import Project="$(RestorePackagesPath)\XliffTasks.$(XliffTasksVersion)\build\XliffTasks.targets" Condition="'$(DisableLocalization)' != 'true'" />
   <Import Project="../Tools/Build.Common.props" Condition="'$(TargetDotnetProfile)'=='coreclr'"/>
   <Import Project="$(BuildVersionFilePath)"     Condition="Exists('$(BuildVersionFilePath)')" />
+-->
 
 </Project>

src/FSharpSource.targets

@@ -8,74 +8,43 @@
 
   <Import Project="..\build\targets\GitHash.props" />
 
-  <Choose>
-    <When Condition="'$(Configuration)' == 'Debug' or '$(Configuration)' == 'Release' ">
-      <PropertyGroup>
-        <SkipSigning>false</SkipSigning><!-- Skip using the ,net toolset to generate signing . -->
-        <UseOpenSourceSign>true</UseOpenSourceSign>
-      </PropertyGroup>
-      <Choose>
-        <When Condition="'$(ProjectLanguage)' == 'FSharp'">
-          <Choose>
-            <!-- Some unit test assemblies must not have strong names since they reference other assemblies that don't have strong names -->
-            <!-- These unit test assemblies can't use InternalsVisibleTo into assemblies with strong names. -->
-            <When Condition="'$(StrongNames)' == 'false'" >
-              <PropertyGroup>
-                <SkipSigning>true</SkipSigning>
-                <UseOpenSourceSign>false</UseOpenSourceSign>
-                <MicroBuildAssemblyFileLanguage>fs</MicroBuildAssemblyFileLanguage>
-              </PropertyGroup>
-            </When>
-            <!-- In the Microsoft build we just delay-sign everything with the MSFT key -->
-            <!-- We have to do unit test DLLs well because they can see the internals of other strong-named DLLs -->
-            <Otherwise>
-              <PropertyGroup>
-                <DelaySign>true</DelaySign>
-                <StrongNames>true</StrongNames>
-                <MicroBuildAssemblyFileLanguage>fs</MicroBuildAssemblyFileLanguage>
-              </PropertyGroup>
-            </Otherwise>
-          </Choose>
-        </When>
-        <Otherwise>
-          <!-- Not F# code -->
-          <PropertyGroup>
-            <SignAssembly>true</SignAssembly>
-            <AssemblyOriginatorKeyFile>$(FSharpSourcesRoot)\fsharp\msft.pubkey</AssemblyOriginatorKeyFile>
-            <StrongNames>true</StrongNames>
-            <DelaySign>true</DelaySign>
-            <MicroBuildAssemblyFileLanguage>fs</MicroBuildAssemblyFileLanguage>
-          </PropertyGroup>
-        </Otherwise>
-      </Choose>
-    </When>
-    <Otherwise>
-      <PropertyGroup Condition="'$(StrongNames)' != 'true'">
-        <!-- For the proto build we don't use strong names. -->
-        <DefineConstants>NO_STRONG_NAMES;$(DefineConstants)</DefineConstants>
-        <MicroBuildAssemblyFileLanguage>fs</MicroBuildAssemblyFileLanguage>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
+  <PropertyGroup>
+    <MicroBuildAssemblyFileLanguage>fs</MicroBuildAssemblyFileLanguage>
+  </PropertyGroup>
 
+  <!-- Some unit test assemblies must not have strong names since they reference other assemblies that don't have strong names -->
+  <!-- These unit test assemblies can't use InternalsVisibleTo into assemblies with strong names. -->
+  <PropertyGroup Condition="'$(StrongNames)' == 'false'">
+    <SkipSigning>true</SkipSigning>
+    <UseOpenSourceSign>false</UseOpenSourceSign>
+    <SignAssembly>false</SignAssembly>
+    <DefineConstants>NO_STRONG_NAMES;$(DefineConstants)</DefineConstants>
+  </PropertyGroup>
+
+  <!-- On mono, use test.snk to sign private compiler binaries -->
+  <PropertyGroup Condition="'$(StrongNames)' != 'false' AND '$(MonoPackaging)' == 'true' AND '$(AssemblyName)' != 'FSharp.Core' AND '$(AssemblyName)' != 'FSharp.Compiler.Interactive.Settings'" >
+    <AssemblyOriginatorKeyFile>$(FSharpSourcesRoot)\fsharp\test.snk</AssemblyOriginatorKeyFile>
+    <DelaySign>false</DelaySign>
+    <DefineConstants>STRONG_NAME_FSHARP_COMPILER_WITH_TEST_KEY;$(DefineConstants)</DefineConstants>
+  </PropertyGroup>
+
+  <!-- On proto, use he FSharp.Core assembly version for everything (it only matters we get it right for FSharp.Core), and pass the version flag explicitly if not using MicroBuild -->
   <PropertyGroup Condition="'$(Configuration)' == 'Proto'">
-    <OtherFlags >$(OtherFlags) --version:"$(MicroBuildAssemblyVersion)"</OtherFlags>
+    <MicroBuildAssemblyVersion>$(FSCoreVersion)</MicroBuildAssemblyVersion>
+    <OtherFlags>$(OtherFlags) --version:"$(MicroBuildAssemblyVersion)"</OtherFlags>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(UseSourceLink)' == 'true'">
     <SourceLink>$(IntermediateOutputPath)source_link.json</SourceLink>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(StrongNames)' != 'true'">
-    <DefineConstants>NO_STRONG_NAMES;$(DefineConstants)</DefineConstants>
-  </PropertyGroup>
-
+  <!-- We assume MSBuild 15.0 or greater. Note the Mono packaging doesn't actually rely on any specific version of MSBuild any longer except to build the MSBuild task-->
   <PropertyGroup>
     <DefineConstants>MSBUILD_AT_LEAST_14;$(DefineConstants)</DefineConstants>
   </PropertyGroup>
 
+  <!-- Disable uwa toolchain nuget package resolve logic. -->
   <PropertyGroup>
-    <!-- Disable uwa toolchain nuget package resolve logic. -->
     <NuGetTargets  Condition="'$(NuGetTargets)' == ''">false</NuGetTargets>
   </PropertyGroup>  
 
@@ -126,7 +95,8 @@
     <TargetFrameworkOutputDirectory Condition="'$(FSharpCoreBackVersion)' == '3.0'">fsharp30\$(TargetDotnetProfile)</TargetFrameworkOutputDirectory>
     <TargetFrameworkOutputDirectory Condition="'$(FSharpCoreBackVersion)' == '3.1'">fsharp31\$(TargetDotnetProfile)</TargetFrameworkOutputDirectory>
     <TargetFrameworkOutputDirectory Condition="'$(FSharpCoreBackVersion)' == '4.0'">fsharp40\$(TargetDotnetProfile)</TargetFrameworkOutputDirectory>
-    <IntermediateOutputPath>obj\$(TargetFrameworkOutputDirectory)\</IntermediateOutputPath>
+    <TargetFrameworkOutputDirectory>$(TargetDotnetProfile)</TargetFrameworkOutputDirectory>
+    <IntermediateOutputPath>obj\$(Configuration)\$(TargetFrameworkOutputDirectory)\</IntermediateOutputPath>
   </PropertyGroup>
 
   <Choose>