Commit Graph
137 Commits
Author SHA1 Message Date
Bill Wagner 0a512a7965 Merge pull request #210 from dotnet/publish-23600 2021-02-10 06:24:02 -05:00
CXWTool Service Account 2e16d3f580 Merge branch 'master' into publish-23600 2021-02-10 07:01:00 +00:00
Andy De George c6e13afda1 Fix update vs include (#207)
* Fix update vs include

* Minor wording change
2021-02-09 15:47:08 -08:00
Andy De George a11eb130d1 Update threading-model.md (#208) 2021-02-09 15:46:56 -08:00
Andy De George a8d0ef7e59 Fix wpf overview styles xaml (#209) 2021-02-09 15:46:32 -08:00
Bill Wagner 2575c2a26b Merge pull request #203 from dotnet/publish-31801 2021-02-05 08:14:16 -05:00
CXWTool Service Account 24909fd743 Merge branch 'master' into publish-31801 2021-02-05 07:01:02 +00:00
Andy De George 445388b7f6 Update .ghal.rules.json (#201) 2021-02-04 13:32:58 -08:00
Andy De George 455923e44f Merge pull request #199 from dotnet/master
Publish: Revert WPF to 16.8 for now (#198)
2021-02-03 10:44:23 -08:00
Andy De George 917e65e6c3 Revert WPF to 16.8 for now (#198)
* Revert WPF to 16.8 for now

* minor
2021-02-03 10:42:49 -08:00
Bill Wagner d7d89e96c8 Merge pull request #197 from dotnet/publish-23450 2021-02-03 06:41:18 -05:00
CXWTool Service Account cd23c90d9e Merge branch 'master' into publish-23450 2021-02-03 07:00:53 +00:00
Andy De George fb0c8caad2 Add new create wpf app article (#193) 2021-02-02 20:25:07 -08:00
Andy De George 1aad00b25d Add csharp code;fix headers;bugs (#194) 2021-02-02 13:24:37 -08:00
Andy De George 4c720fbda1 Fix migration refs related to EmbeddedResource (#195) 2021-02-02 13:24:22 -08:00
Bill Wagner 7f48b9ecf8 Merge pull request #185 from dotnet/publish-12373 2021-01-28 07:43:48 -05:00
CXWTool Service Account 85e78c8656 Merge branch 'master' into publish-12373 2021-01-28 07:01:09 +00:00
Andy De George 34d3c6108f Remove Jill as author (#184) 2021-01-27 14:24:08 -08:00
Igor VelikorossovandAndy De George 1fe35d6424 Update webbrowser sample (#173)
* Update webbrowser sample

As per suggestions https://github.com/dotnet/winforms/issues/4443#issuecomment-759333446

Resolves dotnet/winforms#4443

* fixup! Update webbrowser sample

* fixup! Update webbrowser sample

* Update dotnet-desktop-guide/framework/winforms/controls/implement-two-way-com-between-dhtml-and-client.md

Co-authored-by: Andy De George <[email protected]>

Co-authored-by: Andy De George <[email protected]>
2021-01-27 14:21:32 -08:00
Bill Wagner 7d5333d8bf Merge pull request #175 from dotnet/publish-24627 2021-01-20 10:19:59 -05:00
CXWTool Service Account e54b0a03a4 Merge branch 'master' into publish-24627 2021-01-20 07:00:56 +00:00
Andy De George 232f1b91e2 Disable custom .NET install for snip5000 (#170) 2021-01-19 12:17:52 -06:00
Andy De George b79168189c Disable custom .NET install for snip5000 (#170) 2021-01-19 07:50:00 -06:00
Bill Wagner 7e271d44c8 Merge pull request #174 from dotnet/publish-20989 2021-01-19 06:49:48 -05:00
CXWTool Service Account 79c96db256 Merge branch 'master' into publish-20989 2021-01-19 07:01:06 +00:00
Jochem a72a43dc1c Added missing closing bracket (#167) 2021-01-18 11:11:11 -08:00
Bill Wagner 302273bd74 Merge pull request #171 from dotnet/publish-30962 2021-01-16 14:27:40 -05:00
CXWTool Service Account 2426bbf0c1 Merge branch 'master' into publish-30962 2021-01-16 07:00:59 +00:00
Andy De George a856d83f28 Add note about x:key conflict with explicit keys (#166)
* Update how-to-use-an-application-scope-resource-dictionary.md

* Update how-to-use-an-application-scope-resource-dictionary.md
2021-01-15 12:23:49 -06:00
Andy De George 701634d9a5 Update how-to-set-jpeg-compression-level.md (#159) 2021-01-15 12:23:31 -06:00
Andy De George cf26656c12 Merge pull request #157 from dotnet/master
Publish PR
2020-12-18 14:48:04 -08:00
Andy De George cfc49a53e4 Updates to include vs update (#156) 2020-12-18 10:20:53 -08:00
Bill Wagner dd2882e3ca Merge pull request #155 from dotnet/publish-28185
Merge master into live
2020-12-15 06:44:31 -05:00
CXWTool Service Account 72b0e497d1 Merge branch 'master' into publish-28185 2020-12-15 07:01:05 +00:00
Thiago Villa 30d5a2d587 Remove extra "and" (#154) 2020-12-14 15:17:21 -08:00
Bill Wagner e8e3f6f23b Merge pull request #152 from dotnet/publish-27798
Merge master into live
2020-12-10 06:26:31 -05:00
CXWTool Service Account f4bfcc0ecd Merge branch 'master' into publish-27798 2020-12-10 07:01:04 +00:00
Maira Wenzel d35a40ba97 Update VS version (#151) 2020-12-09 15:07:58 -08:00
Bill Wagner 9f6df084c5 Merge pull request #149 from dotnet/publish-17684
Merge master into live
2020-12-09 06:41:38 -05:00
CXWTool Service Account 42ebf02fd4 Merge branch 'master' into publish-17684 2020-12-09 07:00:53 +00:00
Andy De George 545fa98996 update label rules (#148) 2020-12-08 14:45:48 -08:00
Bill Wagner bad997e567 Merge pull request #147 from dotnet/publish-21020
Merge master into live
2020-12-08 06:32:03 -05:00
CXWTool Service Account ef80b65d6b Merge branch 'master' into publish-21020 2020-12-08 07:01:11 +00:00
Andy De George ffc3b77150 Restore WPF .NET Framework content from WPF .NET (#144)
* Copy .NET 5 WPF content back into .NET Framework

* Add H1 heading difference for .NET

* Fix validation errors
2020-12-07 13:06:20 -08:00
Bill Wagner 1ab344c447 Merge pull request #145 from dotnet/publish-254
Merge master into live
2020-12-04 06:27:12 -05:00
CXWTool Service Account 3a6eeac5fb Merge branch 'master' into publish-254 2020-12-04 07:01:08 +00:00
Andy De George 99e90fa162 Update metadata rules and individual articles (#142)
* Add conceptual topic type for framework

* Add NET WPF article topic types

* Framework winforms overview topic types

* Update metadata

* Update walkthrough-my-first-wpf-desktop-application.md
2020-12-03 09:58:46 -08:00
Bill Wagner de8549ba04 Merge pull request #141 from dotnet/publish-7434
Merge master into live
2020-12-03 09:35:24 -05:00
CXWTool Service Account 487fd28d06 Merge branch 'master' into publish-7434 2020-12-03 07:00:48 +00:00
Andy De George 6a2b7dc939 Update walkthrough-my-first-wpf-desktop-application.md (#138) 2020-12-02 13:38:07 -08:00