Skip to content

Step 1 fixing publishing #1295

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

Jump to bottom
Merged
Parent: Fix publishing of bad article
merged 164 commits into from
Feb 1, 2022
Merged

Step 1 fixing publishing #1295

merged 164 commits into from
Feb 1, 2022

Conversation

@adegeo
Copy link
Contributor

@adegeo adegeo commented Feb 1, 2022

Summary

Step 1 into fixing merge conflicts with PRs accidentally merged into the live branch.

Erroneous PRs

adegeo and others added 30 commits August 14, 2020 11:55
@adegeo
Merge pull request #12 from dotnet/master
ebd98c6 
Update live with base config
@adegeo
Merge pull request #21 from dotnet/master
ae8c1a5 
Initial publish
@adegeo
Merge pull request #23 from dotnet/master
fa59e60 
ad hoc publish fixing toc
@adegeo
Merge pull request #25 from dotnet/master
daf66e7 
Publish to finally fix TOC
@adegeo
Merge pull request #32 from dotnet/master
6cc5bca 
Publish WPF content
@RussKie @adegeo
Update defining-default-values-with-the-shouldserialize-and-reset-met…
7631737 
…hods.md (#34)

* Update defining-default-values-with-the-shouldserialize-and-reset-methods.md

Make the methods private as those are invoked by convention.

* Update dotnet-desktop-guide/framework/winforms/controls/defining-default-values-with-the-shouldserialize-and-reset-methods.md

Co-authored-by: Andy De George <67293991+adegeo@users.noreply.github.com>

Co-authored-by: Andy De George <67293991+adegeo@users.noreply.github.com>
@Youssef1313
Update xaml-syntax-in-detail.md (#43)
026b53d
@adegeo
Merge pull request #45 from dotnet/master
9c0a288 
Merge master into live
@adegeo
Merge pull request #49 from dotnet/master
695d0a2 
Merge master into live
@cxwtool
Merge branch 'master' into publish-17711
e28a535
@BillWagner
Merge pull request #55 from dotnet/publish-17711
95374f1 
Merge master into live
@cxwtool
Merge branch 'master' into publish-15572
bcc2e76
@BillWagner
Merge pull request #59 from dotnet/publish-15572
4fc7ebb 
Merge master into live
@ignispotentia
Fix missing letter in first link of article (#68)
b98f4b8
@cxwtool
Merge branch 'master' into publish-30170
84713aa
@BillWagner
Merge pull request #71 from dotnet/publish-30170
f8b2aab 
Merge master into live
@cxwtool
Merge branch 'master' into publish-19828
58f5f12
@BillWagner
Merge pull request #89 from dotnet/publish-19828
4000d5e 
Merge master into live
@adegeo
Merge pull request #97 from dotnet/master
5bd63ee 
Adhoc publish for winforms 5 content
@cxwtool
Merge branch 'master' into publish-8192
e50074c
@BillWagner
Merge pull request #102 from dotnet/publish-8192
d2b8992 
Merge master into live
@cxwtool
Merge branch 'master' into publish-15147
db1fc37
@BillWagner
Merge pull request #105 from dotnet/publish-15147
79836c0 
Merge master into live
@cxwtool
Merge branch 'master' into publish-27362
bee0cc6
@BillWagner
Merge pull request #113 from dotnet/publish-27362
cf3b75e 
Merge master into live
@cxwtool
Merge branch 'master' into publish-28416
3652f9b
@adegeo
Merge pull request #117 from dotnet/publish-28416
a88bf14 
Merge master into live
@cxwtool
Merge branch 'master' into publish-24024
2fbec48
@BillWagner
Merge pull request #120 from dotnet/publish-24024
169c173 
Merge master into live
@cxwtool
Merge branch 'master' into publish-20660
87f93ef
cxwtool and others added 25 commits November 16, 2021 06:01
@cxwtool
merge main branch
218f20a
@BillWagner
Merge pull request #1217 from dotnet/publish-26931
6e1bf1b
@BillWagner
Merge pull request #1216 from dotnet/publish-18437
769b4cb
@adegeo
Merge pull request #1218 from dotnet/main
20f8b58 
Publish
@adegeo
Merge pull request #1222 from dotnet/main
25f3ab4 
Publish
@cxwtool
merge main branch
9846de5
@BillWagner
Merge pull request #1234 from dotnet/publish-9028
1b138cd
@cxwtool
merge main branch
1b9d3aa
@BillWagner
Merge pull request #1235 from dotnet/publish-27506
c226bfa
@cxwtool
merge main branch
d082ecf
@BillWagner
Merge pull request #1245 from dotnet/publish-20968
eeffa91 
Merge main into live
@cxwtool
merge main branch
f2fd64d
@BillWagner
Merge pull request #1248 from dotnet/publish-28760
9218668
@cxwtool
merge main branch
5178662
@BillWagner
Merge pull request #1263 from dotnet/publish-5018
8587b28
@cxwtool
merge main branch
19e8c6b
@BillWagner
Merge pull request #1264 from dotnet/publish-23136
7ca4b81
@cxwtool
merge main branch
3e1acf0
@BillWagner
Merge pull request #1268 from dotnet/publish-16318
750928d
@cxwtool
merge main branch
032c8c7
@BillWagner
Merge pull request #1275 from dotnet/publish-24248
055a391
@cxwtool
merge main branch
5a0e087
@BillWagner
Merge pull request #1282 from dotnet/publish-4339
46e0170
@cxwtool
merge main branch
ec98bc8
@BillWagner
Merge pull request #1286 from dotnet/publish-21568
142cd7c
@adegeo adegeo changed the base branch from main to adegeo-fix-publish February 1, 2022 23:15
@adegeo adegeo merged commit 2c4740d into adegeo-fix-publish Feb 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

dotnet-framework/svc winforms/subsvc wpf/subsvc

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@adegeo @dotnet-bot @RussKie @Youssef1313 @cxwtool @BillWagner @ignispotentia @gewarren