Skip to content

Merge release/dev17.0-vs-deps back to release/dev17.0#56451

Merged
Cosifne merged 171 commits intodotnet:release/dev17.0from
Cosifne:dev/shech/release-dev17.0-vs-deps
Sep 20, 2021
Merged

Merge release/dev17.0-vs-deps back to release/dev17.0#56451
Cosifne merged 171 commits intodotnet:release/dev17.0from
Cosifne:dev/shech/release-dev17.0-vs-deps

Conversation

@Cosifne
Copy link
Copy Markdown
Member

@Cosifne Cosifne commented Sep 16, 2021

17.0 P4 is shipped, so I think we can safely merge the changes back to release/dev17.0 branch

genlu and others added 30 commits July 20, 2021 14:23
@genlu
Revert "Merge pull request dotnet#53952 from dotnet/revert-53837-full…
f21b60a 
…Ngen"

This reverts commit 5536669, reversing
changes made to b6a9f8c.
@akhera99
workaround for editor bug
0b82d34
@akhera99
working on fixing the update bug
c3f0644
@akhera99
fixed the coloring, but need to make it less hardcodey
99dd75a
@akhera99
update tags now
baa1d6c
@akhera99
added comment indicating why we need to retrieve new tags
799b862
@dotnet-bot
Merge pull request dotnet#55150 from dotnet/merges/main-to-main-vs-deps
df80866 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request dotnet#55164 from dotnet/merges/main-to-main-vs-deps
529aa33 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request dotnet#55172 from dotnet/merges/release/dev17.0-vs…
b187470 
…-deps-to-main-vs-deps

Merge release/dev17.0-vs-deps to main-vs-deps
@JoeRobich
Merge branch 'main-vs-deps' into merges/main-to-main-vs-deps
347df43
@dotnet-bot
Merge pull request dotnet#55175 from dotnet/merges/main-to-main-vs-deps
d0f6069 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request dotnet#55195 from dotnet/merges/release/dev17.0-vs…
a96ad66 
…-deps-to-main-vs-deps

Merge release/dev17.0-vs-deps to main-vs-deps
@CyrusNajmabadi
Update to latest async lightbulb api
a63a04b
@CyrusNajmabadi
Bookkeeping
5d4054c
@JoeRobich
Merge remote-tracking branch 'origin/main-vs-deps' into merges/main-t…
32c2100 
…o-main-vs-deps
@JoeRobich
Merge remote-tracking branch 'origin/main-vs-deps' into merges/releas…
1eeb8c1 
…e/dev17.0-vs-deps-to-main-vs-deps
@CyrusNajmabadi
Fix branch
33494c4
@JoeRobich
Fix bad conflict resolution which caused mulitple entries
73bc86a
@JoeRobich
Fix bad conflict resolution which caused mulitple entries
80b237a
@CyrusNajmabadi
process in loop
4e19af6
@CyrusNajmabadi
Add comment
e628402
@genlu
Merge remote-tracking branch 'dotnet/main-vs-deps' into fullNgen
796aed9
@genlu
remove duplicate field
28b5693
@CyrusNajmabadi
Export the priroities we care about
5250f45
@CyrusNajmabadi
Add support for the new 'treatment variable' approach to A/B testing.
2074d19
@CyrusNajmabadi
Merge branch 'fixMainVSDEaps' into treatmentVariables
0487d72
@JoeRobich
Merge pull request dotnet#55233 from CyrusNajmabadi/fixMainVSDEaps
36bb89c 
Fix branch
Merge pull request dotnet#55198 from dotnet/merges/main-to-main-vs-deps
d9fe2bb 
Merge main to main-vs-deps
@JoeRobich
Merge branch 'main-vs-deps' into merges/release/dev17.0-vs-deps-to-ma…
7e9ff3e 
…in-vs-deps
@CyrusNajmabadi
Merge pull request dotnet#55239 from CyrusNajmabadi/treatmentVariables
3a06c12 
Add support for the new 'treatment variable' approach to A/B testing.
JoeRobich and others added 19 commits September 2, 2021 18:11
@JoeRobich
Merge pull request dotnet#56144 from dotnet/locfiles/499c4c4a-8a61-43…
ee6de22 
…d9-8584-b1072b9ef9a0

Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 1339482
@dotnet-bot
Localized file check-in by OneLocBuild Task
d926b18
@dotnet-bot
Localized file check-in by OneLocBuild Task
248f5f0
@dotnet-bot
Localized file check-in by OneLocBuild Task
0d6cba6
@JoeRobich
Merge pull request dotnet#56152 from dotnet/locfiles/3a16df0c-b1a1-40…
9d0f59a 
…a3-8050-78a7673e0687

Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 1339667
@dotnet-bot
Localized file check-in by OneLocBuild Task
7cd2104
@dotnet-bot
Localized file check-in by OneLocBuild Task
4a507ea
@dotnet-bot
Localized file check-in by OneLocBuild Task
7dfdd3c
@JoeRobich
Merge pull request dotnet#56169 from dotnet/locfiles/fbb9f7e4-77c5-4d…
9be19be 
…33-9e43-ab128b6b08cf

Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 1341341
@JoeRobich
Merge pull request dotnet#56155 from dotnet/locfiles/fc761ed0-b58c-4d…
cd52244 
…cd-84c4-f983137a4fa8

Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 1339847
@dotnet-bot
Merge pull request dotnet#56182 from dotnet/merges/release/dev17.0-to…
0c06046 
…-release/dev17.0-vs-deps

Merge release/dev17.0 to release/dev17.0-vs-deps
@chsienki
Flip compiler cache from opt-out to opt-in (dotnet#56250)
2bfff7b
@davidwengier
Update packages
62be2b8
@JoeRobich
Merge pull request dotnet#56366 from davidwengier/UpdateP4Packages
73165d0 
Update P4 packages
@dotnet-bot
Localized file check-in by OneLocBuild Task
8dd3ec9
@dotnet-bot
Localized file check-in by OneLocBuild Task
7f485d1
@dotnet-bot
Localized file check-in by OneLocBuild Task
2da15b2
@JoeRobich
Rebuild XLFs
399e5b5
@JoeRobich
Merge pull request dotnet#56388 from dotnet/locfiles/de157bf4-e352-40…
c3add9e 
…31-9ed3-3c26b09fdfd8

Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 1361888
@Cosifne Cosifne requested review from a team as code owners September 16, 2021 17:28
@Cosifne Cosifne requested review from a team and removed request for a team September 16, 2021 17:28
@ghost ghost added the Area-Infrastructure label Sep 16, 2021
@Cosifne Cosifne merged commit da274b9 into dotnet:release/dev17.0 Sep 20, 2021
@Cosifne Cosifne deleted the dev/shech/release-dev17.0-vs-deps branch September 20, 2021 19:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@JoeRobich JoeRobich JoeRobich approved these changes

Assignees

No one assigned

Labels

Area-Infrastructure

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.