Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/main-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ on:
push:
branches:
- main-vs-deps
- release/dev17.15
- release/dev17.15-vs-deps
workflow_dispatch:
inputs:
configuration_file_branch:
Expand Down
1 change: 1 addition & 0 deletions azure-pipelines-integration-scouting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ schedules:
branches:
include:
- main
exclude:
- main-vs-deps

variables:
Expand Down
6 changes: 6 additions & 0 deletions azure-pipelines-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="10.0.616902">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="10.0.617002">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
<Sha>b99d40df247e865fb0a9de15bdcfdfa7f550a55e</Sha>
<Sha>cf30e8fd726730aa4b142275fb2fc0503528b7dd</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="System.CommandLine" Version="2.0.0-beta4.24528.1">
Expand Down
10 changes: 10 additions & 0 deletions eng/config/PublishData.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
10 changes: 8 additions & 2 deletions eng/config/branch-merge.jsonc
Original file line number Diff line number Diff line change
@@ -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"
}
Expand Down
Loading