Disable requiring msbuild.structuredlogger always being up to date (#279

)
TheAngryByrd · Sep 18, 2023 · a886b79 · a886b79
1 parent bd78574
commit a886b79
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/Content/Console/build/build.fs b/Content/Console/build/build.fs
@@ -230,6 +230,9 @@ module FSharpAnalyzers =
 // Target Implementations
 //-----------------------------------------------------------------------------
 
+/// So we don't require always being on the latest MSBuild.StructuredLogger
+let disableBinLog (p: MSBuild.CliArguments) = { p with DisableInternalBinLog = true }
+
 let clean _ =
     [
         "bin"
@@ -265,6 +268,7 @@ let dotnetRestore _ =
             DotNet.restore
                 (fun c -> {
                     c with
+                        MSBuildParams = disableBinLog c.MSBuildParams
                         Common =
                             c.Common
                             |> DotNet.Options.withAdditionalArgs args
@@ -294,6 +298,7 @@ let dotnetBuild ctx =
     DotNet.build
         (fun c -> {
             c with
+                MSBuildParams = disableBinLog c.MSBuildParams
                 Configuration = configuration (ctx.Context.AllExecutingTargets)
                 Common =
                     c.Common
@@ -341,6 +346,7 @@ let dotnetTest ctx =
 
             {
                 c with
+                    MSBuildParams = disableBinLog c.MSBuildParams
                     Configuration = configuration (ctx.Context.AllExecutingTargets)
                     Common =
                         c.Common

diff --git a/Content/Library/build/build.fs b/Content/Library/build/build.fs
@@ -301,6 +301,8 @@ let allPublishChecks () =
 // Target Implementations
 //-----------------------------------------------------------------------------
 
+/// So we don't require always being on the latest MSBuild.StructuredLogger
+let disableBinLog (p: MSBuild.CliArguments) = { p with DisableInternalBinLog = true }
 
 let clean _ =
     [
@@ -339,6 +341,7 @@ let dotnetRestore _ =
             DotNet.restore
                 (fun c -> {
                     c with
+                        MSBuildParams = disableBinLog c.MSBuildParams
                         Common =
                             c.Common
                             |> DotNet.Options.withCustomParams (Some(args))
@@ -369,6 +372,7 @@ let dotnetBuild ctx =
     DotNet.build
         (fun c -> {
             c with
+                MSBuildParams = disableBinLog c.MSBuildParams
                 Configuration = configuration (ctx.Context.AllExecutingTargets)
                 Common =
                     c.Common
@@ -428,6 +432,7 @@ let dotnetTest ctx =
 
             {
                 c with
+                    MSBuildParams = disableBinLog c.MSBuildParams
                     Configuration = configuration (ctx.Context.AllExecutingTargets)
                     Common =
                         c.Common
@@ -570,6 +575,7 @@ let dotnetPack ctx =
     DotNet.pack
         (fun c -> {
             c with
+                MSBuildParams = disableBinLog c.MSBuildParams
                 Configuration = configuration (ctx.Context.AllExecutingTargets)
                 OutputPath = Some distDir
                 Common =

diff --git a/build/build.fs b/build/build.fs
@@ -269,6 +269,9 @@ let allPublishChecks () =
 //-----------------------------------------------------------------------------
 
 
+/// So we don't require always being on the latest MSBuild.StructuredLogger
+let disableBinLog (p: MSBuild.CliArguments) = { p with DisableInternalBinLog = true }
+
 let clean _ =
     [
         "bin"
@@ -305,6 +308,7 @@ let dotnetRestore _ =
             DotNet.restore
                 (fun c -> {
                     c with
+                        MSBuildParams = disableBinLog c.MSBuildParams
                         Common =
                             c.Common
                             |> DotNet.Options.withCustomParams (Some(args))
@@ -334,6 +338,7 @@ let dotnetBuild ctx =
     DotNet.build
         (fun c -> {
             c with
+                MSBuildParams = disableBinLog c.MSBuildParams
                 Configuration = configuration (ctx.Context.AllExecutingTargets)
                 Common =
                     c.Common
@@ -392,6 +397,7 @@ let dotnetPack ctx =
         DotNet.pack
             (fun c -> {
                 c with
+                    MSBuildParams = disableBinLog c.MSBuildParams
                     Configuration = configuration (ctx.Context.AllExecutingTargets)
                     OutputPath = Some distDir
                     Common =