diff --git a/eng/Versions.props b/eng/Versions.props
index f938c3964446..6db16b87e9a4 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -225,7 +225,7 @@
     <MicrosoftCodeAnalysisCommonPackageVersion>3.7.0</MicrosoftCodeAnalysisCommonPackageVersion>
     <MicrosoftCodeAnalysisCSharpPackageVersion>3.7.0</MicrosoftCodeAnalysisCSharpPackageVersion>
     <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>3.7.0</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
-    <MicrosoftCodeAnalysisPublicApiAnalyzersPackageVersion>3.3.0-beta2.final</MicrosoftCodeAnalysisPublicApiAnalyzersPackageVersion>
+    <MicrosoftCodeAnalysisPublicApiAnalyzersPackageVersion>3.3.0</MicrosoftCodeAnalysisPublicApiAnalyzersPackageVersion>
     <MicrosoftCodeAnalysisFxCopAnalyzersPackageVersion>3.0.0</MicrosoftCodeAnalysisFxCopAnalyzersPackageVersion>
     <MicrosoftCssParserPackageVersion>1.0.0-20200708.1</MicrosoftCssParserPackageVersion>
     <MicrosoftIdentityModelClientsActiveDirectoryPackageVersion>3.19.8</MicrosoftIdentityModelClientsActiveDirectoryPackageVersion>
diff --git a/eng/targets/CSharp.Common.targets b/eng/targets/CSharp.Common.targets
index f0df33c3e552..2d9deb5890ba 100644
--- a/eng/targets/CSharp.Common.targets
+++ b/eng/targets/CSharp.Common.targets
@@ -14,21 +14,21 @@
     <!-- Public members should not use oblivious types. Not done with all nullable annotations. -->
     <NoWarn>$(NoWarn);RS0041</NoWarn>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(IsImplementationProject)' == 'true' AND
+
+  <ItemGroup Condition=" Exists('$(MSBuildProjectDirectory)\PublicAPI.*.txt') AND
+      '$(IsImplementationProject)' == 'true' AND
       '$(DotNetBuildFromSource)' != 'true' AND
       ! $(RepoRelativeProjectDir.Contains('Tools')) ">
-    <!-- Package does nothing in projects lacking PublicAPI.Shipped.txt or PublicAPI.Unshipped.txt files. -->
     <Reference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" ExcludeAssets="Compile" PrivateAssets="All" />
-
-    <AdditionalFiles Include="PublicAPI.Shipped.txt"
-        Condition=" Exists('$(MSBuildProjectDirectory)\PublicAPI.Shipped.txt') " />
-    <AdditionalFiles Include="PublicAPI.Unshipped.txt"
-        Condition=" Exists('$(MSBuildProjectDirectory)\PublicAPI.Unshipped.txt') " />
-    <AdditionalFiles Include="PublicAPI.Shipped.txt"
-        Condition=" Exists('$(MSBuildProjectDirectory)\$(_TFMDirectory)\PublicAPI.Shipped.txt') " />
-    <AdditionalFiles Include="PublicAPI.Unshipped.txt"
-        Condition=" Exists('$(MSBuildProjectDirectory)\$(_TFMDirectory)\PublicAPI.Unshipped.txt') " />
   </ItemGroup>
+  <Target Name="_CheckIgnoredPublicApiFiles"
+      BeforeTargets="Build;Restore"
+      Condition=" Exists('$(MSBuildProjectDirectory)\PublicAPI.*.txt') AND
+      !('$(IsImplementationProject)' == 'true' AND
+        '$(DotNetBuildFromSource)' != 'true' AND
+        ! $(RepoRelativeProjectDir.Contains('Tools'))) ">
+    <Warning Text="Public API baseline files ignored." />
+  </Target>
 
   <Target Name="GetCustomAssemblyAttributes"
           BeforeTargets="GetAssemblyAttributes"