diff --git a/Directory.Build.props b/Directory.Build.props index dc1f3554115a..002172ceab1e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -110,7 +110,7 @@ - $(NoWarn.Replace('1591', '')) + $(NoWarn.Replace('1591', ''));NETSDK1023 $(NoWarn);0105 diff --git a/Directory.Build.targets b/Directory.Build.targets index e7501159d6f6..2fff77f52437 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -191,4 +191,11 @@ + + + + diff --git a/NuGet.config b/NuGet.config index f7375b2fdcbf..ed7097de2540 100644 --- a/NuGet.config +++ b/NuGet.config @@ -2,6 +2,7 @@ + diff --git a/eng/build.ps1 b/eng/build.ps1 index 9e7fd3057ec8..a56cf94bc9e5 100644 --- a/eng/build.ps1 +++ b/eng/build.ps1 @@ -433,6 +433,7 @@ try { /p:Restore=$RunRestore ` /p:Build=true ` /clp:NoSummary ` + /nowarn:NETSDK1023 ` @ToolsetBuildArguments } @@ -441,7 +442,7 @@ try { Remove-Item variable:global:_BuildTool -ErrorAction Ignore $msbuildEngine = 'vs' - MSBuild $toolsetBuildProj /p:RepoRoot=$RepoRoot @MSBuildArguments + MSBuild $toolsetBuildProj /p:RepoRoot=$RepoRoot /nowarn:NETSDK1023 @MSBuildArguments } if ($performDotnetBuild) { @@ -449,7 +450,7 @@ try { Remove-Item variable:global:_BuildTool -ErrorAction Ignore $msbuildEngine = 'dotnet' - MSBuild $toolsetBuildProj /p:RepoRoot=$RepoRoot @dotnetBuildArguments + MSBuild $toolsetBuildProj /p:RepoRoot=$RepoRoot /nowarn:NETSDK1023 @dotnetBuildArguments } } catch { diff --git a/eng/build.sh b/eng/build.sh index 311734c91cff..fa86f98fe5df 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -369,13 +369,14 @@ if [ "$build_repo_tasks" = true ]; then -p:Restore=$run_restore \ -p:Build=true \ -clp:NoSummary \ + -nowarn:NETSDK1023 \ ${toolset_build_args[@]+"${toolset_build_args[@]}"} fi if [ "$only_build_repo_tasks" != true ]; then # This incantation avoids unbound variable issues if msbuild_args is empty # https://stackoverflow.com/questions/7577052/bash-empty-array-expansion-with-set-u - MSBuild $_InitializeToolset -p:RepoRoot="$repo_root" ${msbuild_args[@]+"${msbuild_args[@]}"} + MSBuild $_InitializeToolset -p:RepoRoot="$repo_root" -nowarn:NETSDK1023 ${msbuild_args[@]+"${msbuild_args[@]}"} fi ExitWithExitCode 0 diff --git a/eng/tools/GenerateFiles/Directory.Build.targets.in b/eng/tools/GenerateFiles/Directory.Build.targets.in index 53cd9040e933..8c2e45e21eae 100644 --- a/eng/tools/GenerateFiles/Directory.Build.targets.in +++ b/eng/tools/GenerateFiles/Directory.Build.targets.in @@ -54,6 +54,11 @@ Condition=" '$(IsServicingBuild)' != 'true' ">${MicrosoftAspNetCoreAppRefVersion} + + diff --git a/packages/Microsoft.Net.Compilers.Toolset.4.0.0-ci.final.nupkg b/packages/Microsoft.Net.Compilers.Toolset.4.0.0-ci.final.nupkg new file mode 100644 index 000000000000..8292b49ea3d3 Binary files /dev/null and b/packages/Microsoft.Net.Compilers.Toolset.4.0.0-ci.final.nupkg differ