Skip to content

Commit

Permalink
amend about to use package info from dotnet tool which includes licen…
Browse files Browse the repository at this point in the history 
…se and better package information for more transparency
  • Loading branch information
@pjmagee
pjmagee committed Nov 27, 2024
1 parent 84c39f8 commit 4fffab1
Show file tree
Hide file tree
Showing 8 changed files with 292 additions and 91 deletions.
44 changes: 0 additions & 44 deletions D2Helper.sln
View file

This file was deleted.

3 changes: 3 additions & 0 deletions src/Dota2Helper.Desktop/Dota2Helper.Desktop.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,8 @@
<None Update="appsettings.timers.default.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="packages.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
</Project>
214 changes: 214 additions & 0 deletions src/Dota2Helper.Desktop/packages.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,214 @@
[
{
"PackageId": "Avalonia",
"PackageVersion": "11.2.1",
"PackageProjectUrl": "https://avaloniaui.net/?utm_source=nuget\u0026utm_medium=referral\u0026utm_content=project_homepage_link",
"Copyright": "Copyright 2013-2024 \u00A9 The AvaloniaUI Project",
"Authors": "Avalonia Team",
"License": "MIT",
"LicenseUrl": "https://licenses.nuget.org/MIT",
"LicenseInformationOrigin": 0
},
{
"PackageId": "Avalonia.Controls.DataGrid",
"PackageVersion": "11.2.1",
"PackageProjectUrl": "https://avaloniaui.net/?utm_source=nuget\u0026utm_medium=referral\u0026utm_content=project_homepage_link",
"Copyright": "Copyright 2013-2024 \u00A9 The AvaloniaUI Project",
"Authors": "Avalonia Team",
"License": "MIT",
"LicenseUrl": "https://licenses.nuget.org/MIT",
"LicenseInformationOrigin": 0
},
{
"PackageId": "Avalonia.Desktop",
"PackageVersion": "11.2.1",
"PackageProjectUrl": "https://avaloniaui.net/?utm_source=nuget\u0026utm_medium=referral\u0026utm_content=project_homepage_link",
"Copyright": "Copyright 2013-2024 \u00A9 The AvaloniaUI Project",
"Authors": "Avalonia Team",
"License": "MIT",
"LicenseUrl": "https://licenses.nuget.org/MIT",
"LicenseInformationOrigin": 0
},
{
"PackageId": "Avalonia.Diagnostics",
"PackageVersion": "11.2.1",
"PackageProjectUrl": "https://avaloniaui.net/?utm_source=nuget\u0026utm_medium=referral\u0026utm_content=project_homepage_link",
"Copyright": "Copyright 2013-2024 \u00A9 The AvaloniaUI Project",
"Authors": "Avalonia Team",
"License": "MIT",
"LicenseUrl": "https://licenses.nuget.org/MIT",
"LicenseInformationOrigin": 0
},
{
"PackageId": "Avalonia.Fonts.Inter",
"PackageVersion": "11.2.1",
"PackageProjectUrl": "https://avaloniaui.net/?utm_source=nuget\u0026utm_medium=referral\u0026utm_content=project_homepage_link",
"Copyright": "Copyright 2013-2024 \u00A9 The AvaloniaUI Project",
"Authors": "Avalonia Team",
"License": "MIT",
"LicenseUrl": "https://licenses.nuget.org/MIT",
"LicenseInformationOrigin": 0
},
{
"PackageId": "Avalonia.Themes.Fluent",
"PackageVersion": "11.2.1",
"PackageProjectUrl": "https://avaloniaui.net/?utm_source=nuget\u0026utm_medium=referral\u0026utm_content=project_homepage_link",
"Copyright": "Copyright 2013-2024 \u00A9 The AvaloniaUI Project",
"Authors": "Avalonia Team",
"License": "MIT",
"LicenseUrl": "https://licenses.nuget.org/MIT",
"LicenseInformationOrigin": 0
},
{
"PackageId": "Avalonia.Xaml.Interactions",
"PackageVersion": "11.2.0.1",
"PackageProjectUrl": "https://github.com/wieslawsoltes/AvaloniaBehaviors",
"Copyright": "Copyright \u00A9 Wies\u0142aw \u0160olt\u00E9s 2024",
"Authors": "Wies\u0142aw \u0160olt\u00E9s",
"License": "MIT",
"LicenseUrl": "https://licenses.nuget.org/MIT",
"LicenseInformationOrigin": 0
},
{
"PackageId": "Avalonia.Xaml.Interactions.Events",
"PackageVersion": "11.2.0.1",
"PackageProjectUrl": "https://github.com/wieslawsoltes/AvaloniaBehaviors",
"Copyright": "Copyright \u00A9 Wies\u0142aw \u0160olt\u00E9s 2024",
"Authors": "Wies\u0142aw \u0160olt\u00E9s",
"License": "MIT",
"LicenseUrl": "https://licenses.nuget.org/MIT",
"LicenseInformationOrigin": 0
},
{
"PackageId": "CommunityToolkit.Mvvm",
"PackageVersion": "8.3.2",
"PackageProjectUrl": "https://github.com/CommunityToolkit/dotnet",
"Copyright": "(c) .NET Foundation and Contributors. All rights reserved.",
"Authors": "Microsoft",
"License": "MIT",
"LicenseUrl": "https://licenses.nuget.org/MIT",
"LicenseInformationOrigin": 0
},
{
"PackageId": "coverlet.collector",
"PackageVersion": "6.0.0",
"PackageProjectUrl": "https://github.com/coverlet-coverage/coverlet",
"Authors": "tonerdo",
"License": "MIT",
"LicenseUrl": "https://licenses.nuget.org/MIT",
"LicenseInformationOrigin": 0
},
{
"PackageId": "FluentIcons.Avalonia",
"PackageVersion": "1.1.265",
"Authors": "davidxuang",
"License": "MIT",
"LicenseUrl": "https://licenses.nuget.org/MIT",
"LicenseInformationOrigin": 0
},
{
"PackageId": "GitVersion.MsBuild",
"PackageVersion": "6.0.0",
"PackageProjectUrl": "https://github.com/GitTools/GitVersion",
"Copyright": "Copyright GitTools 2024.",
"Authors": "GitTools and Contributors",
"License": "MIT",
"LicenseUrl": "https://licenses.nuget.org/MIT",
"LicenseInformationOrigin": 0
},
{
"PackageId": "Microsoft.Extensions.Configuration.Binder",
"PackageVersion": "9.0.0",
"PackageProjectUrl": "https://dot.net/",
"Copyright": "\u00A9 Microsoft Corporation. All rights reserved.",
"Authors": "Microsoft",
"License": "MIT",
"LicenseUrl": "https://licenses.nuget.org/MIT",
"LicenseInformationOrigin": 0
},
{
"PackageId": "Microsoft.Extensions.Configuration.Json",
"PackageVersion": "9.0.0",
"PackageProjectUrl": "https://dot.net/",
"Copyright": "\u00A9 Microsoft Corporation. All rights reserved.",
"Authors": "Microsoft",
"License": "MIT",
"LicenseUrl": "https://licenses.nuget.org/MIT",
"LicenseInformationOrigin": 0
},
{
"PackageId": "Microsoft.Extensions.DependencyInjection",
"PackageVersion": "9.0.0",
"PackageProjectUrl": "https://dot.net/",
"Copyright": "\u00A9 Microsoft Corporation. All rights reserved.",
"Authors": "Microsoft",
"License": "MIT",
"LicenseUrl": "https://licenses.nuget.org/MIT",
"LicenseInformationOrigin": 0
},
{
"PackageId": "Microsoft.Extensions.Options",
"PackageVersion": "9.0.0",
"PackageProjectUrl": "https://dot.net/",
"Copyright": "\u00A9 Microsoft Corporation. All rights reserved.",
"Authors": "Microsoft",
"License": "MIT",
"LicenseUrl": "https://licenses.nuget.org/MIT",
"LicenseInformationOrigin": 0
},
{
"PackageId": "Microsoft.NET.Test.Sdk",
"PackageVersion": "17.11.1",
"PackageProjectUrl": "https://github.com/microsoft/vstest",
"Copyright": "\u00A9 Microsoft Corporation. All rights reserved.",
"Authors": "Microsoft",
"License": "MIT",
"LicenseUrl": "https://licenses.nuget.org/MIT",
"LicenseInformationOrigin": 0
},
{
"PackageId": "MSTest.TestAdapter",
"PackageVersion": "3.6.3",
"PackageProjectUrl": "https://github.com/microsoft/testfx",
"Copyright": "\u00A9 Microsoft Corporation. All rights reserved.",
"Authors": "Microsoft",
"License": "MIT",
"LicenseUrl": "https://licenses.nuget.org/MIT",
"LicenseInformationOrigin": 0
},
{
"PackageId": "MSTest.TestFramework",
"PackageVersion": "3.6.3",
"PackageProjectUrl": "https://github.com/microsoft/testfx",
"Copyright": "\u00A9 Microsoft Corporation. All rights reserved.",
"Authors": "Microsoft",
"License": "MIT",
"LicenseUrl": "https://licenses.nuget.org/MIT",
"LicenseInformationOrigin": 0
},
{
"PackageId": "NAudio",
"PackageVersion": "2.2.1",
"PackageProjectUrl": "https://github.com/naudio/NAudio",
"Copyright": "\u00A9 Mark Heath 2023",
"Authors": "Mark Heath \u0026 Contributors",
"ValidationErrors": [
{
"Error": "Validation for licenses of type File not yet supported",
"Context": "C:\\Users\\patri\\Documents\\Projects\\D2Helper\\src\\Dota2Helper\\Dota2Helper.csproj"
}
],
"LicenseUrl": "https://aka.ms/deprecateLicenseUrl",
"LicenseInformationOrigin": 2
},
{
"PackageId": "ValveKeyValue",
"PackageVersion": "0.12.0.391",
"PackageProjectUrl": "https://valveresourceformat.github.io/",
"Copyright": "Copyright \u00A9 ValveKeyValue Contributors",
"Authors": "ValveKeyValue Contributors",
"License": "MIT",
"LicenseUrl": "https://licenses.nuget.org/MIT",
"LicenseInformationOrigin": 0
}
]
28 changes: 28 additions & 0 deletions src/Dota2Helper.sln
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@

Microsoft Visual Studio Solution File, Format Version 12.00
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dota2Helper", "Dota2Helper\Dota2Helper.csproj", "{C8DC9729-2B3D-942F-D433-7DFCC693BE70}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dota2Helper.Desktop", "Dota2Helper.Desktop\Dota2Helper.Desktop.csproj", "{D7580C62-3395-9E02-34BD-DDAA7DA49647}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dota2Helper.Tests", "Dota2Helper.Tests\Dota2Helper.Tests.csproj", "{F92ADE4B-E249-4032-3578-8AC3D768D5E4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{C8DC9729-2B3D-942F-D433-7DFCC693BE70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C8DC9729-2B3D-942F-D433-7DFCC693BE70}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C8DC9729-2B3D-942F-D433-7DFCC693BE70}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C8DC9729-2B3D-942F-D433-7DFCC693BE70}.Release|Any CPU.Build.0 = Release|Any CPU
{D7580C62-3395-9E02-34BD-DDAA7DA49647}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D7580C62-3395-9E02-34BD-DDAA7DA49647}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D7580C62-3395-9E02-34BD-DDAA7DA49647}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D7580C62-3395-9E02-34BD-DDAA7DA49647}.Release|Any CPU.Build.0 = Release|Any CPU
{F92ADE4B-E249-4032-3578-8AC3D768D5E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F92ADE4B-E249-4032-3578-8AC3D768D5E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F92ADE4B-E249-4032-3578-8AC3D768D5E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F92ADE4B-E249-4032-3578-8AC3D768D5E4}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
13 changes: 7 additions & 6 deletions src/Dota2Helper/Controls/AboutTabContent.axaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,19 @@
xmlns:viewModels="clr-namespace:Dota2Helper.ViewModels"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:DataType="viewModels:SettingsViewModel"
HorizontalContentAlignment="Stretch"
x:Class="Dota2Helper.Controls.AboutTabContent">
<StackPanel Orientation="Vertical" Spacing="5" HorizontalAlignment="Left">
x:Class="Dota2Helper.Controls.AboutTabContent" Margin="5">

<StackPanel Orientation="Vertical" Spacing="5" HorizontalAlignment="Left" Width="750">
<TextBlock Margin="5" HorizontalAlignment="Left">
This contains a list of all the framework libraries and 3rd party libraries used in the project.
All 3rd party packages used in this project.
</TextBlock>
<DataGrid ItemsSource="{Binding AboutItems}"
<DataGrid ItemsSource="{Binding PackageItems}"
IsReadOnly="True" Margin="5"
GridLinesVisibility="All"
HorizontalAlignment="Left"
MaxHeight="450" BorderThickness="1"
MaxColumnWidth="500"
CanUserResizeColumns="True" GridLinesVisibility="All"
CanUserResizeColumns="True"
HorizontalScrollBarVisibility="Visible"
AutoGenerateColumns="True" />
</StackPanel>
Expand Down
31 changes: 25 additions & 6 deletions src/Dota2Helper/Features/About/AboutItem.cs
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,34 @@
using System;
using System.Text.Json.Serialization;

namespace Dota2Helper.Features.About;

public class AboutItem : IComparable<AboutItem>
public class PackageItem : IComparable<PackageItem>
{
public int CompareTo(AboutItem? other)
public int CompareTo(PackageItem? other)
{
return string.Compare(Name, other?.Name, StringComparison.Ordinal);
return string.Compare(PackageId, other?.PackageId, StringComparison.Ordinal);
}

public required string Name { get; set; }
public required string Value { get; set; }
public required string Description { get; set; }

[JsonPropertyName("PackageId")]
public string PackageId { get; set; }

[JsonPropertyName("PackageVersion")]
public string PackageVersion { get; set; }

[JsonPropertyName("PackageProjectUrl")]
public string PackageProjectUrl { get; set; }

[JsonPropertyName("Copyright")]
public string Copyright { get; set; }

[JsonPropertyName("Authors")]
public string Authors { get; set; }

[JsonPropertyName("License")]
public string License { get; set; }

[JsonPropertyName("LicenseUrl")]
public string LicenseUrl { get; set; }
}
Loading

0 comments on commit 4fffab1

Please sign in to comment.