Update CI yamls to .NET8

microsoft · Mar 4, 2024 · ebbbf5d · ebbbf5d
1 parent 405c6fd
commit ebbbf5d
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 38 deletions.
diff --git a/build/onebranch/ci-api-validation-steps.yml b/build/onebranch/ci-api-validation-steps.yml
@@ -2,7 +2,7 @@ steps:
 - task: DownloadPipelineArtifact@2
   displayName: 'Download BotBuilderDLLs from Artifacts'
   inputs:
-    artifactName: 'BotBuilderDLLs-Debug-Windows-netcoreapp31'
+    artifactName: 'BotBuilderDLLs-Debug-Windows-net8'
     targetPath: '$(System.ArtifactsDirectory)/OutputDlls'
 
 - task: DownloadPipelineArtifact@2

diff --git a/build/onebranch/ci-test-steps.yml b/build/onebranch/ci-test-steps.yml
@@ -20,32 +20,32 @@ steps:
     customCommand: 'install -g @microsoft/botframework-cli@next'
 
 - task: UseDotNet@2
-  displayName: "Install .NET Core 3.1.415"
+  displayName: "Install .NET Core 6.0"
   continueOnError: true
   inputs:
     packageType: "sdk"
-    version: 3.1.415
-  condition: and(succeeded(), eq(variables['BuildConfiguration'],'Release-Windows'), eq(variables['BuildTarget'],'netcoreapp31'))
+    version: 6.x
+  condition: and(succeeded(), eq(variables['BuildConfiguration'],'Release-Windows'), eq(variables['BuildTarget'],'net6'))
 
 - task: DotNetCoreCLI@2
-  displayName: 'dotnet test (release) 3.1'
+  displayName: 'dotnet test (release) 6.0'
   inputs:
     command: test
     projects: |
      Tests/**/*Tests.csproj
 
-    arguments: '-v n  -f netcoreapp3.1 --configuration release --no-build --no-restore --filter "TestCategory!=IgnoreInAutomatedBuild&TestCategory!=FunctionalTests" --collect:"Code Coverage" --settings $(Build.SourcesDirectory)\CodeCoverage.runsettings'
-  condition: and(succeeded(), eq(variables['BuildConfiguration'],'Release-Windows'), eq(variables['BuildTarget'],'netcoreapp31'))
+    arguments: '-v n  -f net6.0 --configuration release --no-build --no-restore --filter "TestCategory!=IgnoreInAutomatedBuild&TestCategory!=FunctionalTests" --collect:"Code Coverage" --settings $(Build.SourcesDirectory)\CodeCoverage.runsettings'
+  condition: and(succeeded(), eq(variables['BuildConfiguration'],'Release-Windows'), eq(variables['BuildTarget'],'net6'))
 
 - task: DotNetCoreCLI@2
-  displayName: 'dotnet test (release) 6.0'
+  displayName: 'dotnet test (release) 8.0'
   inputs:
     command: test
     projects: |
      Tests/**/*Tests.csproj
 
-    arguments: '-v n  -f net6.0 --configuration release --no-build --no-restore --filter "TestCategory!=IgnoreInAutomatedBuild&TestCategory!=FunctionalTests" --collect:"Code Coverage" --settings $(Build.SourcesDirectory)\CodeCoverage.runsettings'
-  condition: and(succeeded(), eq(variables['BuildConfiguration'],'Release-Windows'), eq(variables['BuildTarget'],'net6'))
+    arguments: '-v n  -f net80 --configuration release --no-build --no-restore --filter "TestCategory!=IgnoreInAutomatedBuild&TestCategory!=FunctionalTests" --collect:"Code Coverage" --settings $(Build.SourcesDirectory)\CodeCoverage.runsettings'
+  condition: and(succeeded(), eq(variables['BuildConfiguration'],'Release-Windows'), eq(variables['BuildTarget'],'net8'))
 
 - powershell: |
    # This task copies the code coverage file created by dotnet test into a well known location. In all

diff --git a/build/onebranch/pr.yml b/build/onebranch/pr.yml
@@ -42,34 +42,34 @@ variables:
 stages:
 - stage: Build
   jobs:
-  - job: Debug_Windows_Configuration_31
+  - job: Debug_Windows_Configuration_6
     variables:
       BuildConfiguration: Debug-Windows
-      BuildTarget: 'netcoreapp31' # set the TargetFramework property for tests to use netcoreapp3.1
+      BuildTarget: 'net6' # set the TargetFramework property for tests to use net6.0
     steps:
     - template: ci-build-steps.yml
     - template: ci-test-steps.yml
     - template: ci-component-detection-steps.yml
-  - job: Debug_Windows_Configuration_6
+  - job: Debug_Windows_Configuration_8
     variables:
       BuildConfiguration: Debug-Windows
-      BuildTarget: 'net6' # set the TargetFramework property for tests to use net6.0
+      BuildTarget: 'net8' # set the TargetFramework property for tests to use net8.0
     steps:
     - template: ci-build-steps.yml
     - template: ci-test-steps.yml
     - template: ci-component-detection-steps.yml
-  - job: Release_Windows_Configuration_31
+  - job: Release_Windows_Configuration_6
     variables:
       BuildConfiguration: Release-Windows
-      BuildTarget: 'netcoreapp31' # set the TargetFramework property for tests to use netcoreapp3.1
+      BuildTarget: 'net6' # set the TargetFramework property for tests to use net6.0
     steps:
     - template: ci-build-steps.yml
     - template: ci-test-steps.yml
     - template: ci-component-detection-steps.yml
-  - job: Release_Windows_Configuration_6
+  - job: Release_Windows_Configuration_8
     variables:
       BuildConfiguration: Release-Windows
-      BuildTarget: 'net6' # set the TargetFramework property for tests to use net6.0
+      BuildTarget: 'net8' # set the TargetFramework property for tests to use net8.0
       PublishCoverage: true
     steps:
     - template: ci-build-steps.yml

diff --git a/build/yaml/botbuilder-dotnet-ci-mac.yml b/build/yaml/botbuilder-dotnet-ci-mac.yml
@@ -24,9 +24,9 @@ steps:
     version: 6.0.x
 
 - task: UseDotNet@2
-  displayName: 'Use .Net Core sdk 3.1.101'
+  displayName: 'Use .Net sdk 8.0'
   inputs:
-    version: 3.1.101
+    version: 8.0.x
 
 - powershell: 'gci env:* | sort-object name | Format-Table -AutoSize -Wrap'
   displayName: 'Display env vars'

diff --git a/build/yaml/botbuilder-dotnet-ci.yml b/build/yaml/botbuilder-dotnet-ci.yml
@@ -42,34 +42,34 @@ variables:
 stages:
 - stage: Build
   jobs:
-  - job: Debug_Windows_Configuration_31
+  - job: Debug_Windows_Configuration_6
     variables:
       BuildConfiguration: Debug-Windows
-      BuildTarget: 'netcoreapp31' # set the TargetFramework property for tests to use netcoreapp3.1
+      BuildTarget: 'net6' # set the TargetFramework property for tests to use net6.0
     steps:
     - template: ci-build-steps.yml
     - template: ci-test-steps.yml
     - template: ci-component-detection-steps.yml
-  - job: Debug_Windows_Configuration_6
+  - job: Debug_Windows_Configuration_8
     variables:
       BuildConfiguration: Debug-Windows
-      BuildTarget: 'net6' # set the TargetFramework property for tests to use net6.0
+      BuildTarget: 'net8' # set the TargetFramework property for tests to use net8.0
     steps:
     - template: ci-build-steps.yml
     - template: ci-test-steps.yml
     - template: ci-component-detection-steps.yml
-  - job: Release_Windows_Configuration_31
+  - job: Release_Windows_Configuration_6
     variables:
       BuildConfiguration: Release-Windows
-      BuildTarget: 'netcoreapp31' # set the TargetFramework property for tests to use netcoreapp3.1
+      BuildTarget: 'net6' # set the TargetFramework property for tests to use net6.0
     steps:
     - template: ci-build-steps.yml
     - template: ci-test-steps.yml
     - template: ci-component-detection-steps.yml
-  - job: Release_Windows_Configuration_6
+  - job: Release_Windows_Configuration_8
     variables:
       BuildConfiguration: Release-Windows
-      BuildTarget: 'net6' # set the TargetFramework property for tests to use net6.0
+      BuildTarget: 'net8' # set the TargetFramework property for tests to use net8.0
       PublishCoverage: true
     steps:
     - template: ci-build-steps.yml

diff --git a/build/yaml/ci-api-validation-steps.yml b/build/yaml/ci-api-validation-steps.yml
@@ -2,7 +2,7 @@ steps:
 - task: DownloadPipelineArtifact@2
   displayName: 'Download BotBuilderDLLs from Artifacts'
   inputs:
-    artifactName: 'BotBuilderDLLs-Debug-Windows-netcoreapp31'
+    artifactName: 'BotBuilderDLLs-Debug-Windows-net8'
     targetPath: '$(System.ArtifactsDirectory)/OutputDlls'
 
 - task: DownloadPipelineArtifact@2

diff --git a/build/yaml/ci-test-steps.yml b/build/yaml/ci-test-steps.yml
@@ -20,32 +20,32 @@ steps:
     customCommand: 'install -g @microsoft/botframework-cli@next'
 
 - task: UseDotNet@2
-  displayName: "Install .NET Core 3.1.415"
+  displayName: "Install .NET Core 6.0"
   continueOnError: true
   inputs:
     packageType: "sdk"
-    version: 3.1.415
-  condition: and(succeeded(), eq(variables['BuildConfiguration'],'Release-Windows'), eq(variables['BuildTarget'],'netcoreapp31'))
+    version: 6.x
+  condition: and(succeeded(), eq(variables['BuildConfiguration'],'Release-Windows'), eq(variables['BuildTarget'],'net6'))
 
 - task: DotNetCoreCLI@2
-  displayName: 'dotnet test (release) 3.1'
+  displayName: 'dotnet test (release) 6.0'
   inputs:
     command: test
     projects: |
      Tests/**/*Tests.csproj
 
-    arguments: '-v n  -f netcoreapp3.1 --configuration release --no-build --no-restore --filter "TestCategory!=IgnoreInAutomatedBuild&TestCategory!=FunctionalTests" --collect:"Code Coverage" --settings $(Build.SourcesDirectory)\CodeCoverage.runsettings'
-  condition: and(succeeded(), eq(variables['BuildConfiguration'],'Release-Windows'), eq(variables['BuildTarget'],'netcoreapp31'))
+    arguments: '-v n  -f net6.0 --configuration release --no-build --no-restore --filter "TestCategory!=IgnoreInAutomatedBuild&TestCategory!=FunctionalTests" --collect:"Code Coverage" --settings $(Build.SourcesDirectory)\CodeCoverage.runsettings'
+  condition: and(succeeded(), eq(variables['BuildConfiguration'],'Release-Windows'), eq(variables['BuildTarget'],'net6'))
 
 - task: DotNetCoreCLI@2
-  displayName: 'dotnet test (release) 6.0'
+  displayName: 'dotnet test (release) 8.0'
   inputs:
     command: test
     projects: |
      Tests/**/*Tests.csproj
 
-    arguments: '-v n  -f net6.0 --configuration release --no-build --no-restore --filter "TestCategory!=IgnoreInAutomatedBuild&TestCategory!=FunctionalTests" --collect:"Code Coverage" --settings $(Build.SourcesDirectory)\CodeCoverage.runsettings'
-  condition: and(succeeded(), eq(variables['BuildConfiguration'],'Release-Windows'), eq(variables['BuildTarget'],'net6'))
+    arguments: '-v n  -f net8.0 --configuration release --no-build --no-restore --filter "TestCategory!=IgnoreInAutomatedBuild&TestCategory!=FunctionalTests" --collect:"Code Coverage" --settings $(Build.SourcesDirectory)\CodeCoverage.runsettings'
+  condition: and(succeeded(), eq(variables['BuildConfiguration'],'Release-Windows'), eq(variables['BuildTarget'],'net8'))
 
 - powershell: |
    # This task copies the code coverage file created by dotnet test into a well known location. In all