Pass constants when building with MSBuild

FormattableString only needs to included when building .NET 4.5 so allow defining of constants when building from command line with MSBuild

Author: russcam

build/scripts/Paths.fsx

@@ -132,7 +132,7 @@ module Tooling =
         let targetLocation = "build/tools/nuget/nuget.exe" 
         if (not (File.Exists targetLocation))
         then
-            trace "Nuget not found %s. Downloading now"
+            trace (sprintf "Nuget not found at %s. Downloading now" targetLocation)
             let url = "http://dist.nuget.org/win-x86-commandline/latest/nuget.exe" 
             Directory.CreateDirectory("build/tools/nuget") |> ignore
             use webClient = new WebClient()
@@ -209,16 +209,16 @@ module Tooling =
 
     let DotNet = new DotNetTooling("dotnet.exe")
 
-    type DotNetFrameworkIdentifier = { MSBuild: string; Nuget: string; }
+    type DotNetFrameworkIdentifier = { MSBuild: string; Nuget: string; DefineConstants: string; }
 
     type DotNetFramework = 
         | Net45 
         | Net46 
         static member All = [Net45; Net46] 
         member this.Identifier = 
             match this with
-            | Net45 -> { MSBuild = "v4.5"; Nuget = "net45"; }
-            | Net46 -> { MSBuild = "v4.6"; Nuget = "net46"; }
+            | Net45 -> { MSBuild = "v4.5"; Nuget = "net45"; DefineConstants = "TRACE;NET45"; }
+            | Net46 -> { MSBuild = "v4.6"; Nuget = "net46"; DefineConstants = "TRACE;NET46"; }
 
     type MsBuildTooling() =
        let msbuildProperties = [
@@ -227,6 +227,11 @@ module Tooling =
        ]
 
        member this.Exec output target framework projects =
-            MSBuild output target (msbuildProperties |> List.append [("TargetFrameworkVersion", framework.MSBuild)]) projects |> ignore
+            let properties = msbuildProperties 
+                             |> List.append [
+                                ("TargetFrameworkVersion", framework.MSBuild); 
+                                ("DefineConstants", framework.DefineConstants)
+                             ]
+            MSBuild output target properties projects |> ignore
 
     let MsBuild = new MsBuildTooling()

src/Elasticsearch.Net/Elasticsearch.Net.csproj

@@ -19,7 +19,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\net45\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DefineConstants Condition="'$(DefineConstants)' == ''">TRACE;DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -30,7 +30,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\net45\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants Condition="'$(DefineConstants)' == ''">TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Release\net45\Elasticsearch.Net.XML</DocumentationFile>

src/Elasticsearch.Net/Extensions/FormattableString.cs

@@ -1,4 +1,4 @@
-
+#if NET45
 namespace System.Runtime.CompilerServices
 {
 	internal class FormattableStringFactory
@@ -35,3 +35,4 @@ public FormattableString(string messageFormat, object[] args)
 		public string ToString(IFormatProvider formatProvider) => string.Format(formatProvider, _messageFormat, _args);
 	}
 }
+#endif