From 4fa6393329f350ba5d5046d8aaba7e74837d74e8 Mon Sep 17 00:00:00 2001
From: JT <Hawxy@users.noreply.github.com>
Date: Sun, 28 Jun 2020 03:20:30 +0800
Subject: [PATCH] meta: Fix CI/CD (#1583)

* Update build.yml

* Update azure-pipelines.yml

* Update examples to NC3.1
---
 azure-pipelines.yml                                        | 11 +++--------
 azure/build.yml                                            |  7 ++++++-
 samples/01_basic_ping_bot/01_basic_ping_bot.csproj         |  2 +-
 samples/02_commands_framework/02_commands_framework.csproj |  4 ++--
 samples/03_sharded_client/03_sharded_client.csproj         |  4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 5a1d48082..2fe5abfe8 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -14,25 +14,20 @@ trigger:
 jobs:
 - job: Linux
   pool:
-    vmImage: 'ubuntu-16.04'
+    vmImage: 'ubuntu-latest'
   steps:
-  - task: UseDotNet@2
-    displayName: 'Use .NET Core sdk'
-    inputs:
-      packageType: 'sdk'
-      version: '3.x'
   - template: azure/build.yml
 
 - job: Windows_build
   pool:
-    vmImage: 'windows-2019'
+    vmImage: 'windows-latest'
   condition: ne(variables['Build.SourceBranch'], 'refs/heads/dev')
   steps:
   - template: azure/build.yml
 
 - job: Windows_deploy
   pool:
-    vmImage: 'windows-2019'
+    vmImage: 'windows-latest'
   condition: |
       and (
         succeeded(),
diff --git a/azure/build.yml b/azure/build.yml
index 3399d7e3d..63ba93964 100644
--- a/azure/build.yml
+++ b/azure/build.yml
@@ -1,5 +1,10 @@
 steps:
-- script: dotnet restore --no-cache Discord.Net.sln
+- task: DotNetCoreCLI@2
+  inputs:
+     command: 'restore'
+     projects: 'Discord.Net.sln'
+     feedsToUse: 'select'
+     verbosityRestore: 'Minimal'
   displayName: Restore packages
 
 - script: dotnet build "Discord.Net.sln" --no-restore -v minimal -c $(buildConfiguration) /p:BuildNumber=$(buildNumber) /p:IsTagBuild=$(buildTag)
diff --git a/samples/01_basic_ping_bot/01_basic_ping_bot.csproj b/samples/01_basic_ping_bot/01_basic_ping_bot.csproj
index 4b4e35e3f..128082edb 100644
--- a/samples/01_basic_ping_bot/01_basic_ping_bot.csproj
+++ b/samples/01_basic_ping_bot/01_basic_ping_bot.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/samples/02_commands_framework/02_commands_framework.csproj b/samples/02_commands_framework/02_commands_framework.csproj
index 84b30aa99..151e546a2 100644
--- a/samples/02_commands_framework/02_commands_framework.csproj
+++ b/samples/02_commands_framework/02_commands_framework.csproj
@@ -2,11 +2,11 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/03_sharded_client/03_sharded_client.csproj b/samples/03_sharded_client/03_sharded_client.csproj
index a6599c117..24f9942f9 100644
--- a/samples/03_sharded_client/03_sharded_client.csproj
+++ b/samples/03_sharded_client/03_sharded_client.csproj
@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <RootNamespace>_03_sharded_client</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.0" />
   </ItemGroup>
 
   <ItemGroup>