Browse Source

Properly use accessor in JSONConfiguration

pull/2998/head
Christoph Wille 2 years ago
parent
commit
22d98f5857
  1. 2
      ILSpy/ILSpy.csproj
  2. 7
      ILSpy/MainWindow.xaml.cs

2
ILSpy/ILSpy.csproj

@ -45,7 +45,7 @@
<PackageReference Include="Microsoft.VisualStudio.Composition" Version="17.4.16" /> <PackageReference Include="Microsoft.VisualStudio.Composition" Version="17.4.16" />
<PackageReference Include="DataGridExtensions" Version="2.5.14" /> <PackageReference Include="DataGridExtensions" Version="2.5.14" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" /> <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
<PackageReference Include="NetSparkleUpdater.UI.WPF" Version="2.3.0-preview20230604001" /> <PackageReference Include="NetSparkleUpdater.UI.WPF" Version="2.3.0-preview20230605001" />
<PackageReference Include="TomsToolbox.Wpf.Styles" Version="$(WpfStylesToolboxVersion)" /> <PackageReference Include="TomsToolbox.Wpf.Styles" Version="$(WpfStylesToolboxVersion)" />
</ItemGroup> </ItemGroup>

7
ILSpy/MainWindow.xaml.cs

@ -930,15 +930,18 @@ namespace ICSharpCode.ILSpy
// https://github.com/NetSparkleUpdater/NetSparkle/blob/develop/src/NetSparkle.Samples.NetCore.WPF/MainWindow.xaml.cs // https://github.com/NetSparkleUpdater/NetSparkle/blob/develop/src/NetSparkle.Samples.NetCore.WPF/MainWindow.xaml.cs
string sparkleSettingsPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "ICSharpCode\\ILSpy-sparkle.json"); string sparkleSettingsPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "ICSharpCode\\ILSpy-sparkle.json");
// var icsdasm = typeof(DecompilerVersionInfo).Assembly.FullName;
_sparkle = new SparkleUpdater( _sparkle = new SparkleUpdater(
"https://ilspy.net/appcast.xml", "https://ilspy.net/appcast.xml",
new Ed25519Checker(SecurityMode.Strict, "s2P6MPexSRSjod77aWUjgVKj/gKYYAeqgHY/0Gf8b78=") new Ed25519Checker(SecurityMode.Strict, "s2P6MPexSRSjod77aWUjgVKj/gKYYAeqgHY/0Gf8b78=")
) { ) {
UIFactory = new NetSparkleUpdater.UI.WPF.UIFactory(null), UIFactory = new NetSparkleUpdater.UI.WPF.UIFactory(Images.ILSpyIcon),
RelaunchAfterUpdate = false, RelaunchAfterUpdate = false,
CustomInstallerArguments = "", CustomInstallerArguments = "",
Configuration = new JSONConfiguration(null, sparkleSettingsPath) Configuration = new JSONConfiguration(new NetSparkleUpdater.AssemblyAccessors.AssemblyReflectionAccessor(null), sparkleSettingsPath)
}; };
_sparkle.StartLoop(true); _sparkle.StartLoop(true);
} }

Loading…
Cancel
Save