Update to .net8.0

GeorgRottensteiner · Nov 20, 2024 · 92f8548 · 92f8548
1 parent 50d9eb6
commit 92f8548
Show file tree

Hide file tree

Showing 24 changed files with 62 additions and 104 deletions.
diff --git a/.gitignore b/.gitignore
@@ -154,7 +154,6 @@
 /Sample Projects/MacroTest/macro_overloaded.prg
 /Sample Projects/MacroTest/po_nested_zone.prg
 /C64Ass/publish
-/C64StudioRelease/net6.0
 /Sample Projects/MacroTest/referencenotlisted.prg
 /Sample Projects/MacroTest/cpc_z80.prg
 /Sample Projects/MacroTest/cpc_all.prg
@@ -167,6 +166,8 @@
 /C64StudioRelease/net4.8
 /C64StudioRelease/net6.0
 /C64StudioRelease/net6.0-windows
+/C64StudioRelease/net8.0
+/C64StudioRelease/net8.0-windows
 /Sample Projects/MacroTest/po_while.prg
 /Sample Projects/MacroTest/shifted-letters-petscii.prg
 /Sample Projects/MacroTest/acme.prg
@@ -220,6 +221,7 @@
 /C64StudioRelease3.5ARM.zip
 /C64StudioRelease4.8ARM.zip
 /C64StudioRelease6.0ARM.zip
+/C64StudioRelease8.0ARM.zip
 /C64StudioReleaseARM.zip
 /Sample Projects/MacroTest/segment_overlapping.prg
 /C64StudioRelease.zip

diff --git a/C64Ass/C64Ass.csproj b/C64Ass/C64Ass.csproj
@@ -1,21 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net3.5;net4.8;net6.0-windows;net6.0</TargetFrameworks>
+    <TargetFrameworks>net3.5;net4.8;net8.0-windows;net8.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true</IsWindows>
     <IsOSX Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">true</IsOSX>
     <IsLinux Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">true</IsLinux>
-	  <UseWindowsForms Condition="'$(TargetFramework)' != 'net6.0'">true</UseWindowsForms>
-	  <ImportWindowsDesktopTargets Condition="'$(TargetFramework)' != 'net6.0'">true</ImportWindowsDesktopTargets>
-	  <RuntimeIdentifiers>win7-x86;win7-x64;linux-x64</RuntimeIdentifiers>
+	  <UseWindowsForms Condition="'$(TargetFramework)' != 'net8.0'">true</UseWindowsForms>
+	  <ImportWindowsDesktopTargets Condition="'$(TargetFramework)' != 'net8.0'">true</ImportWindowsDesktopTargets>
+	  <RuntimeIdentifiers>win-x86;win-x64;linux-x64</RuntimeIdentifiers>
     <Platforms>AnyCPU;ARM64</Platforms>
   </PropertyGroup>
   <PropertyGroup Condition="'$(IsWindows)'=='true'">
     <DefineConstants>OS_WINDOWS</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
 	<DefineConstants>OS_CROSS_PLATFORM</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
@@ -55,12 +55,12 @@
     </PostBuildEvent>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.3.330701">
+    <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.421302">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
 
   <Import Project="..\Common\Common.projitems" Label="Shared" />
-  <Import Project="..\CommonWindows\CommonWindows.projitems" Label="Shared" Condition="'$(TargetFramework)' != 'net6.0'" />
+  <Import Project="..\CommonWindows\CommonWindows.projitems" Label="Shared" Condition="'$(TargetFramework)' != 'net8.0'" />
   <Import Project="..\C64Models\C64Models.projitems" Label="Shared" />
 </Project>
diff --git a/C64Studio.sln b/C64Studio.sln
@@ -150,7 +150,6 @@ Global
 		CommonWindows\CommonWindows.projitems*{5bea5ce5-4c5d-4ec5-83f3-83634e929858}*SharedItemsImports = 5
 		Common\Common.projitems*{5bea5ce5-4c5d-4ec5-83f3-83634e929858}*SharedItemsImports = 5
 		C64Models\C64Models.projitems*{6f69db22-f5b9-4446-adb1-56f18b64374e}*SharedItemsImports = 5
-		CommonWindows\CommonWindows.projitems*{6f69db22-f5b9-4446-adb1-56f18b64374e}*SharedItemsImports = 5
 		Common\Common.projitems*{6f69db22-f5b9-4446-adb1-56f18b64374e}*SharedItemsImports = 5
 		C64Models\C64Models.projitems*{85f30a2d-5636-4648-8125-a22f11a56f1f}*SharedItemsImports = 5
 		CommonWindows\CommonWindows.projitems*{85f30a2d-5636-4648-8125-a22f11a56f1f}*SharedItemsImports = 5

diff --git a/C64Studio/C64Studio.csproj b/C64Studio/C64Studio.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net3.5;net4.8;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net3.5;net4.8;net8.0-windows</TargetFrameworks>
     <OutputType>WinExe</OutputType>
     <RootNamespace>RetroDevStudio</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -544,10 +544,10 @@
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net4.8|AnyCPU'">
     <NoWarn>1701;1702;CA1416</NoWarn>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0-windows|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-windows|AnyCPU'">
     <NoWarn>1701;1702;CA1416</NoWarn>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net6.0-windows|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-windows|AnyCPU'">
     <NoWarn>1701;1702;CA1416</NoWarn>
   </PropertyGroup>
   <Import Project="..\Common\Common.projitems" Label="Shared" />

diff --git a/C64Studio/Controls/DecentForms/ControlRenderer.cs b/C64Studio/Controls/DecentForms/ControlRenderer.cs
@@ -306,7 +306,7 @@ private Pen ColoredPen( uint BaseColor )
 
 
 
-    public void DrawText( Font Font, string Text, int BoundsX, int BoundsY, int Width, int Height, TextAlignment Alignment, int DX = 0, int DY = 0 )
+    public void DrawText( System.Drawing.Font Font, string Text, int BoundsX, int BoundsY, int Width, int Height, TextAlignment Alignment, int DX = 0, int DY = 0 )
     {
       BoundsX -= _DisplayOffsetX;
       BoundsY -= _DisplayOffsetY;
@@ -323,7 +323,7 @@ public void DrawText( string Text, int BoundsX, int BoundsY, int Width, int Heig
 
 
 
-    public void DrawText( Font Font, string Text, int BoundsX, int BoundsY, int Width, int Height, TextAlignment Alignment, uint Color )
+    public void DrawText( System.Drawing.Font Font, string Text, int BoundsX, int BoundsY, int Width, int Height, TextAlignment Alignment, uint Color )
     {
       BoundsX -= _DisplayOffsetX;
       BoundsY -= _DisplayOffsetY;

diff --git a/C64Studio/Settings/StudioSettings.cs b/C64Studio/Settings/StudioSettings.cs
@@ -9,7 +9,6 @@
 using System.Drawing;
 using RetroDevStudio.Documents;
 using System.Linq;
-using MDIApp;
 using System.Management;
 
 namespace RetroDevStudio

diff --git a/Common/Common.projitems b/Common/Common.projitems
@@ -25,7 +25,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Common\Map.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Common\MemoryImage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Common\MemoryReader.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Common\Misc.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Common\MultiMap.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Common\Path.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Common\PixelFormat.cs" />

diff --git a/Common/Common/MemoryImage.cs b/Common/Common/MemoryImage.cs
@@ -1183,7 +1183,7 @@ public bool SetData( GR.Memory.ByteBuffer ImageData )
 
 
 
-#if !OS_CROSS_PLATFORM
+#if ( OS_WINDOWS ) && ( !OS_CROSS_PLATFORM )
 #if NET5_0_OR_GREATER
     [SupportedOSPlatform("windows")]
 #endif

diff --git a/Common/Common/Misc.cs b/Common/Common/Misc.cs
diff --git a/FastColoredTextBox/FastColoredTextBox.cs b/FastColoredTextBox/FastColoredTextBox.cs
@@ -2489,7 +2489,7 @@ public virtual void OnVisibleRangeChanged()
     public new void Invalidate()
     {
       if ( InvokeRequired )
-        BeginInvoke( new MethodInvoker( Invalidate ) );
+        BeginInvoke( new System.Windows.Forms.MethodInvoker( Invalidate ) );
       else
         base.Invalidate();
     }
@@ -3128,7 +3128,7 @@ private void ResetTimer( Timer timer )
     {
       if ( InvokeRequired )
       {
-        BeginInvoke( new MethodInvoker( () => ResetTimer( timer ) ) );
+        BeginInvoke( new System.Windows.Forms.MethodInvoker( () => ResetTimer( timer ) ) );
         return;
       }
       timer.Stop();
@@ -4221,7 +4221,7 @@ public void UpdateScrollbars()
         AutoScrollMinSize = AutoScrollMinSize;
 
       if ( IsHandleCreated )
-        BeginInvoke( (MethodInvoker)OnScrollbarsUpdated );
+        BeginInvoke( new System.Windows.Forms.MethodInvoker( OnScrollbarsUpdated ) );
     }
 
     protected virtual void OnScrollbarsUpdated()

diff --git a/FastColoredTextBox/FastColoredTextBox.csproj b/FastColoredTextBox/FastColoredTextBox.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net3.5;net4.8;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net3.5;net4.8;net8.0-windows</TargetFrameworks>
     <OutputType>Library</OutputType>
     <RootNamespace>FastColoredTextBoxNS</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -33,10 +33,10 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.3.330701">
+    <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.421302">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.6" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.0" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System.Design" Condition="'$(TargetFramework)' == 'net3.5'" />

diff --git a/HexBox/HexBox.csproj b/HexBox/HexBox.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net3.5;net4.8;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net3.5;net4.8;net8.0-windows</TargetFrameworks>
     <OutputType>Library</OutputType>
     <StartupObject>
     </StartupObject>
@@ -23,9 +23,9 @@
     <EmbeddedResource Remove="Properties\Resources.resx" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.3.330701">
+    <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.421302">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.6" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.0" />
   </ItemGroup>
 </Project>
diff --git a/MediaManager/MediaManager.csproj b/MediaManager/MediaManager.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net3.5;net4.8;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net3.5;net4.8;net8.0-windows</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -9,10 +9,10 @@
     <Platforms>AnyCPU;ARM64</Platforms>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.3.330701">
+    <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.421302">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.6" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.0" />
   </ItemGroup>
   <ItemGroup>
     <Compile Update="Properties\Settings.Designer.cs">

diff --git a/MediaTool/MediaTool.csproj b/MediaTool/MediaTool.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net3.5;net4.8;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net3.5;net4.8;net8.0-windows</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWindowsForms>true</UseWindowsForms>
@@ -15,10 +15,10 @@
 	<DefineConstants>OS_WINDOWS</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.3.330701">
+    <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.421302">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.6" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.0" />
   </ItemGroup>
   <Import Project="..\Common\Common.projitems" Label="Shared" />
   <Import Project="..\C64Models\C64Models.projitems" Label="Shared" />

diff --git a/Sample Projects/MacroTest/MacroTest.c64 b/Sample Projects/MacroTest/MacroTest.c64
diff --git a/Sample Projects/MacroTest/MacroTest.s64 b/Sample Projects/MacroTest/MacroTest.s64
diff --git a/Sample Projects/Sample Project 6 - Cartridge/cart64.c64 b/Sample Projects/Sample Project 6 - Cartridge/cart64.c64
diff --git a/Sample Projects/Sample Project 6 - Cartridge/easyflash.crt b/Sample Projects/Sample Project 6 - Cartridge/easyflash.crt
diff --git a/SourceControl/SourceControl.csproj b/SourceControl/SourceControl.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net3.5;net4.8;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net3.5;net4.8;net8.0-windows</TargetFrameworks>
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>disable</Nullable>
     <IsPublishable>False</IsPublishable>
@@ -33,7 +33,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="LibGit2Sharp" Version="0.30.0" Condition="'$(TargetFramework)'=='net6.0-windows'" />
+    <PackageReference Include="LibGit2Sharp" Version="0.30.0" Condition="'$(TargetFramework)'=='net8.0-windows'" />
   </ItemGroup>
 
 </Project>
diff --git a/TestProject/TestProject.csproj b/TestProject/TestProject.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows7.0</TargetFramework>
     <OutputType>Library</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <PlatformTarget>x86</PlatformTarget>
@@ -81,12 +81,13 @@
   </Choose>
   <ItemGroup>
     <PackageReference Include="LibGit2Sharp" Version="0.30.0" />
-    <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.3.330701">
+    <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.421302">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.6.3" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.6.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
   <ItemGroup>
     <None Update="Compare Files\Cartridge16kBin.bin">

diff --git a/Tiny64Cmd/Tiny64Cmd.csproj b/Tiny64Cmd/Tiny64Cmd.csproj
@@ -1,20 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows7.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWindowsForms>true</UseWindowsForms>
     <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Platforms>AnyCPU;ARM64</Platforms>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <DefineConstants>OS_CROSS_PLATFORM</DefineConstants>
+  </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.3.330701">
+    <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.421302">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.6" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.0" />
   </ItemGroup>
   <Import Project="..\Common\Common.projitems" Label="Shared" />
   <Import Project="..\C64Models\C64Models.projitems" Label="Shared" />
-  <Import Project="..\CommonWindows\CommonWindows.projitems" Label="Shared" />
 </Project>
diff --git a/Tiny64Emu/Tiny64Emu.csproj b/Tiny64Emu/Tiny64Emu.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows7.0</TargetFramework>
     <OutputType>WinExe</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWindowsForms>true</UseWindowsForms>
@@ -14,10 +14,10 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
-    <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.3.330701">
+    <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.421302">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.6" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.0" />
   </ItemGroup>
   <Import Project="..\Common\Common.projitems" Label="Shared" />
   <Import Project="..\C64Models\C64Models.projitems" Label="Shared" />