Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

fix: export bot include v2 project structure files #7248

Merged
cwhitten merged 9 commits into from
Apr 23, 2021
Merged

fix: export bot include v2 project structure files #7248

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
526bfaa
export bot include new structure files
zhixzhan Apr 22, 2021
6897e45
Merge branch 'main' into zhixzhan/exportbot-fix
cwhitten Apr 22, 2021
ca4802e
Merge branch 'main' into zhixzhan/exportbot-fix
zhixzhan Apr 23, 2021
aca7c44
include js runtime type bot files
zhixzhan Apr 23, 2021
fe051db
clean up
zhixzhan Apr 23, 2021
01d2434
Merge branch 'main' into zhixzhan/exportbot-fix
zhixzhan Apr 23, 2021
d1b1a9f
Merge branch 'main' into zhixzhan/exportbot-fix
cwhitten Apr 23, 2021
91e1345
Merge branch 'main' into zhixzhan/exportbot-fix
cwhitten Apr 23, 2021
19be628
Merge branch 'main' into zhixzhan/exportbot-fix
cwhitten Apr 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 22 additions & 6 deletions Composer/packages/server/src/models/storage/localDiskStorage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,22 +162,38 @@ export class LocalDiskStorage implements IFileStorage {

async zip(source: string, exclusions, cb): Promise<void> {
const defaultDirectories = [
'/Controllers/',
'/dialogs/',
'/language-understanding/',
'/language-generation/',
'/settings/',
'/generated/',
'/form-dialogs/',
'/knowledge-base/',
'/language-generation/',
'/language-understanding/',
'/media/',
'/Properties/',
'/recognizers/',
'/form-dialogs/',
'/schemas/',
'/scripts/',
Copy link
Contributor

@hatpick hatpick Apr 23, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

on my mac it's Scripts, are these case-sensitive? (asking since you have Controllers)

Copy link
Contributor Author

@zhixzhan zhixzhan Apr 23, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The glob pattern we used is case-insensitive. I noticed some of the template bots is Scripts and some is scripts. maybe need align them in bot templates side;

'/settings/',
'/wwwroot/',
'/generated/',
];

const directoriesToInclude = defaultDirectories.filter((elem) => {
return exclusions?.directories == undefined || exclusions?.directories?.indexOf(elem) == -1;
});

const defaultFiles = [`*${FileExtensions.BotProject}`, `*${FileExtensions.Dialog}`, 'README.md', '.gitignore'];
const defaultFiles = [
`*${FileExtensions.BotProject}`,
`*${FileExtensions.Dialog}`,
`*.csproj`,
`*.cs`,
`*.js`,
`*.json`,
`Nuget.config`,
'web.config',
'README.md',
'.gitignore',
];

const filesToInclude = defaultFiles.filter((elem) => {
return exclusions?.files == undefined || exclusions?.files?.indexOf(elem) == -1;
Expand Down