Synchronize VMR's non-src/ content from tarball/content (#14893)

Previously, we manually copied the `tarball/content` folder over when bootstrapping the VMR. Now it is handled by the darc tooling when you point it to the right dir.

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "microsoft.dotnet.darc": {
-      "version": "1.1.0-beta.22552.1",
+      "version": "1.1.0-beta.22554.2",
       "commands": [
         "darc"
       ]

eng/Version.Details.xml

@@ -205,13 +205,13 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>5be556106f26f171f32187951b9a141f9580d03a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.22552.1">
+    <Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.22554.2">
       <Uri>https://github.com/dotnet/arcade-services</Uri>
-      <Sha>cc8a2aea1dc604f3572d32e464f17fbae3a0bcd6</Sha>
+      <Sha>7a093e86507405b990f0e6aa5c634c9a5585319f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.22552.1">
+    <Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.22554.2">
       <Uri>https://github.com/dotnet/arcade-services</Uri>
-      <Sha>cc8a2aea1dc604f3572d32e464f17fbae3a0bcd6</Sha>
+      <Sha>7a093e86507405b990f0e6aa5c634c9a5585319f</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Logging.Console" Version="7.0.0-rc.1.22426.10">
       <Uri>https://github.com/dotnet/runtime</Uri>

eng/Versions.props

@@ -30,7 +30,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/arcade-services -->
-    <MicrosoftDotNetDarcLibVersion>1.1.0-beta.22552.1</MicrosoftDotNetDarcLibVersion>
+    <MicrosoftDotNetDarcLibVersion>1.1.0-beta.22554.2</MicrosoftDotNetDarcLibVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->

src/VirtualMonoRepo/InitializeVMR.proj

@@ -33,8 +33,6 @@
   <Target Name="InitializeVMR" DependsOnTargets="GenerateFullNuGetVersion;
                                                  GenerateVersionFile;
                                                  InitializeCleanVmr;
-                                                 CopyTarballContent;
-                                                 CommitInitialContent;
                                                  InitializeRepoAndDependentsRecursive;
                                                  CopyTextOnlyPackages;
                                                  CommitTextOnlyPackages">
@@ -46,13 +44,12 @@
     <MakeDir Directories="$(VmrDir)" />
     <MakeDir Directories="$(VmrGitInfoDir)" Condition=" '$(VmrGitInfoDir)' != '' " />
     <MakeDir Directories="$(TmpDir)" Condition=" !EXISTS('$(TmpDir)') " />
+    <MakeDir Directories="$(VmrDir)/src" />
+    <Copy SourceFiles="$(MSBuildThisFileDirectory)/source-mappings.json" DestinationFolder="$(VmrDir)/src" />
 
-    <Exec Command="git init -b $(VmrDefaultBranch)" WorkingDirectory="$(VmrDir)" />
-  </Target>
-
-  <Target Name="CommitInitialContent">
-    <Exec Command="git add -A" WorkingDirectory="$(VmrDir)" />
-    <Exec Command="git commit -m '[Initialization] Initial commit%0D%0A%0D%0A[[ commit created by automation ]]'" WorkingDirectory="$(VmrDir)" />
+    <Exec WorkingDirectory="$(VmrDir)" Command="git init -b $(VmrDefaultBranch)" />
+    <Exec WorkingDirectory="$(VmrDir)" Command="git add -A" />
+    <Exec WorkingDirectory="$(VmrDir)" Command="git commit -m 'Initial commit of the VMR%0D%0A%0D%0A[[ commit created by automation ]]'" />
   </Target>
 
   <Target Name="InitializeRepoAndDependentsRecursive"
@@ -85,8 +82,8 @@
   </Target>
 
   <Target Name="CommitTextOnlyPackages">
-    <Exec Command="git add packages/text-only" WorkingDirectory="$(VmrDir)" />
-    <Exec Command="git commit -m '[Initialization] Initialized text-only packages%0D%0A%0D%0A[[ commit created by automation ]]'" WorkingDirectory="$(VmrDir)" />
+    <Exec WorkingDirectory="$(VmrDir)" Command="git add packages/text-only" />
+    <Exec WorkingDirectory="$(VmrDir)" Command="git commit -m '[Initialization] Initialized text-only packages%0D%0A%0D%0A[[ commit created by automation ]]'" />
   </Target>
 
 </Project>

src/VirtualMonoRepo/source-mappings.json

@@ -1,18 +1,26 @@
 // This file configures where the VMR synchronizes the sources from.
-// Each individual repository has its own mapping which says where the remote repo is,
-// what files are excluded from the sync, etc.
-// More details can be found at: {{ TODO: https://github.com/dotnet/arcade/issues/11226 }}
+// Each development repository has a mapping record which says where the remote repo is,
+// what files are in/excluded from the sync, etc.
+//
+// This file does not contain information about what version of sources is synchronized.
+// Please check the source-manifest.json file for that purpose.
+//
+// More details on this file's mechanics:
+// https://github.com/dotnet/arcade/blob/main/Documentation/UnifiedBuild/VMR-Design-And-Operation.md#repository-source-mappings
 {
-    // Location withing the VMR where the source-build patches are stored
+    // Location within the VMR where the source-build patches are stored
     // These patches are applied on top of the code synchronized into the VMR
     "patchesPath": "src/installer/src/SourceBuild/tarball/patches",
 
+    // Files on this path are synchronized with files in the root of the VMR
+    "contentPath": "src/installer/src/SourceBuild/tarball/content",
+
     // These defaults are added to all mappings unless `ignoreDefaults: true` is specified
     // When no "include" filter is specified, "**/*" is used
+    // The default filters do not apply to submodules
+    // Only filters which start with submodule's path are applied when syncing submodules
     "defaults": {
         "defaultRef": "main",
-        // The default filters do not apply to submodules
-        // Only filters which start with submodule's path are applied when syncing submodules
         "exclude": [
             "**/*.dll",
             "**/*.Dll",
@@ -39,10 +47,6 @@
                 "**/samples/**/jquery-validation-unobtrusive/*.js"
             ]
         },
-        {
-            "name": "clicommandlineparser",
-            "defaultRemote": "https://github.com/dotnet/clicommandlineparser"
-        },
         {
             "name": "command-line-api",
             "defaultRemote": "https://github.com/dotnet/command-line-api"
@@ -81,11 +85,6 @@
                 "external/cecil/**/*.mdb"
             ]
         },
-        {
-            "name": "llvm-project",
-            "defaultRemote": "https://github.com/dotnet/llvm-project",
-            "defaultRef": "dotnet/main"
-        },
         {
             "name": "msbuild",
             "defaultRemote": "https://github.com/dotnet/msbuild"
@@ -115,10 +114,6 @@
             "name": "sdk",
             "defaultRemote": "https://github.com/dotnet/sdk"
         },
-        {
-            "name": "source-build",
-            "defaultRemote": "https://github.com/dotnet/source-build"
-        },
         {
             "name": "source-build-externals",
             "defaultRemote": "https://github.com/dotnet/source-build-externals",
@@ -162,4 +157,4 @@
             "defaultRemote": "https://github.com/dotnet/xliff-tasks"
         }
     ]
-}
+}