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

Jump to bottom

chore: Migration to .NET 9 SDK #936

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

chore: Migration to .NET 9 SDK #936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aff908f
chore: Migration to .NET 9 SDK
maximilien-noal Nov 16, 2024
fe0dd72
chore: Silence vulnerability warning ->pin STJ 9.0
maximilien-noal Nov 16, 2024
d715156
chore: NoWarn for CS1591 (missing XML summary)
maximilien-noal Nov 16, 2024
446949c
refactor: Remove unused class variable
maximilien-noal Nov 16, 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
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: '8.0.x'
dotnet-version: '9.0.x'

- run: |
echo "running custom build action..."
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nuget.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: '8.0.x'
dotnet-version: '9.0.x'

- name: Test with dotnet
working-directory: ./src
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: '8.0.x'
dotnet-version: '9.0.x'

- name: Test with dotnet
working-directory: ./src
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prerelease.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: '8.0.x'
dotnet-version: '9.0.x'

- name: Install zip
uses: montudor/action-zip@v1
Expand Down
15 changes: 1 addition & 14 deletions src/Bufdio.Spice86/Bufdio.Spice86.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,8 @@
</PropertyGroup>
<!-- Properties geared towards NuGet -->
<PropertyGroup>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<version>7.0.0</version>
<PackageId>Bufdio.Spice86</PackageId>
<Authors>Luthfi Tri Atmaja, Kevin Ferrare, Maximilien Noal, Joris van Eijden, Artjom Vejsel</Authors>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<Description>Reverse engineer and rewrite real mode dos programs</Description>
<PackageProjectUrl>https://github.com/OpenRakis/Spice86</PackageProjectUrl>
<RepositoryUrl>https://github.com/OpenRakis/Spice86</RepositoryUrl>
<RepositoryType>git</RepositoryType>
</PropertyGroup>

<!-- Source Link configuration -->
<PropertyGroup>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
</PropertyGroup>

<ItemGroup>
Expand Down
23 changes: 22 additions & 1 deletion src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,29 @@
<Project>
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<EnablePackageValidation>true</EnablePackageValidation>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<WarningsAsErrors>nullable</WarningsAsErrors>
<NoWarn>$(NoWarn);1591;NU1507</NoWarn>
</PropertyGroup>
<!-- Source Link configuration -->
<PropertyGroup>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
</PropertyGroup>
<!-- Nuget package info-->
<PropertyGroup>
<Version>7.0.0</Version>
<PackageReleaseNotes>Some breaking API changes (SegmentRegisters.cs), WIP new CFG_CPU, addtionnal memory/disasm views to the internal debugger, replaced UI DI framework with Microsoft.DI.</PackageReleaseNotes>
<Authors>Kevin Ferrare, Maximilien Noal, Joris van Eijden, Artjom Vejsel</Authors>
<PackageTags>reverse-engineering;avalonia;debugger;assembly;emulator;cross-platform</PackageTags>
<Description>Reverse engineer and rewrite real mode dos programs</Description>
<PackageProjectUrl>https://github.com/OpenRakis/Spice86</PackageProjectUrl>
<RepositoryUrl>https://github.com/OpenRakis/Spice86</RepositoryUrl>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<RepositoryType>git</RepositoryType>
</PropertyGroup>
</Project>
34 changes: 15 additions & 19 deletions src/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,18 @@
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
<NoWarn>$(NoWarn);NU1507</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Avalonia" Version="11.2.0" />
<PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.2.0" />
<PackageVersion Include="Avalonia" Version="11.2.1" />
<PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.2.1" />
<PackageVersion Include="Avalonia.Controls.PanAndZoom" Version="11.2.0" />
<PackageVersion Include="Avalonia.Controls.TreeDataGrid" Version="11.0.10" />
<PackageVersion Include="Avalonia.Desktop" Version="11.2.0" />
<PackageVersion Include="Avalonia.Diagnostics" Version="11.1.4" />
<PackageVersion Include="Avalonia.Fonts.Inter" Version="11.2.0" />
<PackageVersion Include="Avalonia.Desktop" Version="11.2.1" />
<PackageVersion Include="Avalonia.Diagnostics" Version="11.2.1" />
<PackageVersion Include="Avalonia.Fonts.Inter" Version="11.2.1" />
<PackageVersion Include="Avalonia.Xaml.Behaviors" Version="11.2.0" />
<PackageVersion Include="AvaloniaGraphControl" Version="0.6.1" />
<PackageVersion Include="AvaloniaHex" Version="0.1.4" />
<PackageVersion Include="AvaloniaHex" Version="0.1.5" />
<PackageVersion Include="bodong.Avalonia.PropertyGrid" Version="11.1.4.2" />
<PackageVersion Include="bodong.PropertyModels" Version="11.1.4.2" />
<PackageVersion Include="CommandLineParser" Version="2.9.1" />
Expand All @@ -23,34 +22,31 @@
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
<PackageVersion Include="DialogHost.Avalonia" Version="0.8.1" />
<PackageVersion Include="ErrorProne.NET.CoreAnalyzers" Version="0.1.2" />
<PackageVersion Include="FluentAssertions" Version="6.12.2" />
<PackageVersion Include="FluentIcons.Avalonia.Fluent" Version="1.1.263" />
<PackageVersion Include="FluentIcons.Avalonia.Fluent" Version="1.1.265" />
<PackageVersion Include="Iced" Version="1.21.0" />
<PackageVersion Include="JetBrains.Annotations" Version="2024.3.0" />
<PackageVersion Include="JvE.Structurizer" Version="1.0.1" />
<PackageVersion Include="MeltySynth" Version="2.4.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageVersion Include="Morris.Moxy" Version="1.10" />
<PackageVersion Include="Mt32emu.net" Version="1.0.0-rc.1" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="NSubstitute" Version="5.3.0" />
<PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />
<PackageVersion Include="Roslynator.Analyzers" Version="4.12.9" />
<PackageVersion Include="Roslynator.CodeAnalysis.Analyzers" Version="4.12.9" />
<PackageVersion Include="Semi.Avalonia" Version="11.2.0" />
<PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.2.0" />
<PackageVersion Include="Semi.Avalonia.TreeDataGrid" Version="11.0.10" />
<PackageVersion Include="Semi.Avalonia" Version="11.2.1" />
<PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.2.1" />
<PackageVersion Include="Semi.Avalonia.TreeDataGrid" Version="11.0.10.1" />
<PackageVersion Include="Serilog" Version="4.1.0" />
<PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
<PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />
<PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
<PackageVersion Include="System.Buffers" Version="4.5.1" />
<PackageVersion Include="System.Buffers" Version="4.6.0" />
<PackageVersion Include="System.IO" Version="4.3.0" />
<PackageVersion Include="System.IO.UnmanagedMemoryStream" Version="4.3.0" />
<PackageVersion Include="System.Memory" Version="4.5.5" />
<PackageVersion Include="System.Memory.Data" Version="8.0.1" />
<PackageVersion Include="System.Text.Encoding.CodePages" Version="8.0.0" />
<PackageVersion Include="xunit" Version="2.9.2" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
<PackageVersion Include="System.Memory" Version="4.6.0" />
<PackageVersion Include="System.Memory.Data" Version="9.0.0" />
<PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.0" />
<PackageVersion Include="System.Text.Json" Version="9.0.0" />
</ItemGroup>
</Project>
100 changes: 43 additions & 57 deletions src/Spice86.Core/Spice86.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,79 +1,65 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<NoWarn>1591;1572;1573;1570;1587;1574</NoWarn>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<Using Remove="System.Linq" />
<Using Include="System.Buffers.Binary" />
<Using Include="CommunityToolkit.HighPerformance" />
<Using Include="Spice86.Core.CLI" />
<Using Remove="System.Linq" />
<Using Include="System.Buffers.Binary" />
<Using Include="CommunityToolkit.HighPerformance" />
<Using Include="Spice86.Core.CLI" />
</ItemGroup>
<!-- Properties geared towards NuGet -->
<PropertyGroup>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<version>7.0.0</version>
<Authors>Kevin Ferrare, Maximilien Noal, Joris van Eijden, Artjom Vejsel</Authors>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<Description>Reverse engineer and rewrite real mode dos programs</Description>
<PackageProjectUrl>https://github.com/OpenRakis/Spice86</PackageProjectUrl>
<RepositoryUrl>https://github.com/OpenRakis/Spice86</RepositoryUrl>
<RepositoryType>git</RepositoryType>
</PropertyGroup>
<!-- Source Link configuration -->
<PropertyGroup>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
<PackageId>Spice86.Core</PackageId>
</PropertyGroup>
<!-- Moxy configuration -->
<PropertyGroup>
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
</PropertyGroup>
<ItemGroup>
<AdditionalFiles Include="Emulator/CPU/CfgCpu/ParsedInstruction/Instructions/Mixins/*.mixin" />
<AdditionalFiles Include="Emulator/CPU/CfgCpu/Parser/SpecificParsers/Mixin/*.mixin" />
<AdditionalFiles Include="Emulator/CPU/CfgCpu/ParsedInstruction/Instructions/Mixins/*.mixin" />
<AdditionalFiles Include="Emulator/CPU/CfgCpu/Parser/SpecificParsers/Mixin/*.mixin" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="CommunityToolkit.HighPerformance" />
<PackageReference Include="JetBrains.Annotations" />
<PackageReference Include="Newtonsoft.Json" />
<PackageReference Include="Serilog" />
<PackageReference Include="Serilog.Sinks.Console" />
<PackageReference Include="Serilog.Sinks.Debug" />
<PackageReference Include="System.Buffers" />
<PackageReference Include="System.IO" />
<PackageReference Include="System.IO.UnmanagedMemoryStream" />
<PackageReference Include="System.Memory" />
<PackageReference Include="System.Memory.Data" />
<PackageReference Include="System.Text.Encoding.CodePages" />
<PackageReference Include="CommandLineParser" />
<!--WARNING: No Mac OS support (MUNT needs to be build and included for this platform)-->
<PackageReference Include="Mt32emu.net" />
<PackageReference Include="MeltySynth" />
<PackageReference Include="Morris.Moxy" />
<PackageReference Include="CommunityToolkit.HighPerformance" />
<PackageReference Include="JetBrains.Annotations" />
<PackageReference Include="Newtonsoft.Json" />
<PackageReference Include="Serilog" />
<PackageReference Include="Serilog.Sinks.Console" />
<PackageReference Include="Serilog.Sinks.Debug" />
<PackageReference Include="System.Buffers" />
<PackageReference Include="System.IO" />
<PackageReference Include="System.IO.UnmanagedMemoryStream" />
<PackageReference Include="System.Memory" />
<PackageReference Include="System.Memory.Data" />
<PackageReference Include="System.Text.Encoding.CodePages" />
<PackageReference Include="CommandLineParser" />
<PackageReference Include="MeltySynth" />
<PackageReference Include="Morris.Moxy" />
<!--WARNING: No Mac OS support (MUNT needs to be build and included for this platform)-->
<PackageReference Include="Mt32emu.net" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Bufdio.Spice86\Bufdio.Spice86.csproj" />
<ProjectReference Include="..\Spice86.Logging\Spice86.Logging.csproj" />
<ProjectReference Include="..\Spice86.Shared\Spice86.Shared.csproj" />
<ProjectReference Include="..\Bufdio.Spice86\Bufdio.Spice86.csproj" />
<ProjectReference Include="..\Spice86.Logging\Spice86.Logging.csproj" />
<ProjectReference Include="..\Spice86.Shared\Spice86.Shared.csproj" />
</ItemGroup>
<ItemGroup>
<None Update="Resources\2MGM.license">
<Link>2MGM.license</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Resources\2MGM.sf2">
<Link>2MGM.sf2</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Resources\2MGM.license">
<Link>2MGM.license</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Resources\2MGM.sf2">
<Link>2MGM.sf2</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
<_Parameter1>Spice86.Tests</_Parameter1>
</AssemblyAttribute>
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
<_Parameter1>DynamicProxyGenAssembly2</_Parameter1>
</AssemblyAttribute>
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
<_Parameter1>Spice86.Tests</_Parameter1>
</AssemblyAttribute>
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
<_Parameter1>DynamicProxyGenAssembly2</_Parameter1>
</AssemblyAttribute>
</ItemGroup>
</Project>
25 changes: 6 additions & 19 deletions src/Spice86.Logging/Spice86.Logging.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Properties geared towards NuGet -->
<PropertyGroup>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<version>7.0.0</version>
<Authors>Kevin Ferrare, Maximilien Noal, Joris van Eijden, Artjom Vejsel</Authors>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<Description>Reverse engineer and rewrite real mode dos programs</Description>
<PackageProjectUrl>https://github.com/OpenRakis/Spice86</PackageProjectUrl>
<RepositoryUrl>https://github.com/OpenRakis/Spice86</RepositoryUrl>
<RepositoryType>git</RepositoryType>
</PropertyGroup>
<!-- Source Link configuration -->
<PropertyGroup>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
<PackageId>Spice86.Logging</PackageId>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Serilog" />
<PackageReference Include="Serilog.Sinks.Console" />
<PackageReference Include="Serilog.Sinks.Debug" />
<PackageReference Include="Serilog.Sinks.File" />
<PackageReference Include="Serilog" />
<PackageReference Include="Serilog.Sinks.Console" />
<PackageReference Include="Serilog.Sinks.Debug" />
<PackageReference Include="Serilog.Sinks.File" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Spice86.Shared\Spice86.Shared.csproj" />
<ProjectReference Include="..\Spice86.Shared\Spice86.Shared.csproj" />
</ItemGroup>
</Project>
23 changes: 5 additions & 18 deletions src/Spice86.Shared/Spice86.Shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Properties geared towards NuGet -->
<PropertyGroup>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<version>7.0.0</version>
<Authors>Kevin Ferrare, Maximilien Noal, Joris van Eijden, Artjom Vejsel</Authors>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<Description>Reverse engineer and rewrite real mode dos programs</Description>
<PackageProjectUrl>https://github.com/OpenRakis/Spice86</PackageProjectUrl>
<RepositoryUrl>https://github.com/OpenRakis/Spice86</RepositoryUrl>
<RepositoryType>git</RepositoryType>
</PropertyGroup>
<!-- Source Link configuration -->
<PropertyGroup>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
<PackageId>Spice86.Shared</PackageId>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Avalonia" />
<PackageReference Include="Serilog" />
<PackageReference Include="Serilog.Sinks.Console" />
<PackageReference Include="Serilog.Sinks.Debug" />
<PackageReference Include="Avalonia" />
<PackageReference Include="Serilog" />
<PackageReference Include="Serilog.Sinks.Console" />
<PackageReference Include="Serilog.Sinks.Debug" />
</ItemGroup>
</Project>
9 changes: 7 additions & 2 deletions src/Spice86.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spice86.Tests", "..\tests\S
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bufdio.Spice86", "Bufdio.Spice86\Bufdio.Spice86.csproj", "{7D5BE77E-870A-411B-8B05-E52AC9D784B4}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{52A35F7D-C8DB-4690-84C6-0173E2EADD97}"
ProjectSection(SolutionItems) = preProject
Directory.Build.props = Directory.Build.props
Directory.Packages.props = Directory.Packages.props
..\tests\Directory.Packages.props = ..\tests\Directory.Packages.props
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -49,8 +56,6 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {020167FB-AD64-4756-930F-EBF609283573}
EndGlobalSection
Expand Down
Loading
Loading