7.2 (#113)

* upgrade Decompiler, fix a few errors * add mac instructions * 7.2
icsharpcode · May 8, 2022 · 113ef11 · 113ef11
1 parent 0fe68b2
commit 113ef11
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/ILSpy.Core/App.xaml b/ILSpy.Core/App.xaml
@@ -6,7 +6,7 @@
 		<StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
 		<StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml"/>
 		<StyleInclude Source="avares://AvaloniaEdit/AvaloniaEdit.xaml" />
-        <StyleInclude Source="resm:Avalonia.Controls.DataGrid.Themes.Default.xaml?assembly=Avalonia.Controls.DataGrid"/>
+        <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Default.xaml"/>
 		<StyleInclude Source="avares://SharpTreeView/Themes/TreeView.xaml" />
         <StyleInclude Source="/Controls/DockedPane.xaml" />
         <StyleInclude Source="/Controls/SearchBox.xaml" />

diff --git a/ILSpy.Core/Controls/SearchBox.xaml b/ILSpy.Core/Controls/SearchBox.xaml
@@ -19,7 +19,7 @@
 						<Grid x:Name="LayoutGrid">
 							<Grid.ColumnDefinitions>
 								<ColumnDefinition Width="*" />
-								<ColumnDefinition Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Bounds.Height, Converter={x:Static local:SearchBox.GridLengthConvert}}}" />
+								<ColumnDefinition Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Bounds.Height, Converter={x:Static local:SearchBox.GridLengthConvert}}" />
 							</Grid.ColumnDefinitions>
 
                           <ScrollViewer Grid.Column="0" HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"

diff --git a/ILSpy.Core/ILSpy.Core.csproj b/ILSpy.Core/ILSpy.Core.csproj
@@ -29,7 +29,7 @@
   <ItemGroup>
     <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
     <PackageReference Include="Avalonia.Controls.DataGrid" Version="$(AvaloniaVersion)" />
-    <PackageReference Include="ICSharpCode.Decompiler" Version="7.2.0.6844" />
+    <PackageReference Include="ICSharpCode.Decompiler" Version="7.2.1.6856" />
     <PackageReference Include="Microsoft.DiaSymReader" Version="1.4.0" />
     <PackageReference Include="Microsoft.DiaSymReader.Converter.Xml" Version="1.1.0-beta2-22164-02" />
     <PackageReference Include="Microsoft.VisualStudio.Composition" Version="17.1.20" />

diff --git a/ILSpy.Core/Properties/AssemblyInfo.cs b/ILSpy.Core/Properties/AssemblyInfo.cs
@@ -36,7 +36,7 @@
 internal static class RevisionClass
 {
 	public const string Major = "7";
-	public const string Minor = "1";
+	public const string Minor = "2";
 	public const string Build = "0";
 	public const string Revision = "0";
 	public const string VersionName = "rc";

diff --git a/README.md b/README.md
@@ -30,6 +30,7 @@ How to run on Linux:
 
 How to run on Mac:
 - just move the app into `/Applications` folder and open it
+- run `xattr -rd com.apple.quarantine /Applications/ILSpy.app`
 - if you see `“ILSpy” cannot be opened because the developer cannot be verified.`, please open up `System Preferences` -> `Security & Privacy` -> `General` -> `Open Anyway` 
 - if you see the error `The application ILSpy can't be opened' error on launch`, you could `chmod +x "/Applications/ILSpy.app/Contents/MacOS/ILSpy"`
 

diff --git a/SharpTreeView/Themes/TreeView.xaml b/SharpTreeView/Themes/TreeView.xaml
@@ -177,7 +177,7 @@
                     <Border Background="Transparent">
                         <Border Background="{DynamicResource ThemeBackgroundBrush}">
                             <local:SharpTreeNodeView Name="nodeView"
-                                                       Foreground="{DynamicResource ThemeForegroundBrush}}"
+                                                       Foreground="{DynamicResource ThemeForegroundBrush}"
                                                        HorizontalAlignment="Left" />
                         </Border>
                     </Border>