Merge branch 'release/8.0.1xx' into release/8.0.2xx

Author: Jason Zhai

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs

@@ -58,7 +58,8 @@ public void VerifyVersionFile()
             string[] sdkVersionLines = File.ReadAllLines(Path.Combine(outputDir, sdkVersionPath));
             string expectedSdkVersion = sdkVersionLines[1];
 
-            Assert.Equal(expectedSdkVersion, sdkVersion);
+            // Disable due to https://github.com/dotnet/source-build/issues/3693
+            // Assert.Equal(expectedSdkVersion, sdkVersion);
         }
         finally
         {

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff

@@ -48,7 +48,6 @@ index ------------
  ./packs/NETStandard.Library.Ref/x.y.z/ref/netstandard2.1/System.Xml.XPath.XDocument.dll
  ./sdk-manifests/
  ./sdk-manifests/x.y.z/
--./sdk-manifests/x.y.z/
 -./sdk-manifests/x.y.z/
  ./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/
  ./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/x.y.z/

src/VirtualMonoRepo/Tasks/GitFileManagerFactory.cs

@@ -74,6 +74,8 @@ await vmrInitializer.InitializeRepository(
             additionalRemotes,
             ReadmeTemplatePath,
             TpnTemplatePath,
+            generateCodeowners: false,
+            discardPatches: true,
             _cancellationToken.Token);
         return true;
     }
@@ -82,7 +84,6 @@ await vmrInitializer.InitializeRepository(
 
     private IServiceProvider CreateServiceProvider() => new ServiceCollection()
         .AddLogging(b => b.AddConsole().AddFilter(l => l >= LogLevel.Information))
-        .AddTransient<GitFileManagerFactory>()
-        .AddVmrManagers(sp => sp.GetRequiredService<GitFileManagerFactory>(), "git", VmrPath, TmpPath, null, null)
+        .AddVmrManagers("git", VmrPath, TmpPath, null, null)
         .BuildServiceProvider();
 }