Merge branch 'main' into darc-main-d1692cc6-e594-4aaf-9242-8c8113d82c8d

README.md

@@ -91,7 +91,7 @@ Further instructions on how to build inside of the Codespace will be available u
 
     ```bash
     cd /path/to/complete/dotnet/sources
-    ./prep.sh
+    ./prep.sh --bootstrap
     ```
 
 3. Build the .NET SDK

eng/Version.Details.xml

@@ -218,9 +218,9 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>af841c8b33cecc92d74222298f1e45bf7bf3d90a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23210.5">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23211.4">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>f43e7ac7040fa13408a8c2475e5ba76f33402ad2</Sha>
+      <Sha>01850f2b7bff23e118d1faecb941d770c8e626f2</Sha>
       <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.SourceLink.GitHub" Version="8.0.0-beta.23210.2" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">

src/SourceBuild/content/Directory.Build.props

@@ -199,7 +199,7 @@
 
   <Import Project="$(GitInfoAllRepoPropsFile)" />
 
-  <!-- Additional psuedo-versions that some repos depend on -->
+  <!-- Additional pseudo-versions that some repos depend on -->
   <ItemGroup>
     <!-- we don't produce the Windows version of this package but that's the one core-sdk keys off of for the ASP.NET version -->
     <ExtraPackageVersionPropsPackageInfo Include="MicrosoftAspNetCoreAppRuntimewinx64PackageVersion" Version="$(aspnetcoreOutputPackageVersion)" />

src/SourceBuild/content/eng/Versions.props

@@ -18,8 +18,8 @@
       These URLs can't be composed from their base URL and version as we read them from the
       prep.sh and pipeline scripts, outside of MSBuild.
     -->
-    <PrivateSourceBuiltArtifactsUrl>https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-preview.3.23178.1.centos.8-x64.tar.gz</PrivateSourceBuiltArtifactsUrl>
+    <PrivateSourceBuiltArtifactsUrl>https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-preview.3.23178.7.centos.8-x64.tar.gz</PrivateSourceBuiltArtifactsUrl>
     <PrivateSourceBuiltPrebuiltsUrl>https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-8.0.100-18.centos.8-x64.tar.gz</PrivateSourceBuiltPrebuiltsUrl>
-    <PrivateSourceBuiltSdkUrl_CentOS8Stream>https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-preview.3.23178.1-centos.8-x64.tar.gz</PrivateSourceBuiltSdkUrl_CentOS8Stream>
+    <PrivateSourceBuiltSdkUrl_CentOS8Stream>https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-preview.3.23210.1-centos.8-x64.tar.gz</PrivateSourceBuiltSdkUrl_CentOS8Stream>
   </PropertyGroup>
 </Project>

src/SourceBuild/content/repo-projects/dotnet.proj

@@ -22,6 +22,7 @@
     <RepositoryReference Include="emsdk" />
     <RepositoryReference Include="razor" />
     <RepositoryReference Include="xliff-tasks" />
+    <RepositoryReference Include="cecil" />
     <RepositoryReference Include="runtime" />
     <RepositoryReference Include="roslyn" />
     <RepositoryReference Include="source-build-externals" />

src/SourceBuild/patches/sourcelink/0002-Exclude-dotnet-sourcelink-from-source-build.patch

@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Michael Simons <msimons@microsoft.com>
+Date: Tue, 11 Apr 2023 17:03:48 +0000
+Subject: [PATCH] Exclude dotnet-sourcelink from source build
+
+This addresses prebuilts.
+
+Backport: https://github.com/dotnet/sourcelink/pull/933
+---
+ src/dotnet-sourcelink/dotnet-sourcelink.csproj | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/dotnet-sourcelink/dotnet-sourcelink.csproj b/src/dotnet-sourcelink/dotnet-sourcelink.csproj
+index f2a6e7a..5c675ef 100644
+--- a/src/dotnet-sourcelink/dotnet-sourcelink.csproj
++++ b/src/dotnet-sourcelink/dotnet-sourcelink.csproj
+@@ -2,6 +2,7 @@
+   <PropertyGroup>
+     <OutputType>Exe</OutputType>
+     <TargetFrameworks>$(NetCurrent)</TargetFrameworks>
++    <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
+ 
+     <!-- NuGet -->
+     <IsPackable>true</IsPackable>