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

[main] Update dependencies from dotnet/efcore dotnet/runtime #48224

Merged
merged 29 commits into from
May 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
d6d6527
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] May 13, 2023
f66413a
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] May 14, 2023
f6e0517
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] May 15, 2023
f5421d5
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] May 15, 2023
eb13f77
Synchronize KnownWebAssemblySdkPack with KnownRuntimePack
maraf May 16, 2023
0bc131e
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] May 16, 2023
18f76eb
Use updated AesGcm constructor
lewing May 16, 2023
997fd00
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] May 16, 2023
cd97540
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] May 17, 2023
be39438
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] May 17, 2023
13d1f29
Rename dotnet.wasm to dotnet.native.wasm in E2E tests
maraf May 17, 2023
71e76e2
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] May 17, 2023
0a41e59
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] May 17, 2023
4800318
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] May 17, 2023
419af4a
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] May 17, 2023
c7be591
Try removing win-arm build
wtgodbe May 17, 2023
bd4c823
Maybe this
wtgodbe May 17, 2023
3798ee5
test
wtgodbe May 17, 2023
c08272f
Merge branch 'darc-main-d07100d0-6a03-436a-bb9e-3147022fd207' of http…
wtgodbe May 17, 2023
c5c1cc0
Restore condition
wtgodbe May 17, 2023
44bbc57
Use explicit command
wtgodbe May 17, 2023
f514e97
Cond
wtgodbe May 17, 2023
e9cbaeb
try this
wtgodbe May 17, 2023
1532c84
Release
wtgodbe May 17, 2023
ff8d217
PlatSpecific
wtgodbe May 17, 2023
2b948eb
?
wtgodbe May 17, 2023
10a0675
Spacing
wtgodbe May 17, 2023
27546fe
Working
wtgodbe May 18, 2023
297c37b
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] May 18, 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
146 changes: 19 additions & 127 deletions .azure/pipelines/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,6 @@ parameters:
default: false
displayName: Produce binlogs?
type: boolean
# Choose whether to test source indexing.
# Will cause inaccessible links on https://source.dot.net/ unless commits are also available in GitHub.
- name: testSourceIndexing
default: false
displayName: Test source indexing? !Danger! see comments in YAML.
type: boolean

variables:
- name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
Expand All @@ -71,6 +65,9 @@ variables:
value: true
- name: _UseHelixOpenQueues
value: ${{ ne(variables['System.TeamProject'], 'internal') }}
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/main')) }}:
- name: enableSourceIndex
value: true
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- name: _BuildArgs
value: /p:TeamName=$(_TeamName)
Expand All @@ -85,12 +82,6 @@ variables:
value: /p:Publish=true
/p:GenerateChecksums=true
/p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines)
# Variables for source indexing afterBuild step and job.
- name: sourceIndexPackageVersion
value: 1.0.1-20230228.2
- name: sourceIndexPackageSource
value: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
- group: source-dot-net stage1 variables
- ${{ if ne(parameters.produceBinlogs, 'true') }}:
# Do not log most Windows steps in official builds; this is the slowest job. Site extensions step always logs.
- name: WindowsArm64LogArgs
Expand Down Expand Up @@ -353,59 +344,6 @@ stages:
- name: Windows_ANCMIISExpress_Msi
path: artifacts/bin/AncmIISExpressV2

# Build Windows ARM
- template: jobs/default-build.yml
parameters:
codeSign: true
jobName: Windows_arm_build
jobDisplayName: "Build: Windows ARM"
agentOs: Windows
buildArgs:
-arch arm
-sign
-pack
-noBuildNodeJS
-noBuildJava
-binaryLog
/p:DotNetSignType=$(_SignType)
/p:OnlyPackPlatformSpecificPackages=true
/p:AssetManifestFileName=aspnetcore-win-arm.xml
$(_BuildArgs)
$(_PublishArgs)
$(_InternalRuntimeDownloadArgs)
${{ if and(ne(variables['System.TeamProject'], 'public'), or(eq(parameters.testSourceIndexing, 'true'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}:
afterBuild:
- task: UseDotNet@2
displayName: Use .NET Core SDK 6
inputs:
packageType: sdk
version: 6.0.x
installationPath: $(Build.SourcesDirectory)/.dotnet
workingDirectory: $(Build.SourcesDirectory)
- powershell: . $(Build.SourcesDirectory)/activate.ps1;
dotnet tool install BinLogToSln
--version $(SourceIndexPackageVersion)
--add-source $(SourceIndexPackageSource)
--tool-path $(Build.SourcesDirectory)/.tools;
$(Build.SourcesDirectory)/.tools/BinLogToSln
-i $(Build.SourcesDirectory)/artifacts/log/Release/Build.binlog
-r $(Build.SourcesDirectory)
-n $(Build.Repository.Name)
-o $(Build.ArtifactStagingDirectory)/sourceIndex/
displayName: Process binary log into indexable sln
installNodeJs: false
installJdk: false
artifacts:
- name: Windows_arm_Logs
path: artifacts/log/
publishOnError: true
includeForks: true
- name: Windows_arm_Packages
path: artifacts/packages/
- ${{ if and(ne(variables['System.TeamProject'], 'public'), or(eq(parameters.testSourceIndexing, 'true'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}:
- name: Windows_arm_SourceIndex
path: $(Build.ArtifactStagingDirectory)/sourceIndex/

# Build MacOS arm64
- template: jobs/default-build.yml
parameters:
Expand Down Expand Up @@ -798,13 +736,26 @@ stages:
# Log environment variables in binary logs to ease debugging
MSBUILDLOGALLENVIRONMENTVARIABLES: true

- ${{ if eq(variables.enableSourceIndex, 'true') }}:
- template: /eng/common/templates/job/source-index-stage1.yml
parameters:
sourceIndexBuildCommand: ./eng/build.cmd -Configuration Release -ci -noBuildJava -binaryLog /p:OnlyPackPlatformSpecificPackages=true
binlogPath: artifacts/log/Release/Build.binlog
presteps:
- task: NodeTool@0
displayName: Install Node 18.x
inputs:
versionSpec: 18.x
pool:
name: $(DncEngInternalBuildPool)
demands: ImageOverride -equals 1es-windows-2022

# Publish to the BAR and perform source indexing. Wait until everything else is done.
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- template: /eng/common/templates/job/publish-build-assets.yml
parameters:
dependsOn:
- Windows_build
- Windows_arm_build
- ${{ if ne(variables.PostBuildSign, 'true') }}:
- CodeSign_Xplat_MacOS_arm64
- CodeSign_Xplat_MacOS_x64
Expand All @@ -831,74 +782,15 @@ stages:
- MacOS_Test
- Linux_Test
- Helix_x64
- ${{ if eq(variables.enableSourceIndex, 'true') }}:
- SourceIndexStage1
- Source_Build_Managed
pool:
name: $(DncEngInternalBuildPool)
demands: ImageOverride -equals 1es-windows-2019
publishUsingPipelines: ${{ variables._PublishUsingPipelines }}
enablePublishBuildArtifacts: true # publish artifacts/log files
publishAssetsImmediately: true # Don't use a separate stage for darc publishing.
- ${{ if and(ne(variables['System.TeamProject'], 'public'), or(eq(parameters.testSourceIndexing, 'true'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}:
- job: SourceIndexUpload
displayName: Upload indexable solution
dependsOn:
- Windows_arm_build
# In addition to the dependency above that provides assets, ensure the build was successful overall.
- Windows_build
- ${{ if ne(variables.PostBuildSign, 'true') }}:
- CodeSign_Xplat_MacOS_arm64
- CodeSign_Xplat_MacOS_x64
- CodeSign_Xplat_Linux_x64
- CodeSign_Xplat_Linux_arm
- CodeSign_Xplat_Linux_arm64
- CodeSign_Xplat_Linux_musl_x64
- CodeSign_Xplat_Linux_musl_arm
- CodeSign_Xplat_Linux_musl_arm64
- ${{ if eq(variables.PostBuildSign, 'true') }}:
- MacOs_arm64_build
- MacOs_x64_build
- Linux_x64_build
- Linux_arm_build
- Linux_arm64_build
- Linux_musl_x64_build
- Linux_musl_arm_build
- Linux_musl_arm64_build
- ${{ if in(variables['Build.Reason'], 'Manual') }}:
- Code_check
- ${{ if ne(parameters.skipTests, 'true') }}:
- Windows_Test
- MacOS_Test
- Linux_Test
- Helix_x64
- Source_Build_Managed
pool:
name: $(DncEngInternalBuildPool)
# Visual Studio Enterprise - no BuildTools agents exist internally and job must run on Windows
demands: ImageOverride -equals 1es-windows-2019
steps:
- task: DownloadBuildArtifacts@0
inputs:
artifactName: Windows_arm_SourceIndex
cleanDestinationFolder: true
# Ignore repository's global.json and any existing .NET SDK.
- task: UseDotNet@2
displayName: Use .NET Core SDK 6
inputs:
packageType: sdk
version: 6.0.x
installationPath: $(Agent.TempDirectory)/.dotnet
workingDirectory: $(Agent.TempDirectory)
- script: $(Agent.TempDirectory)/.dotnet/dotnet tool install UploadIndexStage1
--version $(SourceIndexPackageVersion)
--add-source $(SourceIndexPackageSource)
--tool-path $(Agent.TempDirectory)/.tools &&
$(Agent.TempDirectory)/.tools/UploadIndexStage1
-i $(System.ArtifactsDirectory)/Windows_arm_SourceIndex/
-n $(Build.Repository.Name)
displayName: Upload indexable solution
workingDirectory: $(Agent.TempDirectory)
env:
BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url)

- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(variables.runCodeQL3000, 'true')) }}:
- template: /eng/common/templates/post-build/post-build.yml
Expand Down
Loading