diff --git a/Directory.Build.props b/Directory.Build.props
index bd25c39f..6c0581ac 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -88,17 +88,12 @@
 
   <PropertyGroup Condition=" $(RepoRelativeProjectDir.Contains('src')) ">
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <EnablePackageValidation>true</EnablePackageValidation>
     <IncludeSymbols>true</IncludeSymbols>
     <IsPackable>true</IsPackable>
     <IsShipping>true</IsShipping>
     <Serviceable>false</Serviceable>
   </PropertyGroup>
 
-  <ItemGroup Condition=" $(RepoRelativeProjectDir.Contains('src')) ">
-    <ApiCompatSuppressionFile Include="$(MSBuildThisFileDirectory)eng\CompatibilitySuppressions.xml" />
-  </ItemGroup>
-
   <PropertyGroup>
     <PolySharpIncludeRuntimeSupportedAttributes>true</PolySharpIncludeRuntimeSupportedAttributes>
   </PropertyGroup>
diff --git a/OpenIddict.sln b/OpenIddict.sln
index 03be0aba..8139285f 100644
--- a/OpenIddict.sln
+++ b/OpenIddict.sln
@@ -60,7 +60,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "eng", "eng", "{6E8E862C-3F26-47D9-9C20-E3E87FD7CDFC}"
 	ProjectSection(SolutionItems) = preProject
 		eng\CodeAnalysis.ruleset = eng\CodeAnalysis.ruleset
-		eng\CompatibilitySuppressions.xml = eng\CompatibilitySuppressions.xml
 		eng\key.snk = eng\key.snk
 		eng\Signing.props = eng\Signing.props
 		eng\Tools.props = eng\Tools.props
diff --git a/eng/CompatibilitySuppressions.xml b/eng/CompatibilitySuppressions.xml
deleted file mode 100644
index 9197578b..00000000
--- a/eng/CompatibilitySuppressions.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:OpenIddict.Client.WebIntegration.OpenIddictClientWebIntegrationConfiguration.#ctor</Target>
-    <Left>lib/net6.0/OpenIddict.Client.WebIntegration.dll</Left>
-    <Right>lib/net6.0/OpenIddict.Client.WebIntegration.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:OpenIddict.Client.WebIntegration.OpenIddictClientWebIntegrationConfiguration.#ctor</Target>
-    <Left>lib/net7.0/OpenIddict.Client.WebIntegration.dll</Left>
-    <Right>lib/net7.0/OpenIddict.Client.WebIntegration.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:OpenIddict.Client.SystemIntegration.OpenIddictClientSystemIntegrationHelpers.GetWebAuthenticationResult(OpenIddict.Client.OpenIddictClientTransaction)</Target>
-    <Left>lib/netcoreapp3.1/OpenIddict.Client.SystemIntegration.dll</Left>
-    <Right>lib/net6.0-windows7.0/OpenIddict.Client.SystemIntegration.dll</Right>
-  </Suppression>
-
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:OpenIddict.Client.SystemIntegration.OpenIddictClientSystemIntegrationHelpers.GetWebAuthenticationResult(OpenIddict.Client.OpenIddictClientTransaction)</Target>
-    <Left>lib/netcoreapp3.1/OpenIddict.Client.SystemIntegration.dll</Left>
-    <Right>lib/net6.0/OpenIddict.Client.SystemIntegration.dll</Right>
-  </Suppression>
-
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:OpenIddict.Client.WebIntegration.OpenIddictClientWebIntegrationConfiguration.#ctor</Target>
-    <Left>lib/netcoreapp3.1/OpenIddict.Client.WebIntegration.dll</Left>
-    <Right>lib/netcoreapp3.1/OpenIddict.Client.WebIntegration.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:OpenIddict.Client.SystemIntegration.OpenIddictClientSystemIntegrationConfiguration.#ctor(Microsoft.Extensions.Hosting.IHostingEnvironment)</Target>
-    <Left>lib/netstandard2.0/OpenIddict.Client.SystemIntegration.dll</Left>
-    <Right>lib/netcoreapp3.1/OpenIddict.Client.SystemIntegration.dll</Right>
-  </Suppression>
-
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:OpenIddict.Client.SystemIntegration.OpenIddictClientSystemIntegrationConfiguration.#ctor(Microsoft.Extensions.Hosting.IHostingEnvironment)</Target>
-    <Left>lib/netstandard2.1/OpenIddict.Client.SystemIntegration.dll</Left>
-    <Right>lib/netcoreapp3.1/OpenIddict.Client.SystemIntegration.dll</Right>
-  </Suppression>
-
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:OpenIddict.Client.SystemIntegration.OpenIddictClientSystemIntegrationHandlers.AbortAuthenticationDemand.#ctor(OpenIddict.Client.SystemIntegration.OpenIddictClientSystemIntegrationMarshal,Microsoft.Extensions.Hosting.IApplicationLifetime)</Target>
-    <Left>lib/netstandard2.0/OpenIddict.Client.SystemIntegration.dll</Left>
-    <Right>lib/netcoreapp3.1/OpenIddict.Client.SystemIntegration.dll</Right>
-  </Suppression>
-
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:OpenIddict.Client.SystemIntegration.OpenIddictClientSystemIntegrationHandlers.AbortAuthenticationDemand.#ctor(OpenIddict.Client.SystemIntegration.OpenIddictClientSystemIntegrationMarshal,Microsoft.Extensions.Hosting.IApplicationLifetime)</Target>
-    <Left>lib/netstandard2.1/OpenIddict.Client.SystemIntegration.dll</Left>
-    <Right>lib/netcoreapp3.1/OpenIddict.Client.SystemIntegration.dll</Right>
-  </Suppression>
-
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:OpenIddict.Client.SystemIntegration.OpenIddictClientSystemIntegrationHandlers.RedirectProtocolActivation.#ctor(Microsoft.Extensions.Hosting.IApplicationLifetime,Microsoft.Extensions.Options.IOptionsMonitor{OpenIddict.Client.SystemIntegration.OpenIddictClientSystemIntegrationOptions},OpenIddict.Client.SystemIntegration.OpenIddictClientSystemIntegrationService)</Target>
-    <Left>lib/netstandard2.0/OpenIddict.Client.SystemIntegration.dll</Left>
-    <Right>lib/netcoreapp3.1/OpenIddict.Client.SystemIntegration.dll</Right>
-  </Suppression>
-
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:OpenIddict.Client.SystemIntegration.OpenIddictClientSystemIntegrationHandlers.RedirectProtocolActivation.#ctor(Microsoft.Extensions.Hosting.IApplicationLifetime,Microsoft.Extensions.Options.IOptionsMonitor{OpenIddict.Client.SystemIntegration.OpenIddictClientSystemIntegrationOptions},OpenIddict.Client.SystemIntegration.OpenIddictClientSystemIntegrationService)</Target>
-    <Left>lib/netstandard2.1/OpenIddict.Client.SystemIntegration.dll</Left>
-    <Right>lib/netcoreapp3.1/OpenIddict.Client.SystemIntegration.dll</Right>
-  </Suppression>
-
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:OpenIddict.Client.WebIntegration.OpenIddictClientWebIntegrationConfiguration.#ctor(System.IServiceProvider)</Target>
-    <Left>lib/netstandard2.0/OpenIddict.Client.WebIntegration.dll</Left>
-    <Right>lib/netstandard2.1/OpenIddict.Client.WebIntegration.dll</Right>
-  </Suppression>
-
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:OpenIddict.Client.WebIntegration.OpenIddictClientWebIntegrationConfiguration.#ctor</Target>
-    <Left>lib/netstandard2.1/OpenIddict.Client.WebIntegration.dll</Left>
-    <Right>lib/netstandard2.1/OpenIddict.Client.WebIntegration.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-</Suppressions>
\ No newline at end of file
diff --git a/eng/Versions.props b/eng/Versions.props
index 03aca1c2..f74a30c3 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,7 +5,6 @@
     <MinorVersion>7</MinorVersion>
     <PatchVersion>0</PatchVersion>
     <VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
-    <PackageValidationBaselineVersion Condition=" '$(PackageValidationBaselineVersion)' == '' ">4.4.0</PackageValidationBaselineVersion>
     <PreReleaseVersionLabel>preview1</PreReleaseVersionLabel>
     <PreReleaseVersionIteration></PreReleaseVersionIteration>
     <PreReleaseBrandingLabel>Preview 1</PreReleaseBrandingLabel>
diff --git a/src/OpenIddict.Client.AspNetCore/OpenIddict.Client.AspNetCore.csproj b/src/OpenIddict.Client.AspNetCore/OpenIddict.Client.AspNetCore.csproj
index d5a1e14c..467041e0 100644
--- a/src/OpenIddict.Client.AspNetCore/OpenIddict.Client.AspNetCore.csproj
+++ b/src/OpenIddict.Client.AspNetCore/OpenIddict.Client.AspNetCore.csproj
@@ -1,10 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>
-      $(NetFrameworkTargetFrameworks);
-      $(NetCoreTargetFrameworks)
-    </TargetFrameworks>
+    <TargetFrameworks>$(NetFrameworkTargetFrameworks);$(NetCoreTargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>