Merge branch 'main' into releases/4.22

# Conflicts:
#	libraries/Microsoft.Bot.Connector/Microsoft.Bot.Connector.csproj

Author: Tracy Boehrer

FunctionalTests/Microsoft.Bot.Builder.FunctionalTests/Microsoft.Bot.Builder.FunctionalTests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <Configurations>Debug;Release;</Configurations>
   </PropertyGroup>

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

build/onebranch/ci-test-steps.yml

@@ -33,7 +33,6 @@ steps:
     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'))
 
@@ -47,6 +46,16 @@ steps:
     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) 8.0'
+  inputs:
+    command: test
+    projects: |
+     Tests/**/*Tests.csproj
+
+    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
    # checks I've done, dotnet test ALWAYS outputs the coverage file to the temp directory. 

build/onebranch/pr.yml

@@ -58,6 +58,14 @@ stages:
     - template: ci-build-steps.yml
     - template: ci-test-steps.yml
     - template: ci-component-detection-steps.yml
+  - job: Debug_Windows_Configuration_8
+    variables:
+      BuildConfiguration: Debug-Windows
+      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
     variables:
       BuildConfiguration: Release-Windows
@@ -70,6 +78,14 @@ stages:
     variables:
       BuildConfiguration: Release-Windows
       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_8
+    variables:
+      BuildConfiguration: Release-Windows
+      BuildTarget: 'net8' # set the TargetFramework property for tests to use net8.0
       PublishCoverage: true
     steps:
     - template: ci-build-steps.yml

build/yaml/botbuilder-dotnet-ci-mac.yml

@@ -24,17 +24,17 @@ 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'
 
 - task: NuGetToolInstaller@1
   displayName: 'Use NuGet '
 
-- task: NuGetAuthenticate@0
+- task: NuGetAuthenticate@1
   displayName: 'NuGet Authenticate'
   inputs:
     nuGetServiceConnections: SDK_Dotnet_V4_org Connection

build/yaml/botbuilder-dotnet-ci.yml

@@ -58,6 +58,14 @@ stages:
     - template: ci-build-steps.yml
     - template: ci-test-steps.yml
     - template: ci-component-detection-steps.yml
+  - job: Debug_Windows_Configuration_8
+    variables:
+      BuildConfiguration: Debug-Windows
+      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
     variables:
       BuildConfiguration: Release-Windows
@@ -70,6 +78,14 @@ stages:
     variables:
       BuildConfiguration: Release-Windows
       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_8
+    variables:
+      BuildConfiguration: Release-Windows
+      BuildTarget: 'net8' # set the TargetFramework property for tests to use net8.0
       PublishCoverage: true
     steps:
     - template: ci-build-steps.yml

build/yaml/botbuilder-dotnet-functional-test-linux.yml

@@ -87,7 +87,7 @@ steps:
     command: publish
     publishWebProjects: false
     projects: '$(System.DefaultWorkingDirectory)\tests\Microsoft.Bot.Builder.TestBot\Microsoft.Bot.Builder.TestBot.csproj'
-    arguments: '-r linux-x64 --configuration $(BuildConfiguration) --output $(System.DefaultWorkingDirectory)\tests\Microsoft.Bot.Builder.TestBot\publishedbot -p:TreatWarningsAsErrors=false -p:RestoreUseSkipNonexistentTargets=false'
+    arguments: '-r linux-x64 --configuration $(BuildConfiguration) --self-contained --output $(System.DefaultWorkingDirectory)\tests\Microsoft.Bot.Builder.TestBot\publishedbot -p:TreatWarningsAsErrors=false -p:RestoreUseSkipNonexistentTargets=false'
     zipAfterPublish: false
     modifyOutputPath: false
 
@@ -136,4 +136,4 @@ steps:
    ls -R
   displayName: 'Dir workspace'
   continueOnError: true
-  condition: succeededOrFailed()
+  condition: succeededOrFailed()

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

build/yaml/ci-test-steps.yml

@@ -33,7 +33,6 @@ steps:
     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'))
 
@@ -47,6 +46,16 @@ steps:
     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) 8.0'
+  inputs:
+    command: test
+    projects: |
+     Tests/**/*Tests.csproj
+
+    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
    # checks I've done, dotnet test ALWAYS outputs the coverage file to the temp directory. 

build/yaml/functional-test-setup-steps.yml

@@ -8,7 +8,7 @@ steps:
     command: publish
     publishWebProjects: false
     projects: '$(System.DefaultWorkingDirectory)\tests\Microsoft.Bot.Builder.TestBot\Microsoft.Bot.Builder.TestBot.csproj'
-    arguments: '-r linux-x64 --output $(System.DefaultWorkingDirectory)\tests\Microsoft.Bot.Builder.TestBot\PublishedBot --configuration $(TestConfiguration) --framework net6.0'
+    arguments: '-r linux-x64 --output $(System.DefaultWorkingDirectory)\tests\Microsoft.Bot.Builder.TestBot\PublishedBot --configuration $(TestConfiguration) --framework net8.0'
 
 - task: CopyFiles@2
   displayName: 'Copy root Directory.Build.props to staging'