Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release/7.0] Target only net7.0 during source-build #75168

Merged
merged 9 commits into from
Sep 12, 2022
Merged

[release/7.0] Target only net7.0 during source-build #75168

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3f91e94
Target net7.0 in additional projects
lbussell Aug 4, 2022
2975185
Update compatibility suppressions
lbussell Aug 24, 2022
e2466b6
Only target net7.0 for source-build
lbussell Sep 6, 2022
1bd7778
Revert "Update compatibility suppressions"
lbussell Sep 7, 2022
2a1000e
Disable package validation for source-build
lbussell Sep 7, 2022
5ab855a
Revert compatibility suppression changes
lbussell Sep 7, 2022
3f4c9d2
Use NetCoreAppCurrent instead of hardcoding net7.0
lbussell Sep 7, 2022
9e819d7
Revert mono Apple TFM change
lbussell Sep 8, 2022
b4c49e0
Remove unnecessary LangVersion
lbussell Sep 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
<NetCoreAppCurrentBrandName>.NET $(NetCoreAppCurrentVersion)</NetCoreAppCurrentBrandName>
<NetCoreAppCurrent>net$(NetCoreAppCurrentVersion)</NetCoreAppCurrent>
<NetCoreAppMinimum>net6.0</NetCoreAppMinimum>
<NetCoreAppMinimum Condition="'$(DotNetBuildFromSource)' == 'true'">net7.0</NetCoreAppMinimum>
lbussell marked this conversation as resolved.
Show resolved Hide resolved

<NetCoreAppToolCurrentVersion>7.0</NetCoreAppToolCurrentVersion>
<NetCoreAppToolCurrent>net$(NetCoreAppToolCurrentVersion)</NetCoreAppToolCurrent>
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/Microsoft.Extensions.Caching.Abstractions/src/CompatibilitySuppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Microsoft.Extensions.Caching.Memory.PostEvictionDelegate.#ctor(System.Object,System.IntPtr)</Target>
<Left>lib/net6.0/Microsoft.Extensions.Caching.Abstractions.dll</Left>
<Left>lib/netstandard2.0/Microsoft.Extensions.Caching.Abstractions.dll</Left>
<Right>lib/net7.0/Microsoft.Extensions.Caching.Abstractions.dll</Right>
</Suppression>
</Suppressions>
2 changes: 1 addition & 1 deletion ...s/Microsoft.Extensions.DependencyInjection.Abstractions/src/CompatibilitySuppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Microsoft.Extensions.DependencyInjection.ObjectFactory.#ctor(System.Object,System.IntPtr)</Target>
<Left>lib/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll</Left>
<Left>lib/netstandard2.1/Microsoft.Extensions.DependencyInjection.Abstractions.dll</Left>
<Right>lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll</Right>
</Suppression>
</Suppressions>
2 changes: 1 addition & 1 deletion ...soft.Extensions.DependencyInjection.Specification.Tests/src/CompatibilitySuppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Microsoft.Extensions.DependencyInjection.Specification.DependencyInjectionSpecificationTests.CreateInstanceFunc.#ctor(System.Object,System.IntPtr)</Target>
<Left>lib/net6.0/Microsoft.Extensions.DependencyInjection.Specification.Tests.dll</Left>
<Left>lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Specification.Tests.dll</Left>
<Right>lib/net7.0/Microsoft.Extensions.DependencyInjection.Specification.Tests.dll</Right>
</Suppression>
</Suppressions>
18 changes: 9 additions & 9 deletions src/libraries/Microsoft.Win32.SystemEvents/src/CompatibilitySuppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,55 +3,55 @@
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Microsoft.Win32.PowerModeChangedEventHandler.#ctor(System.Object,System.IntPtr)</Target>
<Left>lib/net6.0/Microsoft.Win32.SystemEvents.dll</Left>
<Left>lib/netstandard2.0/Microsoft.Win32.SystemEvents.dll</Left>
<Right>lib/net7.0/Microsoft.Win32.SystemEvents.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Microsoft.Win32.SessionEndedEventHandler.#ctor(System.Object,System.IntPtr)</Target>
<Left>lib/net6.0/Microsoft.Win32.SystemEvents.dll</Left>
<Left>lib/netstandard2.0/Microsoft.Win32.SystemEvents.dll</Left>
<Right>lib/net7.0/Microsoft.Win32.SystemEvents.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Microsoft.Win32.SessionEndingEventHandler.#ctor(System.Object,System.IntPtr)</Target>
<Left>lib/net6.0/Microsoft.Win32.SystemEvents.dll</Left>
<Left>lib/netstandard2.0/Microsoft.Win32.SystemEvents.dll</Left>
<Right>lib/net7.0/Microsoft.Win32.SystemEvents.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Microsoft.Win32.SessionSwitchEventHandler.#ctor(System.Object,System.IntPtr)</Target>
<Left>lib/net6.0/Microsoft.Win32.SystemEvents.dll</Left>
<Left>lib/netstandard2.0/Microsoft.Win32.SystemEvents.dll</Left>
<Right>lib/net7.0/Microsoft.Win32.SystemEvents.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Microsoft.Win32.SystemEvents.KillTimer(System.IntPtr)</Target>
<Left>lib/net6.0/Microsoft.Win32.SystemEvents.dll</Left>
<Left>lib/netstandard2.0/Microsoft.Win32.SystemEvents.dll</Left>
<Right>lib/net7.0/Microsoft.Win32.SystemEvents.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Microsoft.Win32.TimerElapsedEventArgs.#ctor(System.IntPtr)</Target>
<Left>lib/net6.0/Microsoft.Win32.SystemEvents.dll</Left>
<Left>lib/netstandard2.0/Microsoft.Win32.SystemEvents.dll</Left>
<Right>lib/net7.0/Microsoft.Win32.SystemEvents.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Microsoft.Win32.TimerElapsedEventHandler.#ctor(System.Object,System.IntPtr)</Target>
<Left>lib/net6.0/Microsoft.Win32.SystemEvents.dll</Left>
<Left>lib/netstandard2.0/Microsoft.Win32.SystemEvents.dll</Left>
<Right>lib/net7.0/Microsoft.Win32.SystemEvents.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Microsoft.Win32.UserPreferenceChangedEventHandler.#ctor(System.Object,System.IntPtr)</Target>
<Left>lib/net6.0/Microsoft.Win32.SystemEvents.dll</Left>
<Left>lib/netstandard2.0/Microsoft.Win32.SystemEvents.dll</Left>
<Right>lib/net7.0/Microsoft.Win32.SystemEvents.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Microsoft.Win32.UserPreferenceChangingEventHandler.#ctor(System.Object,System.IntPtr)</Target>
<Left>lib/net6.0/Microsoft.Win32.SystemEvents.dll</Left>
<Left>lib/netstandard2.0/Microsoft.Win32.SystemEvents.dll</Left>
<Right>lib/net7.0/Microsoft.Win32.SystemEvents.dll</Right>
</Suppression>
</Suppressions>
4 changes: 2 additions & 2 deletions src/libraries/System.CodeDom/src/CompatibilitySuppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.CodeDom.Compiler.Executor.ExecWaitWithCapture(System.IntPtr,System.String,System.CodeDom.Compiler.TempFileCollection,System.String@,System.String@)</Target>
<Left>lib/net6.0/System.CodeDom.dll</Left>
<Left>lib/netstandard2.0/System.CodeDom.dll</Left>
<Right>lib/net7.0/System.CodeDom.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.CodeDom.Compiler.Executor.ExecWaitWithCapture(System.IntPtr,System.String,System.String,System.CodeDom.Compiler.TempFileCollection,System.String@,System.String@)</Target>
<Left>lib/net6.0/System.CodeDom.dll</Left>
<Left>lib/netstandard2.0/System.CodeDom.dll</Left>
<Right>lib/net7.0/System.CodeDom.dll</Right>
</Suppression>
</Suppressions>
2 changes: 1 addition & 1 deletion src/libraries/System.Composition.Hosting/src/CompatibilitySuppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Composition.Hosting.Core.CompositeActivator.#ctor(System.Object,System.IntPtr)</Target>
<Left>lib/net6.0/System.Composition.Hosting.dll</Left>
<Left>lib/netstandard2.0/System.Composition.Hosting.dll</Left>
<Right>lib/net7.0/System.Composition.Hosting.dll</Right>
</Suppression>
</Suppressions>
12 changes: 6 additions & 6 deletions src/libraries/System.Configuration.ConfigurationManager/src/CompatibilitySuppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,37 +39,37 @@
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Configuration.SettingChangingEventHandler.#ctor(System.Object,System.IntPtr)</Target>
<Left>lib/net6.0/System.Configuration.ConfigurationManager.dll</Left>
<Left>lib/netstandard2.0/System.Configuration.ConfigurationManager.dll</Left>
<Right>lib/net7.0/System.Configuration.ConfigurationManager.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Configuration.SettingsLoadedEventHandler.#ctor(System.Object,System.IntPtr)</Target>
<Left>lib/net6.0/System.Configuration.ConfigurationManager.dll</Left>
<Left>lib/netstandard2.0/System.Configuration.ConfigurationManager.dll</Left>
<Right>lib/net7.0/System.Configuration.ConfigurationManager.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Configuration.SettingsSavingEventHandler.#ctor(System.Object,System.IntPtr)</Target>
<Left>lib/net6.0/System.Configuration.ConfigurationManager.dll</Left>
<Left>lib/netstandard2.0/System.Configuration.ConfigurationManager.dll</Left>
<Right>lib/net7.0/System.Configuration.ConfigurationManager.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Configuration.ValidatorCallback.#ctor(System.Object,System.IntPtr)</Target>
<Left>lib/net6.0/System.Configuration.ConfigurationManager.dll</Left>
<Left>lib/netstandard2.0/System.Configuration.ConfigurationManager.dll</Left>
<Right>lib/net7.0/System.Configuration.ConfigurationManager.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Configuration.Internal.InternalConfigEventHandler.#ctor(System.Object,System.IntPtr)</Target>
<Left>lib/net6.0/System.Configuration.ConfigurationManager.dll</Left>
<Left>lib/netstandard2.0/System.Configuration.ConfigurationManager.dll</Left>
<Right>lib/net7.0/System.Configuration.ConfigurationManager.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Configuration.Internal.StreamChangeCallback.#ctor(System.Object,System.IntPtr)</Target>
<Left>lib/net6.0/System.Configuration.ConfigurationManager.dll</Left>
<Left>lib/netstandard2.0/System.Configuration.ConfigurationManager.dll</Left>
<Right>lib/net7.0/System.Configuration.ConfigurationManager.dll</Right>
</Suppression>
</Suppressions>
22 changes: 11 additions & 11 deletions src/libraries/System.Data.Odbc/src/CompatibilitySuppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,49 +3,49 @@
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.Odbc.OdbcParameter.get_Offset</Target>
<Left>lib/net6.0/System.Data.Odbc.dll</Left>
<Left>lib/netstandard2.0/System.Data.Odbc.dll</Left>
<Right>runtimes/freebsd/lib/net6.0/System.Data.Odbc.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)</Target>
<Left>lib/net6.0/System.Data.Odbc.dll</Left>
<Left>lib/netstandard2.0/System.Data.Odbc.dll</Left>
<Right>runtimes/freebsd/lib/net6.0/System.Data.Odbc.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.Odbc.OdbcParameter.get_Offset</Target>
<Left>lib/net6.0/System.Data.Odbc.dll</Left>
<Left>lib/netstandard2.0/System.Data.Odbc.dll</Left>
<Right>runtimes/linux/lib/net6.0/System.Data.Odbc.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)</Target>
<Left>lib/net6.0/System.Data.Odbc.dll</Left>
<Left>lib/netstandard2.0/System.Data.Odbc.dll</Left>
<Right>runtimes/linux/lib/net6.0/System.Data.Odbc.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.Odbc.OdbcParameter.get_Offset</Target>
<Left>lib/net6.0/System.Data.Odbc.dll</Left>
<Left>lib/netstandard2.0/System.Data.Odbc.dll</Left>
<Right>runtimes/osx/lib/net6.0/System.Data.Odbc.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)</Target>
<Left>lib/net6.0/System.Data.Odbc.dll</Left>
<Left>lib/netstandard2.0/System.Data.Odbc.dll</Left>
<Right>runtimes/osx/lib/net6.0/System.Data.Odbc.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.Odbc.OdbcParameter.get_Offset</Target>
<Left>lib/net6.0/System.Data.Odbc.dll</Left>
<Left>lib/netstandard2.0/System.Data.Odbc.dll</Left>
<Right>runtimes/win/lib/net6.0/System.Data.Odbc.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)</Target>
<Left>lib/net6.0/System.Data.Odbc.dll</Left>
<Left>lib/netstandard2.0/System.Data.Odbc.dll</Left>
<Right>runtimes/win/lib/net6.0/System.Data.Odbc.dll</Right>
</Suppression>
<Suppression>
Expand Down Expand Up @@ -350,19 +350,19 @@
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.Odbc.OdbcInfoMessageEventHandler.#ctor(System.Object,System.IntPtr)</Target>
<Left>lib/net6.0/System.Data.Odbc.dll</Left>
<Left>lib/netstandard2.0/System.Data.Odbc.dll</Left>
<Right>lib/net7.0/System.Data.Odbc.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.Odbc.OdbcRowUpdatedEventHandler.#ctor(System.Object,System.IntPtr)</Target>
<Left>lib/net6.0/System.Data.Odbc.dll</Left>
<Left>lib/netstandard2.0/System.Data.Odbc.dll</Left>
<Right>lib/net7.0/System.Data.Odbc.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.Odbc.OdbcRowUpdatingEventHandler.#ctor(System.Object,System.IntPtr)</Target>
<Left>lib/net6.0/System.Data.Odbc.dll</Left>
<Left>lib/netstandard2.0/System.Data.Odbc.dll</Left>
<Right>lib/net7.0/System.Data.Odbc.dll</Right>
</Suppression>
</Suppressions>
6 changes: 3 additions & 3 deletions src/libraries/System.Data.OleDb/src/CompatibilitySuppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.OleDb.OleDbInfoMessageEventHandler.#ctor(System.Object,System.IntPtr)</Target>
<Left>lib/net6.0/System.Data.OleDb.dll</Left>
<Left>lib/netstandard2.0/System.Data.OleDb.dll</Left>
<Right>lib/net7.0/System.Data.OleDb.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.OleDb.OleDbRowUpdatedEventHandler.#ctor(System.Object,System.IntPtr)</Target>
<Left>lib/net6.0/System.Data.OleDb.dll</Left>
<Left>lib/netstandard2.0/System.Data.OleDb.dll</Left>
<Right>lib/net7.0/System.Data.OleDb.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Data.OleDb.OleDbRowUpdatingEventHandler.#ctor(System.Object,System.IntPtr)</Target>
<Left>lib/net6.0/System.Data.OleDb.dll</Left>
<Left>lib/netstandard2.0/System.Data.OleDb.dll</Left>
<Right>lib/net7.0/System.Data.OleDb.dll</Right>
</Suppression>
</Suppressions>
8 changes: 4 additions & 4 deletions src/libraries/System.Diagnostics.DiagnosticSource/src/CompatibilitySuppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Diagnostics.SampleActivity`1.#ctor(System.Object,System.IntPtr)</Target>
<Left>lib/net6.0/System.Diagnostics.DiagnosticSource.dll</Left>
<Left>lib/netstandard2.0/System.Diagnostics.DiagnosticSource.dll</Left>
lbussell marked this conversation as resolved.
Show resolved Hide resolved
<Right>lib/net7.0/System.Diagnostics.DiagnosticSource.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Diagnostics.DistributedContextPropagator.PropagatorGetterCallback.#ctor(System.Object,System.IntPtr)</Target>
<Left>lib/net6.0/System.Diagnostics.DiagnosticSource.dll</Left>
<Left>lib/netstandard2.0/System.Diagnostics.DiagnosticSource.dll</Left>
<Right>lib/net7.0/System.Diagnostics.DiagnosticSource.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Diagnostics.DistributedContextPropagator.PropagatorSetterCallback.#ctor(System.Object,System.IntPtr)</Target>
<Left>lib/net6.0/System.Diagnostics.DiagnosticSource.dll</Left>
<Left>lib/netstandard2.0/System.Diagnostics.DiagnosticSource.dll</Left>
<Right>lib/net7.0/System.Diagnostics.DiagnosticSource.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Diagnostics.Metrics.MeasurementCallback`1.#ctor(System.Object,System.IntPtr)</Target>
<Left>lib/net6.0/System.Diagnostics.DiagnosticSource.dll</Left>
<Left>lib/netstandard2.0/System.Diagnostics.DiagnosticSource.dll</Left>
<Right>lib/net7.0/System.Diagnostics.DiagnosticSource.dll</Right>
</Suppression>
</Suppressions>
2 changes: 1 addition & 1 deletion ...raries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<EnableTrimAnalyzer Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'">false</EnableTrimAnalyzer>
<IsPackable>true</IsPackable>
<!-- Lifetime rules introduced in C# 11 impact scenarios in net6 framework -->
<LangVersion Condition="'$(TargetFramework)' == 'net6.0'">10</LangVersion>
<LangVersion Condition="'$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0'">10</LangVersion>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change doesn't look right. We were already targeting net7.0 before. Why wasn't that needed? cc @tarekgh

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CC @AaronRobinsonMSFT as he is the one introduced this.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was because of the ref field support and the project using the .NET 7 Preview ref assemblies instead of the live build assemblies. Once the SDK for the repo was updated, this can likely be removed and the code fixed up a bit.

/cc @jakobbotsch

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Based on Aaron's reply, this setting shouldn't be needed anymore:

Suggested change
<LangVersion Condition="'$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0'">10</LangVersion>

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change should also be forward ported into main.

<EnableAOTAnalyzer>true</EnableAOTAnalyzer>
<PackageDescription>Provides Classes that allow you to decouple code logging rich (unserializable) diagnostics/telemetry (e.g. framework) from code that consumes it (e.g. tools)

Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Diagnostics.EventLog/src/CompatibilitySuppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Diagnostics.EntryWrittenEventHandler.#ctor(System.Object,System.IntPtr)</Target>
<Left>lib/net6.0/System.Diagnostics.EventLog.dll</Left>
<Left>lib/netstandard2.0/System.Diagnostics.EventLog.dll</Left>
<Right>lib/net7.0/System.Diagnostics.EventLog.dll</Right>
</Suppression>
</Suppressions>
4 changes: 2 additions & 2 deletions src/libraries/System.Diagnostics.PerformanceCounter/src/CompatibilitySuppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Diagnostics.ICollectData.CollectData(System.Int32,System.IntPtr,System.IntPtr,System.Int32,System.IntPtr@)</Target>
<Left>lib/net6.0/System.Diagnostics.PerformanceCounter.dll</Left>
<Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
<Right>lib/net7.0/System.Diagnostics.PerformanceCounter.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0006</DiagnosticId>
<Target>M:System.Diagnostics.ICollectData.CollectData(System.Int32,System.IntPtr,System.IntPtr,System.Int32,System.IntPtr@)</Target>
<Left>lib/net6.0/System.Diagnostics.PerformanceCounter.dll</Left>
<Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
<Right>lib/net7.0/System.Diagnostics.PerformanceCounter.dll</Right>
</Suppression>
</Suppressions>
10 changes: 5 additions & 5 deletions src/libraries/System.DirectoryServices.Protocols/src/CompatibilitySuppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,31 @@
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.DirectoryServices.Protocols.DereferenceConnectionCallback.#ctor(System.Object,System.IntPtr)</Target>
<Left>lib/net6.0/System.DirectoryServices.Protocols.dll</Left>
<Left>lib/netstandard2.0/System.DirectoryServices.Protocols.dll</Left>
<Right>lib/net7.0/System.DirectoryServices.Protocols.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.DirectoryServices.Protocols.NotifyOfNewConnectionCallback.#ctor(System.Object,System.IntPtr)</Target>
<Left>lib/net6.0/System.DirectoryServices.Protocols.dll</Left>
<Left>lib/netstandard2.0/System.DirectoryServices.Protocols.dll</Left>
<Right>lib/net7.0/System.DirectoryServices.Protocols.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.DirectoryServices.Protocols.QueryClientCertificateCallback.#ctor(System.Object,System.IntPtr)</Target>
<Left>lib/net6.0/System.DirectoryServices.Protocols.dll</Left>
<Left>lib/netstandard2.0/System.DirectoryServices.Protocols.dll</Left>
<Right>lib/net7.0/System.DirectoryServices.Protocols.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.DirectoryServices.Protocols.QueryForConnectionCallback.#ctor(System.Object,System.IntPtr)</Target>
<Left>lib/net6.0/System.DirectoryServices.Protocols.dll</Left>
<Left>lib/netstandard2.0/System.DirectoryServices.Protocols.dll</Left>
<Right>lib/net7.0/System.DirectoryServices.Protocols.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.DirectoryServices.Protocols.VerifyServerCertificateCallback.#ctor(System.Object,System.IntPtr)</Target>
<Left>lib/net6.0/System.DirectoryServices.Protocols.dll</Left>
<Left>lib/netstandard2.0/System.DirectoryServices.Protocols.dll</Left>
<Right>lib/net7.0/System.DirectoryServices.Protocols.dll</Right>
</Suppression>
</Suppressions>
Loading