Skip to content

Commit 8cad501

Browse files
committed
Resolving conflict
1 parent 6cb6ab8 commit 8cad501

1 file changed

Lines changed: 9 additions & 6 deletions

File tree

test/dotnet/scenarios.json

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{
1+
{
22
"install_dotnet_lts": {
33
"image": "mcr.microsoft.com/devcontainers/base:ubuntu",
44
"remoteUser": "vscode",
@@ -16,7 +16,7 @@
1616
"version": "3.1"
1717
}
1818
}
19-
},
19+
},
2020
"install_dotnet_specific_release_and_feature_band": {
2121
"image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
2222
"remoteUser": "vscode",
@@ -40,10 +40,13 @@
4040
"remoteUser": "vscode",
4141
"features": {
4242
"dotnet": {
43-
"version": "8.0.100-preview.6.23330.14",
43+
"version": "9.0",
4444
"additionalVersions": [
45+
"8.0",
4546
"7.0",
46-
"6.0"
47+
"6.0",
48+
"5.0",
49+
"3.1"
4750
]
4851
}
4952
}
@@ -91,5 +94,5 @@
9194
"workloads": "aspire, wasm-tools"
9295
}
9396
}
94-
}
95-
}
97+
}
98+
}

0 commit comments

Comments
 (0)