latest Avalonia and fix #21

jeffreye · jeffreye · commit 0d4922c2cd57 · 2019-11-08T21:49:57.000-08:00
diff --git a/AvaloniaEdit b/AvaloniaEdit
@@ -1 +1 @@
-Subproject commit b1f2ee52284fb879744ff217d3aa485c990f9c13
+Subproject commit 85c5774958152c05124385c9255ceda14fba7970
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -5,7 +5,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <AvaloniaVersion>0.9.0-preview1</AvaloniaVersion>
+        <AvaloniaVersion>0.9.0-preview7</AvaloniaVersion>
     </PropertyGroup>
 
 </Project>
diff --git a/ILSpy.Core/MainWindow.xaml.cs b/ILSpy.Core/MainWindow.xaml.cs
@@ -606,7 +606,7 @@ private bool CanResolveTypeInPEFile(PEFile module, ITypeReference typeRef, out E
 
         void MainWindow_Loaded(object sender, EventArgs e)
         {
-            Application.Current.FocusManager.Focus(treeView);
+            Application.Current.FocusManager.Focus(this);
 
             InitMainMenu();
             InitToolbar();
diff --git a/ILSpy/ILSpy.csproj b/ILSpy/ILSpy.csproj
@@ -62,6 +62,5 @@
 
   <ItemGroup>
     <PackageReference Include="Avalonia.Desktop" />
-    <PackageReference Include="NSubsys" Version="1.0.0" />
   </ItemGroup>
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -606,7 +606,7 @@ private bool CanResolveTypeInPEFile(PEFile module, ITypeReference typeRef, out E`
`606`	`606`
`607`	`607`	`void MainWindow_Loaded(object sender, EventArgs e)`
`608`	`608`	`{`
`609`		`- Application.Current.FocusManager.Focus(treeView);`
	`609`	`+ Application.Current.FocusManager.Focus(this);`
`610`	`610`
`611`	`611`	`InitMainMenu();`
`612`	`612`	`InitToolbar();`