[automated] Merge branch 'release/8.0.1xx' => 'main' (#17201)
Co-authored-by: Marc Paine <marcpop@microsoft.com> Co-authored-by: Elinor Fung <elfung@microsoft.com> Co-authored-by: Přemek Vysoký <premek.vysoky@microsoft.com> Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
This commit is contained in:
dotnet-maestro-bot
GitHub
parent
8838a9e817
commit
1a741e8932
8 changed files with 25 additions and 14 deletions
|
|
@ -3,7 +3,7 @@
|
|||
"isRoot": true,
|
||||
"tools": {
|
||||
"microsoft.dotnet.darc": {
|
||||
"version": "1.1.0-beta.23374.1",
|
||||
"version": "1.1.0-beta.23416.3",
|
||||
"commands": [
|
||||
"darc"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -5,10 +5,7 @@ trigger:
|
|||
- main
|
||||
- master
|
||||
- release/*
|
||||
- internal/release/3.*
|
||||
- internal/release/5.*
|
||||
- internal/release/6.*
|
||||
- internal/release/7.*
|
||||
- internal/release/*
|
||||
|
||||
variables:
|
||||
- name: _PublishUsingPipelines
|
||||
|
|
|
|||
|
|
@ -219,13 +219,13 @@
|
|||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>385129cbc980a515ddee2fa56f6b16f3183ed9bc</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23374.1">
|
||||
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23416.3">
|
||||
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
||||
<Sha>47ed0ea4d789d359d3749707374d7a5edd84eb19</Sha>
|
||||
<Sha>5d63a226d022fda90cae2c239e882ad253baa758</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.23374.1">
|
||||
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.23416.3">
|
||||
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
||||
<Sha>47ed0ea4d789d359d3749707374d7a5edd84eb19</Sha>
|
||||
<Sha>5d63a226d022fda90cae2c239e882ad253baa758</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-alpha.1.22557.12">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
|
|
|
|||
|
|
@ -25,8 +25,8 @@
|
|||
<VersionFeature21>30</VersionFeature21>
|
||||
<VersionFeature31>32</VersionFeature31>
|
||||
<VersionFeature50>17</VersionFeature50>
|
||||
<VersionFeature60>20</VersionFeature60>
|
||||
<VersionFeature70>9</VersionFeature70>
|
||||
<VersionFeature60>21</VersionFeature60>
|
||||
<VersionFeature70>10</VersionFeature70>
|
||||
<!-- Should be kept in sync with VersionFeature70. It should match the version of Microsoft.NET.ILLink.Tasks
|
||||
referenced by the same 7.0 SDK that references the 7.0.VersionFeature70 runtime pack. -->
|
||||
<_NET70ILLinkPackVersion>7.0.100-1.23211.1</_NET70ILLinkPackVersion>
|
||||
|
|
@ -43,7 +43,7 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/arcade-services -->
|
||||
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.23374.1</MicrosoftDotNetDarcLibVersion>
|
||||
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.23416.3</MicrosoftDotNetDarcLibVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ jobs:
|
|||
- template: /eng/common/templates/variables/pool-providers.yml
|
||||
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||
- group: AzureDevOps-Artifact-Feeds-Pats
|
||||
- ${{ if and(not(parameters.isBuiltFromVmr), eq(variables['System.TeamProject'], 'internal'), not(startswith(parameters.vmrBranch, 'internal/release/'))) }}:
|
||||
- ${{ if and(not(parameters.isBuiltFromVmr), eq(variables['System.TeamProject'], 'internal'), not(startswith(parameters.vmrBranch, 'internal/release/')), not(eq(variables['Build.Reason'], 'PullRequest'))) }}:
|
||||
- group: DotNetBot-GitHub
|
||||
- ${{ else }}:
|
||||
- name: BotAccount-dotnet-bot-repo-PAT
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ steps:
|
|||
./eng/vmr-sync.sh
|
||||
--vmr ${{ parameters.vmrPath }}
|
||||
--tmp $(Agent.TempDirectory)
|
||||
--azdev-pat '$(System.AccessToken)'
|
||||
--branch ${{ parameters.vmrBranch }}
|
||||
--repository "installer:${{ parameters.targetRef }}"
|
||||
--recursive
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ resources:
|
|||
- repository: vmr
|
||||
type: git
|
||||
name: dotnet-dotnet
|
||||
ref: $(VmrBranch)
|
||||
ref: ${{ variables.VmrBranch }}
|
||||
|
||||
stages:
|
||||
# You can temporarily disable the VMR Build stage by changing the default of disableVmrBuild
|
||||
|
|
|
|||
|
|
@ -58,6 +58,9 @@
|
|||
### Optional. Template for the header of VMRs THIRD-PARTY-NOTICES file.
|
||||
### Defaults to src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt
|
||||
###
|
||||
### --azdev-pat
|
||||
### Optional. Azure DevOps PAT to use for cloning private repositories.
|
||||
###
|
||||
### -v, --vmr, --vmr-dir PATH
|
||||
### Optional. Path to the dotnet/dotnet repository. When null, gets cloned to the temporary folder
|
||||
|
||||
|
|
@ -102,6 +105,7 @@ recursive=false
|
|||
verbosity=verbose
|
||||
readme_template="$installer_dir/src/VirtualMonoRepo/README.template.md"
|
||||
tpn_template="$installer_dir/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt"
|
||||
azdev_pat=''
|
||||
|
||||
# If installer is a repo, we're in an installer and not in the dotnet/dotnet repo
|
||||
if [[ -d "$installer_dir/.git" ]]; then
|
||||
|
|
@ -142,6 +146,10 @@ while [[ $# -gt 0 ]]; do
|
|||
tpn_template=$2
|
||||
shift
|
||||
;;
|
||||
--azdev-pat)
|
||||
azdev_pat=$2
|
||||
shift
|
||||
;;
|
||||
-d|--debug)
|
||||
verbosity=debug
|
||||
;;
|
||||
|
|
@ -245,11 +253,16 @@ if [[ -n "$additional_remotes" ]]; then
|
|||
additional_remotes="--additional-remotes $additional_remotes"
|
||||
fi
|
||||
|
||||
if [[ -n "$azdev_pat" ]]; then
|
||||
azdev_pat="--azdev-pat $azdev_pat"
|
||||
fi
|
||||
|
||||
# Synchronize the VMR
|
||||
|
||||
"$dotnet" darc vmr update \
|
||||
--vmr "$vmr_dir" \
|
||||
--tmp "$tmp_dir" \
|
||||
$azdev_pat \
|
||||
--$verbosity \
|
||||
$recursive_arg \
|
||||
--readme-template "$readme_template" \
|
||||
|
|
|
|||
Loading…
Reference in a new issue