Merge branch 'dev' into Animations
This commit is contained in:
Коммит
6c9a87106f
|
@ -53,9 +53,11 @@ stages:
|
|||
displayName: 'Use .NET Core sdk'
|
||||
inputs:
|
||||
packageType: sdk
|
||||
version: 3.0.100-preview9-014004
|
||||
includePreviewVersions: true
|
||||
installationPath: $(Agent.ToolsDirectory)/dotnet
|
||||
version: 3.0.x
|
||||
|
||||
- bash:
|
||||
sudo $AGENT_HOMEDIRECTORY/scripts/select-xamarin-sdk.sh $(MonoVersion)
|
||||
|
||||
- task: NuGetToolInstaller@1
|
||||
displayName: Use Nuget 5.0.2
|
||||
inputs:
|
||||
|
@ -66,9 +68,6 @@ stages:
|
|||
inputs:
|
||||
restoreSolution: build/Comet-Mac.sln
|
||||
|
||||
- bash:
|
||||
sudo $AGENT_HOMEDIRECTORY/scripts/select-xamarin-sdk.sh $(MonoVersion)
|
||||
|
||||
- task: MSBuild@1
|
||||
displayName: 'Build Comet'
|
||||
inputs:
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.Linq;
|
||||
using System.Linq.Expressions;
|
||||
using Comet.Reflection;
|
||||
|
||||
|
@ -62,6 +63,11 @@ namespace Comet
|
|||
{
|
||||
StateManager.CurrentView.GetState().AddGlobalProperties(props);
|
||||
}
|
||||
|
||||
else if(props?.Count == 1 && props[0].BindingObject is State<T> state)
|
||||
{
|
||||
return state;
|
||||
}
|
||||
return new Binding<T>()
|
||||
{
|
||||
IsValue = true,
|
||||
|
|
|
@ -167,7 +167,7 @@ namespace Comet
|
|||
{
|
||||
try
|
||||
{
|
||||
var value = GetValueInternal(key);
|
||||
var value = GetValueInternal(key).value;
|
||||
return value;
|
||||
}
|
||||
catch
|
||||
|
|
|
@ -142,7 +142,7 @@ namespace Comet.Reflection
|
|||
return null;
|
||||
if (obj is BindingObject bo)
|
||||
{
|
||||
obj = bo.GetValueInternal(part);
|
||||
obj = bo.GetValueInternal(part).value;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
@ -68,6 +68,9 @@ namespace Comet.Blazor.Tests
|
|||
var handler = Registrar.Handlers.GetHandler(type);
|
||||
|
||||
Assert.NotNull(handler);
|
||||
//Skia controls don't need explicit handlers
|
||||
if (type.FullName.StartsWith("Comet.Skia"))
|
||||
continue;
|
||||
|
||||
if (type == typeof(View))
|
||||
{
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
<DebugSymbols>false</DebugSymbols>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
|
||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
|
||||
<PackageReference Include="xunit" Version="2.4.1" />
|
||||
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1"><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
|
|
Загрузка…
Ссылка в новой задаче