Updated to 4.0.0-beta.1

nunit · Nov 20, 2020 · 066ec10 · 066ec10
1 parent bb78dc5
commit 066ec10
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 29 deletions.
diff --git a/LICENSE.txt → LICENSE b/LICENSE.txt → LICENSE
@@ -1,3 +1,5 @@
+MIT License
+
 Copyright (c) 2011-2020 Charlie Poole, 2014-2020 Terje Sandstrom
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/NUnit3TestAdapter.sln b/NUnit3TestAdapter.sln
@@ -19,6 +19,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		NuGet.Config = NuGet.Config
 		.github\workflows\NUnit3TestAdapter.Cake.CI.yml = .github\workflows\NUnit3TestAdapter.Cake.CI.yml
 		NUnit3TestAdapter.sln.DotSettings = NUnit3TestAdapter.sln.DotSettings
+		images\nunit_256.png = images\nunit_256.png
 		Osiris.Extended.ruleset = Osiris.Extended.ruleset
 		README.md = README.md
 	EndProjectSection

diff --git a/build.cake b/build.cake
@@ -13,7 +13,7 @@ var configuration = Argument("configuration", "Release");
 //////////////////////////////////////////////////////////////////////
 
 var version = "4.0.0";
-var modifier = "";
+var modifier = "-beta.1";
 
 var dbgSuffix = configuration.ToLower() == "debug" ? "-dbg" : "";
 var packageVersion = version + modifier + dbgSuffix;
@@ -243,7 +243,7 @@ Task("CreateWorkingImage")
         CreateDirectory(PACKAGE_IMAGE_DIR);
         CleanDirectory(PACKAGE_IMAGE_DIR);
 
-        CopyFileToDirectory("LICENSE.txt", PACKAGE_IMAGE_DIR);
+        CopyFileToDirectory("LICENSE", PACKAGE_IMAGE_DIR);
 
         // dotnet publish doesn't work for .NET 3.5
         var net35Files = new FilePath[]

diff --git a/images/nunit_256.png b/images/nunit_256.png
diff --git a/src/NUnit3TestAdapterInstall/NUnit3TestAdapterInstall.csproj b/src/NUnit3TestAdapterInstall/NUnit3TestAdapterInstall.csproj
@@ -33,7 +33,18 @@
     <VsixSourceItem Include="$(VsixInputFileLocation)\NUnit3.TestAdapter.pdb" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="license.rtf;nunit_90.png;preview.png" CopyToOutputDirectory="Always" IncludeInVSIX="true" />
+    <Content Include="license.rtf">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+    <Content Include="nunit_90.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+    <Content Include="preview.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
     <None Include="source.extension.vsixmanifest" SubType="Designer" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/NUnitTestAdapter/AdapterSettings.cs b/src/NUnitTestAdapter/AdapterSettings.cs
@@ -397,30 +397,7 @@ public void Load(string settingsXml)
 
             // Update NumberOfTestWorkers based on the DisableParallelization and NumberOfTestWorkers from runsettings.
             UpdateNumberOfTestWorkers();
-
-
-            string ValidatedPath(string path, string purpose)
-            {
-                try
-                {
-                    if (string.IsNullOrEmpty(WorkDirectory))
-                    {
-                        return Path.GetFullPath(path);
-                    }
-
-                    if (Path.IsPathRooted(path))
-                    {
-                        return Path.GetFullPath(path);
-                    }
-                    return Path.GetFullPath(Path.Combine(WorkDirectory, path));
-                }
-                catch (Exception)
-                {
-                    _logger.Error($"   Invalid path for {purpose}: {path}");
-                    throw;
-                }
-            }
-
+
             void UpdateTestProperties()
             {
                 foreach (XmlNode node in doc.SelectNodes("RunSettings/TestRunParameters/Parameter"))

diff --git a/src/NUnitTestAdapter/CategoryList.cs b/src/NUnitTestAdapter/CategoryList.cs
@@ -33,7 +33,7 @@ public class CategoryList
         public const string NUnitCategoryName = "NUnit.TestCategory";
         private const string NunitTestCategoryLabel = "Category";
         private const string VsTestCategoryLabel = "TestCategory";
-        private const string MSTestCategoryName = "MSTestDiscoverer.TestCategory";
+        // private const string MSTestCategoryName = "MSTestDiscoverer.TestCategory";
 
         internal static readonly TestProperty NUnitTestCategoryProperty = TestProperty.Register(
             NUnitCategoryName,

diff --git a/src/NUnitTestAdapterTests/AdapterSettingsTests.cs b/src/NUnitTestAdapterTests/AdapterSettingsTests.cs
@@ -84,7 +84,7 @@ public void DefaultSettings(string xml)
                 Assert.That(_settings.NewOutputXmlFileForEachRun, Is.False);
             });
         }
-        
+
         [Test]
         public void ResultsDirectorySetting()
         {
-Original file line number
+Diff line change
@@ Expand Up / @@ -84,7 +84,7 @@ public void DefaultSettings(string xml) @@
                     Assert.That(_settings.NewOutputXmlFileForEachRun, Is.False);
                 });
             }
             [Test]
             public void ResultsDirectorySetting()
             {
@@ Expand Down @@