Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge office-addin-taskpane/master #240

Merged
Merged
Changes from all commits
Commits
File filter
Filter file types
Beta Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.

Always

Just for now

BIN +4.58 KB assets/icon-128.png
Binary file not shown.
BIN +2.06 KB assets/icon-64.png
Binary file not shown.
@@ -10,7 +10,7 @@
<DisplayName DefaultValue="Excel Custom Functions" />
<Description DefaultValue="Write your own Excel functions in TypeScript." />
<IconUrl DefaultValue="https://localhost:3000/assets/icon-32.png"/>
<HighResolutionIconUrl DefaultValue="https://localhost:3000/assets/icon-80.png"/>
<HighResolutionIconUrl DefaultValue="https://localhost:3000/assets/icon-64.png"/>
<SupportUrl DefaultValue="https://www.contoso.com/help"/>
<AppDomains>
<AppDomain>https://www.contoso.com</AppDomain>
@@ -10,7 +10,7 @@
<DisplayName DefaultValue="Excel Custom Functions"/>
<Description DefaultValue="Write your own Excel functions in TypeScript."/>
<IconUrl DefaultValue="https://localhost:3000/assets/icon-32.png"/>
<HighResolutionIconUrl DefaultValue="https://localhost:3000/assets/icon-80.png"/>
<HighResolutionIconUrl DefaultValue="https://localhost:3000/assets/icon-64.png"/>
<SupportUrl DefaultValue="https://www.contoso.com/help"/>
<AppDomains>
<AppDomain>https://www.contoso.com</AppDomain>
@@ -27,7 +27,8 @@ describe("Test Excel Custom Functions", function () {
// Call startDebugging to start dev-server and sideload
const devServerCmd = `npm run dev-server -- --config ./test/webpack.config.js`;
const devServerPort = parseNumber(process.env.npm_package_config_dev_server_port || 3000);
await startDebugging(manifestPath, AppType.Desktop, toOfficeApp(host), undefined, undefined, devServerCmd, devServerPort);
await startDebugging(manifestPath, AppType.Desktop, toOfficeApp(host), undefined, undefined,
devServerCmd, devServerPort, undefined, undefined, undefined, false /* enableDebugging */);
}),
describe("Get test results for custom functions and validate results", function () {
it("should get results from the taskpane application", async function () {
ProTip! Use n and p to navigate between commits in a pull request.