diff --git a/Directory.Build.props b/Directory.Build.props
index d901404a13..4b42f630ad 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -36,7 +36,7 @@
true
-
+
$(TrimTaskParameters)
-
+
$(TrimTaskParameters)
$(TrimTaskParameters)
-
+
$(TrimTaskParameters)
$(TrimTaskParameters)
-
+
$(TrimTaskParameters)
$(TrimTaskParameters)
-
+
@@ -101,14 +101,11 @@
true
$(WarningsNotAsErrors);CS1591
+
$(WarningsNotAsErrors);xUnit1004
-
- $(NoWarn);NU5131
-
- $(NoWarn);NU5048
-
+
$(NoWarn);RS1024;RS1025;RS1026
diff --git a/build.ps1 b/build.ps1
index d31ab318cc..96e5cb7bf0 100644
--- a/build.ps1
+++ b/build.ps1
@@ -358,17 +358,12 @@ if (-not $foundJdk -and $RunBuild -and ($All -or $BuildJava) -and -not $NoBuildJ
# Initialize global variables need to be set before the import of Arcade is imported
$restore = $RunRestore
-# Though VS Code may indicate $nodeReuse, $warnAsError and $msbuildEngine are unused, tools.ps1 uses them.
+# Though VS Code may indicate $nodeReuse and $msbuildEngine are unused, tools.ps1 uses them.
# Disable node reuse - Workaround perpetual issues in node reuse and custom task assemblies
$nodeReuse = $false
$env:MSBUILDDISABLENODEREUSE=1
-# Our build often has warnings that we can't fix, like "MSB3026: Could not copy" due to race
-# conditions in building C++
-# Fixing this is tracked by https://github.com/dotnet/aspnetcore-internal/issues/601
-$warnAsError = $false
-
# Use `dotnet msbuild` by default
$msbuildEngine = 'dotnet'
diff --git a/build.sh b/build.sh
index 80dbb7f291..3c3cab39ce 100755
--- a/build.sh
+++ b/build.sh
@@ -306,10 +306,6 @@ restore=$run_restore
nodeReuse=false
export MSBUILDDISABLENODEREUSE=1
-# Our build often has warnings that we can't fix
-# Fixing this is tracked by https://github.com/dotnet/aspnetcore-internal/issues/601
-warn_as_error=false
-
# Ensure passing neither --bl nor --nobl on CI avoids errors in tools.sh. This is needed because we set both variables
# to false by default i.e. they always exist. (We currently avoid binary logs but that is made visible in the YAML.)
if [[ "$ci" == true && "$exclude_ci_binary_log" == false ]]; then
diff --git a/eng/Workarounds.props b/eng/Workarounds.props
index eeb9004c6d..a56cf44b46 100644
--- a/eng/Workarounds.props
+++ b/eng/Workarounds.props
@@ -18,13 +18,6 @@
$(TestRunnerAdditionalArguments) -nocolor
-
-
- $(NoWarn);NU5131
-
- $(NoWarn);NU5048
-
-
- $(NoWarn);NU5129
-
true
aspnetcore;aspnetcoremvc;razor
true
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
index 3156331456..efe499aaca 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj
@@ -13,8 +13,6 @@
$(NoWarn);NU5100
$(NoWarn);NU5129
-
- $(NoWarn);MSB3030;MSB4181
true
diff --git a/src/Razor/test/testassets/Directory.Build.props b/src/Razor/test/testassets/Directory.Build.props
index b1bd192bc1..ece4b1e256 100644
--- a/src/Razor/test/testassets/Directory.Build.props
+++ b/src/Razor/test/testassets/Directory.Build.props
@@ -26,9 +26,6 @@
OutOfProcess
-
-
- $(NoWarn);NU5131