Browse Source

Merge branch 'master' into consistent-LangVersion

pull/9862/head
Simon Cropp 3 years ago
committed by GitHub
parent
commit
7f39e39deb
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      global.json
  2. 6
      src/Avalonia.Controls/TransitioningContentControl.cs
  3. 2
      src/Markup/Avalonia.Markup.Xaml.Loader/AvaloniaXamlIlRuntimeCompiler.cs

4
global.json

@ -4,8 +4,6 @@
"rollForward": "latestFeature" "rollForward": "latestFeature"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.Build.Traversal": "1.0.43", "Microsoft.Build.Traversal": "1.0.43"
"MSBuild.Sdk.Extras": "3.0.22",
"AggregatePackage.NuGet.Sdk" : "0.1.12"
} }
} }

6
src/Avalonia.Controls/TransitioningContentControl.cs

@ -69,6 +69,10 @@ public class TransitioningContentControl : ContentControl
{ {
Dispatcher.UIThread.Post(() => UpdateContentWithTransition(Content)); Dispatcher.UIThread.Post(() => UpdateContentWithTransition(Content));
} }
else if (change.Property == CurrentContentProperty)
{
UpdateLogicalTree(change.OldValue, change.NewValue);
}
} }
protected override void ContentChanged(AvaloniaPropertyChangedEventArgs e) protected override void ContentChanged(AvaloniaPropertyChangedEventArgs e)
@ -94,8 +98,6 @@ public class TransitioningContentControl : ContentControl
if (PageTransition != null) if (PageTransition != null)
await PageTransition.Start(this, null, true, localToken); await PageTransition.Start(this, null, true, localToken);
UpdateLogicalTree(CurrentContent, content);
if (localToken.IsCancellationRequested) if (localToken.IsCancellationRequested)
{ {
return; return;

2
src/Markup/Avalonia.Markup.Xaml.Loader/AvaloniaXamlIlRuntimeCompiler.cs

@ -179,7 +179,7 @@ namespace Avalonia.Markup.Xaml.XamlIl
} }
finally finally
{ {
if( _sreCanSave) if(!success && _sreCanSave)
DumpRuntimeCompilationResults(); DumpRuntimeCompilationResults();
} }
} }

Loading…
Cancel
Save