Skip to content
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
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,23 @@ export enum DotnetVersion {
v31 = "3.1",
v50 = "5.0",
v60 = "6.0",
v70 = "7.0",
v80 = "8.0",
v90 = "9.0",
v10 = "10.0",
}
type DotnetSDK = { version: string; path: string };
const DotnetCoreSDKName = ".NET Core SDK";
const installVersion = isMacOS() && isArm64() ? DotnetVersion.v60 : DotnetVersion.v31;
const supportedVersions = [DotnetVersion.v31, DotnetVersion.v50, DotnetVersion.v60];
const supportedVersions = [
DotnetVersion.v31,
DotnetVersion.v50,
DotnetVersion.v60,
DotnetVersion.v70,
DotnetVersion.v80,
DotnetVersion.v90,
DotnetVersion.v10,
];
const installedNameWithVersion = `${DotnetCoreSDKName} (v${DotnetVersion.v31})`;

export class DotnetChecker implements DepsChecker {
Expand Down
4 changes: 3 additions & 1 deletion packages/tests/src/commonlib/botValidator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,10 @@ export class BotValidator {
);
chai.assert.exists(response);
if (runtime === Runtime.Node) {
// Support both "clientId" (lowercase) and "CLIENT_ID" (uppercase) for different samples
const actualBotId = response["clientId"] || response[BaseConfig.clientId];
chai.assert.equal(
response[BaseConfig.clientId],
actualBotId,
this.ctx[EnvConstants.BOT_ID] as string,
"bot ID should match"
);
Expand Down
45 changes: 0 additions & 45 deletions packages/tests/src/e2e/samples/ProvisionChefBot.tests.ts

This file was deleted.

18 changes: 0 additions & 18 deletions packages/tests/src/e2e/samples/ProvisionNpmSearch.tests.ts

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@ class ProactiveMessagingTestCase extends CaseFactory {
testFolder: string,
sampleName: TemplateProjectFolder
): Promise<void> {
// The sample has nodejs/ and python/ subdirectories
// Use the nodejs subfolder path directly as specified in samples-config downloadUrlInfo.dir
await Executor.openTemplateProject(
appName,
testFolder,
sampleName,
"nodejs" as TemplateProjectFolder,
undefined,
"samples"
`samples/${sampleName}`
);
}

Expand Down
Loading