diff --git a/.github/workflows/CI-winpeas_test.yml b/.github/workflows/CI-winpeas_test.yml
index bb35a64..daa92a4 100644
--- a/.github/workflows/CI-winpeas_test.yml
+++ b/.github/workflows/CI-winpeas_test.yml
@@ -24,15 +24,19 @@ jobs:
# checkout
- name: Checkout
uses: actions/checkout@v2
-
# Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
- name: Setup MSBuild.exe
uses: microsoft/setup-msbuild@v1.0.2
+
+ # Setup NuGet
+ - name: Setup NuGet.exe
+ uses: nuget/setup-nuget@v1
# Restore the packages for testing
- name: Restore the application
- run: msbuild -m $env:Solution_Path /t:Restore /p:Configuration=$env:Configuration
+ # run: msbuild -m $env:Solution_Path /t:Restore /p:Configuration=$env:Configuration
+ run: nuget restore $env:Solution_Path
# build
- name: run MSBuild
diff --git a/winPEAS/winPEASexe/Tests/App.config b/winPEAS/winPEASexe/Tests/App.config
new file mode 100644
index 0000000..88fa402
--- /dev/null
+++ b/winPEAS/winPEASexe/Tests/App.config
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/winPEAS/winPEASexe/Tests/Program.cs b/winPEAS/winPEASexe/Tests/Program.cs
new file mode 100644
index 0000000..1cb78d4
--- /dev/null
+++ b/winPEAS/winPEASexe/Tests/Program.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tests
+{
+ class Program
+ {
+ static void Main(string[] args)
+ {
+ }
+ }
+}
diff --git a/winPEAS/winPEASexe/Tests/Properties/AssemblyInfo.cs b/winPEAS/winPEASexe/Tests/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..4f5cbeb
--- /dev/null
+++ b/winPEAS/winPEASexe/Tests/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Tests")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Tests")]
+[assembly: AssemblyCopyright("Copyright © 2021")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("66aa4619-4d0f-4226-9d96-298870e9bb50")]
+
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/winPEAS/winPEASexe/winPEAS.Tests/SmokeTests.cs b/winPEAS/winPEASexe/Tests/SmokeTests.cs
similarity index 100%
rename from winPEAS/winPEASexe/winPEAS.Tests/SmokeTests.cs
rename to winPEAS/winPEASexe/Tests/SmokeTests.cs
diff --git a/winPEAS/winPEASexe/Tests/packages.config b/winPEAS/winPEASexe/Tests/packages.config
new file mode 100644
index 0000000..fce08e4
--- /dev/null
+++ b/winPEAS/winPEASexe/Tests/packages.config
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/winPEAS/winPEASexe/Tests/winPEAS.Tests.csproj b/winPEAS/winPEASexe/Tests/winPEAS.Tests.csproj
new file mode 100644
index 0000000..4c8f64f
--- /dev/null
+++ b/winPEAS/winPEASexe/Tests/winPEAS.Tests.csproj
@@ -0,0 +1,89 @@
+
+
+
+
+
+
+
+ Debug
+ AnyCPU
+ {66AA4619-4D0F-4226-9D96-298870E9BB50}
+ Exe
+ Tests
+ Tests
+ v4.5.2
+ 512
+ true
+ true
+
+
+
+
+ AnyCPU
+ true
+ full
+ false
+ bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ AnyCPU
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\packages\Microsoft.CodeCoverage.16.10.0\lib\net45\Microsoft.VisualStudio.CodeCoverage.Shim.dll
+
+
+ ..\packages\MSTest.TestFramework.2.2.5\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll
+
+
+ ..\packages\MSTest.TestFramework.2.2.5\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {d934058e-a7db-493f-a741-ae8e3df867f4}
+ winPEAS
+
+
+
+
+
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/winPEAS/winPEASexe/winPEAS.Tests/Properties/AssemblyInfo.cs b/winPEAS/winPEASexe/winPEAS.Tests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 4a29b7d..0000000
--- a/winPEAS/winPEASexe/winPEAS.Tests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("winPEAS.Tests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("winPEAS.Tests")]
-[assembly: AssemblyCopyright("Copyright © 2021")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-[assembly: ComVisible(false)]
-
-[assembly: Guid("52a3b7ff-a1ad-4b41-ab4c-21c7f95ce42f")]
-
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/winPEAS/winPEASexe/winPEAS.Tests/winPEAS.Tests.csproj b/winPEAS/winPEASexe/winPEAS.Tests/winPEAS.Tests.csproj
deleted file mode 100644
index 6564538..0000000
--- a/winPEAS/winPEASexe/winPEAS.Tests/winPEAS.Tests.csproj
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
-
-
- Debug
- AnyCPU
- {52A3B7FF-A1AD-4B41-AB4C-21C7F95CE42F}
- Library
- Properties
- winPEAS.Tests
- winPEAS.Tests
- v4.5.2
- 512
- {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- 15.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
- $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages
- False
- UnitTest
-
-
-
-
-
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
-
-
-
-
-
-
-
-
-
- {d934058e-a7db-493f-a741-ae8e3df867f4}
- winPEAS
-
-
-
-
- 16.10.0
-
-
- 2.1.2
-
-
- 2.1.2
-
-
-
-
-
\ No newline at end of file
diff --git a/winPEAS/winPEASexe/winPEAS.sln b/winPEAS/winPEASexe/winPEAS.sln
index 13c82b3..516c817 100755
--- a/winPEAS/winPEASexe/winPEAS.sln
+++ b/winPEAS/winPEASexe/winPEAS.sln
@@ -5,7 +5,7 @@ VisualStudioVersion = 16.0.29326.143
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "winPEAS", "winPEAS\winPEAS.csproj", "{D934058E-A7DB-493F-A741-AE8E3DF867F4}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "winPEAS.Tests", "winPEAS.Tests\winPEAS.Tests.csproj", "{52A3B7FF-A1AD-4B41-AB4C-21C7F95CE42F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "winPEAS.Tests", "Tests\winPEAS.Tests.csproj", "{66AA4619-4D0F-4226-9D96-298870E9BB50}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -29,18 +29,18 @@ Global
{D934058E-A7DB-493F-A741-AE8E3DF867F4}.Release|x64.Build.0 = Release|x64
{D934058E-A7DB-493F-A741-AE8E3DF867F4}.Release|x86.ActiveCfg = Release|x86
{D934058E-A7DB-493F-A741-AE8E3DF867F4}.Release|x86.Build.0 = Release|x86
- {52A3B7FF-A1AD-4B41-AB4C-21C7F95CE42F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {52A3B7FF-A1AD-4B41-AB4C-21C7F95CE42F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {52A3B7FF-A1AD-4B41-AB4C-21C7F95CE42F}.Debug|x64.ActiveCfg = Debug|Any CPU
- {52A3B7FF-A1AD-4B41-AB4C-21C7F95CE42F}.Debug|x64.Build.0 = Debug|Any CPU
- {52A3B7FF-A1AD-4B41-AB4C-21C7F95CE42F}.Debug|x86.ActiveCfg = Debug|Any CPU
- {52A3B7FF-A1AD-4B41-AB4C-21C7F95CE42F}.Debug|x86.Build.0 = Debug|Any CPU
- {52A3B7FF-A1AD-4B41-AB4C-21C7F95CE42F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {52A3B7FF-A1AD-4B41-AB4C-21C7F95CE42F}.Release|Any CPU.Build.0 = Release|Any CPU
- {52A3B7FF-A1AD-4B41-AB4C-21C7F95CE42F}.Release|x64.ActiveCfg = Release|Any CPU
- {52A3B7FF-A1AD-4B41-AB4C-21C7F95CE42F}.Release|x64.Build.0 = Release|Any CPU
- {52A3B7FF-A1AD-4B41-AB4C-21C7F95CE42F}.Release|x86.ActiveCfg = Release|Any CPU
- {52A3B7FF-A1AD-4B41-AB4C-21C7F95CE42F}.Release|x86.Build.0 = Release|Any CPU
+ {66AA4619-4D0F-4226-9D96-298870E9BB50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {66AA4619-4D0F-4226-9D96-298870E9BB50}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {66AA4619-4D0F-4226-9D96-298870E9BB50}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {66AA4619-4D0F-4226-9D96-298870E9BB50}.Debug|x64.Build.0 = Debug|Any CPU
+ {66AA4619-4D0F-4226-9D96-298870E9BB50}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {66AA4619-4D0F-4226-9D96-298870E9BB50}.Debug|x86.Build.0 = Debug|Any CPU
+ {66AA4619-4D0F-4226-9D96-298870E9BB50}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {66AA4619-4D0F-4226-9D96-298870E9BB50}.Release|Any CPU.Build.0 = Release|Any CPU
+ {66AA4619-4D0F-4226-9D96-298870E9BB50}.Release|x64.ActiveCfg = Release|Any CPU
+ {66AA4619-4D0F-4226-9D96-298870E9BB50}.Release|x64.Build.0 = Release|Any CPU
+ {66AA4619-4D0F-4226-9D96-298870E9BB50}.Release|x86.ActiveCfg = Release|Any CPU
+ {66AA4619-4D0F-4226-9D96-298870E9BB50}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE