Skip to content

Commit

Permalink
Update pinned compiler version (#57585)
Browse files Browse the repository at this point in the history
* 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[])
  • Loading branch information
stephentoub authored Aug 19, 2021
1 parent 21280fd commit 9ec6a20
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
2 changes: 2 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,8 @@
<!-- Enables Strict mode for Roslyn compiler -->
<Features>strict;nullablePublicOnly</Features>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<!-- Warnings to always disable -->
<NoWarn>$(NoWarn),CS8969</NoWarn>
<!-- Always pass portable to override arcade sdk which uses embedded for local builds -->
<DebugType>portable</DebugType>
<DebugSymbols>true</DebugSymbols>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<!-- Opt-in/out repo features -->
<UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers>
<!-- 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. -->
<MicrosoftNetCompilersToolsetVersion>4.0.0-3.21376.12</MicrosoftNetCompilersToolsetVersion>
<MicrosoftNetCompilersToolsetVersion>4.0.0-4.21416.10</MicrosoftNetCompilersToolsetVersion>
<UsingToolMicrosoftNetILLinkTasks>true</UsingToolMicrosoftNetILLinkTasks>
<UsingToolIbcOptimization>false</UsingToolIbcOptimization>
<UsingToolXliff>false</UsingToolXliff>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3392,7 +3392,7 @@ public static int MainMethod(string[] args)
}

;
if (d.GetType() != typeof(dynamic[]))
if (d.GetType() != typeof(object[]))
return 1;
return 0;
}
Expand Down Expand Up @@ -3420,7 +3420,7 @@ public static int MainMethod(string[] args)
}

;
if (d.GetType() != typeof(dynamic[]))
if (d.GetType() != typeof(object[]))
return 1;
return 0;
}
Expand Down Expand Up @@ -3456,7 +3456,7 @@ public static int MainMethod(string[] args)
}

;
if (d.GetType() != typeof(dynamic[]))
if (d.GetType() != typeof(object[]))
return 1;
return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Text.Json/src/System.Text.Json.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<!-- Workaround for overriding the XML comments related warnings that are being supressed repo wide (within arcade): -->
<!-- https://github.com/dotnet/arcade/blob/ea6addfdc65e5df1b2c036f11614a5f922e36267/src/Microsoft.DotNet.Arcade.Sdk/tools/ProjectDefaults.props#L90 -->
<!-- For this project, we want warnings if there are public APIs/types without properly formatted XML comments (particularly CS1591). -->
<NoWarn />
<NoWarn>CS8969</NoWarn>
<Nullable>enable</Nullable>
<IncludeInternalObsoleteAttribute>true</IncludeInternalObsoleteAttribute>
<IsPackable>true</IsPackable>
Expand Down

0 comments on commit 9ec6a20

Please sign in to comment.