diff --git a/.github/workflows/inter-branch-merge-flow.yml b/.github/workflows/inter-branch-merge-flow.yml new file mode 100644 index 00000000000..68fdef4127b --- /dev/null +++ b/.github/workflows/inter-branch-merge-flow.yml @@ -0,0 +1,15 @@ +name: Inter-branch merge workflow +on: + push: + branches: + - vs1** + +permissions: + contents: write + pull-requests: write + +jobs: + Merge: + uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main + with: + configuration_file_path: '.config/git-merge-flow-config.jsonc' \ No newline at end of file diff --git a/.vsts-dotnet.yml b/.vsts-dotnet.yml index 8d54daccfb4..ef712d11984 100644 --- a/.vsts-dotnet.yml +++ b/.vsts-dotnet.yml @@ -14,7 +14,6 @@ parameters: displayName: Optional OptProfDrop Override type: string default: 'default' - default: true - name: enableSigningValidation displayName: Enable Signing Validation type: boolean diff --git a/eng/Versions.props b/eng/Versions.props index 54372626dad..56557977e62 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 16.11.10 + 16.11.11 release 15.1.0.0 preview