Skip to content

Commit 98e9ba1

Browse files
committed
review feedback
1 parent 09d3710 commit 98e9ba1

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,5 @@
5656
]
5757
}
5858
},
59-
"postCreateCommand": "npm i && npx gulp installDependencies && npm i -g gulp"
59+
"postCreateCommand": "npm ci && npx gulp installDependencies && npm i -g gulp"
6060
}

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
* Bump xamltools to 17.13.35521.31 (PR: [#7814](https://github.com/dotnet/vscode-csharp/pull/7814))
66

77
# 2.59.x
8+
* Delete `dotnet.dotnetPath` setting and support automatic migration to replacements (PR: [#7825](https://github.com/dotnet/vscode-csharp/pull/7825))
9+
* Existing `dotnet.dotnetPath` values will be migrated to the .NET Install Tool extension's `dotnetAcquisitionExtension.existingDotnetPath` setting. See [this page](https://github.com/dotnet/vscode-dotnet-runtime/blob/main/vscode-dotnet-runtime-extension/README.md#i-already-have-a-net-runtime-or-sdk-installed-and-i-want-to-use-it) for more details on configuring the .NET Install Tool.
10+
* The OmniSharp version of `dotnet.dotnetPath` has been migrated to `omnisharp.dotnetPath`
811

912
# 2.58.x
1013
* Update Razor to 9.0.0-preview.24569.4 (PR: [#7805](https://github.com/dotnet/vscode-csharp/pull/7805))

src/utils/dotnetDevCertsHttps.ts

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,12 @@ import { commonOptions, omnisharpOptions } from '../shared/options';
99

1010
// Will return true if `dotnet dev-certs https --check` succesfully finds a trusted development certificate.
1111
export async function hasDotnetDevCertsHttps(): Promise<ExecReturnData> {
12-
const dotnetPath = (commonOptions.useOmnisharpServer ? omnisharpOptions.dotnetPath : undefined) ?? 'dotnet';
13-
return await execChildProcess(`${dotnetPath} dev-certs https --check --trust`, process.cwd(), process.env);
12+
return await execChildProcess(`${getDotnetCommand()} dev-certs https --check --trust`, process.cwd(), process.env);
1413
}
1514

1615
// Will run `dotnet dev-certs https --trust` to prompt the user to create a trusted self signed certificates. Retruns true if sucessfull.
1716
export async function createSelfSignedCert(): Promise<ExecReturnData> {
18-
const dotnetPath = (commonOptions.useOmnisharpServer ? omnisharpOptions.dotnetPath : undefined) ?? 'dotnet';
19-
return await execChildProcess(`${dotnetPath} dev-certs https --trust`, process.cwd(), process.env);
17+
return await execChildProcess(`${getDotnetCommand()} dev-certs https --trust`, process.cwd(), process.env);
2018
}
2119

2220
async function execChildProcess(
@@ -31,6 +29,14 @@ async function execChildProcess(
3129
});
3230
}
3331

32+
function getDotnetCommand(): string {
33+
if (commonOptions.useOmnisharpServer) {
34+
return omnisharpOptions.dotnetPath ?? 'dotnet';
35+
} else {
36+
return 'dotnet';
37+
}
38+
}
39+
3440
interface ExecReturnData {
3541
error: cp.ExecException | null;
3642
stdout: string;

0 commit comments

Comments
 (0)