[Pkg-cli-apps-commits] [fsharp] 53/60: integrate visualfsharp\master
Christopher Halse Rogers
raof-guest at moszumanska.debian.org
Sun Sep 14 08:13:42 UTC 2014
This is an automated email from the git hooks/post-receive script.
raof-guest pushed a commit to branch master
in repository fsharp.
commit e9e3ae7496bc0a0054351cfa4ee82a9bd06fe1ed
Merge: 20a9d20 110449b
Author: F# Software Foundation <fsgit at fastmail.fm>
Date: Tue Sep 2 17:10:10 2014 +0200
integrate visualfsharp\master
.gitignore | 3 +
src/FSharpSource.targets | 7 +-
src/fsharp/FSComp.txt | 2 +-
.../FSharp.Core.Unittests.fsproj | 17 ++-
.../FSharp.Core/DiscrimantedUnionType.fs | 2 +-
.../Microsoft.FSharp.Control/AsyncModule.fs | 14 +-
.../Microsoft.FSharp.Control/AsyncType.fs | 56 ++++++--
.../Microsoft.FSharp.Control/LazyType.fs | 36 ++---
.../Microsoft.FSharp.Core/BigIntType.fs | 155 ++++++++++++++++++---
.../FSharpReflection.fs | 32 ++++-
.../FSharp.Core.Unittests/FSharp.Core/PrimTypes.fs | 2 +-
src/fsharp/FSharp.Core.Unittests/LibraryTestFx.fs | 13 +-
src/fsharp/FSharp.Core/control.fs | 9 +-
src/fsharp/FSharp.Core/math/n.fs | 2 +-
src/fsharp/FSharp.Core/math/z.fs | 130 +++++++++++++----
src/fsharp/FSharp.Core/math/z.fsi | 2 +-
src/fsharp/FSharp.Core/set.fs | 2 +-
src/fsharp/ast.fs | 32 ++---
src/fsharp/fsc.fs | 11 +-
src/fsharp/opt.fs | 33 ++---
src/fsharp/pars.fsy | 26 ++--
src/fsharp/pickle.fs | 126 ++++++++---------
tests/config.bat | 4 +-
tests/fsharp/core/array/test.fsx | 33 +++++
tests/fsharp/core/netcore/netcore259/build.bat | 2 +-
tests/fsharp/core/netcore/netcore259/run.bat | 4 +-
tests/fsharp/core/netcore/netcore7/build.bat | 2 +-
tests/fsharp/core/netcore/netcore7/run.bat | 7 +-
tests/fsharp/core/netcore/netcore78/build.bat | 2 +-
tests/fsharp/core/netcore/netcore78/run.bat | 2 +-
.../netcoreautomationhelperlibrary.fsproj | 6 +-
31 files changed, 540 insertions(+), 234 deletions(-)
diff --cc .gitignore
index 8437862,c7612cb..3dca345
--- a/.gitignore
+++ b/.gitignore
@@@ -57,47 -56,5 +57,50 @@@ tests/projects/Sample_VS2012_FSharp_Con
tests/projects/Sample_VS2012_FSharp_ConsoleApp_net45_with_resource/Sample_VS2012_FSharp_ConsoleApp_net45/Sample_VS2012_FSharp_ConsoleApp_net45.userprefs
*.suo
obj
++<<<<<<< HEAD
+src/fsharp/FSharp.Data.TypeProviders/FSData.resx
+src/fsharp/fsiAnyCpu/FSIstrings.resx
+*.actual
+*.mdb
+*test.txt
+tests/fsharp/optimize/stats/*
+tests/fsharp/core/printing/*
+tests/fsharp/core/csfromfs/*
+tests/fsharp/core/control*/*
+tests/fsharp/core/unicode/*
+tests/fsharp/optimize/*/*
+tests/fsharp/typeProviders/builtin/*
+tests/*.log
+tests/fsharp/core/fsfromcs/*
+tests/fsharp/core/load-script/out.txt
+test.fs
+*.resx
+Vagrantfile
+.vagrant
+out
+fsharp/FSharp.Compiler.Silverlight/FSComp.resx
+fsharp/Script2.fsx
+fsharp/Script3.fsx
+tests/fsharp/core/resources/Resources.resources
+test*.il
+test*.res
+tmptest*.ml
+tmptest*.mli
+*.csdl
+*.ssdl
+_UNATTENDEDLOG
+test.ok
+build.ok
+*.dll.config
+*.exe.config
+*.pdb
+*.exe
+*.dll
+*.err
+*.diff
+*.vsdiff
+*.vserr
+
+*.userprefs
+ extras
-ossreadme*.txt
++ossreadme*.txt
diff --cc src/FSharpSource.targets
index 869dcc6,3c1017a..08fef4f
mode 100755,100644..100755
--- a/src/FSharpSource.targets
+++ b/src/FSharpSource.targets
@@@ -267,20 -215,15 +267,20 @@@ Some other NuGET monikers to support i
<DefineConstants>$(DefineConstants);PUT_TYPE_PROVIDERS_IN_FSCORE</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_CUSTOMATTRIBUTEDATA</DefineConstants>
<DefineConstants>$(DefineConstants);FX_RESHAPED_REFLECTION</DefineConstants>
- <DefineConstants>$(DefineConstants);FX_NO_EXIT_CONTEXT_FLAGS</DefineConstants>
- <DefineConstants>$(DefineConstants);FX_EVENTWAITHANDLE_NO_IDISPOSABLE</DefineConstants>
- <TargetingNetCorePortable>true</TargetingNetCorePortable>
+ <DefineConstants>$(DefineConstants);FX_NO_EXIT_CONTEXT_FLAGS</DefineConstants>
+ <DefineConstants>$(DefineConstants);FX_EVENTWAITHANDLE_NO_IDISPOSABLE</DefineConstants>
+ <DefineConstants>$(DefineConstants);QUERIES_IN_FSLIB</DefineConstants>
+ <TargetProfile>netcore</TargetProfile>
<TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <!-- An explicit search path seems to be needed on Mono 3.4.0 otherwise the reference assemblies for the profile aren't found -->
+ <AssemblySearchPaths Condition="Exists('$(MSBuildExtensionsPath32)\..\xbuild-frameworks\.NETPortable\v4.5\System.Runtime.dll')">$(MSBuildExtensionsPath32)\..\xbuild-frameworks\.NETPortable\v4.5</AssemblySearchPaths>
+ <OtherFlags>$(OtherFlags) --targetprofile:netcore</OtherFlags>
</PropertyGroup>
-
- <!-- Target Portable -->
+
+ <!-- Target Portable Profile 78 -->
<PropertyGroup Condition="'$(TargetFramework)'=='portable78'">
+ <TargetFrameworkOutputDirectory>$(TargetFramework)</TargetFrameworkOutputDirectory>
<DefineConstants>$(DefineConstants);FSHARP_CORE_NETCORE_PORTABLE</DefineConstants>
<DefineConstants>$(DefineConstants);FSHARP_CORE_NETCORE_PORTABLE78</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_CONVERTER</DefineConstants>
@@@ -310,16 -253,12 +310,17 @@@
<DefineConstants>$(DefineConstants);FX_NO_CUSTOMATTRIBUTEDATA</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_CONCURRENT_DICTIONARY</DefineConstants>
<DefineConstants>$(DefineConstants);FX_ATLEAST_LINQ</DefineConstants>
+ <TargetProfile>netcore</TargetProfile>
<TargetFrameworkProfile>Profile78</TargetFrameworkProfile>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <!-- An explicit search path seems to be needed on Mono 3.4.0 otherwise the reference assemblies for the profile aren't found -->
+ <AssemblySearchPaths Condition="Exists('$(MSBuildExtensionsPath32)\..\xbuild-frameworks\.NETPortable\v4.5\System.Runtime.dll')">$(MSBuildExtensionsPath32)\..\xbuild-frameworks\.NETPortable\v4.5</AssemblySearchPaths>
+ <OtherFlags>$(OtherFlags) --targetprofile:netcore</OtherFlags>
</PropertyGroup>
+ <!-- Target Portable Profile 259 -->
<PropertyGroup Condition="'$(TargetFramework)'=='portable259'">
+ <TargetFrameworkOutputDirectory>$(TargetFramework)</TargetFrameworkOutputDirectory>
<DefineConstants>$(DefineConstants);FSHARP_CORE_NETCORE_PORTABLE</DefineConstants>
<DefineConstants>$(DefineConstants);FSHARP_CORE_NETCORE_PORTABLE259</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_CONVERTER</DefineConstants>
@@@ -863,11 -686,40 +864,11 @@@
<Target Name="ValidateConfiguration">
<Error
Text="Configuration '$(Configuration)' is not one of the supported configurations: Debug, Release, Proto"
- Condition="'$(Configuration)'!='Release' and '$(Configuration)'!='Debug' and '$(Configuration)'!='Proto'"/>
+ Condition="'$(Configuration)'!='Release' and '$(Configuration)'!='Debug' and '$(Configuration)'!='VSRelease' and '$(Configuration)'!='VSDebug' and '$(Configuration)'!='Proto'"/>
- <Error
- Text="TargetFramework '$(TargetFramework)' is not one of the supported configurations: 'empty', net20, net40, sl3-wp, sl5, sl5-compiler, portable47, portable7, portable78, portable259"
- Condition="! ('$(TargetFramework)' == 'net40' or
- '$(TargetFramework)' == 'net20' or
- '$(TargetFramework)' == 'sl5' or
- '$(TargetFramework)' == 'sl3-wp' or
- '$(TargetFramework)' == 'portable47' or
- '$(TargetFramework)' == 'portable7' or
- '$(TargetFramework)' == 'portable78' or
- '$(TargetFramework)' == 'portable259')"/>
- <Error
- Text="TargetFramework '$(TargetFramework)' is only supported when building FSharp.Core.dll and FSharp.Core.Unittests.dll. All other components must be built with TargetFramework=net40"
- Condition="'$(AssemblyName)' != 'FSharp.Core' and '$(AssemblyName)' != 'FSharp.Core.Unittests' and '$(TargetFramework)' != 'net40'"/>
-
</Target>
- <!-- This build step copies files to the output folder while replacing build variables in the text of
- those file. -->
- <Target
- Name="CustomCopyLocalFiles"
- Inputs="@(CustomCopyLocal)"
- Outputs="@(CustomCopyLocal->'$(OutDir)%(TargetFilename)')"
- Condition="'$(targetCLIDir)'!='Silverlight/4.0/'"
- >
- <Exec Command="$(FSharpSourcesRoot)\fsharp\FSharp.Build\subst.exe "%(CustomCopyLocal.FullPath)" {FinalDir} "$([System.IO.Path]::GetFullPath('$(OutputPath)'))\" {LkgVersion} $(LkgVersion) {BuildSuffix} "$(FsBuildSuffix)" {FSharpTargetsDir} "%24(MSBuildThisFileDirectory)" > $(OutDir)%(CustomCopyLocal.TargetFilename) "/>
- <!-- Make sure it will get cleaned -->
- <CreateItem Include="$(OutDir)%(CustomCopyLocal.TargetFilename)">
- <Output TaskParameter="Include" ItemName="FileWrites"/>
- </CreateItem>
- </Target>
+ <Import Project="$(LkgPath)\..\2.0\FSharp.SRGen.targets" />
- <Import Project="..\lkg\FSharp-$(LkgVersion)\bin\FSharp.SRGen.targets" />
-
<Target Name="ReorderCompileItems"
BeforeTargets="CoreCompile"
Condition="'$(GenerateTargetFrameworkAttribute)' == 'true' AND '$(AssemblyName)' == 'FSharp.Core'">
diff --cc src/fsharp/FSComp.txt
index a928ad7,d2584e0..a383b80
mode 100755,100644..100755
--- a/src/fsharp/FSComp.txt
+++ b/src/fsharp/FSComp.txt
diff --cc src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
index 481949e,f6af3b2..d39546b
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
@@@ -18,9 -19,15 +18,16 @@@
<!-- Prevent compiler from inlining calls to FSharp.Core to improve code coverage accuracy -->
<Optimize>false</Optimize>
<Tailcalls>false</Tailcalls>
- </PropertyGroup>
+ <TargetProfile Condition=" '$(TargetFramework)' == 'portable7' or '$(TargetFramework)' == 'portable78' or '$(TargetFramework)' == 'portable259' ">netcore</TargetProfile>
+ <!-- workaround for msbuild narrowing the assembly search paths when building portable libs -->
+ <AssemblySearchPaths Condition="$(TargetFramework.Contains('portable'))">
+ {CandidateAssemblyFiles};
+ {TargetFrameworkDirectory};
+ {Registry:Software\Microsoft\.NETFramework,v4.5,AssemblyFoldersEx};
+ </AssemblySearchPaths>
+ </PropertyGroup>
<PropertyGroup>
+ <DefineConstants Condition=" '$(TargetFramework)' == 'sl5' OR '$(TargetFramework)' == 'sl5-compiler' ">$(DefineConstants);SILVERLIGHT</DefineConstants>
<DefineConstants Condition=" '$(TargetFramework)' == 'sl5' ">$(DefineConstants);SILVERLIGHT</DefineConstants>
<DefineConstants>$(DefineConstants);EXTENSIONTYPING</DefineConstants>
</PropertyGroup>
@@@ -39,17 -47,19 +46,22 @@@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>3</WarningLevel>
+ <DebugSymbols>False</DebugSymbols>
</PropertyGroup>
<ItemGroup>
- <Reference Include="nunit.framework" Condition="'$(TargetFramework)' != 'sl5' AND '$(TargetFramework)' != 'sl3-wp'" />
+ <!-- need full name and SpecificVersion = true in order to convince msbuild to allow this reference when targeting portable47 -->
+ <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" Condition="'$(TargetFramework)' != 'sl5' AND '$(TargetFramework)' != 'sl3-wp'" >
+ <SpecificVersion>true</SpecificVersion>
+ </Reference>
<Reference Include="NUnitFramework" Condition="'$(TargetFramework)' == 'sl5' OR '$(TargetFramework)' == 'sl3-wp'" />
<ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
<Name>FSharp.Core</Name>
</ProjectReference>
+ <Reference Include="nunit.framework" Condition="'$(TargetFramework)' != 'sl5' AND '$(TargetFramework)' != 'sl5-compiler' AND '$(TargetFramework)' != 'wp7'" />
+ <Reference Include="NUnitFramework" Condition="'$(TargetFramework)' == 'sl5' OR '$(TargetFramework)' == 'wp7' OR '$(TargetFramework)' == 'sl5-compiler'" />
+ </ItemGroup>
+ <ItemGroup Condition="!$(TargetFramework.Contains('portable'))">
<Reference Include="mscorlib" />
<Reference Include="System" />
<Reference Include="System.Numerics" Condition="'$(TargetFramework)' == 'net40'" />
@@@ -95,13 -96,15 +107,14 @@@
<Compile Include="FSharp.Core\Microsoft.FSharp.Control\Cancellation.fs" />
<Compile Include="FSharp.Core\Microsoft.FSharp.Control\AsyncType.fs" />
<Compile Include="FSharp.Core\Microsoft.FSharp.Control\LazyType.fs" />
- <Compile Include="FSharp.Core\Microsoft.FSharp.Control\MailboxProcessorType.fs" />
- <Compile Include="FSharp.Core\Microsoft.FSharp.Control\AsyncModule.fs" />
<Compile Include="FSharp.Core\Microsoft.FSharp.Control\ObservableModule.fs" />
- <Compile Include="FSharp.Core\Microsoft.FSharp.Control\EventModule.fs" />
- <Compile Include="FSharp.Core\Microsoft.FSharp.Reflection\FSharpReflection.fs" />
<Compile Include="FSharp.Core\Microsoft.FSharp.Quotations\FSharpQuotations.fs" />
+ <Compile Include="FSharp.Core\Microsoft.FSharp.Reflection\FSharpReflection.fs" />
+ <Compile Include="FSharp.Core\PrimTypes.fs" />
<Compile Include="TypeForwarding.fs" />
<Compile Include="NUnitFrameworkShims.fs" Condition="'$(TargetFramework)' == 'sl3-wp'" />
+ <!-- <Compile Include="SurfaceArea.4.0.fs"/> -->
+ <Compile Include="SurfaceArea.4.0.fs" Condition="'$(TargetFramework)' == 'net40'"/>
</ItemGroup>
<Import Project="$(FSharpSourcesRoot)\FSharpSource.targets" />
-</Project>
+</Project>
diff --cc src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Control/AsyncModule.fs
index e7cc79c,3c6853e..18b43ec
mode 100755,100644..100755
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Control/AsyncModule.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Control/AsyncModule.fs
@@@ -454,6 -466,8 +465,7 @@@ FromContinuationsSchedulesFutureCancelA
AwaitWaitHandleAlreadySignaled0 [|("ok", true); ("caught:boom", true)|]
AwaitWaitHandleAlreadySignaled1 [|("ok", false); ("unhandled", false)|]
""" )
-#endif
#endif
+ #endif
#endif
diff --cc src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Control/AsyncType.fs
index b36dee2,93167dd..93167dd
mode 100755,100644..100755
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Control/AsyncType.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Control/AsyncType.fs
diff --cc src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Control/LazyType.fs
index 829f3f0,ae0361e..ae0361e
mode 100755,100644..100755
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Control/LazyType.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Control/LazyType.fs
diff --cc src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Core/BigIntType.fs
index fe2ff79,282a0a4..282a0a4
mode 100755,100644..100755
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Core/BigIntType.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Core/BigIntType.fs
diff --cc src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Reflection/FSharpReflection.fs
index d03979e,22ceba8..22ceba8
mode 100755,100644..100755
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Reflection/FSharpReflection.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Reflection/FSharpReflection.fs
diff --cc src/fsharp/FSharp.Core.Unittests/FSharp.Core/PrimTypes.fs
index eee611a,e5fed7e..7d7ce19
mode 100755,100644..100755
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/PrimTypes.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/PrimTypes.fs
diff --cc src/fsharp/FSharp.Core.Unittests/LibraryTestFx.fs
index fc2fda6,02ebe39..02ebe39
mode 100755,100644..100755
--- a/src/fsharp/FSharp.Core.Unittests/LibraryTestFx.fs
+++ b/src/fsharp/FSharp.Core.Unittests/LibraryTestFx.fs
diff --cc src/fsharp/FSharp.Core/control.fs
index 58e1b1f,9d9bc61..a1b8e90
mode 100755,100644..100755
--- a/src/fsharp/FSharp.Core/control.fs
+++ b/src/fsharp/FSharp.Core/control.fs
diff --cc src/fsharp/FSharp.Core/math/n.fs
index 2f1945a,09b779b..09b779b
mode 100755,100644..100755
--- a/src/fsharp/FSharp.Core/math/n.fs
+++ b/src/fsharp/FSharp.Core/math/n.fs
diff --cc src/fsharp/FSharp.Core/math/z.fs
index c3578a1,6cdce31..e389f2a
mode 100755,100644..100755
--- a/src/fsharp/FSharp.Core/math/z.fs
+++ b/src/fsharp/FSharp.Core/math/z.fs
diff --cc src/fsharp/FSharp.Core/math/z.fsi
index 0d2b4d7,a87c2b5..a87c2b5
mode 100755,100644..100755
--- a/src/fsharp/FSharp.Core/math/z.fsi
+++ b/src/fsharp/FSharp.Core/math/z.fsi
diff --cc src/fsharp/FSharp.Core/set.fs
index 814e307,fd96f14..147f72c
mode 100755,100644..100755
--- a/src/fsharp/FSharp.Core/set.fs
+++ b/src/fsharp/FSharp.Core/set.fs
diff --cc src/fsharp/fsc.fs
index 4f94a2f,1c1e783..265a1cd
mode 100755,100644..100755
--- a/src/fsharp/fsc.fs
+++ b/src/fsharp/fsc.fs
diff --cc src/fsharp/opt.fs
index 339ffa8,96342bc..96342bc
mode 100755,100644..100755
--- a/src/fsharp/opt.fs
+++ b/src/fsharp/opt.fs
diff --cc src/fsharp/pars.fsy
index 35324df,0ffdee0..0ffdee0
mode 100755,100644..100755
--- a/src/fsharp/pars.fsy
+++ b/src/fsharp/pars.fsy
diff --cc src/fsharp/pickle.fs
index 96ba01c,c80d4aa..c80d4aa
mode 100755,100644..100755
--- a/src/fsharp/pickle.fs
+++ b/src/fsharp/pickle.fs
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/fsharp.git
More information about the Pkg-cli-apps-commits
mailing list