Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merging internal commits for release/7.0 #82117

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
4531191
Merge in 'release/7.0' changes
dotnet-bot Jan 4, 2023
c06def7
Merge in 'release/7.0' changes
dotnet-bot Jan 4, 2023
de25153
Merge in 'release/7.0' changes
dotnet-bot Jan 4, 2023
088e67d
Merge in 'release/7.0' changes
dotnet-bot Jan 4, 2023
b62f7e1
Merge in 'release/7.0' changes
dotnet-bot Jan 4, 2023
a59bea8
Merge in 'release/7.0' changes
dotnet-bot Jan 4, 2023
b50a270
Merge in 'release/7.0' changes
dotnet-bot Jan 4, 2023
aeac6c1
Merge in 'release/7.0' changes
dotnet-bot Jan 4, 2023
1341e29
Merge in 'release/7.0' changes
dotnet-bot Jan 4, 2023
b39831b
Merge in 'release/7.0' changes
dotnet-bot Jan 5, 2023
6da6b53
Merge in 'release/7.0' changes
dotnet-bot Jan 5, 2023
bdb6f00
Merge in 'release/7.0' changes
dotnet-bot Jan 5, 2023
db4c096
Merge in 'release/7.0' changes
dotnet-bot Jan 5, 2023
e13c32f
Merge in 'release/7.0' changes
dotnet-bot Jan 5, 2023
4824eef
Merge in 'release/7.0' changes
dotnet-bot Jan 5, 2023
2eb0000
Merge in 'release/7.0' changes
dotnet-bot Jan 5, 2023
3d31934
Merge in 'release/7.0' changes
dotnet-bot Jan 5, 2023
266050f
Merge in 'release/7.0' changes
dotnet-bot Jan 5, 2023
275fa87
Merge in 'release/7.0' changes
dotnet-bot Jan 6, 2023
f155fe7
Merge in 'release/7.0' changes
dotnet-bot Jan 6, 2023
05b0551
Merge in 'release/7.0' changes
dotnet-bot Jan 9, 2023
c443d36
Merge in 'release/7.0' changes
dotnet-bot Jan 9, 2023
fe8ed10
Merge in 'release/7.0' changes
dotnet-bot Jan 9, 2023
a3ecc35
Merge in 'release/7.0' changes
dotnet-bot Jan 10, 2023
5d69c40
Merge in 'release/7.0' changes
dotnet-bot Jan 11, 2023
9ed153b
Merge in 'release/7.0' changes
dotnet-bot Jan 11, 2023
7ae2199
Merge in 'release/7.0' changes
dotnet-bot Jan 11, 2023
9fb3185
Merge in 'release/7.0' changes
dotnet-bot Jan 11, 2023
d3109e6
Merge in 'release/7.0' changes
dotnet-bot Jan 11, 2023
7421686
Merge in 'release/7.0' changes
dotnet-bot Jan 12, 2023
a686e14
Merge in 'release/7.0' changes
dotnet-bot Jan 12, 2023
b373e5a
Merge in 'release/7.0' changes
dotnet-bot Jan 12, 2023
c89681a
Merge in 'release/7.0' changes
dotnet-bot Jan 12, 2023
f7ca579
Merge in 'release/7.0' changes
dotnet-bot Jan 12, 2023
08e84f4
Merge in 'release/7.0' changes
dotnet-bot Jan 13, 2023
0cd7795
Merge in 'release/7.0' changes
dotnet-bot Jan 13, 2023
6f8f3db
Merge in 'release/7.0' changes
dotnet-bot Jan 13, 2023
aa2fe3a
Merge in 'release/7.0' changes
dotnet-bot Jan 13, 2023
de2e228
Merge in 'release/7.0' changes
dotnet-bot Jan 13, 2023
153136d
Merge in 'release/7.0' changes
dotnet-bot Jan 17, 2023
8b3d962
Merged PR 28849: Updated Microsoft.Diasymreader.Native to 16.11.23-be…
hoyosjs Jan 18, 2023
1675784
Merged PR 28999: Do not set up nuget sources for source build
mmitche Jan 19, 2023
90768a2
Merged PR 29008: Disable source-build leg for 7.0.
crummel Jan 19, 2023
0a2bda1
Merged PR 29014: Disable source build for 7.0 in official and revert …
mmitche Jan 19, 2023
bd47178
Merge commit '0a2bda10e81d901396c3cff95533529e3a93ad47' into internal…
vseanreesermsft Feb 14, 2023
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: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
<optimizationlinuxarm64MIBCRuntimeVersion>1.0.0-prerelease.22415.6</optimizationlinuxarm64MIBCRuntimeVersion>
<optimizationPGOCoreCLRVersion>1.0.0-prerelease.22415.6</optimizationPGOCoreCLRVersion>
<!-- Not auto-updated. -->
<MicrosoftDiaSymReaderNativeVersion>16.9.0-beta1.21055.5</MicrosoftDiaSymReaderNativeVersion>
<MicrosoftDiaSymReaderNativeVersion>16.11.23-beta1.23063.1</MicrosoftDiaSymReaderNativeVersion>
<SystemCommandLineVersion>2.0.0-beta4.22355.1</SystemCommandLineVersion>
<TraceEventVersion>3.0.3</TraceEventVersion>
<NETStandardLibraryRefVersion>2.1.0</NETStandardLibraryRefVersion>
Expand Down
21 changes: 21 additions & 0 deletions eng/pipelines/common/global-build-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ jobs:
variables:
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- group: DotNet-HelixApi-Access
- group: AzureDevOps-Artifact-Feeds-Pats

- name: _osParameter
value: -os ${{ parameters.osGroup }}
Expand Down Expand Up @@ -128,6 +129,26 @@ jobs:
- ${{ if eq(parameters.isOfficialBuild, true) }}:
- template: /eng/pipelines/common/restore-internal-tools.yml

# Do not set up nuget sources for source build because the source build scripts already do this.
# This will cause the working tree to be dirty, which breaks the stash command when shallow clones are used, like in CI or official builds.
- ${{ if and(ne(variables['System.TeamProject'], 'public'), ne(parameters.buildingOnSourceBuildImage, true)) }}:
- ${{ if ne(parameters.osGroup, 'windows') }}:
- task: Bash@3
displayName: Setup Private Feeds Credentials
inputs:
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
arguments: $(Build.SourcesDirectory)/NuGet.config $Token
env:
Token: $(dn-bot-dnceng-artifact-feeds-rw)
- ${{ if eq(parameters.osGroup, 'windows') }}:
- task: PowerShell@2
displayName: Setup Private Feeds Credentials
inputs:
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
env:
Token: $(dn-bot-dnceng-artifact-feeds-rw)

- ${{ each monoCrossAOTTargetOS in parameters.monoCrossAOTTargetOS }}:
- task: DownloadPipelineArtifact@2
displayName: Download ${{monoCrossAOTTargetOS}} AOT offset files
Expand Down
20 changes: 20 additions & 0 deletions eng/pipelines/coreclr/templates/build-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ jobs:
# Variables used by arcade to gather asset manifests
- name: _DotNetPublishToBlobFeed
value: true
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- group: AzureDevOps-Artifact-Feeds-Pats
- name: officialBuildIdArg
value: ''
- ${{ if eq(parameters.isOfficialBuild, true) }}:
Expand Down Expand Up @@ -182,6 +184,24 @@ jobs:
continueOnError: false
condition: and(succeeded(), in(variables['SignType'], 'real', 'test'))

- ${{ if ne(variables['System.TeamProject'], 'public') }}:
- ${{ if ne(parameters.osGroup, 'windows') }}:
- task: Bash@3
displayName: Setup Private Feeds Credentials
inputs:
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
arguments: $(Build.SourcesDirectory)/NuGet.config $Token
env:
Token: $(dn-bot-dnceng-artifact-feeds-rw)
- ${{ if eq(parameters.osGroup, 'windows') }}:
- task: PowerShell@2
displayName: Setup Private Feeds Credentials
inputs:
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
env:
Token: $(dn-bot-dnceng-artifact-feeds-rw)

- ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}:
- script: |
du -sh $(Build.SourcesDirectory)/*
Expand Down
21 changes: 21 additions & 0 deletions eng/pipelines/installer/jobs/base-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,9 @@ jobs:
${{ if in(parameters.osGroup, 'Linux', 'FreeBSD') }}:
value: '/root/runtime/'

- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- group: AzureDevOps-Artifact-Feeds-Pats

###
### Platform-specific variable setup
###
Expand Down Expand Up @@ -389,6 +392,24 @@ jobs:
df -h
displayName: Disk Usage before Build

- ${{ if ne(variables['System.TeamProject'], 'public') }}:
- ${{ if ne(parameters.osGroup, 'windows') }}:
- task: Bash@3
displayName: Setup Private Feeds Credentials
inputs:
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
arguments: $(Build.SourcesDirectory)/NuGet.config $Token
env:
Token: $(dn-bot-dnceng-artifact-feeds-rw)
- ${{ if eq(parameters.osGroup, 'windows') }}:
- task: PowerShell@2
displayName: Setup Private Feeds Credentials
inputs:
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
env:
Token: $(dn-bot-dnceng-artifact-feeds-rw)

# Build the default subset non-MacOS platforms
- ${{ if ne(parameters.osGroup, 'OSX') }}:
- script: $(BaseJobBuildCommand)
Expand Down
19 changes: 19 additions & 0 deletions eng/pipelines/libraries/base-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ jobs:
variables:
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- group: DotNet-HelixApi-Access
- group: AzureDevOps-Artifact-Feeds-Pats

- _buildScriptFileName: build

Expand Down Expand Up @@ -148,4 +149,22 @@ jobs:
artifactName: '$(_runtimeArtifactName)'
displayName: '$(runtimeFlavorName) build drop'

- ${{ if ne(variables['System.TeamProject'], 'public') }}:
- ${{ if ne(parameters.osGroup, 'windows') }}:
- task: Bash@3
displayName: Setup Private Feeds Credentials
inputs:
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
arguments: $(Build.SourcesDirectory)/NuGet.config $Token
env:
Token: $(dn-bot-dnceng-artifact-feeds-rw)
- ${{ if eq(parameters.osGroup, 'windows') }}:
- task: PowerShell@2
displayName: Setup Private Feeds Credentials
inputs:
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
env:
Token: $(dn-bot-dnceng-artifact-feeds-rw)

- ${{ parameters.steps }}
26 changes: 13 additions & 13 deletions eng/pipelines/runtime-official.yml
Original file line number Diff line number Diff line change
Expand Up @@ -368,19 +368,19 @@ stages:
#
# Build Sourcebuild leg
#
- template: /eng/pipelines/common/platform-matrix.yml
parameters:
jobTemplate: /eng/pipelines/common/global-build-job.yml
buildConfig: Release
helixQueueGroup: ci
platforms:
- SourceBuild_Linux_x64
jobParameters:
nameSuffix: SourceBuild
extraStepsTemplate: /eng/pipelines/common/upload-intermediate-artifacts-step.yml
extraStepsParameters:
name: SourceBuildPackages
timeoutInMinutes: 95
# - template: /eng/pipelines/common/platform-matrix.yml
# parameters:
# jobTemplate: /eng/pipelines/common/global-build-job.yml
# buildConfig: Release
# helixQueueGroup: ci
# platforms:
# - SourceBuild_Linux_x64
# jobParameters:
# nameSuffix: SourceBuild
# extraStepsTemplate: /eng/pipelines/common/upload-intermediate-artifacts-step.yml
# extraStepsParameters:
# name: SourceBuildPackages
# timeoutInMinutes: 95


#
Expand Down