Browse Source
Merge branch 'master' into consistent-LangVersion
pull/9862/head
Simon Cropp
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
6 additions and
6 deletions
-
global.json
-
src/Avalonia.Controls/TransitioningContentControl.cs
-
src/Markup/Avalonia.Markup.Xaml.Loader/AvaloniaXamlIlRuntimeCompiler.cs
|
|
|
@ -4,8 +4,6 @@ |
|
|
|
"rollForward": "latestFeature" |
|
|
|
}, |
|
|
|
"msbuild-sdks": { |
|
|
|
"Microsoft.Build.Traversal": "1.0.43", |
|
|
|
"MSBuild.Sdk.Extras": "3.0.22", |
|
|
|
"AggregatePackage.NuGet.Sdk" : "0.1.12" |
|
|
|
"Microsoft.Build.Traversal": "1.0.43" |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -69,6 +69,10 @@ public class TransitioningContentControl : ContentControl |
|
|
|
{ |
|
|
|
Dispatcher.UIThread.Post(() => UpdateContentWithTransition(Content)); |
|
|
|
} |
|
|
|
else if (change.Property == CurrentContentProperty) |
|
|
|
{ |
|
|
|
UpdateLogicalTree(change.OldValue, change.NewValue); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
protected override void ContentChanged(AvaloniaPropertyChangedEventArgs e) |
|
|
|
@ -94,8 +98,6 @@ public class TransitioningContentControl : ContentControl |
|
|
|
if (PageTransition != null) |
|
|
|
await PageTransition.Start(this, null, true, localToken); |
|
|
|
|
|
|
|
UpdateLogicalTree(CurrentContent, content); |
|
|
|
|
|
|
|
if (localToken.IsCancellationRequested) |
|
|
|
{ |
|
|
|
return; |
|
|
|
|
|
|
|
@ -179,7 +179,7 @@ namespace Avalonia.Markup.Xaml.XamlIl |
|
|
|
} |
|
|
|
finally |
|
|
|
{ |
|
|
|
if( _sreCanSave) |
|
|
|
if(!success && _sreCanSave) |
|
|
|
DumpRuntimeCompilationResults(); |
|
|
|
} |
|
|
|
} |
|
|
|
|