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.

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

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

Merged
merged 64 commits into from
Nov 4, 2022
Merged

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

Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
b3e3d2f
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 1, 2022
2a3eb09
Merge in 'release/6.0.1xx' changes
dotnet-bot Sep 1, 2022
376293a
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 1, 2022
596a350
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 1, 2022
d02d258
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 6, 2022
5fffb31
Merge in 'release/6.0.1xx' changes
dotnet-bot Sep 6, 2022
c5250e1
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 7, 2022
8c4282b
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 7, 2022
7bf9898
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 7, 2022
e8c34a9
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 7, 2022
68bbb51
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 7, 2022
8963ffa
[Backport] Fix Temp Paths for MSRC
nagilson Sep 7, 2022
7e72f23
[Backport] Apply extra change since WorkloadCommandBase Doesn't exist
nagilson Sep 7, 2022
7480eb5
Fix merge conflict I didn't merge correctly
nagilson Sep 7, 2022
22e579c
Apply more fixes to the merge
nagilson Sep 7, 2022
7958523
Update dependencies
nagilson Sep 7, 2022
33b28aa
Accept half merged old change
nagilson Sep 7, 2022
6bfa34b
Remove new test added in merge
nagilson Sep 7, 2022
eaaa9b5
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 8, 2022
74b5216
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 8, 2022
8ee5a12
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 8, 2022
fef9ddf
Remove localiz string
nagilson Sep 8, 2022
756a33b
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 8, 2022
68e7304
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 9, 2022
7ce9675
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 10, 2022
9536c9f
Insert nuget.client 6.0.3-rc.1 to dotnet sdk 6.0.1xx
Sep 11, 2022
46143dd
Merged PR 25585: [Backport] 6.0.1xx Temp Path Changes
nagilson Sep 12, 2022
0c496b6
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 13, 2022
bd263e6
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 13, 2022
877b454
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 13, 2022
3bd7e32
Merge in 'release/6.0.1xx' changes
dotnet-bot Sep 13, 2022
8579d89
Merge in 'release/6.0.1xx' changes
dotnet-bot Sep 13, 2022
fa07d3e
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 14, 2022
a44efce
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 14, 2022
fc46098
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 14, 2022
75a5661
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 14, 2022
0de76c9
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 14, 2022
c71724f
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 14, 2022
516b20e
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 14, 2022
a966823
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 14, 2022
bbed738
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 14, 2022
0138f7d
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 14, 2022
f047ded
Merged PR 25670: Insert nuget.client 6.0.3-rc.1 to dotnet sdk 6.0.1xx
Sep 14, 2022
0d76048
Merged PR 25439: [internal/release/6.0.1xx] Update dependencies from …
dotnet-bot Sep 14, 2022
51ab166
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 14, 2022
a583363
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 14, 2022
b5a4020
Merged PR 25798: [internal/release/6.0.1xx] Update dependencies from …
dotnet-bot Sep 14, 2022
37de952
update dependencies
Forgind Sep 15, 2022
2668f96
update
Forgind Sep 15, 2022
020b4fd
Merged PR 25837: Flow MSBuild with MSRC fix into 6.0.1xx SDK
Forgind Sep 19, 2022
aa67ae0
Merged PR 26021: [internal/release/6.0.1xx] Update dependencies from …
dotnet-bot Sep 20, 2022
4041520
Merged PR 26193: [internal/release/6.0.1xx] Update dependencies from …
dotnet-bot Sep 26, 2022
cb11e73
Merged PR 26217: [internal/release/6.0.1xx] Update dependencies from …
dotnet-bot Sep 27, 2022
a886cd6
Merged PR 26232: [internal/release/6.0.1xx] Update dependencies from …
dotnet-bot Sep 27, 2022
0b4ca0b
Merge commit 'a886cd6214c92f6a5d955c056014820c35591e7b' into internal…
vseanreesermsft Oct 11, 2022
df84365
Merge pull request #28468 from vseanreesermsft/internal-merge-6.0.1xx…
mmitche Oct 14, 2022
ead7c94
Trim away FullFramework release leg
mmitche Oct 18, 2022
751ae4d
Merge pull request #28639 from mmitche/trim-tests
mmitche Oct 18, 2022
a8b769b
Merge branch 'release/6.0.1xx' into release/6.0.3xx
v-wuzhai Oct 19, 2022
05ba0d1
Merge pull request #28643 from dotnet-maestro-bot/merge/release/6.0.1…
marcpopMSFT Nov 3, 2022
1765b46
Merge pull request #28876 from dotnet-maestro-bot/merge/release/6.0.3…
marcpopMSFT Nov 3, 2022
fc48d48
Update dependencies from https://github.com/dotnet/linker build 20221…
dotnet-maestro[bot] Nov 3, 2022
39f176e
Merge pull request #28895 from dotnet/darc-release/6.0.4xx-453cf288-6…
v-wuzhai Nov 4, 2022
6d3236e
Merge branch 'release/6.0.4xx' into release/7.0.1xx
v-wuzhai Nov 4, 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
5 changes: 0 additions & 5 deletions .vsts-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,6 @@ stages:
_PublishArgs: ''
_SignType: test
_Test: -test
Build_Release:
_BuildConfig: Release
_PublishArgs: ''
_SignType: test
_Test: -test

- template: /eng/build.yml
parameters:
Expand Down