Fix problems found in review

nunit · Jan 16, 2021 · 770ed1e · 770ed1e
1 parent 70ba2cc
commit 770ed1e
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 49 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -11,13 +11,6 @@ jobs:
 
   steps:
 
-  - task: UseDotNet@2
-    displayName: 'Install .NET Core 1.1.2'
-    inputs:
-      packageType: runtime
-      version: 1.1.2
-      installationPath: C:/Program Files/dotnet
-
   - powershell: .\build.ps1 -Target Test -Configuration Release
     displayName: Build and test
 
@@ -30,14 +23,6 @@ jobs:
       mergeTestResults: true
       testRunTitle: net35/Windows
     condition: succeededOrFailed()
-  - task: PublishTestResults@2
-    displayName: Publish netcoreapp1.1 test results
-    inputs:
-      testResultsFormat: NUnit
-      testResultsFiles: test-results\netcoreapp1.1\*.xml
-      mergeTestResults: true
-      testRunTitle: netcoreapp1.1/Windows
-    condition: succeededOrFailed()
   - task: PublishTestResults@2
     displayName: Publish netcoreapp2.1 test results
     inputs:
@@ -66,7 +51,6 @@ jobs:
       sudo dpkg -i packages-microsoft-prod.deb
       sudo apt-get install apt-transport-https
       sudo apt-get update
-      sudo apt-get install dotnet-sharedframework-microsoft.netcore.app-1.1.2
       sudo apt-get install dotnet-sdk-2.2
       sudo apt-get install dotnet-runtime-5.0
       ./build.sh --target=Test --configuration=Release
@@ -81,14 +65,6 @@ jobs:
       mergeTestResults: true
       testRunTitle: net35/Linux
     condition: succeededOrFailed()
-  - task: PublishTestResults@2
-    displayName: Publish netcoreapp1.1 test results
-    inputs:
-      testResultsFormat: NUnit
-      testResultsFiles: test-results/netcoreapp1.1/*.xml
-      mergeTestResults: true
-      testRunTitle: netcoreapp1.1/Linux
-    condition: succeededOrFailed()
   - task: PublishTestResults@2
     displayName: Publish netcoreapp2.1 test results
     inputs:
@@ -120,12 +96,6 @@ jobs:
       packageType: runtime
       version: 2.1.x
 
-  - task: UseDotNet@2
-    displayName: 'Install .NET Core runtime 1.1'
-    inputs:
-      packageType: runtime
-      version: 1.1.x
-
   - bash: |
      dotnet tool install --global Cake.Tool
      dotnet cake --target=Test --configuration=Release
@@ -140,14 +110,6 @@ jobs:
       mergeTestResults: true
       testRunTitle: net35/macOS
     condition: succeededOrFailed()
-  - task: PublishTestResults@2
-    displayName: Publish netcoreapp1.1 test results
-    inputs:
-      testResultsFormat: NUnit
-      testResultsFiles: test-results/netcoreapp1.1/*.xml
-      mergeTestResults: true
-      testRunTitle: netcoreapp1.1/macOS
-    condition: succeededOrFailed()
   - task: PublishTestResults@2
     displayName: Publish netcoreapp2.1 test results
     inputs:

diff --git a/build.cake b/build.cake
@@ -47,7 +47,6 @@ var ZIP_IMG = PROJECT_DIR + "zip-image/";
 
 var SOLUTION_FILE = PROJECT_DIR + "NUnitConsole.sln";
 var ENGINE_CSPROJ = PROJECT_DIR + "src/NUnitEngine/nunit.engine/nunit.engine.csproj";
-var ENGINE_CORE_CSPROJ = PROJECT_DIR + "src/NUnitEngine/nunit.engine.core/nunit.engine.core.csproj";
 var ENGINE_API_CSPROJ = PROJECT_DIR + "src/NUnitEngine/nunit.engine.api/nunit.engine.api.csproj";
 var ENGINE_TESTS_CSPROJ = PROJECT_DIR + "src/NUnitEngine/nunit.engine.tests/nunit.engine.tests.csproj";
 var CONSOLE_CSPROJ = PROJECT_DIR + "src/NUnitConsole/nunit3-console/nunit3-console.csproj";

diff --git a/nuget/engine/nunit.engine.nuspec b/nuget/engine/nunit.engine.nuspec
@@ -20,14 +20,6 @@
     <copyright>Copyright (c) 2020 Charlie Poole, Rob Prouse</copyright>
     <dependencies>
       <group targetFramework="net20" />
-      <group targetFramework="netstandard1.6">
-        <dependency id="NETStandard.Library" version="1.6.1" />
-        <dependency id="Microsoft.DotNet.InternalAbstractions" version="1.0.0" exclude="compile" />
-        <dependency id="System.ComponentModel.TypeConverter" version="4.3.0" exclude="compile" />
-        <dependency id="System.Reflection" version="4.3.0" exclude="compile" />
-        <dependency id="System.Diagnostics.Process" version="4.3.0" exclude="compile" />
-        <dependency id="System.Xml.XPath.XmlDocument" version="4.3.0" exclude="compile" />
-      </group>
       <group targetFramework="netstandard2.0">
         <dependency id="NETStandard.Library" version="2.0.0" />
         <dependency id="System.ComponentModel.TypeConverter" version="4.3.0" exclude="compile" />

diff --git a/src/NUnitEngine/nunit.engine.tests/Services/AgentProcessTests.cs b/src/NUnitEngine/nunit.engine.tests/Services/AgentProcessTests.cs
@@ -40,8 +40,6 @@ public void SetUp()
         [TestCase("net-2.0", true, "../agents/net20/nunit-agent-x86.exe")]
         //[TestCase("netcore-2.1", false, "agents/netcoreapp2.1/testcentric-agent.dll")]
         //[TestCase("netcore-2.1", true, "agents/netcoreapp2.1/testcentric-agent-x86.dll")]
-        //[TestCase("netcore-1.1", false, "agents/netcoreapp1.1/testcentric-agent.dll")]
-        //[TestCase("netcore-1.1", true, "agents/netcoreapp1.1/testcentric-agent-x86.dll")]
         public void AgentSelection(string runtime, bool x86, string agentPath)
         {
             _package.Settings[EnginePackageSettings.TargetRuntimeFramework] = runtime;