diff --git a/.github/workflows/main-merge.yml b/.github/workflows/main-merge.yml index 73424ad35fad6..dea32accf533e 100644 --- a/.github/workflows/main-merge.yml +++ b/.github/workflows/main-merge.yml @@ -8,6 +8,8 @@ on: push: branches: - main-vs-deps + - release/dev17.15 + - release/dev17.15-vs-deps workflow_dispatch: inputs: configuration_file_branch: diff --git a/azure-pipelines-integration-scouting.yml b/azure-pipelines-integration-scouting.yml index 346f4dbfe0d38..2c95d62c434db 100644 --- a/azure-pipelines-integration-scouting.yml +++ b/azure-pipelines-integration-scouting.yml @@ -9,6 +9,7 @@ schedules: branches: include: - main + exclude: - main-vs-deps variables: diff --git a/azure-pipelines-integration.yml b/azure-pipelines-integration.yml index afddf6a20c094..3030c3948277c 100644 --- a/azure-pipelines-integration.yml +++ b/azure-pipelines-integration.yml @@ -8,6 +8,9 @@ trigger: - features/* - demos/* exclude: + - main-vs-deps + - release/dev17.15-vs-deps + - release/dev18.0 # Since the version of VS on the integration VM images are a moving target, # we are unable to reliably run integration tests on servicing branches. - release/dev17.8 @@ -24,6 +27,9 @@ pr: - features/* - demos/* exclude: + - main-vs-deps + - release/dev17.15-vs-deps + - release/dev18.0 # Since the version of VS on the integration VM images are a moving target, # we are unable to reliably run integration tests on servicing branches. - release/dev17.8 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc8971e43c250..5cc09a00914c4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ - + https://github.com/dotnet/source-build-reference-packages - b99d40df247e865fb0a9de15bdcfdfa7f550a55e + cf30e8fd726730aa4b142275fb2fc0503528b7dd diff --git a/eng/config/PublishData.json b/eng/config/PublishData.json index d2fb919ac0bb4..aecca17c4de23 100644 --- a/eng/config/PublishData.json +++ b/eng/config/PublishData.json @@ -167,6 +167,16 @@ "insertionTitlePrefix": "[d17.14 P2]", "insertionCreateDraftPR": false }, + "release/dev17.15-vs-deps": { + "nugetKind": [ + "Shipping", + "NonShipping" + ], + "vsBranch": "main", + "vsMajorVersion": 17, + "insertionTitlePrefix": "[d17.15 P1]", + "insertionCreateDraftPR": true + }, "release/dev18.0": { "nugetKind": [ "Shipping", diff --git a/eng/config/branch-merge.jsonc b/eng/config/branch-merge.jsonc index 7cdbfe60c8de2..0d05283460292 100644 --- a/eng/config/branch-merge.jsonc +++ b/eng/config/branch-merge.jsonc @@ -1,13 +1,19 @@ // Used by .github/workflows/main-merge.yml { "merge-flow-configurations": { - // Merge any main changes to main-vs-deps. "main": { "MergeToBranch": "main-vs-deps", "ExtraSwitches": "-QuietComments" }, - // Merge any main-vs-deps changes to release/dev18.0. "main-vs-deps": { + "MergeToBranch": "release/dev17.15", + "ExtraSwitches": "-QuietComments" + }, + "release/dev17.15": { + "MergeToBranch": "release/dev17.15-vs-deps", + "ExtraSwitches": "-QuietComments" + }, + "release/dev17.15-vs-deps": { "MergeToBranch": "release/dev18.0", "ExtraSwitches": "-QuietComments" }