Skip to content

[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' #29314

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 45 commits into from
Dec 1, 2022
Merged

[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' #29314

Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
bf1b831
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 4, 2022
521bbd6
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 4, 2022
e4e6e72
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 4, 2022
8cb6966
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 4, 2022
ffc7c9c
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 5, 2022
7563b84
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 5, 2022
99a9afc
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 5, 2022
6f61944
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 5, 2022
97f7d60
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 6, 2022
8f163bc
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 6, 2022
63ca24f
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 6, 2022
7748563
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 6, 2022
27d7762
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 6, 2022
cddb576
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 7, 2022
c0dc070
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 7, 2022
e94ad24
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 7, 2022
b7ce68b
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 7, 2022
2d089db
Merge in 'release/6.0.3xx' changes
dotnet-bot Oct 10, 2022
22dc8bd
Merge in 'release/6.0.3xx' changes
dotnet-bot Oct 11, 2022
fc5f363
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 12, 2022
57f8ec2
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 13, 2022
15857b3
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 13, 2022
ee49811
Merge in 'release/6.0.3xx' changes
dotnet-bot Oct 14, 2022
c76f125
Merged PR 26432: [internal/release/6.0.3xx] Update dependencies from …
dotnet-bot Oct 14, 2022
63be4c9
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 14, 2022
985b54a
Merged PR 26774: [internal/release/6.0.3xx] Update dependencies from …
dotnet-bot Oct 16, 2022
42e6abe
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 17, 2022
1ebf05b
Merged PR 26792: [internal/release/6.0.3xx] Update dependencies from …
dotnet-bot Oct 17, 2022
7a9f7da
Merged PR 26807: [internal/release/6.0.3xx] Update dependencies from …
dotnet-bot Oct 17, 2022
93c9fc7
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 17, 2022
a1b8ead
Merged PR 26819: [internal/release/6.0.3xx] Update dependencies from …
dotnet-bot Oct 18, 2022
6ee9b3c
Merged PR 26851: [internal/release/6.0.3xx] Update dependencies from …
dotnet-bot Oct 18, 2022
c2fc3bf
Merged PR 26867: [internal/release/6.0.3xx] Update dependencies from …
dotnet-bot Oct 19, 2022
de4ec83
Merged PR 26886: [internal/release/6.0.3xx] Update dependencies from …
dotnet-bot Oct 19, 2022
e154f5f
Merged PR 26894: [internal/release/6.0.3xx] Update dependencies from …
dotnet-bot Oct 19, 2022
b003a18
Merged PR 26905: [internal/release/6.0.3xx] Update dependencies from …
dotnet-bot Oct 19, 2022
bcf774a
Merged PR 26991: [internal/release/6.0.3xx] Update dependencies from …
dotnet-bot Oct 23, 2022
eeb9980
Merged PR 27000: [internal/release/6.0.3xx] Update dependencies from …
dotnet-bot Oct 24, 2022
46b48e7
Merged PR 27007: [internal/release/6.0.3xx] Update dependencies from …
dotnet-bot Oct 24, 2022
3ab4292
Merge commit '46b48e7a82d138728be2d24594b5ce98d6af92dc' into internal…
vseanreesermsft Nov 8, 2022
e3b45b9
Merge pull request #28945 from vseanreesermsft/internal-merge-6.0.3xx…
mmitche Nov 9, 2022
c284ce8
Update dependencies from https://github.com/dotnet/arcade build 20221…
dotnet-maestro[bot] Nov 18, 2022
d5d46ed
Merge branch 'release/6.0.3xx' into release/6.0.4xx
Nov 21, 2022
1c082c6
Merge pull request #29127 from dotnet-maestro-bot/merge/release/6.0.3…
marcpopMSFT Nov 30, 2022
931a966
Merge branch 'release/6.0.4xx' into release/7.0.1xx
Dec 1, 2022
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
6 changes: 6 additions & 0 deletions eng/common/templates/steps/source-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@ steps:
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
fi

runtimeOsArgs=
if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then
runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}'
fi

publishArgs=
if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then
publishArgs='--publish'
Expand All @@ -75,6 +80,7 @@ steps:
$internalRuntimeDownloadArgs \
$internalRestoreArgs \
$targetRidArgs \
$runtimeOsArgs \
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
/p:ArcadeBuildFromSource=true
displayName: Build
Expand Down