[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx'

Directory.Build.props

@@ -11,6 +11,7 @@
     <BuildArchitecture>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant())</BuildArchitecture>
     <Architecture Condition="'$(Architecture)' == '' AND '$(BuildArchitecture)' == 'arm64'">$(BuildArchitecture)</Architecture>
     <Architecture Condition="'$(Architecture)' == '' AND '$(BuildArchitecture)' == 's390x'">$(BuildArchitecture)</Architecture>
+    <Architecture Condition="'$(Architecture)' == '' AND '$(BuildArchitecture)' == 'ppc64le'">$(BuildArchitecture)</Architecture>
     <Architecture Condition="'$(Architecture)' == ''">x64</Architecture>
   </PropertyGroup>
   <PropertyGroup Condition="'$(PgoInstrument)' == 'true'">

eng/Version.Details.xml

@@ -17,11 +17,6 @@
       <Uri>https://github.com/dotnet/windowsdesktop</Uri>
       <Sha>ae2bcebe032a50af14ac0b05efcaa8477b049834</Sha>
     </Dependency>
-    <Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.22459.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
-      <Uri>https://github.com/dotnet/llvm-project</Uri>
-      <Sha>78c9eaec7cec210dfaee9a0443d5816b59683697</Sha>
-      <SourceBuildTarball RepoName="llvm-project" ManagedOnly="true" />
-    </Dependency>
     <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-rtm.22505.15" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>5147f6fc78520db322118cc8287651cb54a506df</Sha>

eng/Versions.props

@@ -193,7 +193,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>7.0.100-rc.1</PrivateSourceBuiltArtifactsPackageVersion>
+    <PrivateSourceBuiltArtifactsPackageVersion>7.0.100-rc.2</PrivateSourceBuiltArtifactsPackageVersion>
   </PropertyGroup>
   <!-- Workload manifest package versions -->
   <PropertyGroup>

src/SourceBuild/tarball/content/Directory.Build.props

@@ -19,6 +19,7 @@
     <BuildArchitecture>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant())</BuildArchitecture>
     <Platform Condition="'$(Platform)' == '' AND '$(BuildArchitecture)' == 'arm64'">$(BuildArchitecture)</Platform>
     <Platform Condition="'$(Platform)' == '' AND '$(BuildArchitecture)' == 's390x'">$(BuildArchitecture)</Platform>
+    <Platform Condition="'$(Platform)' == '' AND '$(BuildArchitecture)' == 'ppc64le'">$(BuildArchitecture)</Platform>
     <Platform Condition="'$(Platform)' == ''">x64</Platform>
 
     <UseStableVersions Condition="'$(UseStableVersions)' == ''">false</UseStableVersions>

src/SourceBuild/tarball/content/build.sh

@@ -178,6 +178,8 @@ if [ "$alternateTarget" == "true" ]; then
   "$CLI_ROOT/dotnet" $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll "$SCRIPT_ROOT/build.proj" /bl:$SCRIPT_ROOT/artifacts/log/Debug/BuildTests_$LogDateStamp.binlog /fileLoggerParameters:LogFile=$SCRIPT_ROOT/artifacts/logs/BuildTests_$LogDateStamp.log /clp:v=m ${MSBUILD_ARGUMENTS[@]} "$@"
 else
   $CLI_ROOT/dotnet $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll /bl:$SCRIPT_ROOT/artifacts/log/Debug/BuildXPlatTasks_$LogDateStamp.binlog /fileLoggerParameters:LogFile=$SCRIPT_ROOT/artifacts/logs/BuildXPlatTasks_$LogDateStamp.log $SCRIPT_ROOT/tools-local/init-build.proj /t:PrepareOfflineLocalTools ${MSBUILD_ARGUMENTS[@]} "$@"
+  # kill off the MSBuild server so that on future invocations we pick up our custom SDK Resolver
+  $CLI_ROOT/dotnet build-server shutdown
 
   $CLI_ROOT/dotnet $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll /bl:$SCRIPT_ROOT/artifacts/log/Debug/Build_$LogDateStamp.binlog /fileLoggerParameters:LogFile=$SCRIPT_ROOT/artifacts/logs/Build_$LogDateStamp.log $SCRIPT_ROOT/build.proj ${MSBUILD_ARGUMENTS[@]} "$@"
 fi

src/SourceBuild/tarball/content/global.json

@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "7.0.100-rc.1.22431.12"
+    "dotnet": "7.0.100-rc.2.22477.23"
   },
   "msbuild-sdks": {
     "Microsoft.Build.CentralPackageVersions": "2.0.1",

src/SourceBuild/tarball/content/repos/known-good.proj

@@ -33,7 +33,6 @@
         <!-- Tier 1 -->
         <RepositoryReference Include="command-line-api" />
         <RepositoryReference Include="diagnostics" />
-        <RepositoryReference Include="llvm-project" />
         <RepositoryReference Include="razor-compiler" />
         <RepositoryReference Include="xliff-tasks" />
         <RepositoryReference Include="roslyn" />

src/SourceBuild/tarball/content/repos/runtime-portable.proj

@@ -9,7 +9,6 @@
   <ItemGroup>
       <RepositoryReference Include="arcade" />
       <RepositoryReference Include="linker" />
-      <RepositoryReference Include="llvm-project" />
       <RepositoryReference Include="source-build-externals" />
       <RepositoryReference Include="roslyn" />
   </ItemGroup>

src/SourceBuild/tarball/content/repos/runtime.proj

@@ -18,7 +18,6 @@
       <RepositoryReference Include="arcade" />
       <RepositoryReference Include="symreader" />
       <RepositoryReference Include="linker" />
-      <RepositoryReference Include="llvm-project" />
       <RepositoryReference Include="source-build-externals" />
       <RepositoryReference Include="roslyn" />
       <RepositoryReference Include="runtime-portable" />