diff --git a/JetBrains.Etw.HostService.Updater/src/JetBrains.Etw.HostService.Updater.csproj b/JetBrains.Etw.HostService.Updater/src/JetBrains.Etw.HostService.Updater.csproj index 1a627c1..6c5e6a7 100644 --- a/JetBrains.Etw.HostService.Updater/src/JetBrains.Etw.HostService.Updater.csproj +++ b/JetBrains.Etw.HostService.Updater/src/JetBrains.Etw.HostService.Updater.csproj @@ -14,7 +14,7 @@ JetBrains s.r.o. Copyright © 2021-$([System.DateTime]::Now.ToString('yyyy')) JetBrains s.r.o. Mikhail Pilin - 16.1.1-preview1 + 16.1.1 diff --git a/JetBrains.Etw.HostService.Updater/src/ViewModel/AboutViewModel.cs b/JetBrains.Etw.HostService.Updater/src/ViewModel/AboutViewModel.cs index e59fa39..9e500a0 100644 --- a/JetBrains.Etw.HostService.Updater/src/ViewModel/AboutViewModel.cs +++ b/JetBrains.Etw.HostService.Updater/src/ViewModel/AboutViewModel.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.ComponentModel; using System.Runtime.CompilerServices; using System.Text; @@ -14,6 +15,19 @@ internal sealed class AboutViewModel : INotifyPropertyChanged public string ToolVersion => App.ToolVersion; public string ProcessArchitecture => HabitatInfo.ProcessArchitecture.ToPresentableString(); + public IEnumerable Licenses => new LicenseItemViewModel[] + { + // @formatter:off + new("Hardcodet.NotifyIcon.Wpf" , "1.1.0" , "Code Project Open License 1.02" , new Uri("https://spdx.org/licenses/CPOL-1.02.html")), + new("HtmlSanitizer" , "8.0.645", "MIT License (Michael Ganss and Contributors)", new Uri("https://spdx.org/licenses/MIT.html")), + new("JetBrains.DownloadPgpVerifier" , "1.0.0" , "Apache License 2.0" , new Uri("https://spdx.org/licenses/Apache-2.0.html")), + new("JetBrains.FormatRipper" , "2.0.1" , "Apache License 2.0" , new Uri("https://spdx.org/licenses/Apache-2.0.html")), + new("JetBrains.HabitatDetector" , "1.0.2" , "Apache License 2.0" , new Uri("https://spdx.org/licenses/Apache-2.0.html")), + new("System.Text.Json" , "7.0.2" , "MIT License (Microsoft Corporation)" , new Uri("https://spdx.org/licenses/MIT.html")), + new("WixToolset.Dtf.WindowsInstaller", "4.0.0" , "Microsoft Reciprocal License" , new Uri("https://spdx.org/licenses/MS-RL.html")), + // @formatter:on + }; + public string YearRange { get diff --git a/JetBrains.Etw.HostService.Updater/src/ViewModel/LicenseItemViewModel.cs b/JetBrains.Etw.HostService.Updater/src/ViewModel/LicenseItemViewModel.cs new file mode 100644 index 0000000..1016c35 --- /dev/null +++ b/JetBrains.Etw.HostService.Updater/src/ViewModel/LicenseItemViewModel.cs @@ -0,0 +1,21 @@ +using System; +using JetBrains.Annotations; + +namespace JetBrains.Etw.HostService.Updater.ViewModel +{ + internal sealed class LicenseItemViewModel + { + public LicenseItemViewModel([NotNull] string packageId, [NotNull] string packageVersion, [NotNull] string licenseName, [NotNull] Uri licenseUri) + { + PackageId = packageId ?? throw new ArgumentNullException(nameof(packageId)); + PackageVersion = packageVersion ?? throw new ArgumentNullException(nameof(packageVersion)); + LicenseName = licenseName ?? throw new ArgumentNullException(nameof(licenseName)); + LicenseUri = licenseUri ?? throw new ArgumentNullException(nameof(licenseUri)); + } + + public string PackageId { get; } + public string PackageVersion { get; } + public Uri LicenseUri { get; } + public string LicenseName { get; } + } +} \ No newline at end of file diff --git a/JetBrains.Etw.HostService.Updater/src/Views/AboutWindow.xaml b/JetBrains.Etw.HostService.Updater/src/Views/AboutWindow.xaml index d6ebcdb..969fd11 100644 --- a/JetBrains.Etw.HostService.Updater/src/Views/AboutWindow.xaml +++ b/JetBrains.Etw.HostService.Updater/src/Views/AboutWindow.xaml @@ -11,25 +11,24 @@ SizeToContent="Height" ResizeMode="NoResize" x:ClassModifier="internal" - Height="300" Width="500" + Height="Auto" Width="500" Background="#F7F7F7"> - + - - + + - + - - - + + @@ -83,39 +82,56 @@ - - - + + + + + + + + + - The ETW host service updater + The ETW host service updater - - Copyright © JetBrains s.r.o. www.jetbrains.com + + + Copyright © JetBrains s.r.o. www.jetbrains.com - - + + Powered by open-source software: - - Hardcodet.NotifyIcon.Wpf (CPOL 1.02) - - - HtmlSanitizer (MIT) - - - + + + + + + + + + + + + + + + + + + + + + + - + -