Complete conversion to net core

xxbiohazrdxx · Dec 6, 2021 · 41d2b22 · 41d2b22
1 parent 5d47b50
commit 41d2b22
Show file tree

Hide file tree

Showing 100 changed files with 44 additions and 3,014 deletions.
diff --git a/AmpAPI/AmpAPI.csproj b/AmpAPI/AmpAPI.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\NewLib\MPRSGxZ.csproj" />
+    <ProjectReference Include="..\MPRSGxZ\MPRSGxZ.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/AmpMonitor/AmpMonitor.csproj b/AmpMonitor/AmpMonitor.csproj
@@ -1,61 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{4DBDB6BA-5F3B-4B00-968B-08E1FFA6ED43}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>AmpMonitor</RootNamespace>
-    <AssemblyName>AmpMonitor</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
+
   <ItemGroup>
-    <None Include="App.config" />
+    <ProjectReference Include="..\MPRSGxZ\MPRSGxZ.csproj" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
+
+</Project>
diff --git a/AmpMonitor/App.config b/AmpMonitor/App.config
diff --git a/AmpMonitor/Program.cs b/AmpMonitor/Program.cs
@@ -10,8 +10,8 @@ class Program
 
 		static void Main(string[] args)
 		{
-			AmpInterface = new AmplifierStack(@"COM3");
-			//AmpInterface = new AmplifierStack();
+			//AmpInterface = new AmplifierStack(@"COM3");
+			AmpInterface = new AmplifierStack();
 			AmpInterface.ZoneChanged += ZoneChanged;
 			AmpInterface.Open();
 
@@ -31,8 +31,8 @@ public static void ZoneChanged(ZoneChangedEventArgs e)
 		{
 			Console.SetCursorPosition(0, 0);
 
-			foreach(var CurrentAmp in AmpInterface.Amplifiers)
-			{	
+			foreach (var CurrentAmp in AmpInterface.Amplifiers)
+			{
 				Console.BackgroundColor = ConsoleColor.DarkGreen;
 				Console.ForegroundColor = ConsoleColor.White;
 				Console.WriteLine($"==AMP {CurrentAmp.ID}=============================================");

diff --git a/AmpMonitor/Properties/AssemblyInfo.cs b/AmpMonitor/Properties/AssemblyInfo.cs
diff --git a/AmplifierTests/AmpCommunicationTests.cs → AmpTest/AmpCommunicationTests.cs b/AmplifierTests/AmpCommunicationTests.cs → AmpTest/AmpCommunicationTests.cs
diff --git a/AmpTest/AmpTest.csproj b/AmpTest/AmpTest.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.1.0" />
+    <PackageReference Include="coverlet.collector" Version="1.2.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\MPRSGxZ\MPRSGxZ.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/AmplifierTests/EventTests.cs → AmpTest/EventTests.cs b/AmplifierTests/EventTests.cs → AmpTest/EventTests.cs
diff --git a/AmplifierTests/LinkedZoneTests.cs → AmpTest/LinkedZoneTests.cs b/AmplifierTests/LinkedZoneTests.cs → AmpTest/LinkedZoneTests.cs
diff --git a/AmplifierTests/AmplifierTests.csproj b/AmplifierTests/AmplifierTests.csproj
diff --git a/AmplifierTests/Properties/AssemblyInfo.cs b/AmplifierTests/Properties/AssemblyInfo.cs
diff --git a/MPRSGxZ.backup/AnalysisReport.sarif b/MPRSGxZ.backup/AnalysisReport.sarif