Skip to content

Commit ba8967d

Browse files
[release/6.0-rc1] Update pinned compiler version (#57730)
* Update pinned compiler version The version that flows in automatically appears to still be old. We need to fix that, but in the meantime, we're a month out of date on the compiler. * Suppress CS8969 warnings * Change several dynamic tests to use typeof(object[]) Co-authored-by: Stephen Toub <stoub@microsoft.com>
1 parent 3d5987f commit ba8967d

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

Directory.Build.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,8 @@
270270
<!-- Enables Strict mode for Roslyn compiler -->
271271
<Features>strict;nullablePublicOnly</Features>
272272
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
273+
<!-- Warnings to always disable -->
274+
<NoWarn>$(NoWarn),CS8969</NoWarn>
273275
<!-- Always pass portable to override arcade sdk which uses embedded for local builds -->
274276
<DebugType>portable</DebugType>
275277
<DebugSymbols>true</DebugSymbols>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<!-- Opt-in/out repo features -->
1919
<UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers>
2020
<!-- TODO: Upgrade compiler version to enable Static Abstracts in Interfaces, interpolated string handlers, and caller arg expressions; remove this once the employed SDK uses a new enough version. -->
21-
<MicrosoftNetCompilersToolsetVersion>4.0.0-3.21376.12</MicrosoftNetCompilersToolsetVersion>
21+
<MicrosoftNetCompilersToolsetVersion>4.0.0-4.21416.10</MicrosoftNetCompilersToolsetVersion>
2222
<UsingToolMicrosoftNetILLinkTasks>true</UsingToolMicrosoftNetILLinkTasks>
2323
<UsingToolIbcOptimization>false</UsingToolIbcOptimization>
2424
<UsingToolXliff>false</UsingToolXliff>

src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.basic.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3392,7 +3392,7 @@ public static int MainMethod(string[] args)
33923392
}
33933393

33943394
;
3395-
if (d.GetType() != typeof(dynamic[]))
3395+
if (d.GetType() != typeof(object[]))
33963396
return 1;
33973397
return 0;
33983398
}
@@ -3420,7 +3420,7 @@ public static int MainMethod(string[] args)
34203420
}
34213421

34223422
;
3423-
if (d.GetType() != typeof(dynamic[]))
3423+
if (d.GetType() != typeof(object[]))
34243424
return 1;
34253425
return 0;
34263426
}
@@ -3456,7 +3456,7 @@ public static int MainMethod(string[] args)
34563456
}
34573457

34583458
;
3459-
if (d.GetType() != typeof(dynamic[]))
3459+
if (d.GetType() != typeof(object[]))
34603460
return 1;
34613461
return 0;
34623462
}

src/libraries/System.Text.Json/src/System.Text.Json.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<!-- Workaround for overriding the XML comments related warnings that are being supressed repo wide (within arcade): -->
66
<!-- https://github.com/dotnet/arcade/blob/ea6addfdc65e5df1b2c036f11614a5f922e36267/src/Microsoft.DotNet.Arcade.Sdk/tools/ProjectDefaults.props#L90 -->
77
<!-- For this project, we want warnings if there are public APIs/types without properly formatted XML comments (particularly CS1591). -->
8-
<NoWarn />
8+
<NoWarn>CS8969</NoWarn>
99
<Nullable>enable</Nullable>
1010
<IncludeInternalObsoleteAttribute>true</IncludeInternalObsoleteAttribute>
1111
<IsPackable>true</IsPackable>

0 commit comments

Comments
 (0)