Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
39 changes: 24 additions & 15 deletions Composer/packages/server/src/locales/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -1565,8 +1565,8 @@
"fail_to_save_bot_578fa8aa": {
"message": "Fail to save bot"
},
"failed_to_start_1edb0dbe": {
"message": "Failed to start"
"failed_276786d": {
"message": "Failed"
},
"false_2f39ee6d": {
"message": "false"
Expand Down Expand Up @@ -1604,6 +1604,9 @@
"filter_by_file_name_fa3d33b5": {
"message": "Filter by file name"
},
"filter_e3398407": {
"message": "Filter"
},
"find_pre_built_adaptive_expressions_b106308e": {
"message": "Find pre-built Adaptive expressions"
},
Expand Down Expand Up @@ -2396,9 +2399,6 @@
"navigation_path_8b299e64": {
"message": "Navigation Path"
},
"navigation_to_see_actions_3be545c9": {
"message": "navigation to see actions"
},
"need_another_template_send_us_a_request_5cf2a4d5": {
"message": "Need another template? Send us a request"
},
Expand Down Expand Up @@ -2636,6 +2636,9 @@
"output_5023cf84": {
"message": "Output"
},
"outputs_e6f0bfbe": {
"message": "Outputs"
},
"page_number_cdee4179": {
"message": "Page number"
},
Expand Down Expand Up @@ -3026,6 +3029,9 @@
"requiredtext_priority_priority_4293288f": {
"message": "{ requiredText } | Priority: { priority }"
},
"reset_view_d5f8245a": {
"message": "Reset view"
},
"resource_group_41fc9245": {
"message": "Resource group:"
},
Expand Down Expand Up @@ -3086,6 +3092,9 @@
"runtime_config_a2904ff9": {
"message": "Runtime Config"
},
"runtime_log_9069fda7": {
"message": "Runtime log."
},
"runtime_type_f9e2419b": {
"message": "Runtime type"
},
Expand Down Expand Up @@ -3143,8 +3152,8 @@
"search_templates_669eab41": {
"message": "Search templates"
},
"see_details_da74090e": {
"message": "See Details"
"see_details_15c93092": {
"message": "See details"
},
"select_a_bot_e1c4dc2b": {
"message": "Select a Bot"
Expand All @@ -3155,8 +3164,8 @@
"select_a_template_874fe803": {
"message": "Select a template"
},
"select_a_trigger_on_the_left_a4b41558": {
"message": "Select a trigger on the left"
"select_a_trigger_in_the_left_br_navigation_to_see__f73148d6": {
"message": "Select a trigger in the left<br />navigation to see actions"
},
"select_a_trigger_type_219bb52f": {
"message": "Select a trigger type"
Expand Down Expand Up @@ -3665,9 +3674,6 @@
"title_ee03d132": {
"message": "Title"
},
"title_msg_ee91458d": {
"message": "{ title }. { msg }"
},
"to_learn_more_a_visit_this_document_a_ce188d8": {
"message": "To learn more, <a>visit this document</a>."
},
Expand Down Expand Up @@ -3746,9 +3752,6 @@
"trueselector_40702dda": {
"message": "TrueSelector"
},
"try_again_ad656c3c": {
"message": "Try again"
},
"try_new_features_in_preview_and_help_us_make_compo_e8e58983": {
"message": "Try new features in preview and help us make Composer better. You can turn them on or off at any time."
},
Expand Down Expand Up @@ -4084,5 +4087,11 @@
},
"your_template_requires_qna_maker_to_access_content_a4ca6f76": {
"message": "Your template requires QnA Maker to access content for your bot."
},
"zoom_in_3205e865": {
"message": "Zoom in"
},
"zoom_out_e4302632": {
"message": "Zoom out"
}
}
14 changes: 14 additions & 0 deletions Composer/packages/server/src/utility/project.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,20 @@ export async function ejectAndMerge(currentProject: BotProject, jobId: string) {
log('Eject skipped for project with invalid runtime setting');
}
}

// TO-DO: Remove this once the SDK packages are public on Nuget instad of Myget
// Inject a Nuget.config file into the project so that pre-release packages can be resolved.
fs.writeFileSync(
Path.join(runtimePath, 'Nuget.config'),
`<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
<add key="BotBuilder.myget.org" value="https://botbuilder.myget.org/F/botbuilder-v4-dotnet-daily/api/v3/index.json" protocolVersion="3" />
</packageSources>
</configuration>`
);

// install all dependencies and build the app
BackgroundProcessManager.updateProcess(jobId, 202, formatMessage('Building runtime'));
await runtime.build(runtimePath, currentProject);
Expand Down