[lucenenet] 03/05: azure-pipelines.yml, run-tests-on-os.yml: Upgraded to use .NET 6 RC2 SDK for building and testing

[ni...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

nightowl888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucenenet.git

commit 4ca983b2bf4eda87867576f314382d5c54883bcc
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Mon Oct 25 03:03:18 2021 +0700

    azure-pipelines.yml, run-tests-on-os.yml: Upgraded to use .NET 6 RC2 SDK for building and testing
---
 azure-pipelines.yml                       | 6 ++++--
 build/azure-templates/run-tests-on-os.yml | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index fd101c1..3bf17dd 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -54,6 +54,8 @@ name: 'vNext$(rev:.r)' # Format for build number (will be overridden)
 variables:
 - name: BuildCounter
   value: $[counter(variables['VersionSuffix'],coalesce(variables['BuildCounterSeed'], 1250))]
+- name: BuildSDKVersion
+  value: '6.0.100-rc.2.21505.57'
 - name: DocumentationArtifactName
   value: 'docs'
 - name: DocumentationArtifactZipFileName
@@ -121,10 +123,10 @@ stages:
       displayName: 'Setup Default Variable Values'
 
     - task: UseDotNet@2
-      displayName: 'Use .NET Core sdk 6.0.100-rc.1'
+      displayName: 'Use .NET Core sdk $(BuildSDKVersion)'
       inputs:
         packageType: 'sdk'
-        version: '6.0.100-rc.1.21463.6'
+        version: '$(BuildSDKVersion)'
 
     - pwsh: |
         Import-Module "$(BuildDirectory)/psake.psm1"
diff --git a/build/azure-templates/run-tests-on-os.yml b/build/azure-templates/run-tests-on-os.yml
index 2436432..4121e47 100644
--- a/build/azure-templates/run-tests-on-os.yml
+++ b/build/azure-templates/run-tests-on-os.yml
@@ -83,13 +83,13 @@ steps:
   displayName: 'Use .NET sdk 5.0.400'
   inputs:
     version: 5.0.400
-  condition: and(succeeded(), contains('${{ parameters.framework }}', 'net5.'))
 
 - task: UseDotNet@2
-  displayName: 'Use .NET Core sdk 6.0.100-rc.1'
+  displayName: 'Use .NET sdk 6.0.100-rc.2'
   inputs:
     packageType: 'sdk'
-    version: '6.0.100-rc.1.21463.6'
+    version: '6.0.100-rc.2.21505.57'
+  condition: and(succeeded(), contains('${{ parameters.testTargetFrameworks }}', 'net6.')) # When this is not a pre-release, we can remove this line and make net5.0 conditional
 
 #- template: 'show-all-files.yml' # Uncomment for debugging
 - pwsh: |