fixed merged latest v2_develop

Author: tig

Benchmarks/Benchmarks.csproj

@@ -2,23 +2,13 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-<<<<<<< HEAD
-    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
-    <ImplicitUsings>enable</ImplicitUsings>
-=======
-    <IsPackable>false</IsPackable>
->>>>>>> v2_develop
     <Nullable>enable</Nullable>
     <RootNamespace>Terminal.Gui.$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-<<<<<<< HEAD
-    <PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
-=======
     <PackageReference Include="BenchmarkDotNet" />
->>>>>>> v2_develop
   </ItemGroup>
 
   <ItemGroup>

Terminal.Gui/Terminal.Gui.csproj

@@ -1,23 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
-<<<<<<< HEAD
-  <!-- =================================================================== -->
-  <!-- Version numbers -->
-  <!-- Automatically updated by gitversion (run `dotnet-gitversion`)  -->
-  <!-- GitVersion.xml controls settings  -->
-  <!-- See ./README.md for more -->
-  <!-- =================================================================== -->
-  <PropertyGroup>
-    <Version>2.0.0</Version>
-  </PropertyGroup>
-  <!-- =================================================================== -->
-  <!-- Assembly name. -->
-  <!-- Referenced throughout this file for consistency. -->
-  <!-- =================================================================== -->
-<PropertyGroup>
-  <AssemblyName>Terminal.Gui</AssemblyName>
-</PropertyGroup>
-=======
-    <!-- =================================================================== -->
+    <!-- =================================================================== -->
     <!-- Version numbers -->
     <!-- Automatically updated by gitversion (run `dotnet-gitversion`)  -->
     <!-- GitVersion.xml controls settings  -->
@@ -33,7 +14,6 @@
     <PropertyGroup>
         <AssemblyName>Terminal.Gui</AssemblyName>
     </PropertyGroup>
->>>>>>> v2_develop
 
     <!-- =================================================================== -->
     <!-- .NET Build Settings -->