Use dotnet publish to deploy fsharp.core.unittests for coreclr

.nuget/NuGet.Config

@@ -7,12 +7,13 @@
 
     <!--To inherit the global NuGet package sources remove the <clear/> line below -->
     <clear />
-    <add key="myget.org fsharp-daily" value="https://www.myget.org/F/fsharp-daily/api/v3/index.json" />  
+    <add key="myget.org fsharp-daily" value="https://www.myget.org/F/fsharp-daily/api/v3/index.json" />
     <add key="myget.org roslyn-master-nightly" value="https://dotnet.myget.org/F/roslyn-master-nightly/api/v3/index.json" />
     <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
-    <add key="myget.org dotnet-buildtools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />  
-    <add key="myget.org roslyn-tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />  
+    <add key="myget.org dotnet-buildtools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
+    <add key="myget.org roslyn-tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
     <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="vctools" value="https://vcppdogfooding.azurewebsites.net/nuget/" />
-  </packageSources>  
+    <add key="artifacts" value="../artifacts" />
+  </packageSources>
 </configuration>

artifacts/readme

@@ -0,0 +1 @@
+Ensure there is an artifacts directory

packages.config

@@ -29,6 +29,7 @@
   <package id="BenchmarkDotNet.Diagnostics.Windows" version="0.9.8"/>
   <package id="VisualCppTools" version="14.0.24519-Pre"/>
   <package id="Newtonsoft.Json" version="6.0.8"/>
+  <package id="Microsoft.FSharp.TupleSample" version="1.0.0-alpha-161112"/>
 
   <!-- Annoyingly the build of FSharp.Compiler.Server.Shared references a Visual Studio-specific attribute -->
   <!-- That DLL is logically part of the F# Compiler and F# Interactive but is shipped as part of the Visual F# IDE Tools -->

src/FSharpSource.Settings.targets

@@ -39,16 +39,16 @@
 
   <PropertyGroup Condition="'$(OS)' != 'Unix'">
     <!-- Things we do only on Windows right now -->
-	<UseMicroBuild>true</UseMicroBuild>
-	<UseSourceLink>true</UseSourceLink>
-	<UseGatherBinaries>true</UseGatherBinaries>
-	<AddVsSdkAttributesToSomeCoreComponents>true</AddVsSdkAttributesToSomeCoreComponents>
+    <UseMicroBuild>true</UseMicroBuild>
+    <UseSourceLink>true</UseSourceLink>
+    <UseGatherBinaries>true</UseGatherBinaries>
+    <AddVsSdkAttributesToSomeCoreComponents>true</AddVsSdkAttributesToSomeCoreComponents>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(OS)' == 'Unix'">
-	<DefineConstants>CROSS_PLATFORM_COMPILER;$(DefineConstants)</DefineConstants>
+    <DefineConstants>CROSS_PLATFORM_COMPILER;$(DefineConstants)</DefineConstants>
   </PropertyGroup>
-	
+
   <PropertyGroup Condition=" '$(ProjectLanguage)' == 'FSharp' ">
     <!-- Things we do only for F# projects -->
     <OtherFlags>$(OtherFlags) --times</OtherFlags>
@@ -77,7 +77,7 @@
     <ErrorReport Condition=" '$(ErrorReport)' == '' ">prompt</ErrorReport>
     <DefineConstants Condition=" '$(ProjectLanguage)' != 'VisualBasic' ">TRACE;$(DefineConstants)</DefineConstants>
     <DefineConstants Condition=" '$(ProjectLanguage)' == 'VisualBasic' ">TRACE=True,$(DefineConstants)</DefineConstants>
-	  <SIGN_WITH_MSFT_KEY Condition=" '$(SIGN_WITH_MSFT_KEY)' == '' ">false</SIGN_WITH_MSFT_KEY>
+    <SIGN_WITH_MSFT_KEY Condition=" '$(SIGN_WITH_MSFT_KEY)' == '' ">false</SIGN_WITH_MSFT_KEY>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Proto'">
@@ -99,7 +99,7 @@
     <DefineConstants Condition="'$(VisualStudioVersion)'=='14.0' AND '$(ProjectLanguage)' != 'VisualBasic'">$(DefineConstants);VS_VERSION_DEV14</DefineConstants>
     <DefineConstants Condition="'$(VisualStudioVersion)'=='15.0' AND '$(ProjectLanguage)' == 'VisualBasic'">$(DefineConstants),VS_VERSION_DEV15=True</DefineConstants>
     <DefineConstants Condition="'$(VisualStudioVersion)'=='15.0' AND '$(ProjectLanguage)' != 'VisualBasic'">$(DefineConstants);VS_VERSION_DEV15</DefineConstants>
-	<!-- VisualStudioVersion is not defined when using xbuild on Mono. Assume 14.0, the last shipped in-the-box with Mono -->
+    <!-- VisualStudioVersion is not defined when using xbuild on Mono. Assume 14.0, the last shipped in-the-box with Mono -->
     <DefineConstants Condition="'$(VisualStudioVersion)'=='' AND '$(ProjectLanguage)' == 'VisualBasic'">$(DefineConstants),VS_VERSION_DEV14=True</DefineConstants>
     <DefineConstants Condition="'$(VisualStudioVersion)'=='' AND '$(ProjectLanguage)' != 'VisualBasic'">$(DefineConstants);VS_VERSION_DEV14</DefineConstants>
   </PropertyGroup>

src/FSharpSource.targets

@@ -499,7 +499,8 @@
     <PropertyGroup>
       <PackageProperties>-prop "licenseUrl=$(PackageLicenceUrl)" -prop "version=$(PackageVersion)" -prop "authors=$(PackageAuthors)" -prop "projectUrl=$(PackageProjectUrl)" -prop "tags=$(PackageTags)"</PackageProperties>
     </PropertyGroup>
-    <Exec Command='$(MSBuildThisFileDirectory)..\.nuget\nuget.exe pack %(PackageNuspec.Filename)%(PackageNuspec.Extension) -BasePath "$(OutputPath.TrimEnd("\"))" -ExcludeEmptyDirectories $(PackageProperties) -OutputDirectory "$(OutputPath.TrimEnd("\"))"' />
+
+    <Exec Command='$(MSBuildThisFileDirectory)..\.nuget\nuget.exe pack %(PackageNuspec.Filename)%(PackageNuspec.Extension) -BasePath "$(OutputPath.TrimEnd("\"))" -ExcludeEmptyDirectories $(PackageProperties) -OutputDirectory "$(MSBuildThisFileDirectory)..\artifacts' />
   </Target>
 
   <Target Name="dotnetrestore" BeforeTargets="Build" Condition=" '$(TargetFramework)' == 'coreclr' and '$(DOTNET_PUBLISH)' == 'true' ">

src/fsharp/FSharp.Compiler.Host.netcore.nuget/FSharp.Compiler.Host.proj

@@ -20,6 +20,24 @@
     <PackageNuspec Include="Microsoft.FSharp.Compiler.Host.netcore.nuspec" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\fsi\Fsi.fsproj">
+      <Name>fsi</Name>
+      <Project>{d0e98c0d-490b-4c61-9329-0862f6e87645}</Project>
+      <Private>True</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Fsc\Fsc.fsproj">
+      <Name>Fsc</Name>
+      <Project>{C94C257C-3C0A-4858-B5D8-D746498D1F08}</Project>
+      <Private>True</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\fsiAnyCpu\FsiAnyCPU.fsproj">
+      <Name>FsiAnyCPU.fsproj</Name>
+      <Project>{8b3e283d-b5fe-4055-9d80-7e3a32f3967b}</Project>
+      <Private>True</Private>
+    </ProjectReference>
+  </ItemGroup>
+
   <Target Name="Build" Outputs="$(TargetPath)"  DependsOnTargets="$(nugetpack)" />
   <Target Name="Rebuild"  DependsOnTargets="$(nugetpack)" />
 

src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj

@@ -46,37 +46,36 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>3</WarningLevel>
   </PropertyGroup>
-  <ItemGroup>
+  <ItemGroup  Condition=" '$(TargetFramework)' != 'coreclr' ">
     <!-- need full name and SpecificVersion = true in order to convince msbuild to allow this reference when targeting portable47 -->
-    <Reference Include="nunit.framework, Version=$(NUnitFullVersion), Culture=neutral, PublicKeyToken=2638cd05610744eb" Condition="'$(TargetFramework)' != 'coreclr'">
+    <Reference Include="nunit.framework, Version=$(NUnitFullVersion), Culture=neutral, PublicKeyToken=2638cd05610744eb">
       <SpecificVersion>true</SpecificVersion>
       <Private>True</Private>
       <HintPath>$(NUnitLibDir)\nunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="FsCheck, Version=$(FsCheckFullVersion)" Condition="'$(TargetFramework)' != 'portable47'">
+    <Reference Include="FsCheck, Version=$(FsCheckFullVersion)" Condition=" '$(TargetFramework)' != 'portable47' ">
       <SpecificVersion>true</SpecificVersion>
       <Private>True</Private>
       <HintPath Condition="'$(TargetFramework)' == 'net40'">$(FsCheckLibDir)\net45\FsCheck.dll</HintPath>
       <HintPath Condition="'$(TargetFramework)' == 'portable7'">$(FsCheckLibDir)\portable-net45+netcore45\FsCheck.dll</HintPath>
       <HintPath Condition="'$(TargetFramework)' == 'portable78'">$(FsCheckLibDir)\portable-net45+netcore45+wp8\FsCheck.dll</HintPath>
-      <HintPath Condition="'$(TargetFramework)' == 'portable259' OR '$(TargetFramework)' == 'coreclr'">$(FsCheckLibDir)\portable-net45+netcore45+wpa81+wp8\FsCheck.dll</HintPath>
+      <HintPath Condition="'$(TargetFramework)' == 'portable259'">$(FsCheckLibDir)\portable-net45+netcore45+wpa81+wp8\FsCheck.dll</HintPath>
     </Reference>
     <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
       <Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
       <Name>FSharp.Core</Name>
     </ProjectReference>
     <Reference Include="System.ValueTuple">
-        <HintPath Condition=" '$(TargetFramework)' == 'coreclr' ">..\..\..\packages\System.ValueTuple.4.0.0-rc3-24212-01\lib\netstandard1.1\System.ValueTuple.dll</HintPath>
         <HintPath Condition=" '$(TargetFramework)' == 'profile47' ">..\..\..\packages\System.ValueTuple.4.4.0-beta-24631-01\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
-        <HintPath Condition=" '$(TargetFramework)' != 'coreclr'  and  '$(TargetFramework)' != 'profile47' ">..\..\..\packages\System.ValueTuple.4.4.0-beta-24631-01\lib\portable-net40+sl4+win8+wp8\System.ValueTuple.dll</HintPath>
+        <HintPath Condition="'$(TargetFramework)' != 'profile47' ">..\..\..\packages\System.ValueTuple.4.4.0-beta-24631-01\lib\portable-net40+sl4+win8+wp8\System.ValueTuple.dll</HintPath>
         <Private>True</Private>
     </Reference>
     <Reference Include="TupleSample">
-        <HintPath Condition=" '$(TargetFramework)' == 'coreclr' ">FSharp.Core\SampleTuples\4.0.0-rc3-24212-01\TupleSample.dll</HintPath>
-        <HintPath Condition=" '$(TargetFramework)' != 'coreclr' ">FSharp.Core\SampleTuples\4.4.0-beta-24631-01\TupleSample.dll</HintPath>
+        <HintPath>..\..\..\packages\Microsoft.FSharp.TupleSample.1.0.0-alpha-161112/lib/portable-net40+sl4+win8+wp8/TupleSample.dll</HintPath>
         <Private>True</Private>
     </Reference>
   </ItemGroup>
+<!--
   <ItemGroup Condition="'$(TargetFramework)' == 'coreclr'">
     <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb">
         <SpecificVersion>true</SpecificVersion>
@@ -90,6 +89,7 @@
     </Reference>
     <None Include="project.json" />
   </ItemGroup>
+-->
   <ItemGroup Condition="(!$(TargetFramework.Contains('portable'))) and '$(TargetFramework)' != 'coreclr'">
     <Reference Include="mscorlib" />
     <Reference Include="System" />

src/fsharp/FSharp.Core.Unittests/FSharp.Core/SampleTuples/Microsoft.FSharp.TupleSample.nuspec

@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
+    <metadata>
+        <id>Microsoft.FSharp.TupleSample</id>
+        <description>Sample CSharpTuple code for tuple interop testing</description>
+        <language>en-US</language>
+        <requireLicenseAcceptance>true</requireLicenseAcceptance>
+        <version>$version$</version>
+        <authors>$authors$</authors>
+        <licenseUrl>$licenseUrl$</licenseUrl>
+        <projectUrl>$projectUrl$</projectUrl>
+        <tags>$tags$</tags>
+        <dependencies>
+            <group>
+                <dependency id="System.ValueTuple" version="4.0.0-rc3-24212-01" />
+            </group>
+        </dependencies>
+    </metadata>
+    <files>
+        <file src="4.0.0-rc3-24212-01\TupleSample.dll"     target="lib/netstandard1.1" />
+        <file src="4.4.0-beta-24631-01\TupleSample.dll"     target="lib/portable-net40+sl4+win8+wp8" />
+    </files>
+</package>

src/fsharp/FSharp.Core.Unittests/project.json

@@ -6,10 +6,12 @@
     "emitEntryPoint": true
   },
   "dependencies": {
+    "nunit": "3.5.0",
+    "nunitlite": "3.5.0",
+    "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-*",
     "System.ValueTuple": "4.0.0-rc3-24212-01",
-    "NUnitLite": "3.5.0",
-    "NUnit": "3.5.0",
-    "FsCheck": "2.6.2"
+    "FsCheck": "2.6.2",
+    "Microsoft.FSharp.TupleSample": "1.0.0-alpha-161112",
   },
   "runtimes": {
     "win7-x86": {},
@@ -23,10 +25,9 @@
         "Microsoft.NETCore.App": {
           "type": "platform",
           "version": "1.0.1"
-        },
-        "Microsoft.NETCore.Portable.Compatibility": "1.0.1"
+        }
       },
-      "imports": [ "netstandard1.6", "portable-net45+win8+wp8+wpa81" ]
+      "imports": [ "netstandard1.1", "netstandard1.6", "portable-net45+win8+wp8+wpa81" ]
     }
-  }
+  },
 }

src/fsharp/fsi/Fsi.fsproj

@@ -29,7 +29,7 @@
       <TranslationFile>$(FSharpSourcesRoot)\..\loc\lcl\{Lang}\$(AssemblyName).exe.lcl</TranslationFile>
       <LciCommentFile>$(FSharpSourcesRoot)\..\loc\lci\$(AssemblyName).exe.lci</LciCommentFile>
       <HasLceComments>false</HasLceComments>
-	  <InProject>false</InProject>
+      <InProject>false</InProject>
     </FilesToLocalize>
   </ItemGroup>
   <ItemGroup>

vsintegration/Vsix/VisualFSharpDesktop/VisualFSharpDesktop.csproj

@@ -43,8 +43,8 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <VSRootSuffix>FSharpDev</VSRootSuffix>
     <UseCodebase>true</UseCodebase>
-    <DeployExtension Condition="'$(AppVeyor)' != '' or '$(HUDSON_COOKIE)' != '' or '$(UsingMicrobuild)' != ''">False</DeployExtension>
-    <DeployExtension Condition="'$(AppVeyor)' == '' and '$(HUDSON_COOKIE)' == '' and '$(UsingMicrobuild)' == ''">True</DeployExtension>
+    <DeployExtension Condition=" '$(DeployExtension)' == '' and ('$(AppVeyor)' != '' or '$(HUDSON_COOKIE)' != '' or '$(UsingMicrobuild)' != '') ">False</DeployExtension>
+    <DeployExtension Condition=" '$(DeployExtension)' == '' and '$(AppVeyor)' == '' and '$(HUDSON_COOKIE)' == '' and '$(UsingMicrobuild)' == '' ">True</DeployExtension>
     <ProjectGuid>{E7EC4A3E-9D57-45B8-83F5-EDDFD6CEF090}</ProjectGuid>
     <IsPackage>true</IsPackage>
     <RootNamespace>VisualFSharpDesktop</RootNamespace>

vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj

@@ -43,8 +43,8 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <VSRootSuffix>FSharpDev</VSRootSuffix>
     <UseCodebase>true</UseCodebase>
-    <DeployExtension Condition="'$(AppVeyor)' != '' or '$(HUDSON_COOKIE)' != '' or '$(UsingMicrobuild)' != ''">False</DeployExtension>
-    <DeployExtension Condition="'$(AppVeyor)' == '' and '$(HUDSON_COOKIE)' == '' and '$(UsingMicrobuild)' == ''">True</DeployExtension>
+    <DeployExtension Condition=" '$(DeployExtension)' == '' and ('$(AppVeyor)' != '' or '$(HUDSON_COOKIE)' != '' or '$(UsingMicrobuild)' != '') ">False</DeployExtension>
+    <DeployExtension Condition=" '$(DeployExtension)' == '' and '$(AppVeyor)' == '' and '$(HUDSON_COOKIE)' == '' and '$(UsingMicrobuild)' == '' ">True</DeployExtension>
     <ProjectGuid>{59ADCE46-9740-4079-834D-9A03A3494EBC}</ProjectGuid>
     <IsPackage>true</IsPackage>
     <RootNamespace>VisualFSharpFull</RootNamespace>

vsintegration/Vsix/VisualFSharpOpenSource/VisualFSharpOpenSource.csproj

@@ -43,8 +43,8 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <VSRootSuffix>FSharpDev</VSRootSuffix>
     <UseCodebase>true</UseCodebase>
-    <DeployExtension Condition="'$(AppVeyor)' != '' or '$(HUDSON_COOKIE)' != '' or '$(UsingMicrobuild)' != ''">False</DeployExtension>
-    <DeployExtension Condition="'$(AppVeyor)' == '' and '$(HUDSON_COOKIE)' == '' and '$(UsingMicrobuild)' == ''">True</DeployExtension>
+    <DeployExtension Condition=" '$(DeployExtension)' == '' and ('$(AppVeyor)' != '' or '$(HUDSON_COOKIE)' != '' or '$(UsingMicrobuild)' != '') ">False</DeployExtension>
+    <DeployExtension Condition=" '$(DeployExtension)' == '' and '$(AppVeyor)' == '' and '$(HUDSON_COOKIE)' == '' and '$(UsingMicrobuild)' == '' ">True</DeployExtension>
     <ProjectGuid>{E6A45CDF-B408-420F-B475-74611BEFC52B}</ProjectGuid>
     <IsPackage>true</IsPackage>
     <RootNamespace>VisualFSharpOpenSource</RootNamespace>

vsintegration/Vsix/VisualFSharpWeb/VisualFSharpWeb.csproj

@@ -43,8 +43,8 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <VSRootSuffix>FSharpDev</VSRootSuffix>
     <UseCodebase>true</UseCodebase>
-    <DeployExtension Condition="'$(AppVeyor)' != '' or '$(HUDSON_COOKIE)' != '' or '$(UsingMicrobuild)' != ''">False</DeployExtension>
-    <DeployExtension Condition="'$(AppVeyor)' == '' and '$(HUDSON_COOKIE)' == '' and '$(UsingMicrobuild)' == ''">True</DeployExtension>
+    <DeployExtension Condition=" '$(DeployExtension)' == '' and ('$(AppVeyor)' != '' or '$(HUDSON_COOKIE)' != '' or '$(UsingMicrobuild)' != '') ">False</DeployExtension>
+    <DeployExtension Condition=" '$(DeployExtension)' == '' and '$(AppVeyor)' == '' and '$(HUDSON_COOKIE)' == '' and '$(UsingMicrobuild)' == '' ">True</DeployExtension>
     <ProjectGuid>{58730C8B-16F5-4956-9291-BB68E17C9142}</ProjectGuid>
     <IsPackage>true</IsPackage>
     <RootNamespace>VisualFSharpWeb</RootNamespace>