Merge pull request #9318 from rokonec/rokonec/BinFmt-disabled-by-default

[BinFmt] Error on serialization custom events in by default in .NET framework
dotnet · Nov 21, 2023 · 959ee4e · 959ee4e
2 parents 38bd5f4 + 897da3f
commit 959ee4e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/documentation/wiki/ChangeWaves.md b/documentation/wiki/ChangeWaves.md
@@ -25,6 +25,7 @@ A wave of features is set to "rotate out" (i.e. become standard functionality) t
 
 ### 17.10
 - [AppDomain configuration is serialized without using BinFmt](https://github.com/dotnet/msbuild/pull/9320) - feature can be opted out only if [BinaryFormatter](https://learn.microsoft.com/en-us/dotnet/api/system.runtime.serialization.formatters.binary.binaryformatter) is allowed at runtime by editing `MSBuild.runtimeconfig.json`
+- [Warning on serialization custom events by default in .NET framework](https://github.com/dotnet/msbuild/pull/9318)
 - [Cache SDK resolver data process-wide](https://github.com/dotnet/msbuild/pull/9335)
 
 ### 17.8

diff --git a/src/Build.UnitTests/BackEnd/BuildManager_Logging_Tests.cs b/src/Build.UnitTests/BackEnd/BuildManager_Logging_Tests.cs
@@ -88,7 +88,7 @@ public void Build_WithCustomBuildArgs_NetCore(string envVariableValue, bool isWa
         [WindowsFullFrameworkOnlyTheory]
         [InlineData("1", true)]
         [InlineData("0", false)]
-        [InlineData(null, false)]
+        [InlineData(null, true)]
         public void Build_WithCustomBuildArgs_Framework(string envVariableValue, bool isWarningExpected) =>
             TestCustomEventWarning<BuildWarningEventArgs>(envVariableValue, isWarningExpected);
 

diff --git a/src/Framework/Traits.cs b/src/Framework/Traits.cs
@@ -392,7 +392,7 @@ public bool EnableWarningOnCustomBuildEvent
 #if RUNTIME_TYPE_NETCORE
                     return true;
 #else
-                    return false;
+                    return ChangeWaves.AreFeaturesEnabled(ChangeWaves.Wave17_10);
 #endif
                 }