From 911ce6a4027e9eda2018023b3f176ea934c6c001 Mon Sep 17 00:00:00 2001
From: Johan Ljunggren <johlju@users.noreply.github.com>
Date: Wed, 8 Jan 2020 15:26:01 +0100
Subject: [PATCH] Removing file 'Tests.depend.ps1' (#1461)

---
 CHANGELOG.md            |  1 +
 azure-pipelines.yml     |  6 ++++--
 tests/Tests.depend.psd1 | 42 -----------------------------------------
 3 files changed, 5 insertions(+), 44 deletions(-)
 delete mode 100644 tests/Tests.depend.psd1

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d79102b3..911b659dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ For older change log history see the [historic changelog](HISTORIC_CHANGELOG.md)
     and fixed style issues.
   - Ignore commit in `GitVersion.yml` to force the correct initial release.
   - Set a display name on all the jobs and tasks in the CI pipeline.
+  - Removing file 'Tests.depend.ps1' as it is no longer required.
 - SqlServerMaxDop
   - Fix line endings in code which did not use the correct format.
 - SqlAlwaysOnService
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 376495700..bd56b5a98 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -34,8 +34,8 @@ stages:
           - task: PublishBuildArtifacts@1
             displayName: 'Publish Build Artifact'
             inputs:
-              PathtoPublish: 'output/'
-              ArtifactName: 'output'
+              pathToPublish: 'output/'
+              artifactName: 'output'
               publishLocation: 'Container'
 
   - stage: Test
@@ -164,6 +164,7 @@ stages:
                   'tests/Integration/MSFT_SqlScriptQuery.Integration.Tests.ps1'
               )
             name: test
+            displayName: 'Run Integration Test'
           - task: PublishTestResults@2
             displayName: 'Publish Test Results'
             condition: succeededOrFailed()
@@ -226,6 +227,7 @@ stages:
                   'tests/Integration/MSFT_SqlScriptQuery.Integration.Tests.ps1'
               )
             name: test
+            displayName: 'Run Integration Test'
           - task: PublishTestResults@2
             displayName: 'Publish Test Results'
             condition: succeededOrFailed()
diff --git a/tests/Tests.depend.psd1 b/tests/Tests.depend.psd1
deleted file mode 100644
index 3446741b8..000000000
--- a/tests/Tests.depend.psd1
+++ /dev/null
@@ -1,42 +0,0 @@
-<#
-    .DESCRIPTION
-        This is the dependency file for use with Assert-TestEnvironment.ps1 and/or
-        Invoke-PSDepend (PSSDepend).
-#>
-@{
-    RemoveTestFramework = @{
-        DependencyType = 'Command'
-        Source = '
-            $testFrameWorkPath = Join-Path -Path $PWD -ChildPath ''DscResource.Tests''
-            if (Test-Path -Path $testFrameWorkPath)
-            {
-                Write-Verbose -Message ''Removing local test framework repository.''
-                Remove-Item -Path (Join-Path -Path $PWD -ChildPath ''DscResource.Tests'') -Recurse -Force
-            }
-        '
-    }
-
-    'CloneTestFramework' = @{
-        DependencyType = 'Git'
-        Name = 'https://github.com/PowerShell/DscResource.Tests'
-        Version = 'dev'
-        DependsOn = 'RemoveTestFramework'
-    }
-
-    LoadDscResourceKitTypes = @{
-        DependencyType = 'Command'
-        Source = '
-            if (-not (''Microsoft.DscResourceKit.Test'' -as [Type]))
-            {
-                Write-Verbose -Message ''Loading the Microsoft.DscResourceKit types into the current session.''
-                $typesSourceFile = Join-Path -Path ''$PWD\DscResource.Tests'' -ChildPath ''Microsoft.DscResourceKit.cs''
-                Add-Type -Path $typesSourceFile -WarningAction SilentlyContinue
-            }
-            else
-            {
-                Write-Verbose -Message ''The Microsoft.DscResourceKit types was already loaded into the current session.''
-            }
-        '
-        DependsOn = 'CloneTestFramework'
-    }
-}