Merge pull request #15 from fsprojects/update-deployment

update build file and dependancies

Author: jbtule

.appveyor.yml

@@ -66,6 +66,6 @@ for:
     configuration: Release
     environment:
       vsuffix: $(APPVEYOR_BUILD_NUMBER)
-      VersionSuffix: $(APPVEYOR_BUILD_NUMBER)
+      VersionSuffix: ".$(APPVEYOR_BUILD_NUMBER)"
       is_prerelease: false
       githubdeploy: true

FSharp.Interop.Dynamic/FSharp.Interop.Dynamic.fsproj

@@ -12,24 +12,26 @@
     <IncludeSource Condition="'$(OS)' == 'Windows_NT'">True</IncludeSource>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
+    <DisableImplicitFSharpCoreReference>True</DisableImplicitFSharpCoreReference>
+    <DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='portable-net45+sl5+win8'">
     <Reference Include="Microsoft.CSharp" />
+    <PackageReference Include="FSharp.Core" Version="4.1.*" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='netstandard1.6'">
     <PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
+    <PackageReference Include="FSharp.Core" Version="4.2.*" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net40'">
     <Reference Include="Microsoft.CSharp" />
+    <PackageReference Include="FSharp.Core" Version="4.1.*" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="FSharp.Core" Version="4.1.*" />
-    <PackageReference Include="FSharp.Compiler.Tools" Version="4.1.*" PrivateAssets="all" />
-    <PackageReference Include="FSharp.NET.Sdk" Version="1.0.*" PrivateAssets="All" />
-   <PackageReference Include="Dynamitey" Version="2.0.6-beta111" />
+   <PackageReference Include="Dynamitey" Version="2.0.*" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Dyn.fs" />

build.fsx

@@ -22,26 +22,44 @@
 
 #I "packages/FAKE/tools"
 #r "FakeLib.dll"
+#r "System.Xml.Linq.dll"
 
 open Fake
 open Fake.DotNet.Testing.NUnit3
 open Fake.DotNet
+open System.Xml.Linq
+open System.Xml.XPath
 
 let sln = "./FSharp.Interop.Dynamic.sln"
 
 let commonBuild target =
     let buildMode = getBuildParamOrDefault "configuration" "Release"
     let vsuffix = getBuildParamOrDefault "vsuffix" ""
 
-    let setParams defaults =
+    let versionPrefix = "Version.props" 
+                        |> System.IO.File.ReadAllText 
+                        |> XDocument.Parse
+                        |> (fun x -> x.XPathEvaluate("//VersionPrefix/text()"))
+                        |> (fun x-> x :?> seq<obj>)
+                        |> Seq.exactlyOne
+                        |> sprintf "%A"
+
+    let vProp =
+        if System.Text.RegularExpressions.Regex.IsMatch(vsuffix, "^\d+$") then 
+            "Version", versionPrefix + "." + vsuffix
+        else
+            "VersionSuffix", vsuffix
+
+
+    let setParams (defaults:MsBuild.MSBuildParams) =
             { defaults with
                 ToolsVersion = Some("15.0")
-                Verbosity = Some(Quiet)
+                Verbosity = Some(MsBuild.MSBuildVerbosity.Quiet)
                 Targets = [target]
                 Properties =
                     [
                         "Configuration", buildMode
-                        "VersionSuffix", vsuffix
+                        vProp
                     ]
              }
     MsBuild.build setParams sln |> DoNothing
@@ -179,7 +197,7 @@ let fakeExe = "packages/FAKE/tools/FAKE.exe"
 downloadNugetTo nugetExe
 
 if doesNotExist fakeExe then
-    exec nugetExe ["install"; "fake";  "-OutputDirectory packages"; "-ExcludeVersion"; "-PreRelease"]
+    exec nugetExe ["install"; "fake"; "-Version 5.0.0-alpha010" ; "-OutputDirectory packages"; "-ExcludeVersion"; "-PreRelease"]
 
 exec fakeExe ([makeFsx; "-d:FSharp_MakeFile"] @ passedArgs)