Merge pull request microsoft#3835 from southworks/external/fix/southworks/fix-va-pipeline-yaml

[C#][VA] Fix Virtual Assistant's Pipeline compatibility issues

Author: lauren-mills

samples/csharp/assistants/virtual-assistant/VirtualAssistantSample/Pipeline/VirtualAssistantSample.yml

@@ -1,31 +1,28 @@
 # specific branch build
 trigger:
- branches: 
+ branches:
  include:
  - master
  - feature/*
- 
+
 pool:
- name: Hosted VS2017
- demands:
- - msbuild
- - visualstudio
+ vmimage: 'windows-2019'
 
 variables:
  buildPlatform: 'Any CPU'
  buildConfiguration: 'Release'
 
 steps:
-- task: DotNetCoreInstaller@0
- displayName: 'Use .NET Core sdk 2.2.100'
+- task: DotNetCoreInstaller@2
+ displayName: 'Use .NET Core sdk 3.1'
  inputs:
- version: 2.2.100
+ version: 3.1.x
  continueOnError: true
 
 - task: NuGetToolInstaller@0
- displayName: 'Use NuGet 4.9.1'
+ displayName: 'Use NuGet 5.3.0'
  inputs:
- versionSpec: 4.9.1
+ versionSpec: 5.3.0
 
 - task: NuGetCommand@2
  displayName: 'NuGet restore'
@@ -60,12 +57,13 @@ steps:
  summaryFileLocation: '$(Build.SourcesDirectory)\VirtualAssistantSample.Tests\coverage.cobertura.xml'
  reportDirectory: '$(Build.SourcesDirectory)\VirtualAssistantSample.Tests'
 
- - task: CopyFiles@2
+- task: CopyFiles@2
  displayName: 'Copy VA'
  inputs:
- SourceFolder: '$(System.DefaultWorkingDirectory)\templates\Virtual-Assistant-Template\csharp\Sample\VirtualAssistantSample'
+ # if your working directory is not root, you may change the following path
+ SourceFolder: '$(System.DefaultWorkingDirectory)\VirtualAssistantSample'
  Contents: '**\*'
  TargetFolder: '$(Build.ArtifactStagingDirectory)\VA'
 
 - task: PublishBuildArtifacts@1
- displayName: 'Artifacts'
+ displayName: 'Artifacts'

templates/csharp/VA/VA/Pipeline/VirtualAssistantSample.yml

@@ -1,31 +1,28 @@
 # specific branch build
 trigger:
- branches: 
+ branches:
  include:
  - master
  - feature/*
- 
+
 pool:
- name: Hosted VS2017
- demands:
- - msbuild
- - visualstudio
+ vmimage: 'windows-2019'
 
 variables:
  buildPlatform: 'Any CPU'
  buildConfiguration: 'Release'
 
 steps:
-- task: DotNetCoreInstaller@0
- displayName: 'Use .NET Core sdk 2.2.100'
+- task: DotNetCoreInstaller@2
+ displayName: 'Use .NET Core sdk 3.1'
  inputs:
- version: 2.2.100
+ version: 3.1.x
  continueOnError: true
 
 - task: NuGetToolInstaller@0
- displayName: 'Use NuGet 4.9.1'
+ displayName: 'Use NuGet 5.3.0'
  inputs:
- versionSpec: 4.9.1
+ versionSpec: 5.3.0
 
 - task: NuGetCommand@2
  displayName: 'NuGet restore'
@@ -60,12 +57,13 @@ steps:
  summaryFileLocation: '$(Build.SourcesDirectory)\$safeprojectname$.Tests\coverage.cobertura.xml'
  reportDirectory: '$(Build.SourcesDirectory)\$safeprojectname$.Tests'
 
- - task: CopyFiles@2
+- task: CopyFiles@2
  displayName: 'Copy VA'
  inputs:
- SourceFolder: '$(System.DefaultWorkingDirectory)\templates\Virtual-Assistant-Template\csharp\Sample\VirtualAssistantSample'
+ # if your working directory is not root, you may change the following path
+ SourceFolder: '$(System.DefaultWorkingDirectory)\$safeprojectname$'
  Contents: '**\*'
  TargetFolder: '$(Build.ArtifactStagingDirectory)\VA'
 
 - task: PublishBuildArtifacts@1
- displayName: 'Artifacts'
+ displayName: 'Artifacts'