Fix tests

src/Test/winswTests/Configuration/ExamplesTest.cs

@@ -45,7 +45,7 @@ namespace winswTests.Configuration
 
         private ServiceDescriptor doLoad(string exampleName) {
             var dir = Directory.GetCurrentDirectory();
-            string path = dir + "\\..\\..\\..\\..\\..\\examples\\sample-" + exampleName + ".xml";
+            string path = Path.GetFullPath(dir + "\\..\\..\\..\\..\\..\\..\\examples\\sample-" + exampleName + ".xml");
             if (!File.Exists(path))
             {
                 throw new FileNotFoundException("Cannot find the XML file " + path, path);

src/Test/winswTests/NunitTest.nunit

@@ -1,9 +1,9 @@
 <NUnitProject>
  <Settings activeconfig="Release" />
  <Config name="Debug">
-	<assembly path="bin\Debug\winswTests.dll" />
+	<assembly path="bin\Debug\net40\winswTests.dll" />
  </Config>
  <Config name="Release">
-	<assembly path="bin\Release\winswTests.dll" />
+	<assembly path="bin\Release\net40\winswTests.dll" />
  </Config>
 </NUnitProject>

src/Test/winswTests/Util/ProcessHelperTest.cs

@@ -18,6 +18,8 @@ namespace winswTests.Util
         [Test]
         public void ShouldPropagateVariablesInUppercase()
         {
+            Environment.SetEnvironmentVariable("TEST_KEY", "TEST_VALUE");
+
             var tmpDir = FilesystemTestHelper.CreateTmpDirectory();
             String envFile = Path.Combine(tmpDir, "env.properties");
             String scriptFile = Path.Combine(tmpDir, "printenv.bat");
@@ -40,12 +42,10 @@ namespace winswTests.Util
             String[] keys = new String[envVars.Count];
             envVars.Keys.CopyTo(keys, 0);
             String availableVars = "[" + String.Join(",", keys) + "]";
-            Assert.That(envVars.ContainsKey("PROCESSOR_ARCHITECTURE"), "No PROCESSOR_ARCHITECTURE in the injected vars: " + availableVars);
+            Assert.That(envVars.ContainsKey("TEST_KEY"), "No TEST_KEY in the injected vars: " + availableVars);
-            Assert.That(envVars.ContainsKey("COMPUTERNAME"), "No COMPUTERNAME in the injected vars: " + availableVars);
-            Assert.That(envVars.ContainsKey("PATHEXT"), "No PATHEXT in the injected vars: " + availableVars);
             
             // And just ensure that the parsing logic is case-sensitive
-            Assert.That(!envVars.ContainsKey("computername"), "Test error: the environment parsing logic is case-insensitive");
+            Assert.That(!envVars.ContainsKey("test_key"), "Test error: the environment parsing logic is case-insensitive");
 
         }
 

src/Test/winswTests/winswTests.csproj

@@ -8,8 +8,10 @@
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="8.0.5.0" />
     <PackageReference Include="log4net" Version="2.0.8" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" />
     <PackageReference Include="NUnit" Version="2.6.4" />
+    <PackageReference Include="NUnitTestAdapter" Version="2.2.0" />
   </ItemGroup>
 
   <ItemGroup>