CSHARP-4040: Rename switch

rstam · rstam · commit 726afb87e3e1 · 2025-11-24T14:11:43.000-08:00
diff --git a/src/MongoDB.Bson/Serialization/BsonClassMap.cs b/src/MongoDB.Bson/Serialization/BsonClassMap.cs
@@ -1337,7 +1337,7 @@ internal IDiscriminatorConvention GetDiscriminatorConvention()
 
             void EnsureNoMemberMapConflicts(string elementName)
             {
-                if (AppContext.TryGetSwitch("DisableCSharp4040Validation", out bool disableCSharp4040Validation) && disableCSharp4040Validation)
+                if (AppContext.TryGetSwitch("Switch.MongoDB.Driver.DisableDiscriminatorFieldConflictCheck", out bool disableConflictCheck) && disableConflictCheck)
                 {
                     return;
                 }
diff --git a/tests/MongoDB.Driver.Tests/Linq/Linq3Implementation/Jira/CSharp4040SwitchTests.cs b/tests/MongoDB.Driver.Tests/Linq/Linq3Implementation/Jira/CSharp4040SwitchTests.cs
@@ -30,7 +30,7 @@ public class CSharp4040SwitchTests : LinqIntegrationTest<CSharp4040SwitchTests.C
 {
     static CSharp4040SwitchTests()
     {
-        AppContext.SetSwitch("DisableCSharp4040Validation", true);
+        AppContext.SetSwitch("Switch.MongoDB.Driver.DisableDiscriminatorFieldConflictCheck", true);
 
         var discriminatorConvention = new HierarchicalDiscriminatorConvention("TypeNames");
 
@@ -46,7 +46,7 @@ static CSharp4040SwitchTests()
 
     public void Dispose()
     {
-        AppContext.SetSwitch("DisableCSharp4040Validation", false);
+        AppContext.SetSwitch("Switch.MongoDB.Driver.DisableDiscriminatorFieldConflictCheck", false);
     }
 
     public CSharp4040SwitchTests(ClassFixture fixture)

Original file line number	Diff line number	Diff line change
`@@ -1337,7 +1337,7 @@ internal IDiscriminatorConvention GetDiscriminatorConvention()`
`1337`	`1337`
`1338`	`1338`	`void EnsureNoMemberMapConflicts(string elementName)`
`1339`	`1339`	`{`
`1340`		`- if (AppContext.TryGetSwitch("DisableCSharp4040Validation", out bool disableCSharp4040Validation) && disableCSharp4040Validation)`
	`1340`	`+ if (AppContext.TryGetSwitch("Switch.MongoDB.Driver.DisableDiscriminatorFieldConflictCheck", out bool disableConflictCheck) && disableConflictCheck)`
`1341`	`1341`	`{`
`1342`	`1342`	`return;`
`1343`	`1343`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public class CSharp4040SwitchTests : LinqIntegrationTest<CSharp4040SwitchTests.C`
`30`	`30`	`{`
`31`	`31`	`static CSharp4040SwitchTests()`
`32`	`32`	`{`
`33`		`- AppContext.SetSwitch("DisableCSharp4040Validation", true);`
	`33`	`+ AppContext.SetSwitch("Switch.MongoDB.Driver.DisableDiscriminatorFieldConflictCheck", true);`
`34`	`34`
`35`	`35`	`var discriminatorConvention = new HierarchicalDiscriminatorConvention("TypeNames");`
`36`	`36`
`@@ -46,7 +46,7 @@ static CSharp4040SwitchTests()`
`46`	`46`
`47`	`47`	`public void Dispose()`
`48`	`48`	`{`
`49`		`- AppContext.SetSwitch("DisableCSharp4040Validation", false);`
	`49`	`+ AppContext.SetSwitch("Switch.MongoDB.Driver.DisableDiscriminatorFieldConflictCheck", false);`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`public CSharp4040SwitchTests(ClassFixture fixture)`