diff --git a/.gitmodules b/.gitmodules
index a9651ed372..71ac27cd22 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -50,10 +50,6 @@
 	path = modules/EntityFrameworkCore
 	url = https://github.com/aspnet/EntityFrameworkCore.git
 	branch = release/2.2
-[submodule "modules/EventNotification"]
-	path = modules/EventNotification
-	url = https://github.com/aspnet/EventNotification.git
-	branch = release/2.2
 [submodule "modules/FileSystem"]
 	path = modules/FileSystem
 	url = https://github.com/aspnet/FileSystem.git
diff --git a/build/artifacts.props b/build/artifacts.props
index 0d2fa2a784..3939eb38ff 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -208,7 +208,6 @@
     <PackageArtifact Include="Microsoft.Extensions.DependencyInjection.Abstractions" Category="ship" />
     <PackageArtifact Include="Microsoft.Extensions.DependencyInjection.Specification.Tests" Category="ship" />
     <PackageArtifact Include="Microsoft.Extensions.DependencyInjection" Category="ship" />
-    <PackageArtifact Include="Microsoft.Extensions.DiagnosticAdapter" Category="ship" />
     <PackageArtifact Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Category="ship" />
     <PackageArtifact Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Category="ship" />
     <PackageArtifact Include="Microsoft.Extensions.Diagnostics.HealthChecks" Category="ship"  />
diff --git a/build/buildorder.props b/build/buildorder.props
index 05aba60937..24c1283055 100644
--- a/build/buildorder.props
+++ b/build/buildorder.props
@@ -10,7 +10,6 @@
     <RepositoryBuildOrder Include="Microsoft.Data.Sqlite" Order="1" />
     <RepositoryBuildOrder Include="DependencyInjection" Order="2" />
     <RepositoryBuildOrder Include="FileSystem" Order="2" />
-    <RepositoryBuildOrder Include="EventNotification" Order="2" />
     <RepositoryBuildOrder Include="JsonPatch" Order="2" />
     <RepositoryBuildOrder Include="Configuration" Order="3" />
     <RepositoryBuildOrder Include="Options" Order="4" />
diff --git a/build/dependencies.props b/build/dependencies.props
index 6a74f270ab..3a50bcd957 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -7,15 +7,16 @@
     <SystemDataSqlClientPackageVersion>4.6.0-rtm-27023-03</SystemDataSqlClientPackageVersion>
     <!-- Packages from aspnet/Extensions -->
     <InternalAspNetCoreAnalyzersPackageVersion>2.2.0-rtm-35542</InternalAspNetCoreAnalyzersPackageVersion>
+    <MicrosoftAspNetCoreAnalyzerTestingPackageVersion>2.2.0-rtm-35542</MicrosoftAspNetCoreAnalyzerTestingPackageVersion>
     <MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>2.2.0-rtm-35542</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
     <MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion>2.2.0-rtm-35542</MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion>
     <MicrosoftAspNetCoreTestingPackageVersion>2.2.0-rtm-35542</MicrosoftAspNetCoreTestingPackageVersion>
     <MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion>2.2.0-rtm-35542</MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion>
     <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>2.2.0-rtm-35542</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
     <MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion>2.2.0-rtm-35542</MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion>
+    <MicrosoftExtensionsDiagnosticAdapterPackageVersion>2.2.0-rtm-35542</MicrosoftExtensionsDiagnosticAdapterPackageVersion>
     <MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>2.2.0-rtm-35542</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
     <MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>2.2.0-rtm-35542</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
-    <MicrosoftAspNetCoreAnalyzerTestingPackageVersion>2.2.0-rtm-35542</MicrosoftAspNetCoreAnalyzerTestingPackageVersion>
     <MicrosoftExtensionsObjectMethodExecutorSourcesPackageVersion>2.2.0-rtm-35542</MicrosoftExtensionsObjectMethodExecutorSourcesPackageVersion>
     <MicrosoftExtensionsObjectPoolPackageVersion>2.2.0-rtm-35542</MicrosoftExtensionsObjectPoolPackageVersion>
     <MicrosoftExtensionsPrimitivesPackageVersion>2.2.0-rtm-35542</MicrosoftExtensionsPrimitivesPackageVersion>
diff --git a/build/external-dependencies.props b/build/external-dependencies.props
index a0e9fdad8e..2057afdc9a 100644
--- a/build/external-dependencies.props
+++ b/build/external-dependencies.props
@@ -19,6 +19,7 @@
     <ExternalDependency Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" Version="$(MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion)" />
     <ExternalDependency Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion)" />
     <ExternalDependency Include="Microsoft.Extensions.CopyOnWriteDictionary.Sources" Version="$(MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion)" />
+    <ExternalDependency Include="Microsoft.Extensions.DiagnosticAdapter" Version="$(MicrosoftExtensionsDiagnosticAdapterPackageVersion)" />
     <ExternalDependency Include="Microsoft.Extensions.HashCodeCombiner.Sources" Version="$(MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion)" />
     <ExternalDependency Include="Microsoft.Extensions.NonCapturingTimer.Sources" Version="$(MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion)" />
     <ExternalDependency Include="Microsoft.Extensions.ObjectMethodExecutor.Sources" Version="$(MicrosoftExtensionsObjectMethodExecutorSourcesPackageVersion)" />
diff --git a/build/submodules.props b/build/submodules.props
index b1d54c7c93..d0038ba961 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -49,7 +49,6 @@
     <Repository Include="Diagnostics" />
     <Repository Include="DotNetTools" />
     <Repository Include="EntityFrameworkCore" />
-    <Repository Include="EventNotification" />
     <Repository Include="FileSystem" />
     <Repository Include="Hosting" />
     <Repository Include="HtmlAbstractions" />
diff --git a/modules/EventNotification b/modules/EventNotification
deleted file mode 160000
index c40e7bc21e..0000000000
--- a/modules/EventNotification
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c40e7bc21ee46f30c376a1e4911462af9201e7e6