Skip to content
This repository has been archived by the owner on Jan 3, 2023. It is now read-only.

Commit

Permalink
integrate updates from http://visualfsharp.codeplex.com master
Browse files Browse the repository at this point in the history
  • Loading branch information
@fsgit
fsgit committed Jul 17, 2014
2 parents 79256a0 + d673d31 commit 5027aa5
Show file tree
Hide file tree
Showing 34 changed files with 328 additions and 2,909 deletions.
2 changes: 1 addition & 1 deletion CHANGES.txt
View file
Expand Up @@ -40,7 +40,7 @@

3.1.1.7
* Build back versions of FSharp.Core 2.3.0.0, 2.3.5.0, 4.3.0.0 to include code generation fix.
* Build Profile7 (portable-net45+sl5+win8) FSharp.Core
* Build Profile7 (portable47) FSharp.Core

3.0.30
* Partial fix for allowing F# 3.1 projects to compile using xbuild (also
Expand Down
32 changes: 16 additions & 16 deletions FSharp.Core.Nuget/FSharp.Core.Mono.Signed.nuspec
View file
Expand Up @@ -46,16 +46,16 @@ Profile 259
<file src="..\lib\release\FSharp.Core.xml" target="lib\net45\FSharp.Core.xml" />

<!-- Profile 7 -->
<file src="..\lib\release\netcore7\FSharp.Core.dll" target="lib\portable-net45+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll" />
<file src="..\lib\release\netcore7\FSharp.Core.optdata" target="lib\portable-net45+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.optdata" />
<file src="..\lib\release\netcore7\FSharp.Core.sigdata" target="lib\portable-net45+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.sigdata" />
<file src="..\lib\release\netcore7\FSharp.Core.xml" target="lib\portable-net45+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.xml" />
<file src="..\lib\release\portable7\FSharp.Core.dll" target="lib\portable-net45+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll" />
<file src="..\lib\release\portable7\FSharp.Core.optdata" target="lib\portable-net45+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.optdata" />
<file src="..\lib\release\portable7\FSharp.Core.sigdata" target="lib\portable-net45+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.sigdata" />
<file src="..\lib\release\portable7\FSharp.Core.xml" target="lib\portable-net45+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.xml" />

<!-- Profile 47-->
<file src="..\lib\release\portable-net45+sl5+win8\FSharp.Core.dll" target="lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll" />
<file src="..\lib\release\portable-net45+sl5+win8\FSharp.Core.optdata" target="lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.optdata" />
<file src="..\lib\release\portable-net45+sl5+win8\FSharp.Core.sigdata" target="lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.sigdata" />
<file src="..\lib\release\portable-net45+sl5+win8\FSharp.Core.xml" target="lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.xml" />
<file src="..\lib\release\portable47\FSharp.Core.dll" target="lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll" />
<file src="..\lib\release\portable47\FSharp.Core.optdata" target="lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.optdata" />
<file src="..\lib\release\portable47\FSharp.Core.sigdata" target="lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.sigdata" />
<file src="..\lib\release\portable47\FSharp.Core.xml" target="lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.xml" />

<!-- Android -->
<file src="..\lib\release\monodroid\FSharp.Core.dll" target="lib\MonoAndroid\FSharp.Core.dll" />
Expand All @@ -70,16 +70,16 @@ Profile 259
<file src="..\lib\release\monotouch\FSharp.Core.xml" target="lib\MonoTouch\FSharp.Core.xml" />

<!-- Profile 78 -->
<file src="..\lib\release\netcore78\FSharp.Core.dll" target="lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.dll" />
<file src="..\lib\release\netcore78\FSharp.Core.optdata" target="lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.optdata" />
<file src="..\lib\release\netcore78\FSharp.Core.sigdata" target="lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.sigdata" />
<file src="..\lib\release\netcore78\FSharp.Core.xml" target="lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.xml" />
<file src="..\lib\release\portable78\FSharp.Core.dll" target="lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.dll" />
<file src="..\lib\release\portable78\FSharp.Core.optdata" target="lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.optdata" />
<file src="..\lib\release\portable78\FSharp.Core.sigdata" target="lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.sigdata" />
<file src="..\lib\release\portable78\FSharp.Core.xml" target="lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.xml" />

<!-- Profile 259-->
<file src="..\lib\release\netcore259\FSharp.Core.dll" target="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.dll" />
<file src="..\lib\release\netcore259\FSharp.Core.optdata" target="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.optdata" />
<file src="..\lib\release\netcore259\FSharp.Core.sigdata" target="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.sigdata" />
<file src="..\lib\release\netcore259\FSharp.Core.xml" target="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.xml" />
<file src="..\lib\release\portable259\FSharp.Core.dll" target="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.dll" />
<file src="..\lib\release\portable259\FSharp.Core.optdata" target="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.optdata" />
<file src="..\lib\release\portable259\FSharp.Core.sigdata" target="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.sigdata" />
<file src="..\lib\release\portable259\FSharp.Core.xml" target="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.xml" />

</files>
</package>
10 changes: 5 additions & 5 deletions README.md
View file
Expand Up @@ -102,10 +102,10 @@ You can also build the FSharp.Core for .NET 2.0, Xamarin Android, Xamarin iOS,
Portable Profile47 (net45+sl5+win8), XNA 4.0 for Xbox 360, and Silverlight 5.0 profiles:
```
msbuild fsharp-library-build.proj /p:TargetFramework=net20 /p:Configuration=Release
msbuild fsharp-library-build.proj /p:TargetFramework=portable-net45+sl5+win8 /p:Configuration=Release
msbuild fsharp-library-build.proj /p:TargetFramework=netcore7 /p:Configuration=Release
msbuild fsharp-library-build.proj /p:TargetFramework=netcore78 /p:Configuration=Release
msbuild fsharp-library-build.proj /p:TargetFramework=netcore259 /p:Configuration=Release
msbuild fsharp-library-build.proj /p:TargetFramework=portable47 /p:Configuration=Release
msbuild fsharp-library-build.proj /p:TargetFramework=portable7 /p:Configuration=Release
msbuild fsharp-library-build.proj /p:TargetFramework=portable78 /p:Configuration=Release
msbuild fsharp-library-build.proj /p:TargetFramework=portable259 /p:Configuration=Release
msbuild fsharp-library-build.proj /p:TargetFramework=sl5 /p:Configuration=Release
msbuild fsharp-library-build.proj /p:TargetFramework=monodroid /p:Configuration=Release
Expand All @@ -123,7 +123,7 @@ version number suitable for use when building libaries that have usable with bot
```
msbuild fsharp-library-build.proj /p:TargetFramework=net20 /p:Configuration=Release /p:FSharpCoreBackVersion=3.0
msbuild fsharp-library-build.proj /p:TargetFramework=net40 /p:Configuration=Release /p:FSharpCoreBackVersion=3.0
msbuild fsharp-library-build.proj /p:TargetFramework=portable-net45+sl5+win8 /p:Configuration=Release /p:FSharpCoreBackVersion=3.0
msbuild fsharp-library-build.proj /p:TargetFramework=portable47 /p:Configuration=Release /p:FSharpCoreBackVersion=3.0
```

### Windows, using xbuild (e.g. if no .NET is installed and only Mono 3.0 is installed):
Expand Down
8 changes: 4 additions & 4 deletions build.bat
View file
Expand Up @@ -18,9 +18,9 @@ set ABS_PATH=%CD%
%MSBUILD% "%ABS_PATH%\fsharp-library-build.proj" /p:TargetFramework=net40 /p:Configuration=Release
%MSBUILD% "%ABS_PATH%\fsharp-compiler-build.proj" /p:TargetFramework=net40 /p:Configuration=Release
%MSBUILD% "%ABS_PATH%\fsharp-library-build.proj" /p:TargetFramework=net20 /p:Configuration=Release
%MSBUILD% "%ABS_PATH%\fsharp-library-build.proj" /p:TargetFramework=portable-net45+sl5+win8 /p:Configuration=Release
%MSBUILD% "%ABS_PATH%\fsharp-library-build.proj" /p:TargetFramework=netcore7 /p:Configuration=Release
%MSBUILD% "%ABS_PATH%\fsharp-library-build.proj" /p:TargetFramework=netcore78 /p:Configuration=Release
%MSBUILD% "%ABS_PATH%\fsharp-library-build.proj" /p:TargetFramework=netcore259 /p:Configuration=Release
%MSBUILD% "%ABS_PATH%\fsharp-library-build.proj" /p:TargetFramework=portable47 /p:Configuration=Release
%MSBUILD% "%ABS_PATH%\fsharp-library-build.proj" /p:TargetFramework=portable7 /p:Configuration=Release
%MSBUILD% "%ABS_PATH%\fsharp-library-build.proj" /p:TargetFramework=portable78 /p:Configuration=Release
%MSBUILD% "%ABS_PATH%\fsharp-library-build.proj" /p:TargetFramework=portable259 /p:Configuration=Release
%MSBUILD% "%ABS_PATH%\fsharp-library-build.proj" /p:TargetFramework=sl5 /p:Configuration=Release
popd
24 changes: 12 additions & 12 deletions config.make.in
View file
Expand Up @@ -57,27 +57,27 @@ VERSION = 2.3.98.1
TARGET = monotouch
endif

ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-portable-net45+sl5+win8-)
ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-portable47-)
VERSION = 2.3.5.1
TARGET = portable-net45+sl5+win8
TARGET = portable47
PCLPATH = .NETPortable
endif

ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-netcore7-)
ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-portable7-)
VERSION = 3.3.1.0
TARGET = netcore7
TARGET = portable7
PCLPATH = .NETCore
endif

ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-netcore78-)
VERSION = 3.3.1.78
TARGET = netcore78
ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-portable78-)
VERSION = 3.78.3.1
TARGET = portable78
PCLPATH = .NETCore
endif

ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-netcore259-)
VERSION = 3.3.1.259
TARGET = netcore259
ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-portable259-)
VERSION = 3.259.3.1
TARGET = portable259
PCLPATH = .NETCore
endif

Expand All @@ -96,9 +96,9 @@ TARGET = 4.0
outsuffix = fsharp30/$(TargetFramework)
endif

ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-portable-net45+sl5+win8-3.0)
ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-portable47-3.0)
VERSION = 2.3.5.0
TARGET = portable-net45+sl5+win8
TARGET = portable47
PCLPATH = .NETPortable
outsuffix = fsharp30/$(TargetFramework)
endif
Expand Down

0 comments on commit 5027aa5

Please sign in to comment.