diff --git a/build/yaml/vnextprototype/botbuilder-dotnet-ci-mac.yml b/build/yaml/vnextprototype/botbuilder-dotnet-ci-mac.yml deleted file mode 100644 index 0bb7dbd412..0000000000 --- a/build/yaml/vnextprototype/botbuilder-dotnet-ci-mac.yml +++ /dev/null @@ -1,65 +0,0 @@ -# -# Replaces the classic BotBuilder-DotNet-master-CI-PR-(MacLinux) -# - -# "name" here defines the build number format. Build number is accessed via $(Build.BuildNumber) -name: $(Build.BuildId) - -pool: - vmImage: 'macOS-latest' - -trigger: none # ci trigger is set in ADO -pr: none # pr trigger is set in ADO - -variables: - BuildConfiguration: debug - -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' - inputs: - version: 6.0.x - -- task: UseDotNet@2 - displayName: 'Use .Net Core sdk 3.1.101' - inputs: - version: 3.1.101 - -- powershell: 'gci env:* | sort-object name | Format-Table -AutoSize -Wrap' - displayName: 'Display env vars' - -- task: NuGetToolInstaller@1 - displayName: 'Use NuGet ' - -- task: NuGetCommand@2 - displayName: 'NuGet restore' - inputs: - restoreSolution: Microsoft.Bot.Builder-Standard.sln - -- task: DotNetCoreCLI@2 - displayName: 'dotnet build' - inputs: - projects: Microsoft.Bot.Builder.sln - -- task: DotNetCoreCLI@2 - displayName: 'dotnet test' - inputs: - command: test - projects: | - Tests/**/*Tests.csproj - - arguments: '-v n --configuration $(BuildConfiguration) --no-build --no-restore --filter "TestCategory!=IgnoreInAutomatedBuild&TestCategory!=FunctionalTests&TestCategory!=WindowsOnly" --collect:"Code Coverage" --settings $(Build.SourcesDirectory)\CodeCoverage.runsettings' - -- task: PublishBuildArtifacts@1 - displayName: 'Publish Artifact: build folder' - inputs: - PathtoPublish: build - ArtifactName: build - -- powershell: | - cd .. - ls -R - displayName: 'Dir workspace' - continueOnError: true - condition: succeededOrFailed() diff --git a/build/yaml/vnextprototype/botbuilder-dotnet-ci.yml b/build/yaml/vnextprototype/botbuilder-dotnet-ci.yml deleted file mode 100644 index ab36631b02..0000000000 --- a/build/yaml/vnextprototype/botbuilder-dotnet-ci.yml +++ /dev/null @@ -1,71 +0,0 @@ -# -# Replaces the classic BotBuilder-DotNet-master-CI-PR -# - -# "name" here defines the build number format. Build number is accessed via $(Build.BuildNumber) -name: $(Build.BuildId) - -pool: - vmImage: $[ coalesce( variables['VMImage'], 'windows-2022' ) ] # or 'windows-latest' - demands: - - msbuild - - visualstudio - -trigger: none # ci trigger is set in ADO -pr: none # pr trigger is set in ADO - -variables: - BuildConfiguration: Debug-Windows - BuildPlatform: any cpu - IsBuildServer: true # This is consumed by tests\Microsoft.Bot.Builder.Dialogs.Declarative.Tests\SchemaTestsFixture.cs. - MSBuildArguments: -p:SignAssembly=false -p:delaySign=false - Parameters.solution: Microsoft.Bot.Builder.sln - PreviewPackageVersion: 5.0.0-preview-$(Build.BuildNumber) # This is consumed by projects in Microsoft.Bot.Builder.sln. - ReleasePackageVersion: 5.0.0-preview-$(Build.BuildNumber) # This is consumed by projects in Microsoft.Bot.Builder.sln. - runCodesignValidationInjection: false # Disables unnecessary CodeSign Validation step - skipComponentGovernanceDetection: true -# Not used: DotNetCoverallsToken: define this in Azure -# Not used: GitHubCommentApiKey: define this in Azure -# Not used: ApiCompatExcludeClasses: (optional) define this in Azure -# Not used: DisableApiCompatibityValidation: (optional) define this in Azure - -# The following 2 stages run multi-configuration, multi-agent parallel jobs. -# Debug-Windows/Release-Windows => Builds everything in Debug/Release + the ASP.NET Desktop. -# Debug/Release => would build all .NET Standard libs and test them. -# The .NET 4.X asp.net integrations libraries do not build and test on non-windows boxes. -# If we drop support for .NET 4.x then we can drop to just Debug/Release. -stages: -- stage: Build - jobs: - - job: Debug_Windows_Configuration_31 - variables: - BuildConfiguration: Debug-Windows - BuildTarget: 'netcoreapp31' # set the TargetFramework property for tests to use netcoreapp3.1 - steps: - - template: ci-build-steps.yml - - template: ci-test-steps.yml - - job: Debug_Windows_Configuration_6 - variables: - BuildConfiguration: Debug-Windows - BuildTarget: 'net6' # set the TargetFramework property for tests to use net6.0 - steps: - - template: ci-build-steps.yml - - template: ci-test-steps.yml - - job: Release_Windows_Configuration_31 - variables: - BuildConfiguration: Release-Windows - BuildTarget: 'netcoreapp31' # set the TargetFramework property for tests to use netcoreapp3.1 - PublishCoverage: false - steps: - - template: ci-build-steps.yml - - template: ci-test-steps.yml - #- template: ci-component-detection-steps.yml - - job: Release_Windows_Configuration_6 - variables: - BuildConfiguration: Release-Windows - BuildTarget: 'net6' # set the TargetFramework property for tests to use net6.0 - PublishCoverage: false - steps: - - template: ci-build-steps.yml - - template: ci-test-steps.yml - # - template: ci-component-detection-steps.yml diff --git a/build/yaml/vnextprototype/ci-build-steps.yml b/build/yaml/vnextprototype/ci-build-steps.yml deleted file mode 100644 index d074c49100..0000000000 --- a/build/yaml/vnextprototype/ci-build-steps.yml +++ /dev/null @@ -1,31 +0,0 @@ -steps: -- powershell: 'gci env:* | sort-object name | Format-Table -AutoSize -Wrap' - displayName: 'Display env vars' - -# Variables ReleasePackageVersion and PreviewPackageVersion are consumed by projects in Microsoft.Bot.Builder.sln. -# For the signed build, they should be settable at queue time. To set that up, define the variables in Azure on the Variables tab. -- task: NuGetToolInstaller@1 - displayName: 'Use NuGet ' - -- task: NuGetCommand@2 - displayName: 'NuGet restore' - inputs: - restoreSolution: '$(Parameters.solution)' - -- task: VSBuild@1 - displayName: 'Build solution Microsoft.Bot.Builder.sln' - inputs: - solution: '$(Parameters.solution)' - vsVersion: 17.0 - msbuildArgs: '$(MSBuildArguments)' - platform: '$(BuildPlatform)' - configuration: '$(BuildConfiguration)' - maximumCpuCount: true - logProjectEvents: false - -- script: | - cd .. - dir *.* /s - displayName: 'Dir workspace' - continueOnError: true - condition: succeededOrFailed() diff --git a/build/yaml/vnextprototype/ci-test-steps.yml b/build/yaml/vnextprototype/ci-test-steps.yml deleted file mode 100644 index 67babd1d25..0000000000 --- a/build/yaml/vnextprototype/ci-test-steps.yml +++ /dev/null @@ -1,73 +0,0 @@ -#variables: -# DotNetCoverallsToken: define this in Azure -# PublishCoverage: (optional) set to true in the calling template. -steps: -- powershell: | - Remove-Item CodeCoverage -Force -Recurse -ErrorAction Ignore - New-Item CodeCoverage -ItemType Directory -Force - displayName: 'Create Code Coverage directory' - -- task: Npm@1 - displayName: 'install botframework-cli to set up for Schema merge tests.' - inputs: - command: custom - verbose: false - customCommand: 'install -g @microsoft/botframework-cli@next' - -- task: DotNetCoreCLI@2 - displayName: 'dotnet test (release) 3.1' - 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(eq(variables['BuildConfiguration'],'Release-Windows'), eq(variables['BuildTarget'],'netcoreapp31')) - -- task: DotNetCoreCLI@2 - displayName: 'dotnet test (release) 6.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')) - -- 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. - # My attempts to override this and have it go directly to the CodeCoverage directory have - # all failed, so I'm just doing the copy here. (cmullins) - - Get-ChildItem -Path "D:\a\_temp" -Include "*.coverage" -Recurse | Copy-Item -Destination CodeCoverage - displayName: 'Copy .coverage Files to CodeCoverage folder' - condition: eq(variables['BuildConfiguration'],'Release-Windows') - -- powershell: 'echo ''##vso[task.setvariable variable=CoverallsToken]$(DotNetCoverallsToken)''' - displayName: 'Set CoverallsToken for PublishToCoveralls.ps1 if token exists' - continueOnError: true - condition: and(succeeded(), eq(variables['PublishCoverage'], 'true')) - -- task: PowerShell@2 - displayName: 'Upload Coverage Files to Coveralls.io https://coveralls.io/github/microsoft/botbuilder-dotnet' - inputs: - targetType: filePath - filePath: '$(Build.SourcesDirectory)\build\PublishToCoveralls.ps1' - arguments: '-pathToCoverageFiles "$(Build.SourcesDirectory)\CodeCoverage" -serviceName "CI-PR build"' - continueOnError: true - condition: and(succeeded(), eq(variables['PublishCoverage'], 'true')) - -- task: PublishBuildArtifacts@1 - displayName: 'Publish build artifact CodeCoverage' - inputs: - PathtoPublish: CodeCoverage - ArtifactName: CodeCoverage - enabled: false - -- script: | - cd .. - dir *.* /s - displayName: 'Dir workspace' - continueOnError: true - condition: succeededOrFailed()