From 9128d1e45c3a9b1ad8cdacc828c7d98398e213e9 Mon Sep 17 00:00:00 2001 From: Maximilien Noal Date: Sat, 9 Nov 2024 11:09:29 +0100 Subject: [PATCH 1/3] chore: Update Nuget packages Signed-off-by: Maximilien Noal --- src/Spice86.Shared/Spice86.Shared.csproj | 2 +- src/Spice86/Spice86.csproj | 16 ++++++++-------- tests/Spice86.Tests/Spice86.Tests.csproj | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Spice86.Shared/Spice86.Shared.csproj b/src/Spice86.Shared/Spice86.Shared.csproj index 1e8e23a83..e4be0bc3a 100644 --- a/src/Spice86.Shared/Spice86.Shared.csproj +++ b/src/Spice86.Shared/Spice86.Shared.csproj @@ -26,7 +26,7 @@ - + diff --git a/src/Spice86/Spice86.csproj b/src/Spice86/Spice86.csproj index 68d496190..55fccbd2a 100644 --- a/src/Spice86/Spice86.csproj +++ b/src/Spice86/Spice86.csproj @@ -46,15 +46,15 @@ - - - + + + - + - - + + @@ -64,8 +64,8 @@ - - + + diff --git a/tests/Spice86.Tests/Spice86.Tests.csproj b/tests/Spice86.Tests/Spice86.Tests.csproj index 4d1ba6d12..3f84d55a7 100644 --- a/tests/Spice86.Tests/Spice86.Tests.csproj +++ b/tests/Spice86.Tests/Spice86.Tests.csproj @@ -13,7 +13,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + From 2272fe9fda917dd68e6ad43e1275dba0aae94c6c Mon Sep 17 00:00:00 2001 From: Maximilien Noal Date: Sat, 9 Nov 2024 11:32:16 +0100 Subject: [PATCH 2/3] chore: Common .csproj lines moved in Build.props Signed-off-by: Maximilien Noal --- src/Bufdio.Spice86/Bufdio.Spice86.csproj | 3 --- src/Directory.Build.props | 29 +++++----------------- src/Spice86.Core/Spice86.Core.csproj | 4 --- src/Spice86.Logging/Spice86.Logging.csproj | 6 ----- src/Spice86.Shared/Spice86.Shared.csproj | 6 ----- src/Spice86/Spice86.csproj | 4 --- 6 files changed, 6 insertions(+), 46 deletions(-) diff --git a/src/Bufdio.Spice86/Bufdio.Spice86.csproj b/src/Bufdio.Spice86/Bufdio.Spice86.csproj index 26a540e2e..7d482ffed 100644 --- a/src/Bufdio.Spice86/Bufdio.Spice86.csproj +++ b/src/Bufdio.Spice86/Bufdio.Spice86.csproj @@ -5,9 +5,6 @@ Bufdio.Spice86 Luthfi Tri Atmaja Only for Spice86 usage. A cross platform audio playback library for .NET based on PortAudio, forked from the original Bufdio by Luthfi Tri Atmaja. - net8.0 - enable - nullable diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 125690c40..be2026848 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,25 +1,8 @@ - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - + + net8.0 + enable + enable + nullable + \ No newline at end of file diff --git a/src/Spice86.Core/Spice86.Core.csproj b/src/Spice86.Core/Spice86.Core.csproj index cc3592a64..092edd251 100644 --- a/src/Spice86.Core/Spice86.Core.csproj +++ b/src/Spice86.Core/Spice86.Core.csproj @@ -1,10 +1,6 @@  - net8.0 - enable - enable - nullable true 1591;1572;1573;1570;1587;1574 diff --git a/src/Spice86.Logging/Spice86.Logging.csproj b/src/Spice86.Logging/Spice86.Logging.csproj index 8e0362634..83285c43b 100644 --- a/src/Spice86.Logging/Spice86.Logging.csproj +++ b/src/Spice86.Logging/Spice86.Logging.csproj @@ -1,10 +1,4 @@  - - net8.0 - enable - enable - Nullable - true diff --git a/src/Spice86.Shared/Spice86.Shared.csproj b/src/Spice86.Shared/Spice86.Shared.csproj index e4be0bc3a..7e5e6e5c7 100644 --- a/src/Spice86.Shared/Spice86.Shared.csproj +++ b/src/Spice86.Shared/Spice86.Shared.csproj @@ -1,11 +1,5 @@  - - net8.0 - enable - enable - Nullable - true diff --git a/src/Spice86/Spice86.csproj b/src/Spice86/Spice86.csproj index 55fccbd2a..4f4b12a09 100644 --- a/src/Spice86/Spice86.csproj +++ b/src/Spice86/Spice86.csproj @@ -2,10 +2,6 @@ Exe - net8.0 - enable - nullable - enable true True 1591;1572;1573;1570;1587;1574 From 6c68bbf5b7e238e9edf47ba02c09d1ea0b758a47 Mon Sep 17 00:00:00 2001 From: Maximilien Noal Date: Sat, 9 Nov 2024 11:44:14 +0100 Subject: [PATCH 3/3] chore: Nugets in Directory.Packages.props files Signed-off-by: Maximilien Noal --- src/Directory.Packages.props | 56 +++++++ src/Spice86.Core/Spice86.Core.csproj | 162 ++++++++++----------- src/Spice86.Logging/Spice86.Logging.csproj | 8 +- src/Spice86.Shared/Spice86.Shared.csproj | 51 +++---- src/Spice86/Spice86.csproj | 146 +++++++++---------- tests/Directory.Packages.props | 20 +++ tests/Spice86.Tests/Spice86.Tests.csproj | 87 ++++++----- 7 files changed, 293 insertions(+), 237 deletions(-) create mode 100644 src/Directory.Packages.props create mode 100644 tests/Directory.Packages.props diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props new file mode 100644 index 000000000..456f7fe23 --- /dev/null +++ b/src/Directory.Packages.props @@ -0,0 +1,56 @@ + + + true + true + $(NoWarn);NU1507 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Spice86.Core/Spice86.Core.csproj b/src/Spice86.Core/Spice86.Core.csproj index 092edd251..b1f2efe27 100644 --- a/src/Spice86.Core/Spice86.Core.csproj +++ b/src/Spice86.Core/Spice86.Core.csproj @@ -1,85 +1,79 @@  - - - true - 1591;1572;1573;1570;1587;1574 - - - - - - - - - - true - 7.0.0 - Kevin Ferrare, Maximilien Noal, Joris van Eijden, Artjom Vejsel - Apache-2.0 - Reverse engineer and rewrite real mode dos programs - https://github.com/OpenRakis/Spice86 - https://github.com/OpenRakis/Spice86 - git - - - - - true - true - true - - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2MGM.license - Always - - - 2MGM.sf2 - Always - - - - - - <_Parameter1>Spice86.Tests - - - <_Parameter1>DynamicProxyGenAssembly2 - - - - + + true + 1591;1572;1573;1570;1587;1574 + + + + + + + + + + true + 7.0.0 + Kevin Ferrare, Maximilien Noal, Joris van Eijden, Artjom Vejsel + Apache-2.0 + Reverse engineer and rewrite real mode dos programs + https://github.com/OpenRakis/Spice86 + https://github.com/OpenRakis/Spice86 + git + + + + true + true + true + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2MGM.license + Always + + + 2MGM.sf2 + Always + + + + + <_Parameter1>Spice86.Tests + + + <_Parameter1>DynamicProxyGenAssembly2 + + + \ No newline at end of file diff --git a/src/Spice86.Logging/Spice86.Logging.csproj b/src/Spice86.Logging/Spice86.Logging.csproj index 83285c43b..6803e8a0a 100644 --- a/src/Spice86.Logging/Spice86.Logging.csproj +++ b/src/Spice86.Logging/Spice86.Logging.csproj @@ -17,10 +17,10 @@ true - - - - + + + + diff --git a/src/Spice86.Shared/Spice86.Shared.csproj b/src/Spice86.Shared/Spice86.Shared.csproj index 7e5e6e5c7..bab813409 100644 --- a/src/Spice86.Shared/Spice86.Shared.csproj +++ b/src/Spice86.Shared/Spice86.Shared.csproj @@ -1,28 +1,25 @@  - - - - true - 7.0.0 - Kevin Ferrare, Maximilien Noal, Joris van Eijden, Artjom Vejsel - Apache-2.0 - Reverse engineer and rewrite real mode dos programs - https://github.com/OpenRakis/Spice86 - https://github.com/OpenRakis/Spice86 - git - - - - - true - true - true - - - - - - - - - + + + true + 7.0.0 + Kevin Ferrare, Maximilien Noal, Joris van Eijden, Artjom Vejsel + Apache-2.0 + Reverse engineer and rewrite real mode dos programs + https://github.com/OpenRakis/Spice86 + https://github.com/OpenRakis/Spice86 + git + + + + true + true + true + + + + + + + + \ No newline at end of file diff --git a/src/Spice86/Spice86.csproj b/src/Spice86/Spice86.csproj index 4f4b12a09..0eb55cb5d 100644 --- a/src/Spice86/Spice86.csproj +++ b/src/Spice86/Spice86.csproj @@ -1,77 +1,71 @@  - - - Exe - true - True - 1591;1572;1573;1570;1587;1574 - true - app.manifest - true - - - - CS1591 - Spice86 - true - 7.0.0 - 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. - Kevin Ferrare, Maximilien Noal, Joris van Eijden, Artjom Vejsel - Apache-2.0 - Reverse engineer and rewrite real mode DOS programs - reverse-engineering;avalonia;debugger;assembly;emulator;cross-platform - https://github.com/OpenRakis/Spice86 - https://github.com/OpenRakis/Spice86 - git - - - - - true - true - true - - - - - lib\net8.0\libportaudio.dll - Always - True - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + Exe + true + True + 1591;1572;1573;1570;1587;1574 + true + app.manifest + true + + + + CS1591 + Spice86 + true + 7.0.0 + 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. + Kevin Ferrare, Maximilien Noal, Joris van Eijden, Artjom Vejsel + Apache-2.0 + Reverse engineer and rewrite real mode DOS programs + reverse-engineering;avalonia;debugger;assembly;emulator;cross-platform + https://github.com/OpenRakis/Spice86 + https://github.com/OpenRakis/Spice86 + git + + + + true + true + true + + + + lib\net8.0\libportaudio.dll + Always + True + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/Directory.Packages.props b/tests/Directory.Packages.props new file mode 100644 index 000000000..7bb6f55c5 --- /dev/null +++ b/tests/Directory.Packages.props @@ -0,0 +1,20 @@ + + + true + true + $(NoWarn);NU1507 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/Spice86.Tests/Spice86.Tests.csproj b/tests/Spice86.Tests/Spice86.Tests.csproj index 3f84d55a7..b301a0e1e 100644 --- a/tests/Spice86.Tests/Spice86.Tests.csproj +++ b/tests/Spice86.Tests/Spice86.Tests.csproj @@ -1,55 +1,50 @@ - - net8.0 - enable - enable - nullable - false + net8.0 + enable + enable + nullable + false - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + - - - - + + + - - - Always - + + Always + - - + \ No newline at end of file