use latest stable Avalonia and minor fixes

icsharpcode · Dec 20, 2019 · e3be0f4 · e3be0f4
1 parent cfcb337
commit e3be0f4
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 6 deletions.
diff --git a/AvaloniaEdit b/AvaloniaEdit
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -5,7 +5,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <AvaloniaVersion>0.9.0-preview7</AvaloniaVersion>
+        <AvaloniaVersion>0.9.0</AvaloniaVersion>
     </PropertyGroup>
 
 </Project>
diff --git a/ILSpy.Core/Properties/AssemblyInfo.cs b/ILSpy.Core/Properties/AssemblyInfo.cs
@@ -38,8 +38,8 @@ internal static class RevisionClass
 	public const string Major = "5";
 	public const string Minor = "0";
 	public const string Build = "2";
-	public const string Revision = "0";
-	public const string VersionName = "beta";
+	public const string Revision = "1";
+	public const string VersionName = "rc";
 
 	public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision + "." + VersionName;
 }
diff --git a/ILSpy.Core/Properties/Resources.resx b/ILSpy.Core/Properties/Resources.resx
@@ -729,7 +729,32 @@
   <data name="CannotAnalyzeMissingRef" xml:space="preserve">
     <value>Entity could not be resolved. Cannot analyze entities from missing assembly references. Add the missing reference and try again.</value>
   </data>
+  <data name="DecompilerSettings.UseThrowExpressions" xml:space="preserve">
+    <value>Use throw expressions</value>
+  </data>
   <data name="DecompilerSettings.AllowExtensionMethodSyntaxOnRef" xml:space="preserve">
     <value>Use 'ref' extension methods</value>
   </data>
+  <data name="AssemblySaveCodeDirectoryNotEmpty" xml:space="preserve">
+    <value>The directory is not empty. File will be overwritten.
+Are you sure you want to continue?</value>
+  </data>
+  <data name="AssemblySaveCodeDirectoryNotEmptyTitle" xml:space="preserve">
+    <value>Project Directory not empty</value>
+  </data>
+  <data name="HighlightMatchingBraces" xml:space="preserve">
+    <value>Highlight matching braces</value>
+  </data>
+  <data name="SelectLanguageDropdownTooltip" xml:space="preserve">
+    <value>Select language to decompile to</value>
+  </data>
+  <data name="SelectVersionDropdownTooltip" xml:space="preserve">
+    <value>Select version of language to output</value>
+  </data>
+  <data name="DecompilerSettings.RemoveDeadStores" xml:space="preserve">
+    <value>Remove dead stores (use with caution!)</value>
+  </data>
+  <data name="DecompilerSettings.AlwaysShowEnumMemberValues" xml:space="preserve">
+    <value>Always show enum member values</value>
+  </data>
 </root>
diff --git a/ILSpy/ILSpy.csproj b/ILSpy/ILSpy.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <OutputType>WinExe</OutputType>
 
     <TieredCompilation>true</TieredCompilation>

diff --git a/ILSpy/Program.cs b/ILSpy/Program.cs
@@ -42,7 +42,12 @@ public static AppBuilder BuildAvaloniaApp()
             Logger.Sink = new ProxyLogSink(Logger.Sink);
 #endif
 
-            return result.UsePlatformDetect();
+            return result
+                .UsePlatformDetect()
+                .With(new X11PlatformOptions
+                 {
+                     UseDBusMenu = true
+                 });
         }
 
         class ProxyLogSink : ILogSink