Skip to content

[automated] Merge branch 'release/5.0-preview3' => 'master' #20591

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Apr 7, 2020
Merged

[automated] Merge branch 'release/5.0-preview3' => 'master' #20591

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6821fa
[5.0-preview3] Remove Code_check job from publish-build-assets.yml `d…
dougbu Apr 5, 2020
905f580
Update dependencies from https://github.com/dotnet/aspnetcore-tooling…
dotnet-maestro[bot] Apr 6, 2020
28f9139
Merge branch 'master' into merge/release/5.0-preview3-to-master
dougbu Apr 6, 2020
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
10 changes: 4 additions & 6 deletions .azure/pipelines/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,16 +77,16 @@ variables:
/p:DotNetPublishToBlobFeed=$(_DotNetPublishToBlobFeed)
/p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines)
/p:DotNetArtifactsCategory=$(_DotNetArtifactsCategory)

# used for post-build phases, internal builds only
- group: DotNet-AspNet-SDLValidation-Params
- ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
- name: _BuildArgs
value: ''
- name: _SignType
value: test
- name: _PublishArgs
value: ''
# used for post-build phases, internal builds only
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- group: DotNet-AspNet-SDLValidation-Params

stages:
- stage: build
Expand Down Expand Up @@ -177,8 +177,7 @@ stages:
-noBuildDeps
$(_BuildArgs)
$(_InternalRuntimeDownloadArgs)
# Disabled until 3.1.3 is released
condition: false
condition: ne(variables['Build.Reason'], 'PullRequest')
displayName: Build SiteExtension

# This runs code-signing on all packages, zips, and jar files as defined in build/CodeSign.targets. If https://github.com/dotnet/arcade/issues/1957 is resolved,
Expand Down Expand Up @@ -799,7 +798,6 @@ stages:
- CodeSign_Xplat_Linux_musl_x64
- CodeSign_Xplat_Linux_musl_arm64
# In addition to the dependencies above, ensure the build was successful overall.
- Code_check
- Linux_Test
- MacOS_Test
- Source_Build
Expand Down