Steven Kirk
dddf1ebd40
Merge branch 'master' into control-resources
9 years ago
Steven Kirk
bf4bb7d54c
Added TryFindResource extension method.
`FindResource` can be ambiguous because it returns `AvaloniaProperty.UnsetValue` in the case of a resource not being found, which is a valid resource value. `TryFindResource` removes this ambiguity. `FindResource` has been left in for API compatibility with other frameworks.
9 years ago
Steven Kirk
814a3a5ee6
Make `IDictionary` members explicit.
And use expression bodied members where possible.
9 years ago
Steven Kirk
1cf3e6bfc6
Use discard in TryGetResource.
9 years ago
Steven Kirk
416c79298c
Merge pull request #1123 from jkoritzinsky/CleanUpBuildWarnings
Clean up build warnings
9 years ago
Steven Kirk
5827f3c284
Missed file from merge
9 years ago
Steven Kirk
e06cdd8810
Merge remote-tracking branch 'origin/master' into pr/1123-clean-up-build-warnings
9 years ago
Steven Kirk
23a672ef6e
Merge pull request #1127 from mterwoord/fixes/improved-error-handling
Improved error messages
9 years ago
Steven Kirk
d4d6412666
Merge branch 'master' into control-resources
9 years ago
Steven Kirk
f4b708c654
Merge branch 'master' into fixes/improved-error-handling
9 years ago
Nikita Tsukanov
9c999ec221
Merge pull request #1137 from AvaloniaUI/update-moq
Update moq to 4.7.99.
9 years ago
Steven Kirk
068bae9022
Merge branch 'master' into fixes/improved-error-handling
9 years ago
Steven Kirk
fd526514f8
Merge branch 'master' into control-resources
Conflicts:
src/Avalonia.Controls/Application.cs
src/Avalonia.Controls/Control.cs
src/Avalonia.Controls/IControl.cs
src/Avalonia.Styling/Styling/StyleExtensions.cs
tests/Avalonia.Styling.UnitTests/ResourceTests.cs
9 years ago
Nikita Tsukanov
87b0db4679
Merge branch 'master' into update-moq
9 years ago
Nikita Tsukanov
fde9aec5f3
Merge pull request #1138 from AvaloniaUI/input-unit-tests-csproj
Fix Avalonia.Input.UnitTests.csproj
9 years ago
Nikita Tsukanov
c53f0e9786
Merge pull request #1135 from AvaloniaUI/lazy-initialize
Lazily initialize some things
9 years ago
Nikita Tsukanov
e9ce9d5b27
Merge branch 'master' into lazy-initialize
9 years ago
Steven Kirk
3b030f19d1
Fix Avalonia.Input.UnitTests.csproj
Previously this project was spewing loads of
```
Severity Code Description Project File Line Suppression State
Warning CS1701 Assuming assembly reference 'System.Runtime, Version=4.0.20.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a' used by 'Avalonia.Controls' matches identity 'System.Runtime, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a' of 'System.Runtime', you may need to supply runtime policy Avalonia.Input.UnitTests(net461) D:\projects\Avalonia\tests\Avalonia.Input.UnitTests\CSC 1 Active`
```
Warnings. Not sure why this was, but updating the `csproj` to be in the same format as the other unit tests stops these warnings and reduces the warnings for a solution build from 5755(!) to 238.
9 years ago
Nikita Tsukanov
668de008ff
Fixed Utf8Buffer and downgraded JetBrains.ReSharper.CommandLineTools
9 years ago
Steven Kirk
8c9dd5c81e
Update moq to 4.7.99.
This fixes a bunch of build warnings.
9 years ago
Steven Kirk
fe957d8093
Fix compile error.
9 years ago
Steven Kirk
c244ac809d
Fixed malformed doc comment.
9 years ago
Steven Kirk
c47e44192b
Make resource dictionary keys objects.
For parity with other XAML frameworks.
9 years ago
Steven Kirk
e54f48b63c
React to application resources changing.
9 years ago
Steven Kirk
a72ce3671d
Added ResourceInclude.
9 years ago
Steven Kirk
12e0fa6f1c
Merge branch 'master' into fixes/improved-error-handling
9 years ago
Steven Kirk
56c06be403
DynamicResource merged dictionary tests.
9 years ago
Steven Kirk
91387a74e1
Start testing MergedDictionaries.
9 years ago
Steven Kirk
0a6216a352
Doc comments.
9 years ago
Steven Kirk
e81b22b9d2
IResourceProvider -> IResourceNode
9 years ago
Steven Kirk
ac8cc99f16
Started adding MergedDictionaries.
9 years ago
Steven Kirk
ea626a0e19
Updated ncrunch config
9 years ago
Steven Kirk
42f10d5caa
Merge branch 'master' into control-resources
9 years ago
Steven Kirk
2c1efe3773
Static resource as binding converter
Enable using a `StaticResource` as a binding converter. Fixes #818 .
9 years ago
Steven Kirk
fcee846228
Added tests for #1020
Passing. Closes #1020 .
9 years ago
Steven Kirk
9a74e8409e
Ensure properties registered.
When calling `AvaloniaPropertyRegistry.GetAttached`.
9 years ago
Steven Kirk
a0bda15576
More resource extension tests.
One failing.
9 years ago
Steven Kirk
71e8b4fc69
Update dynamic resources on set parent.
9 years ago
Steven Kirk
0e155bd2d4
Make dynamic resources work in more situations.
Fixes #492 in a fashion: `DynamicResource` now works for this scenario.
9 years ago
Steven Kirk
2a61bbcb64
Detect resources added in new styles.
9 years ago
Steven Kirk
513efe99f7
Start making DynamicResource react to changes.
9 years ago
Steven Kirk
d1642f13f0
Use AvaloniaDictionary for ResourceDictionary.
9 years ago
Steven Kirk
61848673d2
Renamed test classes.
9 years ago
Steven Kirk
b459445290
Use an anchor for dynamic resources.
9 years ago
Steven Kirk
eda7c1f09d
Added more tests.
Some failing.
9 years ago
Steven Kirk
38dce7b7cd
Added DynamicResourceExtension.
9 years ago
Steven Kirk
c7e1e5ddaa
Moved StaticResourceTests.
9 years ago
Steven Kirk
4268014e66
A few tweaks.
9 years ago
Steven Kirk
4a9302b61e
More work on static resources.
Also found a scenario that Portable.Xaml can't seem to handle...
9 years ago
Steven Kirk
7e568063b4
Throw an exception if static resource not found.
9 years ago