diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 69fc0a9c5..0fc31e809 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.22552.1", + "version": "1.1.0-beta.22554.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a65c368e3..ab801caa7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,13 +205,13 @@ https://github.com/dotnet/arcade 5be556106f26f171f32187951b9a141f9580d03a - + https://github.com/dotnet/arcade-services - cc8a2aea1dc604f3572d32e464f17fbae3a0bcd6 + 7a093e86507405b990f0e6aa5c634c9a5585319f - + https://github.com/dotnet/arcade-services - cc8a2aea1dc604f3572d32e464f17fbae3a0bcd6 + 7a093e86507405b990f0e6aa5c634c9a5585319f https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index f5e85481a..5df8c8b93 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,7 +30,7 @@ - 1.1.0-beta.22552.1 + 1.1.0-beta.22554.2 diff --git a/src/VirtualMonoRepo/InitializeVMR.proj b/src/VirtualMonoRepo/InitializeVMR.proj index 5adf50ebc..df78ccce6 100644 --- a/src/VirtualMonoRepo/InitializeVMR.proj +++ b/src/VirtualMonoRepo/InitializeVMR.proj @@ -33,8 +33,6 @@ @@ -46,13 +44,12 @@ + + - - - - - - + + + - - + + diff --git a/src/SourceBuild/tarball/content/src/source-mappings.json b/src/VirtualMonoRepo/source-mappings.json similarity index 84% rename from src/SourceBuild/tarball/content/src/source-mappings.json rename to src/VirtualMonoRepo/source-mappings.json index f61278234..f267114aa 100644 --- a/src/SourceBuild/tarball/content/src/source-mappings.json +++ b/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" } ] -} +} \ No newline at end of file