Skip to content

Commit fa53d6b

Browse files
authored
Merge pull request #7244 from dibarbet/remove_project_json
Remove project.json support
2 parents 64fdf21 + c1db39c commit fa53d6b

12 files changed

+9
-568
lines changed

omnisharptest/omnisharpUnitTests/assets.test.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ describe('Asset generation: csproj', () => {
3535
isNotNull(tasksJson.tasks[0].args);
3636
const buildPath = tasksJson.tasks[0].args[1];
3737

38-
// ${workspaceFolder}/project.json
3938
const segments = buildPath.split(path.posix.sep);
4039
expect(segments).toStrictEqual(['${workspaceFolder}', 'testApp.csproj']);
4140
});
@@ -123,7 +122,6 @@ describe('Asset generation: csproj', () => {
123122
isNotNull(tasksJson.tasks[0].args);
124123
const buildPath = tasksJson.tasks[0].args[1];
125124

126-
// ${workspaceFolder}/nested/project.json
127125
const segments = buildPath.split(path.posix.sep);
128126
expect(segments).toStrictEqual(['${workspaceFolder}', 'nested', 'testApp.csproj']);
129127
});

package.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -819,7 +819,6 @@
819819
"onLanguage:csharp",
820820
"onCommand:o.showOutput",
821821
"onCommand:omnisharp.registerLanguageMiddleware",
822-
"workspaceContains:project.json",
823822
"workspaceContains:**/*.{csproj,csx,cake}"
824823
],
825824
"contributes": {
@@ -1864,10 +1863,6 @@
18641863
],
18651864
"url": "https://json.schemastore.org/appsettings"
18661865
},
1867-
{
1868-
"fileMatch": "project.json",
1869-
"url": "http://json.schemastore.org/project"
1870-
},
18711866
{
18721867
"fileMatch": "omnisharp.json",
18731868
"url": "http://json.schemastore.org/omnisharp"

src/features/dotnetTest.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ export default class TestManager extends AbstractProvider {
199199
if (projectInfo.MsBuildProject) {
200200
targetFrameworkVersion = projectInfo.MsBuildProject.TargetFramework;
201201
} else {
202-
throw new Error('Expected project.json or .csproj project.');
202+
throw new Error('Expected .csproj project.');
203203
}
204204

205205
return targetFrameworkVersion;
@@ -480,9 +480,6 @@ export default class TestManager extends AbstractProvider {
480480
}
481481

482482
public async debugDotnetTest(testMethod: string, fileName: string, testFrameworkName: string, noBuild = false) {
483-
// We support to styles of 'dotnet test' for debugging: The legacy 'project.json' testing, and the newer csproj support
484-
// using VS Test. These require a different level of communication.
485-
486483
this._eventStream.post(new DotNetTestDebugStart(testMethod));
487484

488485
const { debugEventListener, targetFrameworkVersion } = await this._recordDebugAndGetDebugValues(

src/features/json/jsonContributions.ts

Lines changed: 0 additions & 213 deletions
This file was deleted.

src/features/json/nuGetFlatContainerPackageResponse.ts

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/features/json/nuGetIndexResponse.ts

Lines changed: 0 additions & 14 deletions
This file was deleted.

src/features/json/nuGetSearchAutocompleteServiceResponse.ts

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/features/json/nuGetSearchQueryServiceResponse.ts

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)