From ef52b7ef12646fe546cb8a13ecc3992792b22204 Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Thu, 21 Jan 2021 20:05:01 +0000
Subject: [PATCH] Update MSBuild.SDK.Extras, and remove warning suppressions

---
 Rakefile                               | 11 +++++------
 Stylet/Stylet.csproj                   |  2 +-
 StyletUnitTests/StyletUnitTests.csproj |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Rakefile b/Rakefile
index f0dc92c..6f305ad 100644
--- a/Rakefile
+++ b/Rakefile
@@ -19,21 +19,20 @@ directory COVERAGE_DIR
 
 desc "Build the project using the current CONFIG (or Debug)"
 task :build do
-  # https://github.com/novotnyllc/MSBuildSdkExtras/pull/249
-  sh 'dotnet', 'build', '-c', CONFIG, CSPROJ, '/nowarn:MSB4011'
+  sh 'dotnet', 'build', '-c', CONFIG, CSPROJ
 end
 
 desc "Run unit tests using the current CONFIG (or Debug)"
 task :test do
-  sh 'dotnet', 'test', '-c', CONFIG, UNIT_TESTS, '/nowarn:MSB4011'
+  sh 'dotnet', 'test', '-c', CONFIG, UNIT_TESTS
 end
 
 desc "Create NuGet package"
 task :package do
   # Not sure why these have to be this way around, but they do
-  sh 'dotnet', 'pack', '--no-build', '-c', CONFIG, CSPROJ, "-p:NuSpecFile=../#{NUSPEC_START}", '/nowarn:MSB4011'
-  sh 'dotnet', 'pack', '--no-build', '-c', CONFIG, CSPROJ, '-p:IncludeSymbols=true', '/nowarn:MSB4011'
-  sh 'dotnet', 'pack', '-c', CONFIG, TEMPLATES_CSPROJ, '/nowarn:MSB4011'
+  sh 'dotnet', 'pack', '--no-build', '-c', CONFIG, CSPROJ, "-p:NuSpecFile=../#{NUSPEC_START}"
+  sh 'dotnet', 'pack', '--no-build', '-c', CONFIG, CSPROJ, '-p:IncludeSymbols=true'
+  sh 'dotnet', 'pack', '-c', CONFIG, TEMPLATES_CSPROJ
 end
 
 desc "Bump version number"
diff --git a/Stylet/Stylet.csproj b/Stylet/Stylet.csproj
index 07f0630..14b2834 100644
--- a/Stylet/Stylet.csproj
+++ b/Stylet/Stylet.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
+<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
diff --git a/StyletUnitTests/StyletUnitTests.csproj b/StyletUnitTests/StyletUnitTests.csproj
index a4f81e9..5d5aa34 100644
--- a/StyletUnitTests/StyletUnitTests.csproj
+++ b/StyletUnitTests/StyletUnitTests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
+<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
 
   <PropertyGroup>
     <TargetFrameworks>net5.0-windows</TargetFrameworks>