diff --git a/eng/pipelines/vmr-sync-internal.yml b/eng/pipelines/vmr-sync-internal.yml deleted file mode 100644 index ccb19a196bc7..000000000000 --- a/eng/pipelines/vmr-sync-internal.yml +++ /dev/null @@ -1,65 +0,0 @@ -pr: none - -trigger: - batch: true - branches: - include: - - internal/release/* - exclude: - - internal/release/*.0.2xx - - internal/release/*.0.3xx - - internal/release/*.0.4xx - - internal/release/8.0.4* - -resources: - repositories: - - repository: vmr - type: git - name: dotnet-dotnet - ref: $(Build.SourceBranch) - - - repository: 1ESPipelineTemplates - type: git - name: 1ESPipelineTemplates/1ESPipelineTemplates - ref: refs/tags/release - -parameters: -- name: vmrBranch - displayName: dotnet-dotnet branch to push to - type: string - default: ' ' - -variables: -- template: /eng/common/templates-official/variables/pool-providers.yml@self - -- ${{ if ne(parameters.vmrBranch, ' ') }}: - - name: VmrBranch - value: ${{ replace(parameters.vmrBranch, ' ', '') }} -- ${{ else }}: - - name: VmrBranch - value: ${{ replace(replace(variables['Build.SourceBranch'], 'refs/heads/', ''), 'refs/pull/', '') }} - -extends: - template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates - parameters: - sdl: - sourceAnalysisPool: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 - os: windows - - sourceRepositoriesToScan: - exclude: - - repository: vmr - - componentgovernance: - sourceScanPath: $(Agent.BuildDirectory)/vmr - ignoreDirectories: $(Agent.BuildDirectory)/vmr/src - - stages: - - stage: VMRSynchronization - displayName: VMR Synchronization - jobs: - - template: /eng/pipelines/templates/jobs/vmr-synchronization.yml@self - parameters: - vmrBranch: ${{ variables.VmrBranch }} diff --git a/eng/pipelines/vmr-sync.yml b/eng/pipelines/vmr-sync.yml deleted file mode 100644 index 7de3ef61409e..000000000000 --- a/eng/pipelines/vmr-sync.yml +++ /dev/null @@ -1,66 +0,0 @@ -pr: none - -trigger: - batch: true - branches: - include: - - main - - release/* - exclude: - - release/*.0.2xx - - release/*.0.3xx - - release/*.0.4xx - -resources: - repositories: - - repository: vmr - type: github - name: dotnet/dotnet - endpoint: dotnet - ref: $(Build.SourceBranch) - - - repository: 1ESPipelineTemplates - type: git - name: 1ESPipelineTemplates/1ESPipelineTemplates - ref: refs/tags/release - -parameters: -- name: vmrBranch - displayName: dotnet/dotnet branch to push to - type: string - default: ' ' - -variables: -- template: /eng/common/templates-official/variables/pool-providers.yml@self - -- ${{ if ne(parameters.vmrBranch, ' ') }}: - - name: VmrBranch - value: ${{ replace(parameters.vmrBranch, ' ', '') }} -- ${{ else }}: - - name: VmrBranch - value: ${{ replace(replace(variables['Build.SourceBranch'], 'refs/heads/', ''), 'refs/pull/', '') }} - -extends: - template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates - parameters: - sdl: - sourceAnalysisPool: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 - os: windows - - sourceRepositoriesToScan: - exclude: - - repository: vmr - - componentgovernance: - sourceScanPath: $(Agent.BuildDirectory)/vmr - ignoreDirectories: $(Agent.BuildDirectory)/vmr/src - - stages: - - stage: VMRSynchronization - displayName: VMR Synchronization - jobs: - - template: /eng/pipelines/templates/jobs/vmr-synchronization.yml@self - parameters: - vmrBranch: ${{ variables.VmrBranch }} diff --git a/src/VirtualMonoRepo/source-mappings.json b/src/VirtualMonoRepo/source-mappings.json index 031ba3ee33df..2112dd9dcfd8 100644 --- a/src/VirtualMonoRepo/source-mappings.json +++ b/src/VirtualMonoRepo/source-mappings.json @@ -18,20 +18,7 @@ // 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/sdk/src/SourceBuild/content", - "destination": "" - }, - { - "source": "src/sdk/eng/common", - "destination": "eng/common" - }, - { - "source": "src/sdk/src/VirtualMonoRepo/source-mappings.json", - "destination": "src" - } - ], + "additionalMappings": [ /* These are not supported with the flat flow anymore */], // These defaults are added to all mappings unless `ignoreDefaults: true` is specified // When no "include" filter is specified, "**/*" is used @@ -42,10 +29,13 @@ }, // Each of these mappings has a corresponding folder in the src/ directory + // We set disableSynchronization to true for all of them to be sure the old one-way synchronization does not happen + // This setting does not affect the code flow subscriptions "mappings": [ { "name": "arcade", - "defaultRemote": "https://github.com/dotnet/arcade" + "defaultRemote": "https://github.com/dotnet/arcade", + "disableSynchronization": true }, { "name": "aspire", @@ -54,65 +44,78 @@ "src/Aspire.Dashboard/**/*", "samples/**/*" ], - // Aspire no longer flows/changes, we only keep it for the workload manifest generation "disableSynchronization": true }, { "name": "aspnetcore", - "defaultRemote": "https://github.com/dotnet/aspnetcore" + "defaultRemote": "https://github.com/dotnet/aspnetcore", + "disableSynchronization": true }, { "name": "cecil", - "defaultRemote": "https://github.com/dotnet/cecil" + "defaultRemote": "https://github.com/dotnet/cecil", + "disableSynchronization": true }, { "name": "command-line-api", - "defaultRemote": "https://github.com/dotnet/command-line-api" + "defaultRemote": "https://github.com/dotnet/command-line-api", + "disableSynchronization": true }, { "name": "deployment-tools", - "defaultRemote": "https://github.com/dotnet/deployment-tools" + "defaultRemote": "https://github.com/dotnet/deployment-tools", + "disableSynchronization": true }, { "name": "diagnostics", - "defaultRemote": "https://github.com/dotnet/diagnostics" + "defaultRemote": "https://github.com/dotnet/diagnostics", + "disableSynchronization": true }, { "name": "efcore", - "defaultRemote": "https://github.com/dotnet/efcore" + "defaultRemote": "https://github.com/dotnet/efcore", + "disableSynchronization": true }, { "name": "emsdk", - "defaultRemote": "https://github.com/dotnet/emsdk" + "defaultRemote": "https://github.com/dotnet/emsdk", + "disableSynchronization": true }, { "name": "fsharp", - "defaultRemote": "https://github.com/dotnet/fsharp" + "defaultRemote": "https://github.com/dotnet/fsharp", + "disableSynchronization": true }, { "name": "msbuild", - "defaultRemote": "https://github.com/dotnet/msbuild" + "defaultRemote": "https://github.com/dotnet/msbuild", + "disableSynchronization": true }, { "name": "nuget-client", "defaultRemote": "https://github.com/NuGet/NuGet.Client", - "defaultRef": "dev" + "defaultRef": "dev", + "disableSynchronization": true }, { "name": "razor", - "defaultRemote": "https://github.com/dotnet/razor" + "defaultRemote": "https://github.com/dotnet/razor", + "disableSynchronization": true }, { "name": "roslyn", - "defaultRemote": "https://github.com/dotnet/roslyn" + "defaultRemote": "https://github.com/dotnet/roslyn", + "disableSynchronization": true }, { "name": "roslyn-analyzers", - "defaultRemote": "https://github.com/dotnet/roslyn-analyzers" + "defaultRemote": "https://github.com/dotnet/roslyn-analyzers", + "disableSynchronization": true }, { "name": "runtime", - "defaultRemote": "https://github.com/dotnet/runtime" + "defaultRemote": "https://github.com/dotnet/runtime", + "disableSynchronization": true }, { "name": "scenario-tests", @@ -126,7 +129,8 @@ "exclude": [ // Exclude the VMR content as this is copied to the root of VMR via the synchronization process. "src/SourceBuild/content/**/*" - ] + ], + "disableSynchronization": true }, { "name": "source-build-externals", @@ -142,25 +146,28 @@ "src/spectre-console/NuGet.Config", "src/spectre-console/examples/Console/Canvas/Mandelbrot.cs", "src/xunit/NuGet.Config" - ] + ], + "disableSynchronization": true }, { "name": "source-build-reference-packages", - "defaultRemote": "https://github.com/dotnet/source-build-reference-packages" + "defaultRemote": "https://github.com/dotnet/source-build-reference-packages", + "disableSynchronization": true }, { "name": "sourcelink", "defaultRemote": "https://github.com/dotnet/sourcelink", - // Migrated onto the flat flow "disableSynchronization": true }, { "name": "symreader", - "defaultRemote": "https://github.com/dotnet/symreader" + "defaultRemote": "https://github.com/dotnet/symreader", + "disableSynchronization": true }, { "name": "templating", - "defaultRemote": "https://github.com/dotnet/templating" + "defaultRemote": "https://github.com/dotnet/templating", + "disableSynchronization": true }, { "name": "vstest", @@ -170,11 +177,13 @@ // Non-OSS license - https://github.com/dotnet/source-build/issues/4255 "src/package/licenses/LICENSE_VS.txt", "test/Microsoft.TestPlatform.CoreUtilities.UnitTests/TestAssets/dotnetWinX86.exe" - ] + ], + "disableSynchronization": true }, { "name": "xdt", - "defaultRemote": "https://github.com/dotnet/xdt" + "defaultRemote": "https://github.com/dotnet/xdt", + "disableSynchronization": true }, { "name": "winforms", @@ -185,15 +194,18 @@ "src/test/integration/DesignSurface/**/*.ico", "src/test/integration/DesignSurface/**/*.resx", "src/test/integration/DesignSurface/THIRD-PARTY-NOTICE.txt" - ] + ], + "disableSynchronization": true }, { "name": "wpf", - "defaultRemote": "https://github.com/dotnet/wpf" + "defaultRemote": "https://github.com/dotnet/wpf", + "disableSynchronization": true }, { "name": "windowsdesktop", - "defaultRemote": "https://github.com/dotnet/windowsdesktop" + "defaultRemote": "https://github.com/dotnet/windowsdesktop", + "disableSynchronization": true } ] }