Skip to content
This repository has been archived by the owner on Jun 30, 2022. It is now read-only.

Commit

Permalink
Merge pull request #3380 from microsoft/next
Browse files Browse the repository at this point in the history
1.0 GA Release
  • Loading branch information
lauren-mills authored May 18, 2020
2 parents 55f4904 + edb2679 commit 8444157
Show file tree
Hide file tree
Showing 3,153 changed files with 383,022 additions and 378,708 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .github/SUPPORT.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
## Need Help?

If you have any questions please start with [Stack Overflow](https://stackoverflow.com/questions/tagged/botframework) where we're happy to help. Please use this GitHub Repos issue tracking capability to raise [issues](https://github.com/Microsoft/AI/issues/new?assignees=&labels=Type%3A+Bug&template=bug_report.md&title=) or [feature requests](https://github.com/Microsoft/AI/issues/new?assignees=&labels=Type%3A+Suggestion&template=feature_request.md&title=).
If you have any questions please start with [Stack Overflow](https://stackoverflow.com/questions/tagged/botframework) where we're happy to help. Please use this GitHub Repos issue tracking capability to raise [issues](https://github.com/microsoft/botframework-solutions/issues/new?assignees=&labels=Needs+Triage%2C+Type%3A+Bug&template=bug_report.md&title=) or [feature requests](https://github.com/microsoft/botframework-solutions/issues/new?assignees=&labels=Needs+Triage&template=feature_request.md&title=).
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ FakesAssemblies/
.ntvs_analysis.dat
/solutions/**/node_modules/
/templates/**/node_modules/
/lib/**/node_modules/
/sdk/**/node_modules/
/tools/**/node_modules/
/skills/**/node_modules/
/samples/**/node_modules/
Expand Down Expand Up @@ -359,6 +359,8 @@ ASALocalRun/
**/remove_skill_log.txt
**/publish_log.txt
**/.deployment
**/ComposerDialogs/generated
**/ComposerDialogs/settings

# Zip files
*.7z
Expand Down
14 changes: 3 additions & 11 deletions build/build.botbuilder-libs.ts.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Param(
)

if (-not $version) {
Write-Host "Version for botbuilder-libs required!. Please use the param -version" -ForegroundColor DarkRed
Write-Host "Version for bot-libs required!. Please use the param -version" -ForegroundColor DarkRed
}

pushd sdk\typescript\libraries
Expand All @@ -12,14 +12,7 @@ node .\common\scripts\install-run-rush.js install --no-link

node .\common\scripts\install-run-rush.js link

pushd .\botbuilder-solutions

npm version $($version) --allow-same-version
npm run build

popd

pushd .\botbuilder-skills
pushd .\bot-solutions

npm version $($version) --allow-same-version
npm run build
Expand All @@ -35,7 +28,6 @@ if (-not(test-path ".\outputpackages"))

pushd .\outputpackages

npm pack ..\sdk\typescript\libraries\botbuilder-solutions
npm pack ..\sdk\typescript\libraries\botbuilder-skills
npm pack ..\sdk\typescript\libraries\bot-solutions

popd
6 changes: 3 additions & 3 deletions build/build.generator-assistant.ts.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ Param(
)

if (-not $version) {
Write-Host "Version for generator-botbuilder-assistant required!. Please use the param -version" -ForegroundColor DarkRed
Write-Host "Version for generator-bot-virtualassistant required!. Please use the param -version" -ForegroundColor DarkRed
}

pushd templates/typescript/generator-botbuilder-assistant
pushd templates/typescript/generator-bot-virtualassistant

npm install
npm version $($version) --allow-same-version
Expand All @@ -21,6 +21,6 @@ if (-not(test-path ".\outputpackages"))

pushd .\outputpackages

npm pack ..\templates\typescript\generator-botbuilder-assistant
npm pack ..\templates\typescript\generator-bot-virtualassistant

popd
58 changes: 58 additions & 0 deletions build/yaml/typescript/bot-solutions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# specific branch build
trigger:
branches:
include:
- master
- feature/*

paths:
include:
- 'sdk/typescript/libraries/bot-solutions/*'

# By default will disable PR builds
pr: none

pool:
vmImage: 'vs2017-win2016'
steps:
- task: NodeTool@0
displayName: 'Use Node 10.'
inputs:
versionSpec: 10.x

- task: Npm@1
displayName: 'npm install'
inputs:
workingDir: 'sdk/typescript/libraries/bot-solutions'
verbose: false

- task: Npm@1
displayName: 'npm run build'
inputs:
command: custom
workingDir: 'sdk/typescript/libraries/bot-solutions'
verbose: false
customCommand: 'run build'

- task: Npm@1
displayName: 'npm test - coverage'
inputs:
command: custom
workingDir: 'sdk/typescript/libraries/bot-solutions'
verbose: false
customCommand: 'run test-coverage-ci'

- task: PublishTestResults@2
displayName: 'Publish Test Results '
inputs:
testResultsFiles: 'test-results.xml'
searchFolder: 'sdk/typescript/libraries/bot-solutions'
failTaskOnFailedTests: true

- task: PublishCodeCoverageResults@1
displayName: 'Publish code coverage '
condition: succeededOrFailed()
inputs:
codeCoverageTool: Cobertura
summaryFileLocation: 'sdk/typescript/libraries/bot-solutions/coverage/cobertura-coverage.xml'
reportDirectory: 'sdk/typescript/libraries/bot-solutions/coverage/'
54 changes: 0 additions & 54 deletions build/yaml/typescript/botbuilder-skills.yml

This file was deleted.

55 changes: 0 additions & 55 deletions build/yaml/typescript/botbuilder-solutions.yml

This file was deleted.

49 changes: 49 additions & 0 deletions build/yaml/typescript/generator-bot-virtualassistant.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# specific branch build
trigger:
branches:
include:
- master
- feature/*

paths:
include:
- 'templates/typescript/generator-bot-virtualassistant/*'

# By default will disable PR builds
pr: none

pool:
name: Hosted VS2017
steps:
- task: NodeTool@0
displayName: 'Use Node 10.8.0'
inputs:
versionSpec: 10.8.0

- task: Npm@1
displayName: 'npm install'
inputs:
workingDir: 'templates/typescript/generator-bot-virtualassistant'
verbose: false

- task: Npm@1
displayName: 'npm test - coverage'
inputs:
command: custom
workingDir: 'templates/typescript/generator-bot-virtualassistant'
verbose: false
customCommand: 'run test-coverage-ci'

- task: PublishTestResults@2
displayName: 'publish test results'
inputs:
testResultsFiles: 'test-results.xml'
searchFolder: 'templates/typescript/generator-bot-virtualassistant'
failTaskOnFailedTests: true

- task: PublishCodeCoverageResults@1
displayName: 'publish code coverage'
inputs:
codeCoverageTool: Cobertura
summaryFileLocation: 'templates/typescript/generator-bot-virtualassistant/coverage/cobertura-coverage.xml'
reportDirectory: 'templates/typescript/generator-bot-virtualassistant/coverage/'
49 changes: 0 additions & 49 deletions build/yaml/typescript/generator-botbuilder-assistant.yml

This file was deleted.

Loading

0 comments on commit 8444157

Please sign in to comment.