diff --git a/FSharp.Dynamic/AssemblyInfo.fs b/FSharp.Dynamic/AssemblyInfo.fs index 3881cdc..cebc747 100644 --- a/FSharp.Dynamic/AssemblyInfo.fs +++ b/FSharp.Dynamic/AssemblyInfo.fs @@ -32,5 +32,5 @@ open System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the ‘*’ as shown below: // [assembly: AssemblyVersion("1.0.*")] -[] +[] () \ No newline at end of file diff --git a/FSharp.Dynamic/FSharp.Dynamic.fsproj b/FSharp.Dynamic/FSharp.Dynamic.fsproj index 4d37e21..4209a81 100644 --- a/FSharp.Dynamic/FSharp.Dynamic.fsproj +++ b/FSharp.Dynamic/FSharp.Dynamic.fsproj @@ -10,14 +10,13 @@ FSharp.Dynamic FSharp.Dynamic v4.0 + false + true + Profile47 FSharp.Dynamic ..\ true - - Profile47 - - true full @@ -37,12 +36,14 @@ 3 bin\Release\FSharp.Dynamic.XML + + bin\Release.net40\FSharp.Dynamic.XML + 11 - - - + + @@ -50,18 +51,30 @@ - + + - ..\packages\Dynamitey.0.8.0.6\lib\portable-win+net45+sl40\Dynamitey.dll + ..\packages\Dynamitey.1.0.2.0\lib\net40\Dynamitey.dll True + + FSharp.Core + FSharp.Core.dll + $(MSBuildExtensionsPath32)\..\Reference Assemblies\Microsoft\FSharp\3.0\Runtime\v4.0\FSharp.Core.dll + + + FSharp.Core FSharp.Core.dll $(MSBuildExtensionsPath32)\..\Reference Assemblies\Microsoft\FSharp\3.0\Runtime\.NETPortable\FSharp.Core.dll + + ..\packages\Dynamitey.1.0.2.0\lib\portable-win+net45+sl40+wp80\Dynamitey.dll + True + - + diff --git a/FSharp.Dynamic/FSharp.Dynamic.nuspec b/FSharp.Dynamic/FSharp.Dynamic.nuspec index 5d2aca3..5934b96 100644 --- a/FSharp.Dynamic/FSharp.Dynamic.nuspec +++ b/FSharp.Dynamic/FSharp.Dynamic.nuspec @@ -9,10 +9,15 @@ http://www.apache.org/licenses/LICENSE-2.0 https://github.com/ekonbenefits/FSharp.Dynamic - false + true $description$ PCL port. Copyright 2013 fsharp dynamic dlr pcl + + + + + \ No newline at end of file diff --git a/FSharp.Dynamic/packages.config b/FSharp.Dynamic/packages.config index 78dfbbd..ea27d6d 100644 --- a/FSharp.Dynamic/packages.config +++ b/FSharp.Dynamic/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Tests/Tests.fsproj b/Tests/Tests.fsproj index 4ddf203..a6d775c 100644 --- a/Tests/Tests.fsproj +++ b/Tests/Tests.fsproj @@ -10,6 +10,9 @@ Tests Tests v4.5 + false + true + v4.0 Tests ..\ @@ -35,8 +38,7 @@ bin\Release\Tests.XML - - ..\packages\Dynamitey.0.8.0.6\lib\portable-win+net45+sl40\Dynamitey.dll + True diff --git a/Tests/packages.config b/Tests/packages.config index ef8da3c..36db25d 100644 --- a/Tests/packages.config +++ b/Tests/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/dist/build.proj b/dist/build.proj new file mode 100644 index 0000000..57a8a68 --- /dev/null +++ b/dist/build.proj @@ -0,0 +1,17 @@ + + + + MySolution + + + + Configuration=Release; + + + Configuration=Release;OutputPath=bin\Release.net40\;IntermediateOutputPath=obj\Release.net40\;UseNet40=true; + + + + + + \ No newline at end of file diff --git a/dist/create-nuget.bat b/dist/create-nuget.bat deleted file mode 100644 index eb0a9b4..0000000 --- a/dist/create-nuget.bat +++ /dev/null @@ -1,2 +0,0 @@ -@echo off -..\.nuget\nuget.exe pack ..\FSharp.Dynamic\FSharp.Dynamic.fsproj -Build -Properties Configuration=Release -Symbols \ No newline at end of file diff --git a/dist/create-nuget.ps1 b/dist/create-nuget.ps1 new file mode 100644 index 0000000..4224367 --- /dev/null +++ b/dist/create-nuget.ps1 @@ -0,0 +1,47 @@ +try{ + + $solname = "FSharp.Dynamic" + $testname = "Tests" + $projectname = $solname + $projecttype ="fsproj" + + #Build PCL and .NET version from one project using msbuild script + C:\Windows\Microsoft.NET\Framework\v4.0.30319\msbuild.exe build.proj /p:solname=$solname + + if (!$?){ + throw $error[0].Exception + } + + #Download and configure Nunit test runner + ..\.nuget\nuget.exe install NUnit.Runners -Version 2.6.2 -o ..\packages + Copy-Item nunit-console.exe.config ..\packages\NUnit.Runners.2.6.2\tools\ + + if (!$?){ + throw $error[0].Exception + } + + #Test .net 40 + Echo "Testing Net40" + ..\packages\NUnit.Runners.2.6.2\tools\nunit-console.exe /framework:net-4.0 /noxml /nodots /labels /stoponerror /exclude=Performance ..\$testname\bin\Release.net40\$testname.dll + + if (!$?){ + throw $error[0].Exception + } + + #Test portable + Echo "Testing Portable" + ..\packages\NUnit.Runners.2.6.2\tools\nunit-console.exe /framework:net-4.5 /noxml /nodots /labels /stoponerror /exclude=Performance ..\$testname\bin\Release\$testname.dll + + if (!$?){ + throw $error[0].Exception + } + + +}catch{ + Echo "Build Failed" + exit +} + +#if successful create nuget package +..\.nuget\nuget.exe pack ..\$projectname\$projectname.$projecttype -Properties Configuration=Release -Symbols +Echo "Nuget Success" \ No newline at end of file diff --git a/dist/nunit-console.exe.config b/dist/nunit-console.exe.config new file mode 100644 index 0000000..0b42fdb --- /dev/null +++ b/dist/nunit-console.exe.config @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + +