Skip to content

Commit 155e423

Browse files
baronfelbaronfel
authored
Merge branch 'release/8.0.1xx' into manual-backport-containers-message-updates
2 parents 0d81d9f + 5c3a227 commit 155e423

File tree

48 files changed

+869
-426
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+869
-426
lines changed

‎.github/workflows/inter-branch-merge-flow.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: Inter-branch merge workflow
2+
on:
3+
push:
4+
branches:
5+
- release/**
6+
7+
permissions:
8+
contents: write
9+
pull-requests: write
10+
11+
jobs:
12+
Merge:
13+
uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main

‎.vsts-ci-richnav.yml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ stages:
2626
richCodeNavigationEnvironment: 'production'
2727
pool:
2828
name: $(DncEngPublicBuildPool)
29-
demands: ImageOverride -equals windows.vs2019.amd64.open
29+
demands: ImageOverride -equals windows.vs2019.amd64.open
3030
timeoutInMinutes: 180
3131
strategy:
3232
matrix:
@@ -45,6 +45,7 @@ stages:
4545
- _SignArgs: ''
4646
- _InternalRuntimeDownloadArgs: ''
4747
steps:
48+
- template: /eng/common/templates/steps/enable-internal-runtimes.yml
4849
- powershell: eng\common\build.ps1
4950
-restore
5051
-ci
@@ -60,28 +61,27 @@ stages:
6061
displayName: Build
6162
env:
6263
BuildConfig: $(_BuildConfig)
63-
BlobFeedUrl: $(PB_PublishBlobFeedUrl)
6464
PublishType: $(_PublishType)
6565
TestFullMSBuild: 'true'
6666
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
6767

68-
- task: CopyFiles@2
69-
displayName: Gather Logs
70-
inputs:
71-
SourceFolder: '$(Build.SourcesDirectory)/artifacts'
72-
Contents: |
73-
log/$(_BuildConfig)/**/*
74-
TestResults/$(_BuildConfig)/**/*
75-
SymStore/$(_BuildConfig)/**/*
76-
TargetFolder: '$(Build.ArtifactStagingDirectory)'
77-
continueOnError: true
68+
- task: CopyFiles@2
69+
displayName: Gather Logs
70+
inputs:
71+
SourceFolder: '$(Build.SourcesDirectory)/artifacts'
72+
Contents: |
73+
log/$(_BuildConfig)/**/*
74+
TestResults/$(_BuildConfig)/**/*
75+
SymStore/$(_BuildConfig)/**/*
76+
TargetFolder: '$(Build.ArtifactStagingDirectory)'
77+
continueOnError: true
7878
condition: always()
7979

80-
- task: PublishBuildArtifacts@1
81-
displayName: Publish Logs to VSTS
82-
inputs:
83-
PathtoPublish: '$(Build.ArtifactStagingDirectory)'
84-
ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)'
85-
publishLocation: Container
86-
continueOnError: true
80+
- task: PublishBuildArtifacts@1
81+
displayName: Publish Logs to VSTS
82+
inputs:
83+
PathtoPublish: '$(Build.ArtifactStagingDirectory)'
84+
ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)'
85+
publishLocation: Container
86+
continueOnError: true
8787
condition: always()

‎.vsts-ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,9 @@ variables:
3636
value: /p:OfficialBuilder=Microsoft
3737
- name: Codeql.Enabled
3838
value: true
39-
- group: DotNetBuilds storage account read tokens
4039
- name: _InternalRuntimeDownloadArgs
41-
value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
42-
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
40+
value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
41+
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
4342
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
4443
- group: DotNet-CLI-SDLValidation-Params
4544
- template: /eng/common/templates-official/variables/pool-providers.yml
@@ -115,9 +114,10 @@ extends:
115114
value: ''
116115
- template: /eng/common/templates-official/job/source-build.yml@self
117116
parameters:
117+
enableInternalSources: true
118118
platform:
119119
name: 'Managed'
120-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'
120+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9'
121121
- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
122122
- template: /eng/build.yml@self
123123
parameters:

‎.vsts-pr.yml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,8 @@ pr:
1818
variables:
1919
- name: teamName
2020
value: Roslyn-Project-System
21-
- name: _DotNetPublishToBlobFeed
22-
value: false
2321
- name: _CIBuild
2422
value: -restore -build -sign -pack -ci
25-
- name: _DotNetArtifactsCategory
26-
value: .NETCore
27-
- name: _DotNetValidationArtifactsCategory
28-
value: .NETCore
2923
- ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), eq(variables['Build.Reason'], 'Manual')) }}:
3024
- name: PostBuildSign
3125
value: false
@@ -44,10 +38,9 @@ variables:
4438
value: /p:OfficialBuilder=Microsoft
4539
- name: Codeql.Enabled
4640
value: true
47-
- group: DotNetBuilds storage account read tokens
4841
- name: _InternalRuntimeDownloadArgs
49-
value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
50-
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
42+
value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
43+
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
5144
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
5245
- group: DotNet-CLI-SDLValidation-Params
5346
- template: /eng/common/templates/variables/pool-providers.yml
@@ -64,9 +57,9 @@ stages:
6457
name: $(DncEngInternalBuildPool)
6558
demands: ImageOverride -equals windows.vs2019.amd64
6659
steps:
67-
- publish: $(Build.SourcesDirectory)\eng\BuildConfiguration
68-
artifact: BuildConfiguration
69-
displayName: Publish Build Config
60+
- publish: $(Build.SourcesDirectory)\eng\BuildConfiguration
61+
artifact: BuildConfiguration
62+
displayName: Publish Build Config
7063
- template: /eng/build-pr.yml
7164
parameters:
7265
agentOs: Windows_NT
@@ -94,9 +87,10 @@ stages:
9487
_Test: ''
9588
- template: /eng/common/templates/job/source-build.yml
9689
parameters:
90+
enableInternalSources: true
9791
platform:
9892
name: 'Managed'
99-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'
93+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9'
10094
- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
10195
- template: /eng/build-pr.yml
10296
parameters:

‎NuGet.config

Lines changed: 37 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,45 @@
1-
<?xml version="1.0" encoding="utf-8"?>
21
<configuration>
32
<packageSources>
43
<clear />
54
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
65
<!-- Begin: Package sources from dotnet-emsdk -->
6+
<add key="darc-pub-dotnet-emsdk-a64772f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a64772f5/nuget/v3/index.json" />
7+
<add key="darc-pub-dotnet-emsdk-a64772f-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a64772f5-5/nuget/v3/index.json" />
8+
<add key="darc-pub-dotnet-emsdk-a64772f-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a64772f5-3/nuget/v3/index.json" />
9+
<add key="darc-pub-dotnet-emsdk-a64772f-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a64772f5-2/nuget/v3/index.json" />
10+
<add key="darc-pub-dotnet-emsdk-a64772f-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a64772f5-1/nuget/v3/index.json" />
711
<!-- End: Package sources from dotnet-emsdk -->
812
<!-- Begin: Package sources from dotnet-format -->
9-
<add key="darc-pub-dotnet-format-d237e17" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-d237e172/nuget/v3/index.json" />
10-
<add key="darc-pub-dotnet-format-d237e17-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-d237e172-6/nuget/v3/index.json" />
11-
<add key="darc-pub-dotnet-format-d237e17-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-d237e172-5/nuget/v3/index.json" />
12-
<add key="darc-pub-dotnet-format-d237e17-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-d237e172-4/nuget/v3/index.json" />
13-
<add key="darc-pub-dotnet-format-d237e17-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-d237e172-3/nuget/v3/index.json" />
14-
<add key="darc-pub-dotnet-format-d237e17-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-d237e172-2/nuget/v3/index.json" />
15-
<add key="darc-pub-dotnet-format-d237e17-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-d237e172-1/nuget/v3/index.json" />
13+
<add key="darc-pub-dotnet-format-b252c60" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-b252c608/nuget/v3/index.json" />
1614
<!-- End: Package sources from dotnet-format -->
1715
<!-- Begin: Package sources from dotnet-aspnetcore -->
16+
<add key="darc-int-dotnet-aspnetcore-2f1db20" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-2f1db204/nuget/v3/index.json" />
17+
<add key="darc-int-dotnet-aspnetcore-2f1db20-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-2f1db204-5/nuget/v3/index.json" />
18+
<add key="darc-int-dotnet-aspnetcore-2f1db20-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-2f1db204-3/nuget/v3/index.json" />
19+
<add key="darc-int-dotnet-aspnetcore-2f1db20-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-2f1db204-2/nuget/v3/index.json" />
20+
<add key="darc-int-dotnet-aspnetcore-2f1db20-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-2f1db204-1/nuget/v3/index.json" />
1821
<!-- End: Package sources from dotnet-aspnetcore -->
1922
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
2023
<add key="darc-pub-DotNet-msbuild-Trusted-b5265ef" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-b5265ef3/nuget/v3/index.json" />
2124
<!-- End: Package sources from DotNet-msbuild-Trusted -->
2225
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
2326
<!-- End: Package sources from dotnet-roslyn-analyzers -->
2427
<!-- Begin: Package sources from dotnet-runtime -->
28+
<add key="darc-int-dotnet-runtime-2aade6b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be/nuget/v3/index.json" />
29+
<add key="darc-int-dotnet-runtime-2aade6b-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-5/nuget/v3/index.json" />
30+
<add key="darc-int-dotnet-runtime-2aade6b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-3/nuget/v3/index.json" />
31+
<add key="darc-int-dotnet-runtime-2aade6b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-2/nuget/v3/index.json" />
32+
<add key="darc-int-dotnet-runtime-2aade6b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-1/nuget/v3/index.json" />
2533
<!-- End: Package sources from dotnet-runtime -->
2634
<!-- Begin: Package sources from dotnet-templating -->
27-
<add key="darc-pub-dotnet-templating-3da9776" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-3da9776a/nuget/v3/index.json" />
35+
<add key="darc-pub-dotnet-templating-5cab537" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-5cab5378/nuget/v3/index.json" />
2836
<!-- End: Package sources from dotnet-templating -->
2937
<!-- Begin: Package sources from dotnet-windowsdesktop -->
38+
<add key="darc-int-dotnet-windowsdesktop-28ae95b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-28ae95bc/nuget/v3/index.json" />
39+
<add key="darc-int-dotnet-windowsdesktop-28ae95b-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-28ae95bc-5/nuget/v3/index.json" />
40+
<add key="darc-int-dotnet-windowsdesktop-28ae95b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-28ae95bc-3/nuget/v3/index.json" />
41+
<add key="darc-int-dotnet-windowsdesktop-28ae95b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-28ae95bc-2/nuget/v3/index.json" />
42+
<add key="darc-int-dotnet-windowsdesktop-28ae95b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-28ae95bc-1/nuget/v3/index.json" />
3043
<!-- End: Package sources from dotnet-windowsdesktop -->
3144
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3245
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -51,13 +64,28 @@
5164
<!-- Begin: Package sources from dotnet-templating -->
5265
<!-- End: Package sources from dotnet-templating -->
5366
<!-- Begin: Package sources from dotnet-aspnetcore -->
67+
<add key="darc-int-dotnet-aspnetcore-2f1db20-1" value="true" />
68+
<add key="darc-int-dotnet-aspnetcore-2f1db20-2" value="true" />
69+
<add key="darc-int-dotnet-aspnetcore-2f1db20-3" value="true" />
70+
<add key="darc-int-dotnet-aspnetcore-2f1db20-5" value="true" />
71+
<add key="darc-int-dotnet-aspnetcore-2f1db20" value="true" />
5472
<!-- End: Package sources from dotnet-aspnetcore -->
5573
<!-- Begin: Package sources from dotnet-format -->
5674
<!-- End: Package sources from dotnet-format -->
5775
<!-- End: Package sources from dotnet-aspnetcore -->
5876
<!-- Begin: Package sources from dotnet-runtime -->
77+
<add key="darc-int-dotnet-runtime-2aade6b-1" value="true" />
78+
<add key="darc-int-dotnet-runtime-2aade6b-2" value="true" />
79+
<add key="darc-int-dotnet-runtime-2aade6b-3" value="true" />
80+
<add key="darc-int-dotnet-runtime-2aade6b-5" value="true" />
81+
<add key="darc-int-dotnet-runtime-2aade6b" value="true" />
5982
<!-- End: Package sources from dotnet-runtime -->
6083
<!-- Begin: Package sources from dotnet-windowsdesktop -->
84+
<add key="darc-int-dotnet-windowsdesktop-28ae95b-1" value="true" />
85+
<add key="darc-int-dotnet-windowsdesktop-28ae95b-2" value="true" />
86+
<add key="darc-int-dotnet-windowsdesktop-28ae95b-3" value="true" />
87+
<add key="darc-int-dotnet-windowsdesktop-28ae95b-5" value="true" />
88+
<add key="darc-int-dotnet-windowsdesktop-28ae95b" value="true" />
6189
<!-- End: Package sources from dotnet-windowsdesktop -->
6290
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
6391
</disabledPackageSources>

0 commit comments

Comments
 (0)