Support building assets for NET 7-9

Author: JoeRobich

src/omnisharp/protocol.ts

@@ -874,7 +874,7 @@ export function findNetCoreAppTargetFramework(project: MSBuildProject): TargetFr
 }
 
 export function findModernNetFrameworkTargetFramework(project: MSBuildProject): TargetFramework {
-    let regexp = new RegExp('^net[5-6]');
+    let regexp = new RegExp('^net[5-9]');
     const targetFramework = project.TargetFrameworks.find(tf => regexp.test(tf.ShortName));
 
     // Shortname is being reported as net50 instead of net5.0

test/featureTests/assets.test.ts

@@ -73,30 +73,35 @@ suite("Asset generation: csproj", () => {
         segments.should.deep.equal(['${workspaceFolder}', 'bin', 'Debug', 'netcoreapp1.0', 'testApp.dll']);
     });
 
-    test("Create launch.json for NET 5 project opened in workspace", () => {
-        let rootPath = path.resolve('testRoot');
-        let info = createMSBuildWorkspaceInformation(path.join(rootPath, 'testApp.csproj'), 'testApp', 'net5.0', /*isExe*/ true);
-        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;
-
-        // ${workspaceFolder}/bin/Debug/net5.0/testApp.dll
-        let segments = programPath.split(path.posix.sep);
-        segments.should.deep.equal(['${workspaceFolder}', 'bin', 'Debug', 'net5.0', 'testApp.dll']);
-    });
-
-    test("Create launch.json for NET 6 project opened in workspace", () => {
-        let rootPath = path.resolve('testRoot');
-        let info = createMSBuildWorkspaceInformation(path.join(rootPath, 'testApp.csproj'), 'testApp', 'net60', /*isExe*/ true);
-        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;
-
-        // ${workspaceFolder}/bin/Debug/net6.0/testApp.dll
-        let segments = programPath.split(path.posix.sep);
-        segments.should.deep.equal(['${workspaceFolder}', 'bin', 'Debug', 'net6.0', 'testApp.dll']);
+    [5, 6, 7, 8, 9].forEach(version => {
+        const shortName = `net${version}.0`;
+        const alternameShortName = `net${version}0`;
+
+        test(`Create launch.json for NET ${version} project opened in workspace with shortname '${shortName}'`, () => {
+            let rootPath = path.resolve('testRoot');
+            let info = createMSBuildWorkspaceInformation(path.join(rootPath, 'testApp.csproj'), 'testApp', shortName, /*isExe*/ true);
+            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;
+
+            // ${workspaceFolder}/bin/Debug/net#.0/testApp.dll
+            let segments = programPath.split(path.posix.sep);
+            segments.should.deep.equal(['${workspaceFolder}', 'bin', 'Debug', shortName, 'testApp.dll']);
+        });
+
+        test(`Create launch.json for NET ${version} project opened in workspace with shortname '${alternameShortName}'`, () => {
+            let rootPath = path.resolve('testRoot');
+            let info = createMSBuildWorkspaceInformation(path.join(rootPath, 'testApp.csproj'), 'testApp', alternameShortName, /*isExe*/ true);
+            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;
+
+            // ${workspaceFolder}/bin/Debug/net#.0/testApp.dll
+            let segments = programPath.split(path.posix.sep);
+            segments.should.deep.equal(['${workspaceFolder}', 'bin', 'Debug', shortName, 'testApp.dll']);
+        });
     });
 
     test("Create launch.json for nested project opened in workspace", () => {