Skip to content

Commit 5b9a5a1

Browse files
committed
Include whether modernNet flag is set in project info
1 parent 09b09bc commit 5b9a5a1

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

src/main.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,11 +150,12 @@ export async function activate(context: vscode.ExtensionContext): Promise<CSharp
150150
// If the dotnet bundle is installed, this will ensure the dotnet CLI is on the path.
151151
await initializeDotnetPath();
152152

153-
let telemetryObserver = new TelemetryObserver(platformInfo, () => reporter);
153+
let useModernNetOption = optionProvider.GetLatestOptions().useModernNet;
154+
let telemetryObserver = new TelemetryObserver(platformInfo, () => reporter, useModernNetOption);
154155
eventStream.subscribe(telemetryObserver.post);
155156

156157
let networkSettingsProvider = vscodeNetworkSettingsProvider(vscode);
157-
const useFramework = optionProvider.GetLatestOptions().useModernNet !== true;
158+
const useFramework = useModernNetOption !== true;
158159
let installDependencies: IInstallDependencies = async (dependencies: AbsolutePathPackage[]) => downloadAndInstallPackages(dependencies, networkSettingsProvider, eventStream, isValidDownload, useFramework);
159160
let runtimeDependenciesExist = await ensureRuntimeDependencies(context.extension, eventStream, platformInfo, installDependencies, useFramework);
160161

src/observers/TelemetryObserver.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,12 @@ export class TelemetryObserver {
2121
private platformInfo: PlatformInformation;
2222
private solutionId?: string;
2323
private dotnetInfo?: DotnetInfo;
24+
private useModernNet: boolean;
2425

25-
constructor(platformInfo: PlatformInformation, reporterCreator: () => ITelemetryReporter) {
26+
constructor(platformInfo: PlatformInformation, reporterCreator: () => ITelemetryReporter, useModernNet: boolean) {
2627
this.platformInfo = platformInfo;
2728
this.reporter = reporterCreator();
29+
this.useModernNet = useModernNet;
2830
}
2931

3032
public post = (event: BaseEvent) => {
@@ -109,6 +111,7 @@ export class TelemetryObserver {
109111
telemetryProps['FileExtensions'] = projectConfig.FileExtensions.join("|");
110112
telemetryProps['FileCounts'] = projectConfig.FileCounts?.join("|") ?? "";
111113
telemetryProps['NetSdkVersion'] = this.dotnetInfo?.Version ?? "";
114+
telemetryProps['useModernNet'] = this.useModernNet.toString();
112115
this.reporter.sendTelemetryEvent("ProjectConfiguration", telemetryProps);
113116
}
114117

0 commit comments

Comments
 (0)