Introduce a bit of randomness into TargetPath

Author: winstliu

package-lock.json

@@ -119,7 +119,7 @@
     "tslint": "5.12.1",
     "tslint-microsoft-contrib": "6.0.0",
     "tslint-no-unused-expression-chai": "0.1.4",
-    "typescript": "4.2.4",
+    "typescript": "4.6.3",
     "unzipper": "0.10.11",
     "vsce": "1.100.2",
     "webpack": "5.34.0",
@@ -4084,4 +4084,4 @@
       }
     ]
   }
-}
+}

package.json

@@ -11,7 +11,9 @@ import * as jsonc from 'jsonc-parser';
 
 import { AssetGenerator, ProgramLaunchType, replaceCommentPropertiesWithComments, updateJsonWithComments } from '../../src/assets';
 import { parse } from 'jsonc-parser';
-import { should } from 'chai';
+import { use as chaiUse, should } from 'chai';
+
+chaiUse(require('chai-string'));
 
 suite("Asset generation: csproj", () => {
     suiteSetup(() => should());
@@ -96,11 +98,9 @@ suite("Asset generation: csproj", () => {
         let generator = new AssetGenerator(info, createMockWorkspaceFolder(rootPath));
         generator.setStartupProject(0);
         let launchJson = parse(generator.createLaunchJsonConfigurations(ProgramLaunchType.Console), undefined, { disallowComments: true });
-        let programPath = launchJson[0].program;
+        let programPath: string = launchJson[0].program;
 
-        // ${workspaceFolder}/bin/Debug/netcoreapp1.0/testApp.dll
-        let segments = programPath.split(path.posix.sep);
-        segments.should.deep.equal(['${workspaceFolder}', 'bin', 'Debug', 'netcoreapp1.0', 'testApp.dll']);
+        checkProgramPath(rootPath, programPath, info.MsBuild.Projects[0].TargetPath);
     });
 
     [5, 6, 7, 8, 9].forEach(version => {
@@ -112,11 +112,9 @@ suite("Asset generation: csproj", () => {
             let generator = new AssetGenerator(info, createMockWorkspaceFolder(rootPath));
             generator.setStartupProject(0);
             let launchJson = parse(generator.createLaunchJsonConfigurations(ProgramLaunchType.Console), undefined, { disallowComments: true });
-            let programPath = launchJson[0].program;
+            let programPath: string = launchJson[0].program;
 
-            // ${workspaceFolder}/bin/Debug/net#.0/testApp.dll
-            let segments = programPath.split(path.posix.sep);
-            segments.should.deep.equal(['${workspaceFolder}', 'bin', 'Debug', shortName, 'testApp.dll']);
+            checkProgramPath(rootPath, programPath, info.MsBuild.Projects[0].TargetPath);
         });
     });
 
@@ -126,11 +124,9 @@ suite("Asset generation: csproj", () => {
         let generator = new AssetGenerator(info, createMockWorkspaceFolder(rootPath));
         generator.setStartupProject(0);
         let launchJson = parse(generator.createLaunchJsonConfigurations(ProgramLaunchType.Console), undefined, { disallowComments: true });
-        let programPath = launchJson[0].program;
+        let programPath: string = launchJson[0].program;
 
-        // ${workspaceFolder}/nested/bin/Debug/netcoreapp1.0/testApp.dll
-        let segments = programPath.split(path.posix.sep);
-        segments.should.deep.equal(['${workspaceFolder}', 'nested', 'bin', 'Debug', 'netcoreapp1.0', 'testApp.dll']);
+        checkProgramPath(rootPath, programPath, info.MsBuild.Projects[0].TargetPath);
     });
 
     test("Create launch.json for Blazor web assembly standalone project opened in workspace", () => {
@@ -164,12 +160,12 @@ suite("Asset generation: csproj", () => {
         generator.setStartupProject(0);
         const launchJson = parse(generator.createLaunchJsonConfigurations(ProgramLaunchType.BlazorWebAssemblyHosted), undefined, { disallowComments: true });
         const hostedBlazorLaunchConfig = launchJson[0];
-        const programPath = hostedBlazorLaunchConfig.program;
+        const programPath: string = hostedBlazorLaunchConfig.program;
         const cwd = hostedBlazorLaunchConfig.cwd;
         const hosted = hostedBlazorLaunchConfig.hosted;
 
-        let segments = programPath.split(path.posix.sep);
-        segments.should.deep.equal(['${workspaceFolder}', 'bin', 'Debug', 'netcoreapp3.0', 'testApp.dll']);
+        checkProgramPath(rootPath, programPath, info.MsBuild.Projects[0].TargetPath);
+
         cwd.should.equal('${workspaceFolder}');
         hosted.should.equal(true);
     });
@@ -181,12 +177,12 @@ suite("Asset generation: csproj", () => {
         generator.setStartupProject(0);
         let launchJson = parse(generator.createLaunchJsonConfigurations(ProgramLaunchType.BlazorWebAssemblyHosted), undefined, { disallowComments: true });
         const hostedBlazorLaunchConfig = launchJson[0];
-        const programPath = hostedBlazorLaunchConfig.program;
+        const programPath: string = hostedBlazorLaunchConfig.program;
         const cwd = hostedBlazorLaunchConfig.cwd;
         const hosted = hostedBlazorLaunchConfig.hosted;
 
-        let segments = programPath.split(path.posix.sep);
-        segments.should.deep.equal(['${workspaceFolder}', 'nested', 'bin', 'Debug', 'netcoreapp3.0', 'testApp.dll']);
+        checkProgramPath(rootPath, programPath, info.MsBuild.Projects[0].TargetPath);
+
         cwd.should.equal('${workspaceFolder}/nested');
         hosted.should.equal(true);
     });
@@ -197,11 +193,9 @@ suite("Asset generation: csproj", () => {
         let generator = new AssetGenerator(info, createMockWorkspaceFolder(rootPath));
         generator.setStartupProject(0);
         let launchJson = parse(generator.createLaunchJsonConfigurations(ProgramLaunchType.Web), undefined, { disallowComments: true });
-        let programPath = launchJson[0].program;
+        let programPath: string = launchJson[0].program;
 
-        // ${workspaceFolder}/bin/Debug/netcoreapp1.0/testApp.dll
-        let segments = programPath.split(path.posix.sep);
-        segments.should.deep.equal(['${workspaceFolder}', 'bin', 'Debug', 'netcoreapp1.0', 'testApp.dll']);
+        checkProgramPath(rootPath, programPath, info.MsBuild.Projects[0].TargetPath);
     });
 
     test("Create launch.json for nested web project opened in workspace", () => {
@@ -210,11 +204,9 @@ suite("Asset generation: csproj", () => {
         let generator = new AssetGenerator(info, createMockWorkspaceFolder(rootPath));
         generator.setStartupProject(0);
         let launchJson = parse(generator.createLaunchJsonConfigurations(ProgramLaunchType.Web), undefined, { disallowComments: true });
-        let programPath = launchJson[0].program;
+        let programPath: string = launchJson[0].program;
 
-        // ${workspaceFolder}/nested/bin/Debug/netcoreapp1.0/testApp.dll
-        let segments = programPath.split(path.posix.sep);
-        segments.should.deep.equal(['${workspaceFolder}', 'nested', 'bin', 'Debug', 'netcoreapp1.0', 'testApp.dll']);
+        checkProgramPath(rootPath, programPath, info.MsBuild.Projects[0].TargetPath);
     });
 
     test("Add a new item to JSON", () => {
@@ -316,6 +308,11 @@ suite("Asset generation: csproj", () => {
     });
 });
 
+function checkProgramPath(rootPath: string, programPath: string, targetPath: string): void {
+    programPath.should.startWith('${workspaceFolder}/');
+    programPath.should.equal(targetPath.replace(rootPath, '${workspaceFolder}').replaceAll(path.win32.sep, path.posix.sep));
+}
+
 function createMockWorkspaceFolder(rootPath: string): vscode.WorkspaceFolder {
     return {
         uri: vscode.Uri.file(rootPath),
@@ -333,7 +330,7 @@ function createMSBuildWorkspaceInformation(projectPath: string, assemblyName: st
                     ProjectGuid: '',
                     Path: projectPath,
                     AssemblyName: assemblyName,
-                    TargetPath: path.join(path.dirname(projectPath), 'bin', 'Debug', targetFrameworkShortName, `${assemblyName}.dll`),
+                    TargetPath: path.join(path.dirname(projectPath), 'bin', 'Debug', new Date().getTime().toString(), targetFrameworkShortName, `${assemblyName}.dll`),
                     TargetFramework: '',
                     SourceFiles: [],
                     TargetFrameworks: [

test/featureTests/assets.test.ts

@@ -4,7 +4,7 @@
 		"module": "commonjs",
 		"outDir": "out",
 		"lib": [
-			"ES2017"
+			"ES2021"
 		],
 		"sourceMap": true,
 		"moduleResolution": "node",
@@ -20,4 +20,4 @@
 		".vscode-test",
 		"vsix"
 	]
-}
+}