From 20663112b5c5c18e4fcf22c7b1421d9cd5ccb480 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= <premek.vysoky@microsoft.com>
Date: Wed, 9 Nov 2022 21:21:25 +0100
Subject: [PATCH] Update `darc` and synchronize more VMR non-`src/` content
 (#14944)

---
 .config/dotnet-tools.json                |  2 +-
 eng/Version.Details.xml                  |  8 ++++----
 eng/Versions.props                       |  2 +-
 src/VirtualMonoRepo/source-mappings.json | 14 ++++++++++++--
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 59a557da7..f6136c69a 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "microsoft.dotnet.darc": {
-      "version": "1.1.0-beta.22557.2",
+      "version": "1.1.0-beta.22559.2",
       "commands": [
         "darc"
       ]
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index b7070af96..7e545e184 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -205,13 +205,13 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>80b6be47e1425ea90c5febffac119250043a0c92</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.22557.2">
+    <Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.22559.2">
       <Uri>https://github.com/dotnet/arcade-services</Uri>
-      <Sha>09c0d1e48621eb3b85257ec0c3af9814c33665a1</Sha>
+      <Sha>5f08d3d04702feaa49acd692aa3a169512446ee9</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.22557.2">
+    <Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.22559.2">
       <Uri>https://github.com/dotnet/arcade-services</Uri>
-      <Sha>09c0d1e48621eb3b85257ec0c3af9814c33665a1</Sha>
+      <Sha>5f08d3d04702feaa49acd692aa3a169512446ee9</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Logging.Console" Version="7.0.0-rc.1.22426.10">
       <Uri>https://github.com/dotnet/runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 30ad3fe39..7a4d0ba74 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -30,7 +30,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/arcade-services -->
-    <MicrosoftDotNetDarcLibVersion>1.1.0-beta.22557.2</MicrosoftDotNetDarcLibVersion>
+    <MicrosoftDotNetDarcLibVersion>1.1.0-beta.22559.2</MicrosoftDotNetDarcLibVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->
diff --git a/src/VirtualMonoRepo/source-mappings.json b/src/VirtualMonoRepo/source-mappings.json
index f267114aa..0f2620a51 100644
--- a/src/VirtualMonoRepo/source-mappings.json
+++ b/src/VirtualMonoRepo/source-mappings.json
@@ -12,8 +12,18 @@
     // 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",
+    // Some files are copied outside of the src/ directory into other locations
+    // When files in the source paths are changed, they are automatically synchronized too
+    "additionalMappings": [
+        {
+            "source": "src/installer/src/SourceBuild/tarball/content",
+            "destination": ""
+        },
+        {
+            "source": "src/installer/eng/common",
+            "destination": "eng/common"
+        }
+    ],
 
     // These defaults are added to all mappings unless `ignoreDefaults: true` is specified
     // When no "include" filter is specified, "**/*" is used