Skip to content

Commit 1756c7f

Browse files
authored
Update SDK in global.json (#6568)
1 parent 88b628c commit 1756c7f

File tree

8 files changed

+53
-28
lines changed

8 files changed

+53
-28
lines changed

dotnet.config

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

global.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "10.0.100-rc.1.25451.107",
3+
"dotnet": "10.0.100-rc.2.25464.104",
44
"runtimes": {
55
"dotnet": [
66
"3.1.32",
@@ -23,7 +23,7 @@
2323
}
2424
},
2525
"sdk": {
26-
"version": "10.0.100-rc.1.25451.107",
26+
"version": "10.0.100-rc.2.25464.104",
2727
"paths": [
2828
".dotnet",
2929
"$host$"
@@ -32,6 +32,9 @@
3232
"allowPrerelease": true,
3333
"rollForward": "latestFeature"
3434
},
35+
"test": {
36+
"runner": "Microsoft.Testing.Platform"
37+
},
3538
"msbuild-sdks": {
3639
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25462.2",
3740
"MSBuild.Sdk.Extras": "3.0.44"

test/IntegrationTests/MSTest.Acceptance.IntegrationTests/PublishAotNonNativeTests.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,12 @@ we end up with a -dev or -ci version which will lose resolution over -preview de
6868
</ItemGroup>
6969
</Project>
7070
71-
#file dotnet.config
72-
[dotnet.test.runner]
73-
name= "VSTest"
71+
#file global.json
72+
{
73+
"test": {
74+
"runner": "VSTest"
75+
}
76+
}
7477
7578
#file UnitTest1.cs
7679

test/IntegrationTests/MSTest.Acceptance.IntegrationTests/SdkTests.cs

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,12 @@ we end up with a -dev or -ci version which will lose resolution over -preview de
3333
3434
</Project>
3535
36-
#file dotnet.config
37-
[dotnet.test.runner]
38-
name= "VSTest"
36+
#file global.json
37+
{
38+
"test": {
39+
"runner": "VSTest"
40+
}
41+
}
3942
4043
#file UnitTest1.cs
4144
using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -473,9 +476,12 @@ public sealed class TestAssetFixture() : TestAssetFixtureBase(AcceptanceFixture.
473476
</ItemGroup>
474477
</Project>
475478
476-
#file dotnet.config
477-
[dotnet.test.runner]
478-
name= "VSTest"
479+
#file global.json
480+
{
481+
"test": {
482+
"runner": "VSTest"
483+
}
484+
}
479485
480486
#file UnitTest1.cs
481487
namespace AspireProject;
@@ -540,9 +546,12 @@ public async Task HomepageHasPlaywrightInTitleAndGetStartedLinkLinkingToTheIntro
540546
}
541547
}
542548
543-
#file dotnet.config
544-
[dotnet.test.runner]
545-
name= "VSTest"
549+
#file global.json
550+
{
551+
"test": {
552+
"runner": "VSTest"
553+
}
554+
}
546555
""";
547556

548557
public string AspireProjectPath => GetAssetPath(AspireProjectName);

test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/Helpers/AcceptanceTestBase.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,12 @@ public void TestMethod1()
4343
}
4444
}
4545
46-
#file dotnet.config
47-
[dotnet.test.runner]
48-
name= "VSTest"
46+
#file global.json
47+
{
48+
"test": {
49+
"runner": "VSTest"
50+
}
51+
}
4952
""";
5053

5154
static AcceptanceTestBase()

test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/MSBuildTests.Solution.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,12 @@ public async Task MSBuildTests_UseMSBuildTestInfrastructure_Should_Run_Solution_
4242
string solutionFolder = Path.Combine(tempDirectory.Path, "Solution");
4343
VSSolution solution = new(solutionFolder, "MSTestSolution");
4444
string nugetFile = solution.AddOrUpdateFileContent("Nuget.config", nugetConfigContent);
45-
solution.AddOrUpdateFileContent("dotnet.config", """
46-
[dotnet.test.runner]
47-
name= "VSTest"
45+
solution.AddOrUpdateFileContent("global.json", """
46+
{
47+
"test": {
48+
"runner": "VSTest"
49+
}
50+
}
4851
""");
4952
for (int i = 0; i < 3; i++)
5053
{

test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/MSBuildTests.Test.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -341,9 +341,12 @@ public async Task TestingPlatformDisableCustomTestTarget_Should_Cause_UserDefine
341341
</Target>
342342
</Project>
343343
344-
#file dotnet.config
345-
[dotnet.test.runner]
346-
name= "VSTest"
344+
#file global.json
345+
{
346+
"test": {
347+
"runner": "VSTest"
348+
}
349+
}
347350
348351
#file Program.cs
349352
using Microsoft.Testing.Platform.Builder;

test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/RetryFailedTestsTests.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,9 +249,12 @@ public sealed class TestAssetFixture() : TestAssetFixtureBase(AcceptanceFixture.
249249
</ItemGroup>
250250
</Project>
251251
252-
#file dotnet.config
253-
[dotnet.test.runner]
254-
name= "VSTest"
252+
#file global.json
253+
{
254+
"test": {
255+
"runner": "VSTest"
256+
}
257+
}
255258
256259
#file Program.cs
257260
using Microsoft.Testing.Extensions;

0 commit comments

Comments
 (0)