From 96fe048f7b600136ced5e30d897d0f7fcb60d6ff Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Fri, 9 Jul 2021 10:53:46 -0700
Subject: [PATCH 1/3] Update SDK

This ingests the global imports change from the SDK
---
 global.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/global.json b/global.json
index 2d2e63ba783d..b0d2d042233b 100644
--- a/global.json
+++ b/global.json
@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "6.0.100-preview.7.21356.3"
+    "version": "6.0.100-preview.7.21359.3"
   },
   "tools": {
-    "dotnet": "6.0.100-preview.7.21356.3",
+    "dotnet": "6.0.100-preview.7.21359.3",
     "runtimes": {
       "dotnet/x64": [
         "2.1.27",

From 09d9b0aedd9c32635e7848ca4364f2aeace286be Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Fri, 9 Jul 2021 12:04:13 -0700
Subject: [PATCH 2/3] Implicit imports fixes

---
 eng/targets/CSharp.Common.props             | 2 +-
 eng/tools/Directory.Build.props             | 1 +
 src/Servers/Kestrel/Directory.Build.targets | 8 ++++++++
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 src/Servers/Kestrel/Directory.Build.targets

diff --git a/eng/targets/CSharp.Common.props b/eng/targets/CSharp.Common.props
index 55ff8dac4d21..b97198a89136 100644
--- a/eng/targets/CSharp.Common.props
+++ b/eng/targets/CSharp.Common.props
@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <LangVersion>9.0</LangVersion>
+    <LangVersion>10.0</LangVersion>
 
     <!-- Enables Strict mode for Roslyn compiler -->
     <Features>strict;nullablePublicOnly</Features>
diff --git a/eng/tools/Directory.Build.props b/eng/tools/Directory.Build.props
index 169cff2c21d8..117dcdc8deab 100644
--- a/eng/tools/Directory.Build.props
+++ b/eng/tools/Directory.Build.props
@@ -5,5 +5,6 @@
     <IsPackable>false</IsPackable>
     <DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
     <Nullable>disable</Nullable>
+    <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
   </PropertyGroup>
 </Project>
diff --git a/src/Servers/Kestrel/Directory.Build.targets b/src/Servers/Kestrel/Directory.Build.targets
new file mode 100644
index 000000000000..9760bf235060
--- /dev/null
+++ b/src/Servers/Kestrel/Directory.Build.targets
@@ -0,0 +1,8 @@
+<Project>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.targets))\Directory.Build.targets" />
+
+  <ItemGroup>
+    <Import Remove="System.Net.Http" />
+  </ItemGroup>
+
+</Project>

From 94511d6532672b7de843afd77d06ea49e3c71c43 Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Fri, 9 Jul 2021 13:32:11 -0700
Subject: [PATCH 3/3] Fix test projects

---
 .../Wasm.Performance/Driver/Wasm.Performance.Driver.csproj       | 1 +
 .../InProcessNewShimWebSite/InProcessNewShimWebSite.csproj       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/Components/benchmarkapps/Wasm.Performance/Driver/Wasm.Performance.Driver.csproj b/src/Components/benchmarkapps/Wasm.Performance/Driver/Wasm.Performance.Driver.csproj
index 346ddc48f16b..2ad41a63c633 100644
--- a/src/Components/benchmarkapps/Wasm.Performance/Driver/Wasm.Performance.Driver.csproj
+++ b/src/Components/benchmarkapps/Wasm.Performance/Driver/Wasm.Performance.Driver.csproj
@@ -9,6 +9,7 @@
     <SignAssembly>false</SignAssembly>
     <IsTestAssetProject>true</IsTestAssetProject>
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
+    <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj
index eb02e425685d..83f17ad5b8ff 100644
--- a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj
+++ b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj
@@ -8,6 +8,7 @@
     <TestAssetOutputName>InProcessNewShimWebSite</TestAssetOutputName>
     <DefineConstants>FORWARDCOMPAT</DefineConstants>
     <CompileUsingReferenceAssemblies>false</CompileUsingReferenceAssemblies>
+    <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(OS)' == 'Windows_NT'">