Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Nuget packages update #905

Merged
merged 5 commits into from
Oct 27, 2024
Merged

chore: Nuget packages update #905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4104215
chore: Update Nugets (again)
maximilien-noal Oct 27, 2024
e490b58
chore: Same NoWarn XML element as UI csproj
maximilien-noal Oct 27, 2024
0fe5e9f
chore: Duplicate package reference
maximilien-noal Oct 27, 2024
953dfca
chore: Remove+Sort usings (Bufdio.Spice86)
maximilien-noal Oct 27, 2024
ac45719
chore: Remove+Sort usings (Spice86.Tests)
maximilien-noal Oct 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/Bufdio.Spice86/Bindings/PortAudio/NativeMethods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
namespace Bufdio.Spice86.Bindings.PortAudio;

using System;
using System.Runtime.InteropServices;

using Bufdio.Spice86.Bindings.PortAudio.Enums;
using Bufdio.Spice86.Utilities;

using System;
using System.Runtime.InteropServices;
using System.Runtime.Versioning;

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions src/Bufdio.Spice86/Bindings/PortAudio/Structs/PaStreamParameters.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
namespace Bufdio.Spice86.Bindings.PortAudio.Structs;

using Bufdio.Spice86.Bindings.PortAudio.Enums;

using System;
using System.Runtime.InteropServices;

using Bufdio.Spice86.Bindings.PortAudio.Enums;

[StructLayout(LayoutKind.Sequential)]
internal readonly record struct PaStreamParameters
{
Expand Down
38 changes: 8 additions & 30 deletions src/Bufdio.Spice86/Bufdio.Spice86.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<RootNamespace>Bufdio.Spice86</RootNamespace>
<Copyright>Luthfi Tri Atmaja</Copyright>
<Description>Only for Spice86 usage. A cross platform audio playback library for .NET based on PortAudio, forked from the original Bufdio by Luthfi Tri Atmaja.</Description>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<WarningsAsErrors>nullable</WarningsAsErrors>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<RootNamespace>Bufdio.Spice86</RootNamespace>
<Copyright>Luthfi Tri Atmaja</Copyright>
<Description>Only for Spice86 usage. A cross platform audio playback library for .NET based on PortAudio, forked from the original Bufdio by Luthfi Tri Atmaja.</Description>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<WarningsAsErrors>nullable</WarningsAsErrors>
</PropertyGroup>
<!-- Properties geared towards NuGet -->
<PropertyGroup>
Expand All @@ -27,28 +27,6 @@
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
<PackageReference Include="DotNet.ReproducibleBuilds" Version="1.2.25">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<PackageReference Include="ErrorProne.NET.CoreAnalyzers" Version="0.1.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.Analyzers" Version="4.12.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.CodeAnalysis.Analyzers" Version="4.12.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Spice86.Shared\Spice86.Shared.csproj" />
Expand Down
6 changes: 3 additions & 3 deletions src/Bufdio.Spice86/Engines/PortAudioEngine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@

using System;
using System.Runtime.InteropServices;

using Bufdio.Spice86.Bindings.PortAudio;
using Bufdio.Spice86.Bindings.PortAudio.Enums;
using Bufdio.Spice86.Bindings.PortAudio.Structs;
using Bufdio.Spice86.Exceptions;
using Bufdio.Spice86.Utilities.Extensions;

using System;
using System.Runtime.InteropServices;

namespace Bufdio.Spice86.Engines;

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions src/Bufdio.Spice86/Exceptions/PortAudioException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
namespace Bufdio.Spice86.Exceptions;

using System;

using Bufdio.Spice86.Utilities.Extensions;

using System;

/// <summary>
/// An exception that is thrown when errors occured in internal PortAudio processes.
/// <para>Implements: <see cref="Exception"/>.</para>
/// </summary>
public class PortAudioException : Exception

Check warning on line 11 in src/Bufdio.Spice86/Exceptions/PortAudioException.cs

View workflow job for this annotation

GitHub Actions / Analyze (csharp) 

Implement exception constructors (https://josefpihrt.github.io/docs/roslynator/analyzers/RCS1194)

Check warning on line 11 in src/Bufdio.Spice86/Exceptions/PortAudioException.cs

View workflow job for this annotation

GitHub Actions / build (macos-latest) 

Implement exception constructors (https://josefpihrt.github.io/docs/roslynator/analyzers/RCS1194)

Check warning on line 11 in src/Bufdio.Spice86/Exceptions/PortAudioException.cs

View workflow job for this annotation

GitHub Actions / build (windows-latest) 

Implement exception constructors (https://josefpihrt.github.io/docs/roslynator/analyzers/RCS1194)

Check warning on line 11 in src/Bufdio.Spice86/Exceptions/PortAudioException.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest) 

Implement exception constructors (https://josefpihrt.github.io/docs/roslynator/analyzers/RCS1194)
{
/// <summary>
/// Initializes <see cref="PortAudioException"/>.
Expand Down
3 changes: 1 addition & 2 deletions src/Bufdio.Spice86/PortAudioLib.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
namespace Bufdio.Spice86;

using System.Collections.Generic;

using Bufdio.Spice86.Bindings.PortAudio;
using Bufdio.Spice86.Bindings.PortAudio.Structs;
using Bufdio.Spice86.Exceptions;
using Bufdio.Spice86.Utilities;
using Bufdio.Spice86.Utilities.Extensions;

using System;
using System.Collections.Generic;

/// <summary>
/// Provides functionalities to retrieve, configure and manage current PortAudio environment
Expand Down
4 changes: 2 additions & 2 deletions src/Bufdio.Spice86/Utilities/Extensions/PortAudioExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
namespace Bufdio.Spice86.Utilities.Extensions;

using System.Runtime.InteropServices;

using Bufdio.Spice86.Bindings.PortAudio;
using Bufdio.Spice86.Bindings.PortAudio.Structs;
using Bufdio.Spice86.Exceptions;

using System.Runtime.InteropServices;

internal static class PortAudioExtensions {
public static bool PaIsError(this int code) {
return code < 0;
Expand Down
25 changes: 25 additions & 0 deletions src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<Project>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
<PackageReference Include="DotNet.ReproducibleBuilds" Version="1.2.25">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="ErrorProne.NET.CoreAnalyzers" Version="0.1.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.Analyzers" Version="4.12.9">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.CodeAnalysis.Analyzers" Version="4.12.9">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="SerilogAnalyzer" Version="0.15.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
</Project>
42 changes: 10 additions & 32 deletions src/Spice86.Core/Spice86.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<WarningsAsErrors>nullable</WarningsAsErrors>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<NoWarn>1591;1572;1573;1570;1587;1574</NoWarn>
</PropertyGroup>
<ItemGroup>
<Using Remove="System.Linq" />
Expand All @@ -24,7 +25,7 @@
<RepositoryUrl>https://github.com/OpenRakis/Spice86</RepositoryUrl>
<RepositoryType>git</RepositoryType>
</PropertyGroup>

<!-- Source Link configuration -->
<PropertyGroup>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
Expand All @@ -39,37 +40,14 @@
<AdditionalFiles Include="Emulator/CPU/CfgCpu/ParsedInstruction/Instructions/Mixins/*.mixin" />
<AdditionalFiles Include="Emulator/CPU/CfgCpu/Parser/SpecificParsers/Mixin/*.mixin" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
<PackageReference Include="DotNet.ReproducibleBuilds" Version="1.2.25">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<PackageReference Include="CommunityToolkit.HighPerformance" Version="8.3.2" />
<PackageReference Include="JetBrains.Annotations" Version="2024.2.0" />
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Roslynator.Analyzers" Version="4.12.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.CodeAnalysis.Analyzers" Version="4.12.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Serilog" Version="4.0.2" />
<PackageReference Include="Serilog" Version="4.1.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
<PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
<PackageReference Include="SerilogAnalyzer" Version="0.15.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="ErrorProne.NET.CoreAnalyzers" Version="0.1.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="System.Buffers" Version="4.5.1" />
<PackageReference Include="System.IO" Version="4.3.0" />
<PackageReference Include="System.IO.UnmanagedMemoryStream" Version="4.3.0" />
Expand All @@ -90,12 +68,12 @@

<ItemGroup>
<None Update="Resources\2MGM.license">
<Link>2MGM.license</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<Link>2MGM.license</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Resources\2MGM.sf2">
<Link>2MGM.sf2</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<Link>2MGM.sf2</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>

Expand All @@ -107,5 +85,5 @@
<_Parameter1>DynamicProxyGenAssembly2</_Parameter1>
</AssemblyAttribute>
</ItemGroup>

</Project>
27 changes: 2 additions & 25 deletions src/Spice86.Logging/Spice86.Logging.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
Expand All @@ -23,33 +23,10 @@
<ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
<PackageReference Include="DotNet.ReproducibleBuilds" Version="1.2.25">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.Analyzers" Version="4.12.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.CodeAnalysis.Analyzers" Version="4.12.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Serilog" Version="4.0.2" />
<PackageReference Include="Serilog" Version="4.1.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
<PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
<PackageReference Include="SerilogAnalyzer" Version="0.15.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="ErrorProne.NET.CoreAnalyzers" Version="0.1.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Spice86.Shared\Spice86.Shared.csproj" />
Expand Down
30 changes: 4 additions & 26 deletions src/Spice86.Shared/Spice86.Shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
Expand All @@ -20,37 +20,15 @@

<!-- Source Link configuration -->
<PropertyGroup>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="11.1.4" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
<PackageReference Include="DotNet.ReproducibleBuilds" Version="1.2.25">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.Analyzers" Version="4.12.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.CodeAnalysis.Analyzers" Version="4.12.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Serilog" Version="4.0.2" />
<PackageReference Include="Avalonia" Version="11.1.4" />
<PackageReference Include="Serilog" Version="4.1.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
<PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
<PackageReference Include="SerilogAnalyzer" Version="0.15.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="ErrorProne.NET.CoreAnalyzers" Version="0.1.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
</Project>
31 changes: 7 additions & 24 deletions src/Spice86/Spice86.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<RepositoryType>git</RepositoryType>
</PropertyGroup>

<!-- set by DotNet.ReproducibleBuilds -->
<!-- Source Link configuration -->
<PropertyGroup>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
Expand All @@ -52,35 +52,18 @@
<PackageReference Include="Avalonia.Controls.TreeDataGrid" Version="11.0.10" />
<PackageReference Include="Avalonia.Desktop" Version="11.1.4" />
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.3" />
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.4" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.1.4" />
<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.1.0.4" />
<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.1.0.5" />
<PackageReference Include="AvaloniaGraphControl" Version="0.6.1" />
<PackageReference Include="AvaloniaHex" Version="0.1.3" />
<PackageReference Include="bodong.Avalonia.PropertyGrid" Version="11.1.1.1" />
<PackageReference Include="bodong.PropertyModels" Version="11.1.1.1" />
<PackageReference Include="AvaloniaHex" Version="0.1.4" />
<PackageReference Include="bodong.Avalonia.PropertyGrid" Version="11.1.4.2" />
<PackageReference Include="bodong.PropertyModels" Version="11.1.4.2" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
<PackageReference Include="DialogHost.Avalonia" Version="0.8.1" />
<PackageReference Include="DotNet.ReproducibleBuilds" Version="1.2.25">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="ErrorProne.NET.CoreAnalyzers" Version="0.1.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="FluentIcons.Avalonia.Fluent" Version="1.1.259" />
<PackageReference Include="FluentIcons.Avalonia.Fluent" Version="1.1.262" />
<PackageReference Include="Iced" Version="1.21.0" />
<PackageReference Include="JvE.Structurizer" Version="1.0.1" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
<PackageReference Include="Roslynator.Analyzers" Version="4.12.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.CodeAnalysis.Analyzers" Version="4.12.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Semi.Avalonia" Version="11.1.0.4" />
<PackageReference Include="Semi.Avalonia.DataGrid" Version="11.1.0.4" />
<PackageReference Include="Semi.Avalonia.TreeDataGrid" Version="11.0.10" />
Expand Down
Loading
Loading