Commit 7559659
committed
Merge branch 'main' of https://github.com/dotnet/wpf into remove-XamlTypeInvoker-dead-code
# Conflicts:
# src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Schema/XamlTypeInvoker.csFile tree
1,128 files changed
+85578
-16247
lines changed- Documentation
- docs
- eng
- WpfArcadeSdk/tools
- common
- core-templates/post-build
- cross
- post-build
- src/Microsoft.DotNet.Wpf
- cycle-breakers/PresentationFramework
- src
- Extensions
- PresentationFramework-SystemData
- PresentationFramework-SystemXml
- PresentationBuildTasks
- MS/Internal
- MarkupCompiler
- Tasks
- Microsoft/Build/Tasks/Windows
- PresentationCore
- MS/internal
- AppModel
- Automation
- FontCache
- FontFace
- IO/Packaging
- Ink
- GestureRecognizer
- InkSerializedFormat
- Media3D
- Resources
- TextFormatting
- System
- IO/Packaging
- Windows
- Automation/Peers
- Generated
- Ink
- Input
- Command
- Stylus
- Common
- Pointer
- Wisp
- InterOp
- Media3D
- Converters/Generated
- Generated
- Media
- Animation
- Generated
- Converters/Generated
- Generated
- Imaging
- textformatting
- ref
- PresentationFramework
- MS/Internal
- Annotations
- Anchoring
- Component
- AppModel
- Commands
- Controls
- Data
- Globalization
- IO/Packaging
- Ink
- Printing
- PtsHost
- Text
- Utility
- documents
- Microsoft/Win32
- System/Windows
- Annotations
- Storage
- Automation/Peers
- Controls
- Primitives
- Data
- Documents
- Serialization
- Generated
- Input
- Interop
- Markup
- Baml2006
- Localizer
- Primitives
- Media/Animation
- Generated
- Shapes
- Standard
- PresentationUI/MS/Internal/Documents
- Application
- ReachFramework
- AlphaFlattener
- Packaging
- PrintConfig
- Serialization
- manager
- System.Windows.Controls.Ribbon/Microsoft/Windows/Controls
- Ribbon
- Primitives
- System.Windows.Input.Manipulations/System/Windows/Input/Manipulations
- System.Windows.Primitives
- System.Xaml
- System
- Windows/Markup
- Xaml
- Context
- InfosetObjects
- MS/Impl
- Parser
- RefOnly
- Replacements
- Runtime
- Schema
- Themes
- PresentationFramework.Aero2/Microsoft/Windows/Themes
- PresentationFramework.AeroLite/Microsoft/Windows/Themes
- PresentationFramework.Aero/Microsoft/Windows/Themes
- PresentationFramework.Classic/Microsoft/Windows/Themes
- PresentationFramework.Fluent
- Resources/Theme
- Styles
- Themes
- PresentationFramework.Luna/Microsoft/Windows/Themes
- PresentationFramework.Royale/Microsoft/Windows/Themes
- UIAutomation
- UIAutomationClientSideProviders/MS/Internal/AutomationProxies
- UIAutomationClient
- MS
- Internal/Automation
- Win32
- System/Windows/Automation
- Text
- UIAutomationProvider/System/Windows/Automation/Provider
- UIAutomationTypes/System/Windows/Automation
- Text
- WindowsBase
- MS/Internal
- ComponentModel
- IO/Packaging
- CompoundFile
- Security/RightsManagement
- Threading
- System
- Collections/ObjectModel
- ComponentModel
- IO/Packaging
- CompoundFile
- Security/RightsManagement
- Windows
- Converters/Generated
- Data
- Generated
- Input
- Markup/Primitives
- Media
- Converters/Generated
- Generated
- Threading
- WindowsFormsIntegration/System/Windows/Integration
- WpfGfx/codegen/mcg/generators
- tests
- IntegrationTests/Common/DRT/TestServices/MS/Win32
- UnitTests
- PresentationCore.Tests/System/Windows
- Input
- Command
- Media/Animation
- System.Xaml.Tests
- Common
- System/Xaml
- Replacements
- Schema
- WindowsBase.Tests
- Resources
- System
- Collections/Specialized
- ComponentModel
- Diagnostics
- IO/Packaging
- Security/RightsManagement
- Windows
- Converters
- Data
- Input
- Interop
- Markup
- Primitives
- Media
- Converters
- Threading
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
1,128 files changed
+85578
-16247
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
37 | | - | |
| 37 | + | |
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
19 | | - | |
| 19 | + | |
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
| |||
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
43 | | - | |
| 43 | + | |
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
47 | | - | |
| 47 | + | |
48 | 48 | | |
49 | 49 | | |
50 | 50 | | |
51 | | - | |
| 51 | + | |
52 | 52 | | |
53 | 53 | | |
54 | 54 | | |
55 | 55 | | |
56 | 56 | | |
57 | 57 | | |
58 | | - | |
| 58 | + | |
59 | 59 | | |
60 | 60 | | |
61 | 61 | | |
| |||
66 | 66 | | |
67 | 67 | | |
68 | 68 | | |
69 | | - | |
| 69 | + | |
70 | 70 | | |
71 | | - | |
| 71 | + | |
72 | 72 | | |
73 | 73 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
19 | | - | |
| 19 | + | |
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
27 | | - | |
| 27 | + | |
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
| |||
0 commit comments