diff --git a/src/Kestrel.Core/Kestrel.Core.csproj b/src/Kestrel.Core/Kestrel.Core.csproj
index fa14ffb523..764b0d5bd8 100644
--- a/src/Kestrel.Core/Kestrel.Core.csproj
+++ b/src/Kestrel.Core/Kestrel.Core.csproj
@@ -9,7 +9,8 @@
     <PackageTags>aspnetcore;kestrel</PackageTags>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>CS1591;$(NoWarn)</NoWarn>
-    <EnableApiCheck>false</EnableApiCheck>
+    <!-- TODO: remove when https://github.com/dotnet/sdk/pull/1270 is fixed -->
+    <GenerateResourceMSBuildRuntime>CurrentRuntime</GenerateResourceMSBuildRuntime>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/baseline.netcore.json b/src/Kestrel.Core/baseline.netcore.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/baseline.netcore.json
rename to src/Kestrel.Core/baseline.netcore.json
diff --git a/src/Kestrel.Https/Kestrel.Https.csproj b/src/Kestrel.Https/Kestrel.Https.csproj
index 284c7f6fb3..e99a6f7423 100644
--- a/src/Kestrel.Https/Kestrel.Https.csproj
+++ b/src/Kestrel.Https/Kestrel.Https.csproj
@@ -8,7 +8,8 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>aspnetcore;kestrel</PackageTags>
     <NoWarn>CS1591;$(NoWarn)</NoWarn>
-    <EnableApiCheck>false</EnableApiCheck>
+    <!-- TODO: remove when https://github.com/dotnet/sdk/pull/1270 is fixed -->
+    <GenerateResourceMSBuildRuntime>CurrentRuntime</GenerateResourceMSBuildRuntime>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Https/baseline.netcore.json b/src/Kestrel.Https/baseline.netcore.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Server.Kestrel.Https/baseline.netcore.json
rename to src/Kestrel.Https/baseline.netcore.json
diff --git a/src/Kestrel.Transport.Abstractions/Kestrel.Transport.Abstractions.csproj b/src/Kestrel.Transport.Abstractions/Kestrel.Transport.Abstractions.csproj
index a9e754a8ad..cfbd7353cf 100644
--- a/src/Kestrel.Transport.Abstractions/Kestrel.Transport.Abstractions.csproj
+++ b/src/Kestrel.Transport.Abstractions/Kestrel.Transport.Abstractions.csproj
@@ -8,7 +8,6 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>aspnetcore;kestrel</PackageTags>
     <NoWarn>CS1570;CS1571;CS1572;CS1573;CS1574;CS1591;$(NoWarn)</NoWarn>
-    <EnableApiCheck>false</EnableApiCheck>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <UseSystemMemory>false</UseSystemMemory>
   </PropertyGroup>
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions/baseline.netcore.json b/src/Kestrel.Transport.Abstractions/baseline.netcore.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions/baseline.netcore.json
rename to src/Kestrel.Transport.Abstractions/baseline.netcore.json
diff --git a/src/Kestrel.Transport.Libuv/Kestrel.Transport.Libuv.csproj b/src/Kestrel.Transport.Libuv/Kestrel.Transport.Libuv.csproj
index d7324df34d..4251d64cea 100644
--- a/src/Kestrel.Transport.Libuv/Kestrel.Transport.Libuv.csproj
+++ b/src/Kestrel.Transport.Libuv/Kestrel.Transport.Libuv.csproj
@@ -9,7 +9,6 @@
     <PackageTags>aspnetcore;kestrel</PackageTags>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>CS1591;$(NoWarn)</NoWarn>
-    <EnableApiCheck>false</EnableApiCheck>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/baseline.netcore.json b/src/Kestrel.Transport.Libuv/baseline.netcore.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/baseline.netcore.json
rename to src/Kestrel.Transport.Libuv/baseline.netcore.json
diff --git a/src/Kestrel.Transport.Sockets/Kestrel.Transport.Sockets.csproj b/src/Kestrel.Transport.Sockets/Kestrel.Transport.Sockets.csproj
index 9d1f419dc3..af86b481a2 100644
--- a/src/Kestrel.Transport.Sockets/Kestrel.Transport.Sockets.csproj
+++ b/src/Kestrel.Transport.Sockets/Kestrel.Transport.Sockets.csproj
@@ -9,7 +9,8 @@
     <PackageTags>aspnetcore;kestrel</PackageTags>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>CS1591;$(NoWarn)</NoWarn>
-    <EnableApiCheck>false</EnableApiCheck>
+    <!-- TODO: remove when https://github.com/dotnet/sdk/pull/1270 is fixed -->
+    <GenerateResourceMSBuildRuntime>CurrentRuntime</GenerateResourceMSBuildRuntime>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets/baseline.netcore.json b/src/Kestrel.Transport.Sockets/baseline.netcore.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets/baseline.netcore.json
rename to src/Kestrel.Transport.Sockets/baseline.netcore.json
diff --git a/src/Kestrel/Kestrel.csproj b/src/Kestrel/Kestrel.csproj
index ab269185a2..cdd0e1bc70 100644
--- a/src/Kestrel/Kestrel.csproj
+++ b/src/Kestrel/Kestrel.csproj
@@ -8,7 +8,6 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>aspnetcore;kestrel</PackageTags>
     <NoWarn>CS1591;$(NoWarn)</NoWarn>
-    <EnableApiCheck>false</EnableApiCheck>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/baseline.netcore.json b/src/Kestrel/baseline.netcore.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Server.Kestrel/baseline.netcore.json
rename to src/Kestrel/baseline.netcore.json