From 67cbd5770ff62ffd60b60f19e9d755a04f0f37cc Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Tue, 7 Feb 2023 11:07:22 -0600
Subject: [PATCH] Update source-build artifacts to be coherent (#15372)

Co-authored-by: Matt Thalman <mthalman@microsoft.com>
---
 src/SourceBuild/content/build.sh                              | 3 ++-
 src/SourceBuild/content/eng/Versions.props                    | 3 ++-
 src/SourceBuild/content/global.json                           | 2 +-
 src/SourceBuild/content/repo-projects/Directory.Build.props   | 3 +++
 src/SourceBuild/content/repo-projects/Directory.Build.targets | 2 +-
 src/SourceBuild/content/repo-projects/fsharp.proj             | 1 -
 src/SourceBuild/content/repo-projects/xliff-tasks.proj        | 2 --
 7 files changed, 9 insertions(+), 7 deletions(-)

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.
     -->
-    <PrivateSourceBuiltArtifactsPackageVersion>0.1.0-8.0.100-4.centos.8-x64</PrivateSourceBuiltArtifactsPackageVersion>
+    <PrivateSourceBuiltArtifactsPackageVersion>0.1.0-8.0.100-5.centos.8-x64</PrivateSourceBuiltArtifactsPackageVersion>
+    <PrivateSourceBuiltPrebuiltsPackageVersion>0.1.0-8.0.100-1.centos.8-x64</PrivateSourceBuiltPrebuiltsPackageVersion>
   </PropertyGroup>
 </Project>
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 @@
     <EnvironmentVariables Include="DeterministicSourcePaths=false" Condition="'$(DeterministicBuildOptOut)' == 'true'" />
 
     <EnvironmentVariables Include="SourceRoot=$(ProjectDirectory)" />
+
+    <!-- https://github.com/dotnet/source-build/issues/3081 -->
+    <EnvironmentVariables Include="CheckEolTargetFramework=false" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(EnableExtraDebugging)' == 'true'">
diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index b99d03e876e2..a8257d0a26af 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -461,7 +461,7 @@
           AfterTargets="RemoveBuiltPackagesFromCache"
           Condition=" '$(CleanWhileBuilding)' == 'true' ">
 
-    <!-- Make a copy of the build logs & project.assets.json files-->
+    <!-- Make a copy of the build logs & project.assets.json files -->
     <PropertyGroup>
       <BuildLogsDir>$(ProjectDirectory)artifacts/buildLogs</BuildLogsDir>
       <BuildObjDir>$(ProjectDirectory)artifacts/buildObj</BuildObjDir>
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 @@
 
   <ItemGroup>
     <UseSourceBuiltSdkOverride Include="@(ArcadeSdkOverride)" />
-    <EnvironmentVariables Include="CheckEolTargetFramework=false" />
   </ItemGroup>
 
   <Target Name="SetArcadeSdkDir"
diff --git a/src/SourceBuild/content/repo-projects/xliff-tasks.proj b/src/SourceBuild/content/repo-projects/xliff-tasks.proj
index 7964fabdce9d..a5881adb4538 100644
--- a/src/SourceBuild/content/repo-projects/xliff-tasks.proj
+++ b/src/SourceBuild/content/repo-projects/xliff-tasks.proj
@@ -3,8 +3,6 @@
 
   <PropertyGroup>
     <BuildCommandArgs>$(StandardSourceBuildArgs)</BuildCommandArgs>
-    <!-- Repo has netcoreapp2.1 projects: https://github.com/dotnet/xliff-tasks/issues/508 -->
-    <BuildCommandArgs>$(BuildCommandArgs) /p:CheckEolTargetFramework=false</BuildCommandArgs>
     <BuildCommand>$(StandardSourceBuildCommand) $(BuildCommandArgs)</BuildCommand>
 
     <RepoApiImplemented>false</RepoApiImplemented>