Merge pull request #500 from AArnott/fix2.8build

Fix v2.8 build in Azure Pipelines
dotnet · Jul 2, 2022 · c462ce7 · c462ce7
2 parents adea0d2 + c3ee8d0
commit c462ce7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "5.0.201",
+    "version": "6.0.300",
     "rollForward": "patch",
     "allowPrerelease": false
   }

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -9,6 +9,7 @@
     <Nullable>enable</Nullable>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <DefineConstants Condition=" '$(TargetFramework)' == 'netcoreapp2.1' or '$(TargetFramework)' == 'netcoreapp3.0' or '$(TargetFramework)' == 'netcoreapp3.1' ">$(DefineConstants);SPAN_BUILTIN</DefineConstants>
+    <NoWarn>$(NoWarn);NETSDK1138</NoWarn>
 
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>