Merge pull request #7244 from dibarbet/remove_project_json

Remove project.json support
dotnet · Jun 18, 2024 · fa53d6b · fa53d6b
2 parents 64fdf21 + c1db39c
commit fa53d6b
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 568 deletions.
diff --git a/omnisharptest/omnisharpUnitTests/assets.test.ts b/omnisharptest/omnisharpUnitTests/assets.test.ts
@@ -35,7 +35,6 @@ describe('Asset generation: csproj', () => {
         isNotNull(tasksJson.tasks[0].args);
         const buildPath = tasksJson.tasks[0].args[1];
 
-        // ${workspaceFolder}/project.json
         const segments = buildPath.split(path.posix.sep);
         expect(segments).toStrictEqual(['${workspaceFolder}', 'testApp.csproj']);
     });
@@ -123,7 +122,6 @@ describe('Asset generation: csproj', () => {
         isNotNull(tasksJson.tasks[0].args);
         const buildPath = tasksJson.tasks[0].args[1];
 
-        // ${workspaceFolder}/nested/project.json
         const segments = buildPath.split(path.posix.sep);
         expect(segments).toStrictEqual(['${workspaceFolder}', 'nested', 'testApp.csproj']);
     });

diff --git a/package.json b/package.json
@@ -819,7 +819,6 @@
     "onLanguage:csharp",
     "onCommand:o.showOutput",
     "onCommand:omnisharp.registerLanguageMiddleware",
-    "workspaceContains:project.json",
     "workspaceContains:**/*.{csproj,csx,cake}"
   ],
   "contributes": {
@@ -1864,10 +1863,6 @@
         ],
         "url": "https://json.schemastore.org/appsettings"
       },
-      {
-        "fileMatch": "project.json",
-        "url": "http://json.schemastore.org/project"
-      },
       {
         "fileMatch": "omnisharp.json",
         "url": "http://json.schemastore.org/omnisharp"

diff --git a/src/features/dotnetTest.ts b/src/features/dotnetTest.ts
@@ -199,7 +199,7 @@ export default class TestManager extends AbstractProvider {
         if (projectInfo.MsBuildProject) {
             targetFrameworkVersion = projectInfo.MsBuildProject.TargetFramework;
         } else {
-            throw new Error('Expected project.json or .csproj project.');
+            throw new Error('Expected .csproj project.');
         }
 
         return targetFrameworkVersion;
@@ -480,9 +480,6 @@ export default class TestManager extends AbstractProvider {
     }
 
     public async debugDotnetTest(testMethod: string, fileName: string, testFrameworkName: string, noBuild = false) {
-        // We support to styles of 'dotnet test' for debugging: The legacy 'project.json' testing, and the newer csproj support
-        // using VS Test. These require a different level of communication.
-
         this._eventStream.post(new DotNetTestDebugStart(testMethod));
 
         const { debugEventListener, targetFrameworkVersion } = await this._recordDebugAndGetDebugValues(

diff --git a/src/features/json/jsonContributions.ts b/src/features/json/jsonContributions.ts
diff --git a/src/features/json/nuGetFlatContainerPackageResponse.ts b/src/features/json/nuGetFlatContainerPackageResponse.ts
diff --git a/src/features/json/nuGetIndexResponse.ts b/src/features/json/nuGetIndexResponse.ts
diff --git a/src/features/json/nuGetSearchAutocompleteServiceResponse.ts b/src/features/json/nuGetSearchAutocompleteServiceResponse.ts
diff --git a/src/features/json/nuGetSearchQueryServiceResponse.ts b/src/features/json/nuGetSearchQueryServiceResponse.ts