diff --git a/Directory.Build.props b/Directory.Build.props index e5e9cac44a..d4226a9a55 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -20,11 +20,15 @@ $(MSBuildThisFileDirectory)BotBuilder-DotNet.ruleset $(MSBuildThisFileDirectory)\CodeCoverage.runsettings - + + + + + Microsoft diff --git a/FunctionalTests/Microsoft.Bot.Builder.FunctionalTests/Microsoft.Bot.Builder.FunctionalTests.csproj b/FunctionalTests/Microsoft.Bot.Builder.FunctionalTests/Microsoft.Bot.Builder.FunctionalTests.csproj index 05d47c055b..666676179c 100644 --- a/FunctionalTests/Microsoft.Bot.Builder.FunctionalTests/Microsoft.Bot.Builder.FunctionalTests.csproj +++ b/FunctionalTests/Microsoft.Bot.Builder.FunctionalTests/Microsoft.Bot.Builder.FunctionalTests.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 false Debug;Release; diff --git a/build/onebranch/ci-api-validation-steps.yml b/build/onebranch/ci-api-validation-steps.yml index 126713d063..9529cec3cb 100644 --- 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-net8' + artifactName: 'BotBuilderDLLs-Debug-Windows-net9' targetPath: '$(System.ArtifactsDirectory)/OutputDlls' - task: DownloadPipelineArtifact@2 diff --git a/build/onebranch/ci-test-steps.yml b/build/onebranch/ci-test-steps.yml index 3484709eaa..a5efb579f0 100644 --- 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 6.0" + displayName: "Install .NET Core 8.0" continueOnError: true inputs: packageType: "sdk" - version: 6.x - condition: and(succeeded(), eq(variables['BuildConfiguration'],'Release-Windows'), eq(variables['BuildTarget'],'net6')) + version: 8.x + condition: and(succeeded(), eq(variables['BuildConfiguration'],'Release-Windows'), eq(variables['BuildTarget'],'net8')) - 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')) - task: DotNetCoreCLI@2 - displayName: 'dotnet test (release) 8.0' + displayName: 'dotnet test (release) 9.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')) + arguments: '-v n -f net9.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'],'net9')) - 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 index afd69e602c..4323c6321b 100644 --- a/build/onebranch/pr.yml +++ b/build/onebranch/pr.yml @@ -42,34 +42,34 @@ variables: stages: - stage: Build jobs: - - 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: Debug_Windows_Configuration_8 + - job: Debug_Windows_Configuration_9 variables: BuildConfiguration: Debug-Windows - BuildTarget: 'net8' # set the TargetFramework property for tests to use net8.0 + BuildTarget: 'net9' # set the TargetFramework property for tests to use net9.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 steps: - template: ci-build-steps.yml - template: ci-test-steps.yml - template: ci-component-detection-steps.yml - - job: Release_Windows_Configuration_8 + - job: Release_Windows_Configuration_9 variables: BuildConfiguration: Release-Windows - BuildTarget: 'net8' # set the TargetFramework property for tests to use net8.0 + BuildTarget: 'net9' # set the TargetFramework property for tests to use net9.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 index 119445adf4..f225c08bce 100644 --- a/build/yaml/botbuilder-dotnet-ci-mac.yml +++ b/build/yaml/botbuilder-dotnet-ci-mac.yml @@ -19,14 +19,14 @@ variables: steps: # Note: Template ci-build-steps.yml is not supported in macOS because it calls VSBuild@1 in order to build the Windows-only ASP.NET Desktop assemblies. - task: UseDotNet@2 - displayName: 'Use .Net sdk 6.0' + displayName: 'Use .Net sdk 8.0' inputs: - version: 6.0.x + version: 8.0.x - task: UseDotNet@2 - displayName: 'Use .Net sdk 8.0' + displayName: 'Use .Net sdk 9.0' inputs: - version: 8.0.x + version: 9.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 index 50afce3942..a108d6ae12 100644 --- a/build/yaml/botbuilder-dotnet-ci.yml +++ b/build/yaml/botbuilder-dotnet-ci.yml @@ -42,31 +42,31 @@ variables: stages: - stage: Build jobs: - - 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 - - job: Debug_Windows_Configuration_8 + - job: Debug_Windows_Configuration_9 variables: BuildConfiguration: Debug-Windows - BuildTarget: 'net8' # set the TargetFramework property for tests to use net8.0 + BuildTarget: 'net9' # set the TargetFramework property for tests to use net9.0 steps: - template: ci-build-steps.yml - template: ci-test-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 steps: - template: ci-build-steps.yml - template: ci-test-steps.yml - - job: Release_Windows_Configuration_8 + - job: Release_Windows_Configuration_9 variables: BuildConfiguration: Release-Windows - BuildTarget: 'net8' # set the TargetFramework property for tests to use net8.0 + BuildTarget: 'net9' # set the TargetFramework property for tests to use net9.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 index 126713d063..9529cec3cb 100644 --- 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-net8' + artifactName: 'BotBuilderDLLs-Debug-Windows-net9' targetPath: '$(System.ArtifactsDirectory)/OutputDlls' - task: DownloadPipelineArtifact@2 diff --git a/build/yaml/ci-test-steps.yml b/build/yaml/ci-test-steps.yml index 3484709eaa..a5efb579f0 100644 --- 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 6.0" + displayName: "Install .NET Core 8.0" continueOnError: true inputs: packageType: "sdk" - version: 6.x - condition: and(succeeded(), eq(variables['BuildConfiguration'],'Release-Windows'), eq(variables['BuildTarget'],'net6')) + version: 8.x + condition: and(succeeded(), eq(variables['BuildConfiguration'],'Release-Windows'), eq(variables['BuildTarget'],'net8')) - 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')) - task: DotNetCoreCLI@2 - displayName: 'dotnet test (release) 8.0' + displayName: 'dotnet test (release) 9.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')) + arguments: '-v n -f net9.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'],'net9')) - powershell: | # This task copies the code coverage file created by dotnet test into a well known location. In all diff --git a/build/yaml/functional-test-setup-steps.yml b/build/yaml/functional-test-setup-steps.yml index 0265ffe5c3..d683f20145 100644 --- a/build/yaml/functional-test-setup-steps.yml +++ b/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 net8.0' + arguments: '-r linux-x64 --output $(System.DefaultWorkingDirectory)\tests\Microsoft.Bot.Builder.TestBot\PublishedBot --configuration $(TestConfiguration) --framework net9.0' - task: CopyFiles@2 displayName: 'Copy root Directory.Build.props to staging' diff --git a/libraries/Microsoft.Bot.AdaptiveExpressions.Core/Microsoft.Bot.AdaptiveExpressions.Core.csproj b/libraries/Microsoft.Bot.AdaptiveExpressions.Core/Microsoft.Bot.AdaptiveExpressions.Core.csproj index eca5eb9122..78fa13d43b 100644 --- a/libraries/Microsoft.Bot.AdaptiveExpressions.Core/Microsoft.Bot.AdaptiveExpressions.Core.csproj +++ b/libraries/Microsoft.Bot.AdaptiveExpressions.Core/Microsoft.Bot.AdaptiveExpressions.Core.csproj @@ -1,7 +1,7 @@  - netstandard2.0;net6.0;net8.0 + netstandard2.0;net8.0;net9.0 $(LocalPackageVersion) $(ReleasePackageVersion) $(LocalPackageVersion) diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime/Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime.csproj b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime/Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime.csproj index 4399e04e88..9551114aef 100644 --- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime/Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime.csproj +++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime/Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime.csproj @@ -10,7 +10,7 @@ - netstandard2.0;net6.0;net8.0 + netstandard2.0;net8.0;net9.0 Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime Library for building Adaptive Runtime bots using the Bot Framework SDK Library for building Adaptive Runtime bots using the Bot Framework SDK @@ -22,11 +22,7 @@ true - - - - - + diff --git a/libraries/Microsoft.Bot.Streaming/Microsoft.Bot.Streaming.csproj b/libraries/Microsoft.Bot.Streaming/Microsoft.Bot.Streaming.csproj index 88e3473831..20b7fa343d 100644 --- a/libraries/Microsoft.Bot.Streaming/Microsoft.Bot.Streaming.csproj +++ b/libraries/Microsoft.Bot.Streaming/Microsoft.Bot.Streaming.csproj @@ -11,7 +11,7 @@ - netstandard2.0;net6.0;net8.0 + netstandard2.0;net8.0;net9.0 Microsoft.Bot.Streaming Streaming library for the Bot Framework SDK Streaming library for the Bot Framework SDK @@ -30,11 +30,7 @@ - - - - - + diff --git a/libraries/integration/Microsoft.Bot.Builder.Integration.ApplicationInsights.Core/Microsoft.Bot.Builder.Integration.ApplicationInsights.Core.csproj b/libraries/integration/Microsoft.Bot.Builder.Integration.ApplicationInsights.Core/Microsoft.Bot.Builder.Integration.ApplicationInsights.Core.csproj index 4fbf6ee961..21812114bb 100644 --- a/libraries/integration/Microsoft.Bot.Builder.Integration.ApplicationInsights.Core/Microsoft.Bot.Builder.Integration.ApplicationInsights.Core.csproj +++ b/libraries/integration/Microsoft.Bot.Builder.Integration.ApplicationInsights.Core/Microsoft.Bot.Builder.Integration.ApplicationInsights.Core.csproj @@ -9,7 +9,7 @@ - netstandard2.0;net6.0;net8.0 + netstandard2.0;net8.0;net9.0 Microsoft.Bot.Builder.Integration.ApplicationInsights.Core This library integrates the Microsoft Bot Builder SDK with Application Insights. This library provides integration between the Microsoft Bot Builder SDK and Application Insights. @@ -20,15 +20,7 @@ true - - - - - - - - - + diff --git a/libraries/integration/Microsoft.Bot.Builder.Integration.AspNet.Core/Microsoft.Bot.Builder.Integration.AspNet.Core.csproj b/libraries/integration/Microsoft.Bot.Builder.Integration.AspNet.Core/Microsoft.Bot.Builder.Integration.AspNet.Core.csproj index 234496b7f2..1a60ead1e6 100644 --- a/libraries/integration/Microsoft.Bot.Builder.Integration.AspNet.Core/Microsoft.Bot.Builder.Integration.AspNet.Core.csproj +++ b/libraries/integration/Microsoft.Bot.Builder.Integration.AspNet.Core/Microsoft.Bot.Builder.Integration.AspNet.Core.csproj @@ -9,7 +9,7 @@ - netstandard2.0;net6.0;net8.0 + netstandard2.0;net8.0;net9.0 This library integrates the Microsoft Bot Builder SDK with ASP.NET Core. It offers idiomatic configuration APIs in addition to providing all the plumbing to direct incoming bot messages to a configured bot. This library provides integration between the Microsoft Bot Builder SDK and ASP.NET Core. @@ -19,11 +19,7 @@ true - - - - - + diff --git a/tests/Adapters/Microsoft.Bot.Builder.Adapters.Facebook.PrimaryTestBot/Microsoft.Bot.Builder.Adapters.Facebook.PrimaryTestBot.csproj b/tests/Adapters/Microsoft.Bot.Builder.Adapters.Facebook.PrimaryTestBot/Microsoft.Bot.Builder.Adapters.Facebook.PrimaryTestBot.csproj index 0ed20c5ade..fd6c93b05b 100644 --- a/tests/Adapters/Microsoft.Bot.Builder.Adapters.Facebook.PrimaryTestBot/Microsoft.Bot.Builder.Adapters.Facebook.PrimaryTestBot.csproj +++ b/tests/Adapters/Microsoft.Bot.Builder.Adapters.Facebook.PrimaryTestBot/Microsoft.Bot.Builder.Adapters.Facebook.PrimaryTestBot.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 594af4a1-e396-4609-8198-d665eb0c1f78 diff --git a/tests/Adapters/Microsoft.Bot.Builder.Adapters.Facebook.SecondaryTestBot/Microsoft.Bot.Builder.Adapters.Facebook.SecondaryTestBot.csproj b/tests/Adapters/Microsoft.Bot.Builder.Adapters.Facebook.SecondaryTestBot/Microsoft.Bot.Builder.Adapters.Facebook.SecondaryTestBot.csproj index f90ab38a58..dbd7c51063 100644 --- a/tests/Adapters/Microsoft.Bot.Builder.Adapters.Facebook.SecondaryTestBot/Microsoft.Bot.Builder.Adapters.Facebook.SecondaryTestBot.csproj +++ b/tests/Adapters/Microsoft.Bot.Builder.Adapters.Facebook.SecondaryTestBot/Microsoft.Bot.Builder.Adapters.Facebook.SecondaryTestBot.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 dae2bae8-b3c8-4b83-8b3c-4022669c7a20 diff --git a/tests/Adapters/Microsoft.Bot.Builder.Adapters.Facebook.Tests/Microsoft.Bot.Builder.Adapters.Facebook.Tests.csproj b/tests/Adapters/Microsoft.Bot.Builder.Adapters.Facebook.Tests/Microsoft.Bot.Builder.Adapters.Facebook.Tests.csproj index 1d54dead94..fa44c8d5e2 100644 --- a/tests/Adapters/Microsoft.Bot.Builder.Adapters.Facebook.Tests/Microsoft.Bot.Builder.Adapters.Facebook.Tests.csproj +++ b/tests/Adapters/Microsoft.Bot.Builder.Adapters.Facebook.Tests/Microsoft.Bot.Builder.Adapters.Facebook.Tests.csproj @@ -1,9 +1,9 @@  - net6.0 net8.0 - net6.0;net8.0 + net9.0 + net8.0;net9.0 false diff --git a/tests/Adapters/Microsoft.Bot.Builder.Adapters.Slack.TestBot/Microsoft.Bot.Builder.Adapters.Slack.TestBot.csproj b/tests/Adapters/Microsoft.Bot.Builder.Adapters.Slack.TestBot/Microsoft.Bot.Builder.Adapters.Slack.TestBot.csproj index 1db51760ce..539ef4e32b 100644 --- a/tests/Adapters/Microsoft.Bot.Builder.Adapters.Slack.TestBot/Microsoft.Bot.Builder.Adapters.Slack.TestBot.csproj +++ b/tests/Adapters/Microsoft.Bot.Builder.Adapters.Slack.TestBot/Microsoft.Bot.Builder.Adapters.Slack.TestBot.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 $(NoWarn),CS8002 3c783a33-e2a5-4acd-99dd-581d563d47e3 diff --git a/tests/Adapters/Microsoft.Bot.Builder.Adapters.Slack.Tests/Microsoft.Bot.Builder.Adapters.Slack.Tests.csproj b/tests/Adapters/Microsoft.Bot.Builder.Adapters.Slack.Tests/Microsoft.Bot.Builder.Adapters.Slack.Tests.csproj index d8b43db03f..3cdf6b97a2 100644 --- a/tests/Adapters/Microsoft.Bot.Builder.Adapters.Slack.Tests/Microsoft.Bot.Builder.Adapters.Slack.Tests.csproj +++ b/tests/Adapters/Microsoft.Bot.Builder.Adapters.Slack.Tests/Microsoft.Bot.Builder.Adapters.Slack.Tests.csproj @@ -1,9 +1,9 @@  - net6.0 net8.0 - net6.0;net8.0 + net9.0 + net8.0;net9.0 false diff --git a/tests/Adapters/Microsoft.Bot.Builder.Adapters.Twilio.TestBot/Microsoft.Bot.Builder.Adapters.Twilio.TestBot.csproj b/tests/Adapters/Microsoft.Bot.Builder.Adapters.Twilio.TestBot/Microsoft.Bot.Builder.Adapters.Twilio.TestBot.csproj index 0283b0ccb2..8570b755ce 100644 --- a/tests/Adapters/Microsoft.Bot.Builder.Adapters.Twilio.TestBot/Microsoft.Bot.Builder.Adapters.Twilio.TestBot.csproj +++ b/tests/Adapters/Microsoft.Bot.Builder.Adapters.Twilio.TestBot/Microsoft.Bot.Builder.Adapters.Twilio.TestBot.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 latest diff --git a/tests/Adapters/Microsoft.Bot.Builder.Adapters.Twilio.Tests/Microsoft.Bot.Builder.Adapters.Twilio.Tests.csproj b/tests/Adapters/Microsoft.Bot.Builder.Adapters.Twilio.Tests/Microsoft.Bot.Builder.Adapters.Twilio.Tests.csproj index f7b0d7a4d1..60c72ba7f1 100644 --- a/tests/Adapters/Microsoft.Bot.Builder.Adapters.Twilio.Tests/Microsoft.Bot.Builder.Adapters.Twilio.Tests.csproj +++ b/tests/Adapters/Microsoft.Bot.Builder.Adapters.Twilio.Tests/Microsoft.Bot.Builder.Adapters.Twilio.Tests.csproj @@ -1,9 +1,9 @@  - net6.0 net8.0 - net6.0;net8.0 + net9.0 + net8.0;net9.0 false diff --git a/tests/Adapters/Microsoft.Bot.Builder.Adapters.Webex.TestBot/Microsoft.Bot.Builder.Adapters.Webex.TestBot.csproj b/tests/Adapters/Microsoft.Bot.Builder.Adapters.Webex.TestBot/Microsoft.Bot.Builder.Adapters.Webex.TestBot.csproj index 1932906696..eb81373500 100644 --- a/tests/Adapters/Microsoft.Bot.Builder.Adapters.Webex.TestBot/Microsoft.Bot.Builder.Adapters.Webex.TestBot.csproj +++ b/tests/Adapters/Microsoft.Bot.Builder.Adapters.Webex.TestBot/Microsoft.Bot.Builder.Adapters.Webex.TestBot.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 $(NoWarn),CS8002 63730bc1-f7d4-4b32-8efe-ce03907b3e0a diff --git a/tests/Adapters/Microsoft.Bot.Builder.Adapters.Webex.Tests/Microsoft.Bot.Builder.Adapters.Webex.Tests.csproj b/tests/Adapters/Microsoft.Bot.Builder.Adapters.Webex.Tests/Microsoft.Bot.Builder.Adapters.Webex.Tests.csproj index 8f72aa84fb..8dcc0efb80 100644 --- a/tests/Adapters/Microsoft.Bot.Builder.Adapters.Webex.Tests/Microsoft.Bot.Builder.Adapters.Webex.Tests.csproj +++ b/tests/Adapters/Microsoft.Bot.Builder.Adapters.Webex.Tests/Microsoft.Bot.Builder.Adapters.Webex.Tests.csproj @@ -1,9 +1,9 @@  - net6.0 net8.0 - net6.0;net8.0 + net9.0 + net8.0;net9.0 false diff --git a/tests/AdaptiveExpressions.Tests/AdaptiveExpressions.Tests.csproj b/tests/AdaptiveExpressions.Tests/AdaptiveExpressions.Tests.csproj index 26c6a98efd..014a655d1d 100644 --- a/tests/AdaptiveExpressions.Tests/AdaptiveExpressions.Tests.csproj +++ b/tests/AdaptiveExpressions.Tests/AdaptiveExpressions.Tests.csproj @@ -1,9 +1,9 @@  - net6.0 net8.0 - net6.0;net8.0 + net9.0 + net8.0;net9.0 false diff --git a/tests/Auth/bot-authentication/AuthenticationBot.csproj b/tests/Auth/bot-authentication/AuthenticationBot.csproj index 7174f0cea8..49fea717f4 100644 --- a/tests/Auth/bot-authentication/AuthenticationBot.csproj +++ b/tests/Auth/bot-authentication/AuthenticationBot.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 latest diff --git a/tests/Microsoft.Bot.AdaptiveExpressions.Core.AOT.Tests/Microsoft.Bot.AdaptiveExpressions.Core.AOT.Tests.csproj b/tests/Microsoft.Bot.AdaptiveExpressions.Core.AOT.Tests/Microsoft.Bot.AdaptiveExpressions.Core.AOT.Tests.csproj index 79c422175f..8b8405472a 100644 --- a/tests/Microsoft.Bot.AdaptiveExpressions.Core.AOT.Tests/Microsoft.Bot.AdaptiveExpressions.Core.AOT.Tests.csproj +++ b/tests/Microsoft.Bot.AdaptiveExpressions.Core.AOT.Tests/Microsoft.Bot.AdaptiveExpressions.Core.AOT.Tests.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 false @@ -14,6 +14,11 @@ $(DefineConstants);AOT + + $(NoWarn);IL2026 + $(NoWarn);IL3050 + + diff --git a/tests/Microsoft.Bot.AdaptiveExpressions.Core.Tests/Microsoft.Bot.AdaptiveExpressions.Core.Tests.csproj b/tests/Microsoft.Bot.AdaptiveExpressions.Core.Tests/Microsoft.Bot.AdaptiveExpressions.Core.Tests.csproj index 926591529d..94296025e2 100644 --- a/tests/Microsoft.Bot.AdaptiveExpressions.Core.Tests/Microsoft.Bot.AdaptiveExpressions.Core.Tests.csproj +++ b/tests/Microsoft.Bot.AdaptiveExpressions.Core.Tests/Microsoft.Bot.AdaptiveExpressions.Core.Tests.csproj @@ -2,8 +2,8 @@ net8.0 - net6.0 - net6.0;net8.0 + net9.0 + net8.0;net9.0 false diff --git a/tests/Microsoft.Bot.Builder.AI.LUIS.Tests/Microsoft.Bot.Builder.AI.Luis.Tests.csproj b/tests/Microsoft.Bot.Builder.AI.LUIS.Tests/Microsoft.Bot.Builder.AI.Luis.Tests.csproj index 61e13bc19d..8398d87adb 100644 --- a/tests/Microsoft.Bot.Builder.AI.LUIS.Tests/Microsoft.Bot.Builder.AI.Luis.Tests.csproj +++ b/tests/Microsoft.Bot.Builder.AI.LUIS.Tests/Microsoft.Bot.Builder.AI.Luis.Tests.csproj @@ -1,8 +1,8 @@  - net6.0 net8.0 - net6.0;net8.0 + net9.0 + net8.0;net9.0 false false Debug;Release diff --git a/tests/Microsoft.Bot.Builder.AI.Luis.TestUtils/Microsoft.Bot.Builder.AI.Luis.TestUtils.csproj b/tests/Microsoft.Bot.Builder.AI.Luis.TestUtils/Microsoft.Bot.Builder.AI.Luis.TestUtils.csproj index 29def90d71..b9e2388119 100644 --- a/tests/Microsoft.Bot.Builder.AI.Luis.TestUtils/Microsoft.Bot.Builder.AI.Luis.TestUtils.csproj +++ b/tests/Microsoft.Bot.Builder.AI.Luis.TestUtils/Microsoft.Bot.Builder.AI.Luis.TestUtils.csproj @@ -1,9 +1,9 @@  - net6.0 net8.0 - net6.0;net8.0 + net9.0 + net8.0;net9.0 Debug;Release diff --git a/tests/Microsoft.Bot.Builder.AI.Orchestrator.Tests/Microsoft.Bot.Builder.AI.Orchestrator.Tests.csproj b/tests/Microsoft.Bot.Builder.AI.Orchestrator.Tests/Microsoft.Bot.Builder.AI.Orchestrator.Tests.csproj index b0fb16d5ee..75e6e2a97f 100644 --- a/tests/Microsoft.Bot.Builder.AI.Orchestrator.Tests/Microsoft.Bot.Builder.AI.Orchestrator.Tests.csproj +++ b/tests/Microsoft.Bot.Builder.AI.Orchestrator.Tests/Microsoft.Bot.Builder.AI.Orchestrator.Tests.csproj @@ -1,9 +1,9 @@  - net6.0 net8.0 - net6.0;net8.0 + net9.0 + net8.0;net9.0 false false Debug;Release diff --git a/tests/Microsoft.Bot.Builder.AI.QnA.Tests/Microsoft.Bot.Builder.AI.QnA.Tests.csproj b/tests/Microsoft.Bot.Builder.AI.QnA.Tests/Microsoft.Bot.Builder.AI.QnA.Tests.csproj index 60007cb3e3..c03451fc0c 100644 --- a/tests/Microsoft.Bot.Builder.AI.QnA.Tests/Microsoft.Bot.Builder.AI.QnA.Tests.csproj +++ b/tests/Microsoft.Bot.Builder.AI.QnA.Tests/Microsoft.Bot.Builder.AI.QnA.Tests.csproj @@ -1,9 +1,9 @@  - net6.0 net8.0 - net6.0;net8.0 + net9.0 + net8.0;net9.0 false false Debug;Release diff --git a/tests/Microsoft.Bot.Builder.Ai.LUISV3.tests/Microsoft.Bot.Builder.AI.LuisV3.Tests.csproj b/tests/Microsoft.Bot.Builder.Ai.LUISV3.tests/Microsoft.Bot.Builder.AI.LuisV3.Tests.csproj index 8b5acff738..716aef5862 100644 --- a/tests/Microsoft.Bot.Builder.Ai.LUISV3.tests/Microsoft.Bot.Builder.AI.LuisV3.Tests.csproj +++ b/tests/Microsoft.Bot.Builder.Ai.LUISV3.tests/Microsoft.Bot.Builder.AI.LuisV3.Tests.csproj @@ -1,9 +1,9 @@  - net6.0 net8.0 - net6.0;net8.0 + net9.0 + net8.0;net9.0 false false Debug;Release diff --git a/tests/Microsoft.Bot.Builder.ApplicationInsights.Tests/Microsoft.Bot.Builder.ApplicationInsights.Tests.csproj b/tests/Microsoft.Bot.Builder.ApplicationInsights.Tests/Microsoft.Bot.Builder.ApplicationInsights.Tests.csproj index 071a4824e2..25c38366ba 100644 --- a/tests/Microsoft.Bot.Builder.ApplicationInsights.Tests/Microsoft.Bot.Builder.ApplicationInsights.Tests.csproj +++ b/tests/Microsoft.Bot.Builder.ApplicationInsights.Tests/Microsoft.Bot.Builder.ApplicationInsights.Tests.csproj @@ -1,8 +1,8 @@  - net6.0 net8.0 - net6.0;net8.0 + net9.0 + net8.0;net9.0 false false Debug;Release @@ -17,6 +17,10 @@ runtime; build; native; contentfiles; analyzers; buildtransitive + + + + @@ -24,4 +28,5 @@ + diff --git a/tests/Microsoft.Bot.Builder.Azure.Tests/Microsoft.Bot.Builder.Azure.Tests.csproj b/tests/Microsoft.Bot.Builder.Azure.Tests/Microsoft.Bot.Builder.Azure.Tests.csproj index 2175bcb08f..95d58bf1c6 100644 --- a/tests/Microsoft.Bot.Builder.Azure.Tests/Microsoft.Bot.Builder.Azure.Tests.csproj +++ b/tests/Microsoft.Bot.Builder.Azure.Tests/Microsoft.Bot.Builder.Azure.Tests.csproj @@ -1,8 +1,8 @@  - net6.0 net8.0 - net6.0;net8.0 + net9.0 + net8.0;net9.0 false false Debug;Release diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Profiling/Microsoft.Bot.Builder.Dialogs.Adaptive.Profiling.csproj b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Profiling/Microsoft.Bot.Builder.Dialogs.Adaptive.Profiling.csproj index 188786adfc..10317f6f30 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Profiling/Microsoft.Bot.Builder.Dialogs.Adaptive.Profiling.csproj +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Profiling/Microsoft.Bot.Builder.Dialogs.Adaptive.Profiling.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime.Tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime.Tests.csproj b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime.Tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime.Tests.csproj index 1f20170c96..911259aaa4 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime.Tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime.Tests.csproj +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime.Tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime.Tests.csproj @@ -1,9 +1,9 @@  - net6.0 net8.0 - net6.0;net8.0 + net9.0 + net8.0;net9.0 false false Debug;Release diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Templates.Tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Templates.Tests.csproj b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Templates.Tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Templates.Tests.csproj index 5472349718..41963e9593 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Templates.Tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Templates.Tests.csproj +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Templates.Tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Templates.Tests.csproj @@ -1,9 +1,9 @@  - net6.0 net8.0 - net6.0;net8.0 + net9.0 + net8.0;net9.0 false diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests.csproj b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests.csproj index 4d1bd793c2..d20c89a421 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests.csproj +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests.csproj @@ -1,9 +1,9 @@  - net6.0 net8.0 - net6.0;net8.0 + net9.0 + net8.0;net9.0 false Debug;Release diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Debugging.Tests/Microsoft.Bot.Builder.Dialogs.Debugging.Tests.csproj b/tests/Microsoft.Bot.Builder.Dialogs.Debugging.Tests/Microsoft.Bot.Builder.Dialogs.Debugging.Tests.csproj index 865df0f033..99f65801d5 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Debugging.Tests/Microsoft.Bot.Builder.Dialogs.Debugging.Tests.csproj +++ b/tests/Microsoft.Bot.Builder.Dialogs.Debugging.Tests/Microsoft.Bot.Builder.Dialogs.Debugging.Tests.csproj @@ -1,9 +1,9 @@  - net6.0 net8.0 - net6.0;net8.0 + net9.0 + net8.0;net9.0 false diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests.csproj b/tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests.csproj index c54bc8b8d2..665a18b93e 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests.csproj +++ b/tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests.csproj @@ -1,9 +1,9 @@  - net6.0 net8.0 - net6.0;net8.0 + net9.0 + net8.0;net9.0 false diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Tests/Microsoft.Bot.Builder.Dialogs.Tests.csproj b/tests/Microsoft.Bot.Builder.Dialogs.Tests/Microsoft.Bot.Builder.Dialogs.Tests.csproj index 2ae4d29126..7e3d0bb5f6 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Tests/Microsoft.Bot.Builder.Dialogs.Tests.csproj +++ b/tests/Microsoft.Bot.Builder.Dialogs.Tests/Microsoft.Bot.Builder.Dialogs.Tests.csproj @@ -1,8 +1,8 @@  - net6.0 net8.0 - net6.0;net8.0 + net9.0 + net8.0;net9.0 false false Debug;Release diff --git a/tests/Microsoft.Bot.Builder.LanguageGeneration.Tests/Microsoft.Bot.Builder.LanguageGeneration.Tests.csproj b/tests/Microsoft.Bot.Builder.LanguageGeneration.Tests/Microsoft.Bot.Builder.LanguageGeneration.Tests.csproj index fd43c8a348..a3f8f1ef0e 100644 --- a/tests/Microsoft.Bot.Builder.LanguageGeneration.Tests/Microsoft.Bot.Builder.LanguageGeneration.Tests.csproj +++ b/tests/Microsoft.Bot.Builder.LanguageGeneration.Tests/Microsoft.Bot.Builder.LanguageGeneration.Tests.csproj @@ -1,9 +1,9 @@  - net6.0 net8.0 - net6.0;net8.0 + net9.0 + net8.0;net9.0 false diff --git a/tests/Microsoft.Bot.Builder.TemplateManager/Microsoft.Bot.Builder.TemplateManager.Tests.csproj b/tests/Microsoft.Bot.Builder.TemplateManager/Microsoft.Bot.Builder.TemplateManager.Tests.csproj index 9c320e8b95..d1f21c22b6 100644 --- a/tests/Microsoft.Bot.Builder.TemplateManager/Microsoft.Bot.Builder.TemplateManager.Tests.csproj +++ b/tests/Microsoft.Bot.Builder.TemplateManager/Microsoft.Bot.Builder.TemplateManager.Tests.csproj @@ -1,8 +1,8 @@  - net6.0 net8.0 - net6.0;net8.0 + net9.0 + net8.0;net9.0 false false Debug;Release diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Microsoft.Bot.Builder.TestBot.Json.csproj b/tests/Microsoft.Bot.Builder.TestBot.Json/Microsoft.Bot.Builder.TestBot.Json.csproj index f5226e8a5a..9b407cde00 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Microsoft.Bot.Builder.TestBot.Json.csproj +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Microsoft.Bot.Builder.TestBot.Json.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 TestBot Debug;Release diff --git a/tests/Microsoft.Bot.Builder.TestBot.Tests/Microsoft.Bot.Builder.TestBot.Tests.csproj b/tests/Microsoft.Bot.Builder.TestBot.Tests/Microsoft.Bot.Builder.TestBot.Tests.csproj index 5856ab1d08..3736c9e543 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Tests/Microsoft.Bot.Builder.TestBot.Tests.csproj +++ b/tests/Microsoft.Bot.Builder.TestBot.Tests/Microsoft.Bot.Builder.TestBot.Tests.csproj @@ -1,9 +1,9 @@  - net6.0 net8.0 - net6.0;net8.0 + net9.0 + net8.0;net9.0 false Microsoft.Bot.Builder.TestBot.Tests Microsoft.BotBuilderSamples.Tests diff --git a/tests/Microsoft.Bot.Builder.TestBot/Microsoft.Bot.Builder.TestBot.csproj b/tests/Microsoft.Bot.Builder.TestBot/Microsoft.Bot.Builder.TestBot.csproj index 8f26dcc3b3..4d35ebd701 100644 --- a/tests/Microsoft.Bot.Builder.TestBot/Microsoft.Bot.Builder.TestBot.csproj +++ b/tests/Microsoft.Bot.Builder.TestBot/Microsoft.Bot.Builder.TestBot.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 f277272c-9113-411f-addd-a4acfa9701a2 Microsoft.BotBuilderSamples diff --git a/tests/Microsoft.Bot.Builder.TestBot/wwwroot/default.htm b/tests/Microsoft.Bot.Builder.TestBot/wwwroot/default.htm index 1af048a674..80b737fec2 100644 --- a/tests/Microsoft.Bot.Builder.TestBot/wwwroot/default.htm +++ b/tests/Microsoft.Bot.Builder.TestBot/wwwroot/default.htm @@ -5,7 +5,7 @@ -

TestBot using ASP.Net 8

+

TestBot using ASP.Net 9

Describe your bot here and your terms of use etc.

To debug your bot using the Bot Framework Emulator, paste this URL into the Emulator window:

diff --git a/tests/Microsoft.Bot.Builder.TestProtocol/Microsoft.Bot.Builder.TestProtocol.csproj b/tests/Microsoft.Bot.Builder.TestProtocol/Microsoft.Bot.Builder.TestProtocol.csproj index 700d5827d8..112c6e31a4 100644 --- a/tests/Microsoft.Bot.Builder.TestProtocol/Microsoft.Bot.Builder.TestProtocol.csproj +++ b/tests/Microsoft.Bot.Builder.TestProtocol/Microsoft.Bot.Builder.TestProtocol.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 1ae6e573-b022-4bd5-b6b5-7ea57e4977f8 diff --git a/tests/Microsoft.Bot.Builder.Testing.Tests/Microsoft.Bot.Builder.Testing.Tests.csproj b/tests/Microsoft.Bot.Builder.Testing.Tests/Microsoft.Bot.Builder.Testing.Tests.csproj index 2e5d7bd9c3..bfb7c642b9 100644 --- a/tests/Microsoft.Bot.Builder.Testing.Tests/Microsoft.Bot.Builder.Testing.Tests.csproj +++ b/tests/Microsoft.Bot.Builder.Testing.Tests/Microsoft.Bot.Builder.Testing.Tests.csproj @@ -1,9 +1,9 @@  - net6.0 net8.0 - net6.0;net8.0 + net9.0 + net8.0;net9.0 false false Debug;Release diff --git a/tests/Microsoft.Bot.Builder.Tests/Microsoft.Bot.Builder.Tests.csproj b/tests/Microsoft.Bot.Builder.Tests/Microsoft.Bot.Builder.Tests.csproj index 2b3c4afcb0..bd9d858a31 100644 --- a/tests/Microsoft.Bot.Builder.Tests/Microsoft.Bot.Builder.Tests.csproj +++ b/tests/Microsoft.Bot.Builder.Tests/Microsoft.Bot.Builder.Tests.csproj @@ -1,9 +1,9 @@  - net6.0 net8.0 - net6.0;net8.0 + net9.0 + net8.0;net9.0 false false Debug;Release diff --git a/tests/Microsoft.Bot.Builder.Tests/Teams/TeamsActivityHandlerTests.cs b/tests/Microsoft.Bot.Builder.Tests/Teams/TeamsActivityHandlerTests.cs index 4cc3263efb..12506422c5 100644 --- a/tests/Microsoft.Bot.Builder.Tests/Teams/TeamsActivityHandlerTests.cs +++ b/tests/Microsoft.Bot.Builder.Tests/Teams/TeamsActivityHandlerTests.cs @@ -1201,7 +1201,7 @@ void CaptureSend(Activity[] arg) Assert.Equal("OnTeamsMeetingStartAsync", bot.Record[1]); Assert.NotNull(activitiesToSend); Assert.Single(activitiesToSend); - Assert.Contains("12:01:02 AM", activitiesToSend[0].Text); // Date format differs between OSs, so we just Assert.Contains instead of Assert.Equals + Assert.Contains("12:01:02", activitiesToSend[0].Text); // Date format differs between OSs, so we just Assert.Contains instead of Assert.Equals } [Fact] @@ -1234,7 +1234,7 @@ void CaptureSend(Activity[] arg) Assert.Equal("OnTeamsMeetingEndAsync", bot.Record[1]); Assert.NotNull(activitiesToSend); Assert.Single(activitiesToSend); - Assert.Contains("1:02:03 AM", activitiesToSend[0].Text); // Date format differs between OSs, so we just Assert.Contains instead of Assert.Equals + Assert.Contains("1:02:03", activitiesToSend[0].Text); // Date format differs between OSs, so we just Assert.Contains instead of Assert.Equals } [Fact] diff --git a/tests/Microsoft.Bot.Builder.Transcripts.Tests/Microsoft.Bot.Builder.Transcripts.Tests.csproj b/tests/Microsoft.Bot.Builder.Transcripts.Tests/Microsoft.Bot.Builder.Transcripts.Tests.csproj index 24f7e91042..2146f0bd58 100644 --- a/tests/Microsoft.Bot.Builder.Transcripts.Tests/Microsoft.Bot.Builder.Transcripts.Tests.csproj +++ b/tests/Microsoft.Bot.Builder.Transcripts.Tests/Microsoft.Bot.Builder.Transcripts.Tests.csproj @@ -1,8 +1,8 @@  - net6.0 net8.0 - net6.0;net8.0 + net9.0 + net8.0;net9.0 false false Debug;Release diff --git a/tests/Microsoft.Bot.Configuration.Tests/Microsoft.Bot.Configuration.Tests.csproj b/tests/Microsoft.Bot.Configuration.Tests/Microsoft.Bot.Configuration.Tests.csproj index 10ad7c96fb..fc4dd71ef2 100644 --- a/tests/Microsoft.Bot.Configuration.Tests/Microsoft.Bot.Configuration.Tests.csproj +++ b/tests/Microsoft.Bot.Configuration.Tests/Microsoft.Bot.Configuration.Tests.csproj @@ -1,8 +1,8 @@  - net6.0 net8.0 - net6.0;net8.0 + net9.0 + net8.0;net9.0 false false Debug;Release diff --git a/tests/Microsoft.Bot.Connector.Streaming.Perf/Microsoft.Bot.Connector.Streaming.Perf.csproj b/tests/Microsoft.Bot.Connector.Streaming.Perf/Microsoft.Bot.Connector.Streaming.Perf.csproj index e7fbe472a0..399f3f9a71 100644 --- a/tests/Microsoft.Bot.Connector.Streaming.Perf/Microsoft.Bot.Connector.Streaming.Perf.csproj +++ b/tests/Microsoft.Bot.Connector.Streaming.Perf/Microsoft.Bot.Connector.Streaming.Perf.csproj @@ -3,7 +3,7 @@ Exe - net8.0 + net9.0 diff --git a/tests/Microsoft.Bot.Connector.Streaming.Tests.Client/Microsoft.Bot.Connector.Streaming.Tests.Client.csproj b/tests/Microsoft.Bot.Connector.Streaming.Tests.Client/Microsoft.Bot.Connector.Streaming.Tests.Client.csproj index c4eab565ea..89aa1f0de4 100644 --- a/tests/Microsoft.Bot.Connector.Streaming.Tests.Client/Microsoft.Bot.Connector.Streaming.Tests.Client.csproj +++ b/tests/Microsoft.Bot.Connector.Streaming.Tests.Client/Microsoft.Bot.Connector.Streaming.Tests.Client.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 diff --git a/tests/Microsoft.Bot.Connector.Streaming.Tests.Server/Microsoft.Bot.Connector.Streaming.Tests.Server.csproj b/tests/Microsoft.Bot.Connector.Streaming.Tests.Server/Microsoft.Bot.Connector.Streaming.Tests.Server.csproj index 2c914a3546..6de73e6083 100644 --- a/tests/Microsoft.Bot.Connector.Streaming.Tests.Server/Microsoft.Bot.Connector.Streaming.Tests.Server.csproj +++ b/tests/Microsoft.Bot.Connector.Streaming.Tests.Server/Microsoft.Bot.Connector.Streaming.Tests.Server.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 latest diff --git a/tests/Microsoft.Bot.Connector.Streaming.Tests/Microsoft.Bot.Connector.Streaming.Tests.csproj b/tests/Microsoft.Bot.Connector.Streaming.Tests/Microsoft.Bot.Connector.Streaming.Tests.csproj index 7587366d30..5dbb290a68 100644 --- a/tests/Microsoft.Bot.Connector.Streaming.Tests/Microsoft.Bot.Connector.Streaming.Tests.csproj +++ b/tests/Microsoft.Bot.Connector.Streaming.Tests/Microsoft.Bot.Connector.Streaming.Tests.csproj @@ -1,9 +1,9 @@  - net6.0 net8.0 - net6.0;net8.0 + net9.0 + net8.0;net9.0 false false Debug;Release diff --git a/tests/Microsoft.Bot.Connector.Tests/AttachmentsTests.cs b/tests/Microsoft.Bot.Connector.Tests/AttachmentsTests.cs index 0e8a4d92d2..6cec18ff13 100644 --- a/tests/Microsoft.Bot.Connector.Tests/AttachmentsTests.cs +++ b/tests/Microsoft.Bot.Connector.Tests/AttachmentsTests.cs @@ -138,7 +138,7 @@ await UseClientFor(async client => stream.Position = 0; var length = stream.Length > int.MaxValue ? int.MaxValue : Convert.ToInt32(stream.Length); var buffer = new byte[length]; - stream.Read(buffer, 0, length); + stream.ReadExactly(buffer); var actualAsString = Convert.ToBase64String(buffer, Base64FormattingOptions.None); diff --git a/tests/Microsoft.Bot.Connector.Tests/Microsoft.Bot.Connector.Tests.csproj b/tests/Microsoft.Bot.Connector.Tests/Microsoft.Bot.Connector.Tests.csproj index 0014aef311..cc62ceea72 100644 --- a/tests/Microsoft.Bot.Connector.Tests/Microsoft.Bot.Connector.Tests.csproj +++ b/tests/Microsoft.Bot.Connector.Tests/Microsoft.Bot.Connector.Tests.csproj @@ -1,8 +1,8 @@  - net6.0 net8.0 - net6.0;net8.0 + net9.0 + net8.0;net9.0 false false Debug;Release diff --git a/tests/Microsoft.Bot.Schema.Tests/Microsoft.Bot.Schema.Tests.csproj b/tests/Microsoft.Bot.Schema.Tests/Microsoft.Bot.Schema.Tests.csproj index f363d68fc0..1403646795 100644 --- a/tests/Microsoft.Bot.Schema.Tests/Microsoft.Bot.Schema.Tests.csproj +++ b/tests/Microsoft.Bot.Schema.Tests/Microsoft.Bot.Schema.Tests.csproj @@ -1,8 +1,8 @@  - net6.0 net8.0 - net6.0;net8.0 + net9.0 + net8.0;net9.0 false false Debug;Release diff --git a/tests/Microsoft.Bot.Streaming.Tests/Microsoft.Bot.Streaming.Tests.csproj b/tests/Microsoft.Bot.Streaming.Tests/Microsoft.Bot.Streaming.Tests.csproj index 9356f03676..10613b26e9 100644 --- a/tests/Microsoft.Bot.Streaming.Tests/Microsoft.Bot.Streaming.Tests.csproj +++ b/tests/Microsoft.Bot.Streaming.Tests/Microsoft.Bot.Streaming.Tests.csproj @@ -1,9 +1,9 @@  - net6.0 net8.0 - net6.0;net8.0 + net9.0 + net8.0;net9.0 false diff --git a/tests/Parsers/Microsoft.Bot.Builder.Parsers.LU.Tests/Microsoft.Bot.Builder.Parsers.LU.Tests.csproj b/tests/Parsers/Microsoft.Bot.Builder.Parsers.LU.Tests/Microsoft.Bot.Builder.Parsers.LU.Tests.csproj index fcf9f0830b..55c3a580a5 100644 --- a/tests/Parsers/Microsoft.Bot.Builder.Parsers.LU.Tests/Microsoft.Bot.Builder.Parsers.LU.Tests.csproj +++ b/tests/Parsers/Microsoft.Bot.Builder.Parsers.LU.Tests/Microsoft.Bot.Builder.Parsers.LU.Tests.csproj @@ -1,9 +1,9 @@  - net6.0 net8.0 - net6.0;net8.0 + net9.0 + net8.0;net9.0 false false Debug;Release diff --git a/tests/Skills/Bot1/Bot1.csproj b/tests/Skills/Bot1/Bot1.csproj index acd671f4f5..f7bd4e0da8 100644 --- a/tests/Skills/Bot1/Bot1.csproj +++ b/tests/Skills/Bot1/Bot1.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 diff --git a/tests/Skills/Bot2/Bot2.csproj b/tests/Skills/Bot2/Bot2.csproj index acd671f4f5..f7bd4e0da8 100644 --- a/tests/Skills/Bot2/Bot2.csproj +++ b/tests/Skills/Bot2/Bot2.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 diff --git a/tests/Skills/Bot3/Bot3.csproj b/tests/Skills/Bot3/Bot3.csproj index acd671f4f5..f7bd4e0da8 100644 --- a/tests/Skills/Bot3/Bot3.csproj +++ b/tests/Skills/Bot3/Bot3.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 diff --git a/tests/Skills/Child/Child.csproj b/tests/Skills/Child/Child.csproj index e7d4b6730f..65e8e14476 100644 --- a/tests/Skills/Child/Child.csproj +++ b/tests/Skills/Child/Child.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 f277272c-9113-411f-addd-a4acfa9701a2 Microsoft.BotBuilderSamples diff --git a/tests/Skills/Parent/Parent.csproj b/tests/Skills/Parent/Parent.csproj index e02384503c..5d4152c5ea 100644 --- a/tests/Skills/Parent/Parent.csproj +++ b/tests/Skills/Parent/Parent.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 f277272c-9113-411f-addd-a4acfa9701a2 Microsoft.BotBuilderSamples diff --git a/tests/integration/Microsoft.Bot.ApplicationInsights.Core.Tests/Microsoft.Bot.ApplicationInsights.Core.Tests.csproj b/tests/integration/Microsoft.Bot.ApplicationInsights.Core.Tests/Microsoft.Bot.ApplicationInsights.Core.Tests.csproj index 48fddc7e51..b9e5a462af 100644 --- a/tests/integration/Microsoft.Bot.ApplicationInsights.Core.Tests/Microsoft.Bot.ApplicationInsights.Core.Tests.csproj +++ b/tests/integration/Microsoft.Bot.ApplicationInsights.Core.Tests/Microsoft.Bot.ApplicationInsights.Core.Tests.csproj @@ -1,22 +1,22 @@  - net6.0 net8.0 - net6.0;net8.0 + net9.0 + net8.0;net9.0 false false Debug;Release - - - - + + + + diff --git a/tests/integration/Microsoft.Bot.Builder.Integration.AspNet.Core.Tests/Microsoft.Bot.Builder.Integration.AspNet.Core.Tests.csproj b/tests/integration/Microsoft.Bot.Builder.Integration.AspNet.Core.Tests/Microsoft.Bot.Builder.Integration.AspNet.Core.Tests.csproj index ce630ea141..5612952c24 100644 --- a/tests/integration/Microsoft.Bot.Builder.Integration.AspNet.Core.Tests/Microsoft.Bot.Builder.Integration.AspNet.Core.Tests.csproj +++ b/tests/integration/Microsoft.Bot.Builder.Integration.AspNet.Core.Tests/Microsoft.Bot.Builder.Integration.AspNet.Core.Tests.csproj @@ -1,9 +1,9 @@  - net6.0 net8.0 - net6.0;net8.0 + net9.0 + net8.0;net9.0 false false Debug;Release