Skip to content

Commit 4437ef8

Browse files
author
Tracy Boehrer
committed
Merge branch 'main' into releases/4.22
# Conflicts: # libraries/Microsoft.Bot.Connector/Microsoft.Bot.Connector.csproj
2 parents 947714b + 411e092 commit 4437ef8

File tree

137 files changed

+858
-296
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+858
-296
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
<Configurations>Debug;Release;</Configurations>
77
</PropertyGroup>

‎build/onebranch/ci-api-validation-steps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ steps:
22
- task: DownloadPipelineArtifact@2
33
displayName: 'Download BotBuilderDLLs from Artifacts'
44
inputs:
5-
artifactName: 'BotBuilderDLLs-Debug-Windows-netcoreapp31'
5+
artifactName: 'BotBuilderDLLs-Debug-Windows-net8'
66
targetPath: '$(System.ArtifactsDirectory)/OutputDlls'
77

88
- task: DownloadPipelineArtifact@2

‎build/onebranch/ci-test-steps.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ steps:
3333
command: test
3434
projects: |
3535
Tests/**/*Tests.csproj
36-
3736
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'
3837
condition: and(succeeded(), eq(variables['BuildConfiguration'],'Release-Windows'), eq(variables['BuildTarget'],'netcoreapp31'))
3938

@@ -47,6 +46,16 @@ steps:
4746
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'
4847
condition: and(succeeded(), eq(variables['BuildConfiguration'],'Release-Windows'), eq(variables['BuildTarget'],'net6'))
4948

49+
- task: DotNetCoreCLI@2
50+
displayName: 'dotnet test (release) 8.0'
51+
inputs:
52+
command: test
53+
projects: |
54+
Tests/**/*Tests.csproj
55+
56+
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'
57+
condition: and(succeeded(), eq(variables['BuildConfiguration'],'Release-Windows'), eq(variables['BuildTarget'],'net8'))
58+
5059
- powershell: |
5160
# This task copies the code coverage file created by dotnet test into a well known location. In all
5261
# checks I've done, dotnet test ALWAYS outputs the coverage file to the temp directory.

‎build/onebranch/pr.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,14 @@ stages:
5858
- template: ci-build-steps.yml
5959
- template: ci-test-steps.yml
6060
- template: ci-component-detection-steps.yml
61+
- job: Debug_Windows_Configuration_8
62+
variables:
63+
BuildConfiguration: Debug-Windows
64+
BuildTarget: 'net8' # set the TargetFramework property for tests to use net8.0
65+
steps:
66+
- template: ci-build-steps.yml
67+
- template: ci-test-steps.yml
68+
- template: ci-component-detection-steps.yml
6169
- job: Release_Windows_Configuration_31
6270
variables:
6371
BuildConfiguration: Release-Windows
@@ -70,6 +78,14 @@ stages:
7078
variables:
7179
BuildConfiguration: Release-Windows
7280
BuildTarget: 'net6' # set the TargetFramework property for tests to use net6.0
81+
steps:
82+
- template: ci-build-steps.yml
83+
- template: ci-test-steps.yml
84+
- template: ci-component-detection-steps.yml
85+
- job: Release_Windows_Configuration_8
86+
variables:
87+
BuildConfiguration: Release-Windows
88+
BuildTarget: 'net8' # set the TargetFramework property for tests to use net8.0
7389
PublishCoverage: true
7490
steps:
7591
- template: ci-build-steps.yml

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@ steps:
2424
version: 6.0.x
2525

2626
- task: UseDotNet@2
27-
displayName: 'Use .Net Core sdk 3.1.101'
27+
displayName: 'Use .Net sdk 8.0'
2828
inputs:
29-
version: 3.1.101
29+
version: 8.0.x
3030

3131
- powershell: 'gci env:* | sort-object name | Format-Table -AutoSize -Wrap'
3232
displayName: 'Display env vars'
3333

3434
- task: NuGetToolInstaller@1
3535
displayName: 'Use NuGet '
3636

37-
- task: NuGetAuthenticate@0
37+
- task: NuGetAuthenticate@1
3838
displayName: 'NuGet Authenticate'
3939
inputs:
4040
nuGetServiceConnections: SDK_Dotnet_V4_org Connection

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,14 @@ stages:
5858
- template: ci-build-steps.yml
5959
- template: ci-test-steps.yml
6060
- template: ci-component-detection-steps.yml
61+
- job: Debug_Windows_Configuration_8
62+
variables:
63+
BuildConfiguration: Debug-Windows
64+
BuildTarget: 'net8' # set the TargetFramework property for tests to use net8.0
65+
steps:
66+
- template: ci-build-steps.yml
67+
- template: ci-test-steps.yml
68+
- template: ci-component-detection-steps.yml
6169
- job: Release_Windows_Configuration_31
6270
variables:
6371
BuildConfiguration: Release-Windows
@@ -70,6 +78,14 @@ stages:
7078
variables:
7179
BuildConfiguration: Release-Windows
7280
BuildTarget: 'net6' # set the TargetFramework property for tests to use net6.0
81+
steps:
82+
- template: ci-build-steps.yml
83+
- template: ci-test-steps.yml
84+
- template: ci-component-detection-steps.yml
85+
- job: Release_Windows_Configuration_8
86+
variables:
87+
BuildConfiguration: Release-Windows
88+
BuildTarget: 'net8' # set the TargetFramework property for tests to use net8.0
7389
PublishCoverage: true
7490
steps:
7591
- template: ci-build-steps.yml

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ steps:
8787
command: publish
8888
publishWebProjects: false
8989
projects: '$(System.DefaultWorkingDirectory)\tests\Microsoft.Bot.Builder.TestBot\Microsoft.Bot.Builder.TestBot.csproj'
90-
arguments: '-r linux-x64 --configuration $(BuildConfiguration) --output $(System.DefaultWorkingDirectory)\tests\Microsoft.Bot.Builder.TestBot\publishedbot -p:TreatWarningsAsErrors=false -p:RestoreUseSkipNonexistentTargets=false'
90+
arguments: '-r linux-x64 --configuration $(BuildConfiguration) --self-contained --output $(System.DefaultWorkingDirectory)\tests\Microsoft.Bot.Builder.TestBot\publishedbot -p:TreatWarningsAsErrors=false -p:RestoreUseSkipNonexistentTargets=false'
9191
zipAfterPublish: false
9292
modifyOutputPath: false
9393

@@ -136,4 +136,4 @@ steps:
136136
ls -R
137137
displayName: 'Dir workspace'
138138
continueOnError: true
139-
condition: succeededOrFailed()
139+
condition: succeededOrFailed()

‎build/yaml/ci-api-validation-steps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ steps:
22
- task: DownloadPipelineArtifact@2
33
displayName: 'Download BotBuilderDLLs from Artifacts'
44
inputs:
5-
artifactName: 'BotBuilderDLLs-Debug-Windows-netcoreapp31'
5+
artifactName: 'BotBuilderDLLs-Debug-Windows-net8'
66
targetPath: '$(System.ArtifactsDirectory)/OutputDlls'
77

88
- task: DownloadPipelineArtifact@2

‎build/yaml/ci-test-steps.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ steps:
3333
command: test
3434
projects: |
3535
Tests/**/*Tests.csproj
36-
3736
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'
3837
condition: and(succeeded(), eq(variables['BuildConfiguration'],'Release-Windows'), eq(variables['BuildTarget'],'netcoreapp31'))
3938

@@ -47,6 +46,16 @@ steps:
4746
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'
4847
condition: and(succeeded(), eq(variables['BuildConfiguration'],'Release-Windows'), eq(variables['BuildTarget'],'net6'))
4948

49+
- task: DotNetCoreCLI@2
50+
displayName: 'dotnet test (release) 8.0'
51+
inputs:
52+
command: test
53+
projects: |
54+
Tests/**/*Tests.csproj
55+
56+
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'
57+
condition: and(succeeded(), eq(variables['BuildConfiguration'],'Release-Windows'), eq(variables['BuildTarget'],'net8'))
58+
5059
- powershell: |
5160
# This task copies the code coverage file created by dotnet test into a well known location. In all
5261
# checks I've done, dotnet test ALWAYS outputs the coverage file to the temp directory.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ steps:
88
command: publish
99
publishWebProjects: false
1010
projects: '$(System.DefaultWorkingDirectory)\tests\Microsoft.Bot.Builder.TestBot\Microsoft.Bot.Builder.TestBot.csproj'
11-
arguments: '-r linux-x64 --output $(System.DefaultWorkingDirectory)\tests\Microsoft.Bot.Builder.TestBot\PublishedBot --configuration $(TestConfiguration) --framework net6.0'
11+
arguments: '-r linux-x64 --output $(System.DefaultWorkingDirectory)\tests\Microsoft.Bot.Builder.TestBot\PublishedBot --configuration $(TestConfiguration) --framework net8.0'
1212

1313
- task: CopyFiles@2
1414
displayName: 'Copy root Directory.Build.props to staging'

0 commit comments

Comments
 (0)