bugfix/issue-416-fsharp-debug-release-defines (#420)

njlr · purkhusid · web-flow · commit 862c7f5b8bc9 · 2024-03-14T14:10:41.000Z
* Fix DEBUG and RELEASE defines in fsharp_binary

* Split defines in C# compilation as well

* Update Bazel

---------

Co-authored-by: Daníel P. Purkhús &lt;purkhusid@gmail.com&gt;
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-7.0.1
+7.1.0
diff --git a/dotnet/private/rules/csharp/actions/csharp_assembly.bzl b/dotnet/private/rules/csharp/actions/csharp_assembly.bzl
@@ -368,11 +368,13 @@ def _compile(
     if debug:
         args.add("/debug+")
         args.add("/optimize-")
-        args.add("/define:TRACE;DEBUG")
+        args.add("/define:TRACE")
+        args.add("/define:DEBUG")
     else:
         args.add("/debug-")
         args.add("/optimize+")
-        args.add("/define:TRACE;RELEASE")
+        args.add("/define:TRACE")
+        args.add("/define:RELEASE")
 
     args.add("/debug:portable")
 
diff --git a/dotnet/private/rules/fsharp/actions/fsharp_assembly.bzl b/dotnet/private/rules/fsharp/actions/fsharp_assembly.bzl
@@ -340,12 +340,14 @@ def _compile(
     if debug:
         args.add("--debug+")
         args.add("--optimize-")
-        args.add("--define:TRACE;DEBUG")
+        args.add("--define:TRACE")
+        args.add("--define:DEBUG")
         args.add("--tailcalls-")
     else:
         args.add("--debug-")
         args.add("--optimize+")
-        args.add("--define:TRACE;RELEASE")
+        args.add("--define:TRACE")
+        args.add("--define:RELEASE")
 
     args.add("--debug:portable")
 
diff --git a/e2e/net6.0/.bazelversion b/e2e/net6.0/.bazelversion
@@ -1 +1 @@
-7.0.0rc4
+7.1.0
diff --git a/e2e/net7.0/.bazelversion b/e2e/net7.0/.bazelversion
@@ -1 +1 @@
-7.0.0rc4
+7.1.0
diff --git a/e2e/net8.0/.bazelversion b/e2e/net8.0/.bazelversion
@@ -1 +1 @@
-7.0.0rc4
+7.1.0
diff --git a/e2e/smoke/.bazelversion b/e2e/smoke/.bazelversion
@@ -1 +1 @@
-7.0.0rc4
+7.1.0
diff --git a/examples/.bazelversion b/examples/.bazelversion
@@ -1 +1 @@
-7.0.0rc4
+7.1.0
diff --git a/examples/basic_fsharp/BUILD.bazel b/examples/basic_fsharp/BUILD.bazel
@@ -43,3 +43,15 @@ fsharp_library(
         "@paket.example_deps//fsharp.core",
     ],
 )
+
+fsharp_binary(
+    name = "release_mode",
+    srcs = ["release_mode.fs"],
+    target_frameworks = ["net6.0"],
+    targeting_packs = [
+        "@paket.example_deps//microsoft.netcore.app.ref",
+    ],
+    deps = [
+        "@paket.example_deps//fsharp.core",
+    ],
+)
diff --git a/examples/basic_fsharp/release_mode.fs b/examples/basic_fsharp/release_mode.fs
@@ -0,0 +1,20 @@
+open System
+
+#if DEBUG
+let debug = true
+#else
+let debug = false
+#endif
+
+#if RELEASE
+let release = true
+#else
+let release = false
+#endif
+
+[<EntryPoint>]
+let main args =
+    printfn $"DEBUG = %b{debug}"
+    printfn $"RELEASE = %b{release}"
+
+    0
