Update SDK (#34236)

* Update SDK This ingests the global imports change from the SDK * Implicit imports fixes * Fix test projects
dotnet · Jul 9, 2021 · 15949fa · 15949fa
1 parent bb37377
commit 15949fa
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 3 deletions.
diff --git 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
@@ -5,5 +5,6 @@
     <IsPackable>false</IsPackable>
     <DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
     <Nullable>disable</Nullable>
+    <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
   </PropertyGroup>
 </Project>
diff --git 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",

diff --git 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
@@ -8,6 +8,7 @@
     <TestAssetOutputName>InProcessNewShimWebSite</TestAssetOutputName>
     <DefineConstants>FORWARDCOMPAT</DefineConstants>
     <CompileUsingReferenceAssemblies>false</CompileUsingReferenceAssemblies>
+    <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(OS)' == 'Windows_NT'">

diff --git a/src/Servers/Kestrel/Directory.Build.targets 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>