diff --git a/src/SourceBuild/content/build.sh b/src/SourceBuild/content/build.sh index e61ce1b25831..f01633b436cb 100755 --- a/src/SourceBuild/content/build.sh +++ b/src/SourceBuild/content/build.sh @@ -37,7 +37,8 @@ while :; do lowerI="$(echo $1 | awk '{print tolower($0)}')" case $lowerI in --clean-while-building) - MSBUILD_ARGUMENTS+=( "-p:CleanWhileBuilding=true") + # TODO: Reenable with https://github.com/dotnet/source-build/issues/3233 + # MSBUILD_ARGUMENTS+=( "-p:CleanWhileBuilding=true") ;; --online) MSBUILD_ARGUMENTS+=( "-p:BuildWithOnlineSources=true") diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 7a51bf998b66..8d61a0bde76c 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -24,6 +24,7 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 0.1.0-8.0.100-4.centos.8-x64 + 0.1.0-8.0.100-5.centos.8-x64 + 0.1.0-8.0.100-1.centos.8-x64 diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json index 563dc164c2c5..3d6c8c8eedfb 100644 --- a/src/SourceBuild/content/global.json +++ b/src/SourceBuild/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-alpha.1.23061.8" + "dotnet": "8.0.100-alpha.1.23080.2" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.props b/src/SourceBuild/content/repo-projects/Directory.Build.props index 3c2b199018e3..704734ec30a2 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.props +++ b/src/SourceBuild/content/repo-projects/Directory.Build.props @@ -105,6 +105,9 @@ + + + diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets index 2ab5faafe603..9bec1c658a6a 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.targets +++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets @@ -455,7 +455,7 @@ AfterTargets="RemoveBuiltPackagesFromCache" Condition=" '$(CleanWhileBuilding)' == 'true' "> - + $(ProjectDirectory)artifacts/buildLogs $(ProjectDirectory)artifacts/buildObj diff --git a/src/SourceBuild/content/repo-projects/fsharp.proj b/src/SourceBuild/content/repo-projects/fsharp.proj index 36261805fa0c..b1a23d3415d7 100644 --- a/src/SourceBuild/content/repo-projects/fsharp.proj +++ b/src/SourceBuild/content/repo-projects/fsharp.proj @@ -27,7 +27,6 @@ - $(StandardSourceBuildArgs) - - $(BuildCommandArgs) /p:CheckEolTargetFramework=false $(StandardSourceBuildCommand) $(BuildCommandArgs) false