From a2e23546a870b18b36bfcb37560b74b6564dfd76 Mon Sep 17 00:00:00 2001
From: Robert Beekman <mail@rbeekman.nl>
Date: Sun, 15 Nov 2020 23:55:27 +0100
Subject: [PATCH 1/4] Update azure-pipelines.yml for Azure Pipelines

---
 ci/azure-pipelines.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml
index 5d35f3b82..645e5732b 100644
--- a/ci/azure-pipelines.yml
+++ b/ci/azure-pipelines.yml
@@ -17,8 +17,6 @@ steps:
 - checkout: self
   path: s/Artemis
 
-- task: NuGetToolInstaller@1
-
 - task: DownloadPipelineArtifact@2
   inputs:
     buildType: 'specific'
@@ -28,10 +26,11 @@ steps:
     artifactName: 'RGB.NET development build'
     targetPath: '$(Pipeline.Workspace)/s/RGB.NET/bin/netstandard2.0'
 
-- task: NuGetCommand@2
-  displayName: 'NuGet restore Artemis'
+- task: DotNetCoreCLI@2
   inputs:
-    restoreSolution: '$(artemisSolution)'
+    command: 'restore'
+    projects: '$(artemisSolution)'
+    feedsToUse: 'config'
 
 # - task: ResharperCli@2
 #  inputs:

From f0c9ce2ff0180cc500017e4e07bc429343ebcbb0 Mon Sep 17 00:00:00 2001
From: Robert Beekman <mail@rbeekman.nl>
Date: Mon, 16 Nov 2020 00:04:46 +0100
Subject: [PATCH 2/4] Update azure-pipelines.yml for Azure Pipelines

---
 ci/azure-pipelines.yml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml
index 645e5732b..25033ffdf 100644
--- a/ci/azure-pipelines.yml
+++ b/ci/azure-pipelines.yml
@@ -17,6 +17,14 @@ steps:
 - checkout: self
   path: s/Artemis
 
+- task: UseDotNet@2
+  displayName: 'Install .Net 5 SDK'
+  inputs:
+    packageType: 'sdk'
+    version: '5.0.100'
+
+- task: NuGetToolInstaller@1
+
 - task: DownloadPipelineArtifact@2
   inputs:
     buildType: 'specific'
@@ -26,11 +34,10 @@ steps:
     artifactName: 'RGB.NET development build'
     targetPath: '$(Pipeline.Workspace)/s/RGB.NET/bin/netstandard2.0'
 
-- task: DotNetCoreCLI@2
+- task: NuGetCommand@2
+  displayName: 'NuGet restore Artemis'
   inputs:
-    command: 'restore'
-    projects: '$(artemisSolution)'
-    feedsToUse: 'config'
+    restoreSolution: '$(artemisSolution)'
 
 # - task: ResharperCli@2
 #  inputs:

From 78356e98eb39e025f1d75f638a09bdc9f571ce26 Mon Sep 17 00:00:00 2001
From: Robert Beekman <mail@rbeekman.nl>
Date: Mon, 16 Nov 2020 00:09:46 +0100
Subject: [PATCH 3/4] Update azure-pipelines.yml for Azure Pipelines

---
 ci/azure-pipelines.yml | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml
index 25033ffdf..fe6e30c3e 100644
--- a/ci/azure-pipelines.yml
+++ b/ci/azure-pipelines.yml
@@ -23,8 +23,6 @@ steps:
     packageType: 'sdk'
     version: '5.0.100'
 
-- task: NuGetToolInstaller@1
-
 - task: DownloadPipelineArtifact@2
   inputs:
     buildType: 'specific'
@@ -34,16 +32,11 @@ steps:
     artifactName: 'RGB.NET development build'
     targetPath: '$(Pipeline.Workspace)/s/RGB.NET/bin/netstandard2.0'
 
-- task: NuGetCommand@2
-  displayName: 'NuGet restore Artemis'
+- task: DotNetCoreCLI@2
   inputs:
-    restoreSolution: '$(artemisSolution)'
-
-# - task: ResharperCli@2
-#  inputs:
-#    solutionOrProjectPath: 'src/Artemis.sln'
-#    failBuildLevelSelector: 'Error'
-#    additionalArguments: '/disable-settings-layers:SolutionPersonal --properties:Configuration=win-x64'
+    command: 'restore'
+    projects: '$(artemisSolution)'
+    feedsToUse: 'config'
 
 - task: DotNetCoreCLI@2
   displayName: 'Publish Artemis'

From f249e0b648af6003586f7a127d3f18545c901461 Mon Sep 17 00:00:00 2001
From: Robert Beekman <mail@rbeekman.nl>
Date: Mon, 16 Nov 2020 00:13:21 +0100
Subject: [PATCH 4/4] Update azure-pipelines.yml for Azure Pipelines

---
 ci/azure-pipelines.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml
index fe6e30c3e..b14d8115f 100644
--- a/ci/azure-pipelines.yml
+++ b/ci/azure-pipelines.yml
@@ -37,6 +37,7 @@ steps:
     command: 'restore'
     projects: '$(artemisSolution)'
     feedsToUse: 'config'
+    nugetConfigPath: '$(Pipeline.Workspace)/s/Artemis/src/NuGet.Config'
 
 - task: DotNetCoreCLI@2
   displayName: 'Publish Artemis'