| 1 | diff --git a/build.sh.orig b/build.sh
|
| 2 | index e32be1f..c8394d8 100755
|
| 3 | |
| 4 | |
| 5 | @@ -264,10 +264,8 @@ function Build {
|
| 6 | initSourceOnlyBinaryLog="/bl:\"$log_dir/init-source-only.binlog\""
|
| 7 | fi
|
| 8 |
|
| 9 | - "$CLI_ROOT/dotnet" build-server shutdown
|
| 10 | "$CLI_ROOT/dotnet" msbuild "$scriptroot/eng/init-source-only.proj" $initSourceOnlyBinaryLog "${properties[@]}"
|
| 11 | # kill off the MSBuild server so that on future invocations we pick up our custom SDK Resolver
|
| 12 | - "$CLI_ROOT/dotnet" build-server shutdown
|
| 13 | fi
|
| 14 |
|
| 15 | # Point MSBuild to the custom SDK resolvers folder, so it will pick up our custom SDK Resolver
|
| 16 | diff --git a/repo-projects/Directory.Build.targets.orig b/repo-projects/Directory.Build.targets
|
| 17 | index 8c729f8..15608d0 100644
|
| 18 | |
| 19 | |
| 20 | @@ -561,16 +561,6 @@
|
| 21 | Condition="'$(IsUtilityProject)' != 'true' and
|
| 22 | '$(CleanWhileBuilding)' == 'true' and
|
| 23 | Exists('$(ProjectDirectory)artifacts')">
|
| 24 | - <!--
|
| 25 | - Some repositories (WinForms) use source generators that open files manually and keep file handles open on the compiler server (CsWin32).
|
| 26 | - These source generators are written incorrectly (a source generator should never do IO itself),
|
| 27 | - but the required features to read in binary files as input to a source generator don't exist.
|
| 28 | - To work around these source generators, shut down the compiler server so we can delete the obj directories.
|
| 29 | - Don't fail the build when shutdown returns a failure.
|
| 30 | - -->
|
| 31 | - <Exec Command="$(DotnetTool) build-server shutdown --vbcscompiler"
|
| 32 | - IgnoreStandardErrorWarningFormat="true"
|
| 33 | - IgnoreExitCode="true" />
|
| 34 |
|
| 35 | <PropertyGroup>
|
| 36 | <BuildLogsDir>$([MSBuild]::NormalizeDirectory('$(ProjectDirectory)', 'artifacts', 'buildLogs'))</BuildLogsDir>
|