Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit dacb116

Browse files
Merge pull request #29 from LibraStack/develop
Bug fixes.
2 parents 2fb12a3 + ce7c10a commit dacb116

File tree

38 files changed

+476
-125
lines changed

38 files changed

+476
-125
lines changed

‎samples/Unity.Mvvm.Calc/Packages/manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"com.chebanovdd.unitymvvmtoolkit": "file:../../../src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit",
44
"com.unity.collab-proxy": "2.0.4",
55
"com.unity.feature.2d": "1.0.0",
6-
"com.unity.ide.rider": "3.0.21",
6+
"com.unity.ide.rider": "3.0.22",
77
"com.unity.ide.visualstudio": "2.0.18",
88
"com.unity.ide.vscode": "1.2.5",
99
"com.unity.test-framework": "1.1.33",
1010
"com.unity.textmeshpro": "3.0.6",
11-
"com.unity.timeline": "1.6.4",
11+
"com.unity.timeline": "1.6.5",
1212
"com.unity.ugui": "1.0.0",
1313
"com.unity.visualscripting": "1.8.0",
1414
"com.unity.modules.ai": "1.0.0",

‎samples/Unity.Mvvm.Calc/Packages/packages-lock.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
}
130130
},
131131
"com.unity.ide.rider": {
132-
"version": "3.0.21",
132+
"version": "3.0.22",
133133
"depth": 0,
134134
"source": "registry",
135135
"dependencies": {
@@ -181,7 +181,7 @@
181181
"url": "https://packages.unity.com"
182182
},
183183
"com.unity.timeline": {
184-
"version": "1.6.4",
184+
"version": "1.6.5",
185185
"depth": 0,
186186
"source": "registry",
187187
"dependencies": {

‎samples/Unity.Mvvm.Counter/Packages/manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
"com.cysharp.unitask": "2.3.3",
55
"com.unity.collab-proxy": "2.0.4",
66
"com.unity.feature.2d": "1.0.0",
7-
"com.unity.ide.rider": "3.0.21",
7+
"com.unity.ide.rider": "3.0.22",
88
"com.unity.ide.visualstudio": "2.0.18",
99
"com.unity.ide.vscode": "1.2.5",
1010
"com.unity.test-framework": "1.1.33",
1111
"com.unity.textmeshpro": "3.0.6",
12-
"com.unity.timeline": "1.6.4",
12+
"com.unity.timeline": "1.6.5",
1313
"com.unity.ugui": "1.0.0",
1414
"com.unity.visualscripting": "1.8.0",
1515
"com.unity.modules.ai": "1.0.0",

‎samples/Unity.Mvvm.Counter/Packages/packages-lock.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
}
137137
},
138138
"com.unity.ide.rider": {
139-
"version": "3.0.21",
139+
"version": "3.0.22",
140140
"depth": 0,
141141
"source": "registry",
142142
"dependencies": {
@@ -188,7 +188,7 @@
188188
"url": "https://packages.unity.com"
189189
},
190190
"com.unity.timeline": {
191-
"version": "1.6.4",
191+
"version": "1.6.5",
192192
"depth": 0,
193193
"source": "registry",
194194
"dependencies": {

‎samples/Unity.Mvvm.CounterLegacy/Packages/manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"com.chebanovdd.unitymvvmtoolkit": "file:../../../src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit",
44
"com.unity.collab-proxy": "2.0.4",
55
"com.unity.feature.2d": "1.0.0",
6-
"com.unity.ide.rider": "3.0.21",
6+
"com.unity.ide.rider": "3.0.22",
77
"com.unity.ide.visualstudio": "2.0.18",
88
"com.unity.ide.vscode": "1.2.5",
99
"com.unity.test-framework": "1.1.33",
1010
"com.unity.textmeshpro": "3.0.6",
11-
"com.unity.timeline": "1.6.4",
11+
"com.unity.timeline": "1.6.5",
1212
"com.unity.ugui": "1.0.0",
1313
"com.unity.visualscripting": "1.8.0",
1414
"com.unity.modules.ai": "1.0.0",

‎samples/Unity.Mvvm.CounterLegacy/Packages/packages-lock.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
}
130130
},
131131
"com.unity.ide.rider": {
132-
"version": "3.0.21",
132+
"version": "3.0.22",
133133
"depth": 0,
134134
"source": "registry",
135135
"dependencies": {
@@ -181,7 +181,7 @@
181181
"url": "https://packages.unity.com"
182182
},
183183
"com.unity.timeline": {
184-
"version": "1.6.4",
184+
"version": "1.6.5",
185185
"depth": 0,
186186
"source": "registry",
187187
"dependencies": {

‎samples/Unity.Mvvm.ToDoList/Assets/UI Toolkit/Styles/main-view.uss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
}
4141

4242
.add-task-button--animation {
43-
transition-property: rotate background-color;
44-
transition-duration: 150ms 150ms;
43+
transition-property: rotate, background-color;
44+
transition-duration: 150ms, 150ms;
4545
}
4646

4747
.add-task-button__icon {

‎samples/Unity.Mvvm.ToDoList/Packages/manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
"com.cysharp.unitask": "2.3.3",
55
"com.unity.collab-proxy": "2.0.4",
66
"com.unity.feature.2d": "1.0.0",
7-
"com.unity.ide.rider": "3.0.21",
7+
"com.unity.ide.rider": "3.0.22",
88
"com.unity.ide.visualstudio": "2.0.18",
99
"com.unity.ide.vscode": "1.2.5",
1010
"com.unity.nuget.newtonsoft-json": "3.1.0",
1111
"com.unity.test-framework": "1.1.33",
1212
"com.unity.textmeshpro": "3.0.6",
13-
"com.unity.timeline": "1.6.4",
13+
"com.unity.timeline": "1.6.5",
1414
"com.unity.ugui": "1.0.0",
1515
"com.unity.visualscripting": "1.8.0",
1616
"com.unity.modules.ai": "1.0.0",

‎samples/Unity.Mvvm.ToDoList/Packages/packages-lock.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
}
137137
},
138138
"com.unity.ide.rider": {
139-
"version": "3.0.21",
139+
"version": "3.0.22",
140140
"depth": 0,
141141
"source": "registry",
142142
"dependencies": {
@@ -195,7 +195,7 @@
195195
"url": "https://packages.unity.com"
196196
},
197197
"com.unity.timeline": {
198-
"version": "1.6.4",
198+
"version": "1.6.5",
199199
"depth": 0,
200200
"source": "registry",
201201
"dependencies": {

‎src/UnityMvvmToolkit.Core/BindingContextObjectProvider.cs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -114,15 +114,7 @@ public TCommand GetCommand<TCommand>(IBindingContext context, string propertyNam
114114
throw new InvalidOperationException($"Command '{propertyName}' not found.");
115115
}
116116

117-
var propertyInfo = (PropertyInfo) memberInfo;
118-
119-
if (typeof(TCommand).IsAssignableFrom(propertyInfo.PropertyType))
120-
{
121-
return (TCommand) propertyInfo.GetValue(context);
122-
}
123-
124-
throw new InvalidCastException(
125-
$"Can not cast the {propertyInfo.PropertyType} command to the {typeof(TCommand)} command.");
117+
return _objectWrapperHandler.GetCommand<TCommand>(context, memberInfo);
126118
}
127119

128120
public IBaseCommand RentCommandWrapper(IBindingContext context, CommandBindingData bindingData)

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /