Testing (#10)

* Fix for #8 maybe * Reverted Combo Box back to Version 1.5.2, better Error Handling * Added SonarCloud Properties * Github Action is for .Net Core only * Fixed Combo Box Code * Updated SonarCloud/SonarScan .gitignore * Fixed Code Smells * Removed Debug Text * Change Version to 1.6.0.3 for AutoUpdater * Fixed Reference Issues
PeterStrick · Mar 27, 2022 · 72b3263 · 72b3263
1 parent 2f0e8cc
commit 72b3263
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 87 deletions.
diff --git a/ViVeTool-GUI.FeatureScanner/ViVeTool_GUI.FeatureScanner.vbproj b/ViVeTool-GUI.FeatureScanner/ViVeTool_GUI.FeatureScanner.vbproj
@@ -15,26 +15,6 @@
     <MyType>WindowsForms</MyType>
     <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>ViVeTool_GUI.FeatureScanner.xml</DocumentationFile>
-    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <DefineDebug>false</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>ViVeTool_GUI.FeatureScanner.xml</DocumentationFile>
-    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
-  </PropertyGroup>
   <PropertyGroup>
     <OptionExplicit>On</OptionExplicit>
   </PropertyGroup>
@@ -50,6 +30,9 @@
   <PropertyGroup>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>icons8_portrait_mode_scanning.ico</ApplicationIcon>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <PlatformTarget>x64</PlatformTarget>
     <OutputPath>bin\x64\Debug\</OutputPath>
@@ -58,9 +41,6 @@
     <PlatformTarget>x64</PlatformTarget>
     <OutputPath>bin\x64\Release\</OutputPath>
   </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationIcon>icons8_portrait_mode_scanning.ico</ApplicationIcon>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="CrashReporter.NET, Version=1.6.0.0, Culture=neutral, PublicKeyToken=7828e0fd88cab698, processorArchitecture=MSIL">
       <HintPath>..\packages\CrashReporter.NET.Official.1.6.0\lib\net462\CrashReporter.NET.dll</HintPath>
@@ -69,15 +49,15 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="Telerik.WinControls, Version=2021.3.1109.40, Culture=neutral, PublicKeyToken=5bb2a467cbec794e, processorArchitecture=MSIL">
-      <HintPath>..\lib\RCWF\2021.3.1109.40\Telerik.WinControls.dll</HintPath>
+      <HintPath>$(SolutionDir)\lib\RCWF\2021.3.1109.40\Telerik.WinControls.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Telerik.WinControls.UI, Version=2021.3.1109.40, Culture=neutral, PublicKeyToken=5bb2a467cbec794e, processorArchitecture=MSIL">
-      <HintPath>..\lib\RCWF\2021.3.1109.40\Telerik.WinControls.UI.dll</HintPath>
+      <HintPath>$(SolutionDir)\lib\RCWF\2021.3.1109.40\Telerik.WinControls.UI.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="TelerikCommon, Version=2021.3.1109.40, Culture=neutral, PublicKeyToken=5bb2a467cbec794e, processorArchitecture=MSIL">
-      <HintPath>..\lib\RCWF\2021.3.1109.40\TelerikCommon.dll</HintPath>
+      <HintPath>$(SolutionDir)\lib\RCWF\2021.3.1109.40\TelerikCommon.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>

diff --git a/ViVeTool_GUI.sln b/ViVeTool_GUI.sln
@@ -9,38 +9,18 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ViVeTool_GUI.FeatureScanner
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
 		Release|x64 = Release|x64
-		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7E667325-4E6F-49E0-A7A8-52E4B95FBB4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7E667325-4E6F-49E0-A7A8-52E4B95FBB4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7E667325-4E6F-49E0-A7A8-52E4B95FBB4A}.Debug|x64.ActiveCfg = Debug|x64
 		{7E667325-4E6F-49E0-A7A8-52E4B95FBB4A}.Debug|x64.Build.0 = Debug|x64
-		{7E667325-4E6F-49E0-A7A8-52E4B95FBB4A}.Debug|x86.ActiveCfg = Debug|x86
-		{7E667325-4E6F-49E0-A7A8-52E4B95FBB4A}.Debug|x86.Build.0 = Debug|x86
-		{7E667325-4E6F-49E0-A7A8-52E4B95FBB4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7E667325-4E6F-49E0-A7A8-52E4B95FBB4A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7E667325-4E6F-49E0-A7A8-52E4B95FBB4A}.Release|x64.ActiveCfg = Release|x64
 		{7E667325-4E6F-49E0-A7A8-52E4B95FBB4A}.Release|x64.Build.0 = Release|x64
-		{7E667325-4E6F-49E0-A7A8-52E4B95FBB4A}.Release|x86.ActiveCfg = Release|x86
-		{7E667325-4E6F-49E0-A7A8-52E4B95FBB4A}.Release|x86.Build.0 = Release|x86
-		{89B985FC-8979-4D33-8986-05B03F9D617A}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{89B985FC-8979-4D33-8986-05B03F9D617A}.Debug|Any CPU.Build.0 = Debug|x86
 		{89B985FC-8979-4D33-8986-05B03F9D617A}.Debug|x64.ActiveCfg = Debug|x64
 		{89B985FC-8979-4D33-8986-05B03F9D617A}.Debug|x64.Build.0 = Debug|x64
-		{89B985FC-8979-4D33-8986-05B03F9D617A}.Debug|x86.ActiveCfg = Debug|x86
-		{89B985FC-8979-4D33-8986-05B03F9D617A}.Debug|x86.Build.0 = Debug|x86
-		{89B985FC-8979-4D33-8986-05B03F9D617A}.Release|Any CPU.ActiveCfg = Release|x86
-		{89B985FC-8979-4D33-8986-05B03F9D617A}.Release|Any CPU.Build.0 = Release|x86
-		{89B985FC-8979-4D33-8986-05B03F9D617A}.Release|x64.ActiveCfg = Release|x86
-		{89B985FC-8979-4D33-8986-05B03F9D617A}.Release|x64.Build.0 = Release|x86
-		{89B985FC-8979-4D33-8986-05B03F9D617A}.Release|x86.ActiveCfg = Release|x86
-		{89B985FC-8979-4D33-8986-05B03F9D617A}.Release|x86.Build.0 = Release|x86
+		{89B985FC-8979-4D33-8986-05B03F9D617A}.Release|x64.ActiveCfg = Release|x64
+		{89B985FC-8979-4D33-8986-05B03F9D617A}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/vivetool-gui/ViVeTool_GUI.vbproj b/vivetool-gui/ViVeTool_GUI.vbproj
@@ -16,26 +16,6 @@
     <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>ViVeTool_GUI.xml</DocumentationFile>
-    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <DefineDebug>false</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>ViVeTool_GUI.xml</DocumentationFile>
-    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
-  </PropertyGroup>
   <PropertyGroup>
     <OptionExplicit>On</OptionExplicit>
   </PropertyGroup>
@@ -51,16 +31,6 @@
   <PropertyGroup>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <OutputPath>bin\Debug\</OutputPath>
-    <Prefer32Bit>false</Prefer32Bit>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <OutputPath>bin\Release\</OutputPath>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <PlatformTarget>x64</PlatformTarget>
     <OutputPath>bin\x64\Debug\</OutputPath>
@@ -89,21 +59,27 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="Telerik.WinControls, Version=2021.3.1109.40, Culture=neutral, PublicKeyToken=5bb2a467cbec794e, processorArchitecture=MSIL">
-      <HintPath>C:\Program Files (x86)\Progress\Telerik UI for WinForms R3 2021\Bin40\Telerik.WinControls.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Telerik.WinControls.GridView, Version=2021.3.1109.40, Culture=neutral, PublicKeyToken=5bb2a467cbec794e, processorArchitecture=MSIL">
-      <HintPath>C:\Program Files (x86)\Progress\Telerik UI for WinForms R3 2021\Bin40\Telerik.WinControls.GridView.dll</HintPath>
+      <HintPath>$(SolutionDir)\lib\RCWF\2021.3.1109.40\Telerik.WinControls.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Telerik.WinControls.Themes.Fluent, Version=2021.3.1109.40, Culture=neutral, PublicKeyToken=5bb2a467cbec794e, processorArchitecture=MSIL" />
-    <Reference Include="Telerik.WinControls.Themes.FluentDark, Version=2021.3.1109.40, Culture=neutral, PublicKeyToken=5bb2a467cbec794e, processorArchitecture=MSIL" />
     <Reference Include="Telerik.WinControls.UI, Version=2021.3.1109.40, Culture=neutral, PublicKeyToken=5bb2a467cbec794e, processorArchitecture=MSIL">
-      <HintPath>C:\Program Files (x86)\Progress\Telerik UI for WinForms R3 2021\Bin40\Telerik.WinControls.UI.dll</HintPath>
+      <HintPath>$(SolutionDir)\lib\RCWF\2021.3.1109.40\Telerik.WinControls.UI.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="TelerikCommon, Version=2021.3.1109.40, Culture=neutral, PublicKeyToken=5bb2a467cbec794e, processorArchitecture=MSIL">
-      <HintPath>C:\Program Files (x86)\Progress\Telerik UI for WinForms R3 2021\Bin40\TelerikCommon.dll</HintPath>
+      <HintPath>$(SolutionDir)\lib\RCWF\2021.3.1109.40\TelerikCommon.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Telerik.WinControls.GridView, Version=2021.3.1109.40, Culture=neutral, PublicKeyToken=5bb2a467cbec794e, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\lib\RCWF\2021.3.1109.40\Telerik.WinControls.GridView.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Telerik.WinControls.Themes.Fluent, Version=2021.3.1109.40, Culture=neutral, PublicKeyToken=5bb2a467cbec794e, processorArchitecture=MSIL">
+	  <HintPath>$(SolutionDir)\lib\RCWF\2021.3.1109.40\Telerik.WinControls.Themes.Fluent.dll</HintPath>
+      <Private>True</Private>
+	</Reference>
+    <Reference Include="Telerik.WinControls.Themes.FluentDark, Version=2021.3.1109.40, Culture=neutral, PublicKeyToken=5bb2a467cbec794e, processorArchitecture=MSIL">
+	  <HintPath>$(SolutionDir)\lib\RCWF\2021.3.1109.40\Telerik.WinControls.Themes.FluentDark.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>