Update previous source built

eng/Version.Details.xml

@@ -210,9 +210,9 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>569a3f07467a9ebf55b78bbf92ab10b85e597819</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.22261.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.22270.1">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>c71ce108eda9f657c9f58a613a1fe56b6b08235d</Sha>
+      <Sha>3dbb19f76474f2f22749b2e64d34c15178381ffb</Sha>
       <SourceBuildTarball RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-22271-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">

eng/Versions.props

@@ -190,7 +190,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>6.0.104</PrivateSourceBuiltArtifactsPackageVersion>
+    <PrivateSourceBuiltArtifactsPackageVersion>0.1.0-7.0.100-bootstrap.3</PrivateSourceBuiltArtifactsPackageVersion>
   </PropertyGroup>
   <!-- Workload manifest package versions -->
   <PropertyGroup>

src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml

@@ -80,13 +80,9 @@ jobs:
     # This prevents allocation of additional agents if the tarball build legs should be skipped.
     # Only build the tarball if the PR touches source-build source.
     - script: |
-        echo "##vso[task.setvariable variable=_includeTarballBuild;isoutput=true]true"
-
-        # if curl "https://api.github.com/repos/dotnet/installer/pulls/$(System.PullRequest.PullRequestNumber)/files" | grep '"filename": "src/SourceBuild/*'
-        # then
-        #   echo "##vso[task.setvariable variable=_includeTarballBuild;isoutput=true]true"
-        # fi
+        if curl "https://api.github.com/repos/dotnet/installer/pulls/$(System.PullRequest.PullRequestNumber)/files" | grep '"filename": "src/SourceBuild/*'
+        then
+          echo "##vso[task.setvariable variable=_includeTarballBuild;isoutput=true]true"
+        fi
       displayName: Tarball Build Check
       name: Tarball_Build_Check
-      # Disable tarball CI for 7.0 Preview 5 since source-build in not fully supported.
-      condition: false

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

@@ -29,5 +29,12 @@
     <UseSourceBuiltSdkOverride Include="@(ArcadeSdkOverride)" />
   </ItemGroup>
 
+  <Target Name="SetArcadeSdkDir"
+          BeforeTargets="Build">
+    <ItemGroup>
+      <EnvironmentVariables Include="ArcadeSdkDir=$(ToolPackageExtractDir)%(UseSourceBuiltSdkOverride.Identity)/" />
+    </ItemGroup>
+  </Target>
+
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 </Project>

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

@@ -11,6 +11,8 @@
     <!-- issue: https://github.com/dotnet/source-build/issues/1719 -->
     <BuildCommandArgs>$(BuildCommandArgs) /p:UsingToolMicrosoftNetCompilers=false</BuildCommandArgs>
     <BuildCommandArgs>$(BuildCommandArgs) /p:RepoRoot=$(ProjectDirectory)</BuildCommandArgs>
+    <!-- Investigate how to remove this specialization for source-build: https://github.com/dotnet/source-build/issues/2889 -->
+    <BuildCommandArgs>$(BuildCommandArgs) /p:SuppressTfmSupportBuildWarnings=true</BuildCommandArgs>
 
     <BuildCommand>$(ProjectDirectory)build$(ShellExtension) $(BuildCommandArgs)</BuildCommand>
 

src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt

@@ -2,10 +2,10 @@ Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.Analyz
 Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.CodeFixes.xml
 Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.Components.Analyzers.xml
 Microsoft.AspNetCore.App.Ref/analyzers/dotnet/roslyn4.0/cs/Microsoft.Extensions.Logging.Generators.xml
+Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/Microsoft.Interop.LibraryImportGenerator.xml
+Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/Microsoft.Interop.SourceGeneration.xml
 Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/System.Text.Json.SourceGeneration.xml
 Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/System.Text.RegularExpressions.Generator.xml
-Microsoft.NETCore.App.Ref/analyzers/dotnet/Microsoft.Interop.LibraryImportGenerator.xml
-Microsoft.NETCore.App.Ref/analyzers/dotnet/Microsoft.Interop.SourceGeneration.xml
 Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.CSharp.xml
 Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.VisualBasic.Core.xml
 Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.Win32.Primitives.xml
@@ -267,4 +267,4 @@ NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.xml
 NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.XmlDocument.xml
 NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.XmlSerializer.xml
 NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.XPath.XDocument.xml
-NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.XPath.xml
+NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.XPath.xml

src/SourceBuild/tarball/patches/diagnostics/0001-Pin-the-Microsoft.Extensions.Logging-version-so-that.patch

@@ -0,0 +1,67 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MichaelSimons <msimons@microsoft.com>
+Date: Thu, 2 Jun 2022 19:27:41 +0000
+Subject: [PATCH] Pin the Microsoft.Extensions.Logging version so that
+ source-build does not pick up latest
+
+---
+ eng/Versions.props                                            | 2 +-
+ .../Microsoft.Diagnostics.Monitoring.EventPipe.csproj         | 2 +-
+ .../Microsoft.Diagnostics.NETCore.Client.csproj               | 2 +-
+ src/Tools/dotnet-dsrouter/dotnet-dsrouter.csproj              | 4 ++--
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/eng/Versions.props b/eng/Versions.props
+index b4edc421..17c6f9d3 100644
+--- a/eng/Versions.props
++++ b/eng/Versions.props
+@@ -48,7 +48,7 @@
+     <MicrosoftDiagnosticsRuntimeUtilitiesVersion>2.0.250401</MicrosoftDiagnosticsRuntimeUtilitiesVersion>
+     <MicrosoftDiaSymReaderNativePackageVersion>16.9.0-beta1.21055.5</MicrosoftDiaSymReaderNativePackageVersion>
+     <MicrosoftDiagnosticsTracingTraceEventVersion>2.0.64</MicrosoftDiagnosticsTracingTraceEventVersion>
+-    <MicrosoftExtensionsLoggingVersion>2.1.1</MicrosoftExtensionsLoggingVersion>
++    <MicrosoftExtensionsLoggingPinnedVersion>2.1.1</MicrosoftExtensionsLoggingPinnedVersion>
+     <!-- Need version that understands UseAppFilters sentinel. -->
+     <MicrosoftExtensionsLoggingEventSourceVersion>5.0.1</MicrosoftExtensionsLoggingEventSourceVersion>
+     <SystemCommandLineVersion>2.0.0-beta1.20468.1</SystemCommandLineVersion>
+diff --git a/src/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.csproj b/src/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.csproj
+index 733d18da..db90173d 100644
+--- a/src/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.csproj
++++ b/src/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.csproj
+@@ -29,7 +29,7 @@
+   <ItemGroup>
+     <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="$(MicrosoftDiagnosticsTracingTraceEventVersion)" />
+     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesVersion)" />
+-    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" />
++    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPinnedVersion)" />
+     <PackageReference Include="System.ComponentModel.Annotations" Version="$(SystemComponentModelAnnotationsVersion)" />
+     <PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />
+     <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
+diff --git a/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj b/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj
+index 929f82d0..5cb2d582 100644
+--- a/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj
++++ b/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj
+@@ -20,7 +20,7 @@
+
+   <ItemGroup>
+     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesVersion)" />
+-    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" />
++    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPinnedVersion)" />
+   </ItemGroup>
+
+   <ItemGroup>
+diff --git a/src/Tools/dotnet-dsrouter/dotnet-dsrouter.csproj b/src/Tools/dotnet-dsrouter/dotnet-dsrouter.csproj
+index 73fd6f82..3afa7132 100644
+--- a/src/Tools/dotnet-dsrouter/dotnet-dsrouter.csproj
++++ b/src/Tools/dotnet-dsrouter/dotnet-dsrouter.csproj
+@@ -22,8 +22,8 @@
+   <ItemGroup>
+     <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="$(MicrosoftDiagnosticsTracingTraceEventVersion)" GeneratePathProperty="true" />
+     <PackageReference Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
+-    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" />
+-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingVersion)" />
++    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPinnedVersion)" />
++    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingPinnedVersion)" />
+   </ItemGroup>
+
+ </Project>