Skip to content

Commit 33e7fda

Browse files
danmoseleydanmoseley
committed
feedback
1 parent 50c198b commit 33e7fda

File tree

8 files changed

+19
-19
lines changed

8 files changed

+19
-19
lines changed

‎src/Aspire.ProjectTemplates/templates/aspire-starter/.template.config/dotnetcli.host.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"XUnitVersion": {
1818
"shortName": "",
1919
"longName": "xunit-version",
20-
"defaultValue": "v3"
20+
"defaultValue": "v2"
2121
},
2222
"appHostHttpPort": {
2323
"isHidden": true

‎src/Aspire.ProjectTemplates/templates/aspire-starter/.template.config/localize/templatestrings.en.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838
"symbols/XUnitVersion/description": "The version of xUnit.net to use.",
3939
"symbols/XUnitVersion/displayName": "xUnit.net version",
4040
"symbols/XUnitVersion/choices/v2/displayName": "v2",
41-
"symbols/XUnitVersion/choices/v2/description": "Chooses xUnit v2 with VSTest",
41+
"symbols/XUnitVersion/choices/v2/description": "Chooses xUnit.net v2 with VSTest",
4242
"symbols/XUnitVersion/choices/v3/displayName": "v3",
43-
"symbols/XUnitVersion/choices/v3/description": "Chooses xUnit v3 with VSTest (Aspire version 9.1 and later only)",
43+
"symbols/XUnitVersion/choices/v3/description": "Chooses xUnit.net v3 with VSTest (Aspire version 9.2 and later only)",
4444
"symbols/XUnitVersion/choices/v3mtp/displayName": "v3 with Microsoft Test Platform",
45-
"symbols/XUnitVersion/choices/v3mtp/description": "Chooses xUnit v3 with Microsoft Test Platform (Aspire version 9.1 and later only)",
45+
"symbols/XUnitVersion/choices/v3mtp/description": "Chooses xUnit.net v3 with Microsoft Test Platform (Aspire version 9.2 and later only)",
4646
"symbols/appHostHttpPort/description": "Port number to use for the HTTP endpoint in launchSettings.json of the AppHost project.",
4747
"symbols/appHostOtlpHttpPort/description": "Port number to use for the OTLP HTTP endpoint in launchSettings.json of the AppHost project.",
4848
"symbols/appHostResourceHttpPort/description": "Port number to use for the resource service HTTP endpoint in launchSettings.json of the AppHost project.",

‎src/Aspire.ProjectTemplates/templates/aspire-starter/.template.config/template.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@
259259
"description": "The version of xUnit.net to use.",
260260
"displayName": "xUnit.net version",
261261
"datatype": "choice",
262-
"isEnabled": "(TestFramework == 'xUnit.net')",
262+
"isEnabled": "(TestFramework == xUnit.net)",
263263
"replaces": "XUnitVersion",
264264
"choices": [
265265
{
@@ -270,12 +270,12 @@
270270
{
271271
"choice": "v3",
272272
"displayName": "v3",
273-
"description": "Chooses xUnit.net v3 with VSTest (Aspire version 9.1 and later only)"
273+
"description": "Chooses xUnit.net v3 with VSTest (Aspire version 9.2 and later only)"
274274
},
275275
{
276276
"choice": "v3mtp",
277277
"displayName": "v3 with Microsoft Test Platform",
278-
"description": "Chooses xUnit.net v3 with Microsoft Test Platform (Aspire version 9.1 and later only)"
278+
"description": "Chooses xUnit.net v3 with Microsoft Test Platform (Aspire version 9.2 and later only)"
279279
}
280280
],
281281
"defaultValue": "v2"

‎src/Aspire.ProjectTemplates/templates/aspire-starter/9.2/Aspire-StarterApplication.1.Tests/Aspire-StarterApplication.1.Tests.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<IsPackable>false</IsPackable>
88
<IsTestProject>true</IsTestProject>
99
<!--#if (TestFrameworkIsXUnit) -->
10-
<UseMicrosoftTestingPlatformRunner Condition=" '$(XUnitVersion)' != 'v2' ">true</UseMicrosoftTestingPlatformRunner>
11-
<TestingPlatformDotnetTestSupport Condition=" '$(XUnitVersion)' != 'v2' ">true</TestingPlatformDotnetTestSupport>
10+
<UseMicrosoftTestingPlatformRunner Condition=" $(XUnitVersion) == 'v3mtp' ">true</UseMicrosoftTestingPlatformRunner>
11+
<TestingPlatformDotnetTestSupport Condition=" $(XUnitVersion) == 'v3mtp' ">true</TestingPlatformDotnetTestSupport>
1212
<!--#endif-->
1313
</PropertyGroup>
1414

@@ -26,7 +26,7 @@
2626
<PackageReference Include="NUnit.Analyzers" Version="4.2.0" Condition=" $(TestFramework) == 'NUnit' " />
2727
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" Condition=" $(TestFramework) == 'NUnit' " />
2828
<!--#if (TestFrameworkIsXUnit) -->
29-
<PackageReference Include="xunit" Version="2.9.2" Condition=" $(XUnitVersion) == 'v2' "/>
29+
<PackageReference Include="xunit" Version="2.9.3" Condition=" $(XUnitVersion) == 'v2' "/>
3030
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2" Condition=" $(TestFramework) == 'xUnit.net' " />
3131
<PackageReference Include="xunit.v3" Version="2.0.0" Condition=" $(XUnitVersion) == 'v3' " />
3232
<PackageReference Include="xunit.v3" Version="2.0.0" Condition=" $(XUnitVersion) == 'v3mtp' " />

‎src/Aspire.ProjectTemplates/templates/aspire-xunit/.template.config/dotnetcli.host.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"XUnitVersion": {
1818
"shortName": "",
1919
"longName": "xunit-version",
20-
"defaultValue": "v3"
20+
"defaultValue": "v2"
2121
},
2222
"skipRestore": {
2323
"longName": "no-restore",

‎src/Aspire.ProjectTemplates/templates/aspire-xunit/.template.config/localize/templatestrings.en.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
"symbols/XUnitVersion/description": "The version of xUnit.net to use.",
3131
"symbols/XUnitVersion/displayName": "xUnit.net version",
3232
"symbols/XUnitVersion/choices/v2/displayName": "v2",
33-
"symbols/XUnitVersion/choices/v2/description": "Chooses xUnit v2 with VSTest",
33+
"symbols/XUnitVersion/choices/v2/description": "Chooses xUnit.net v2 with VSTest",
3434
"symbols/XUnitVersion/choices/v3/displayName": "v3",
35-
"symbols/XUnitVersion/choices/v3/description": "Chooses xUnit v3 with VSTest (Aspire version 9.1 and later only)",
35+
"symbols/XUnitVersion/choices/v3/description": "Chooses xUnit.net v3 with VSTest (Aspire version 9.2 and later only)",
3636
"symbols/XUnitVersion/choices/v3mtp/displayName": "v3 with Microsoft Test Platform",
37-
"symbols/XUnitVersion/choices/v3mtp/description": "Chooses xUnit v3 with Microsoft Test Platform (Aspire version 9.1 and later only)",
37+
"symbols/XUnitVersion/choices/v3mtp/description": "Chooses xUnit.net v3 with Microsoft Test Platform (Aspire version 9.2 and later only)",
3838
"symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
3939
"postActions/restore/description": "Restore NuGet packages required by this project.",
4040
"postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'"

‎src/Aspire.ProjectTemplates/templates/aspire-xunit/.template.config/template.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -178,12 +178,12 @@
178178
{
179179
"choice": "v3",
180180
"displayName": "v3",
181-
"description": "Chooses xUnit.net v3 with VSTest (Aspire version 9.1 and later only)"
181+
"description": "Chooses xUnit.net v3 with VSTest (Aspire version 9.2 and later only)"
182182
},
183183
{
184184
"choice": "v3mtp",
185185
"displayName": "v3 with Microsoft Test Platform",
186-
"description": "Chooses xUnit.net v3 with Microsoft Test Platform (Aspire version 9.1 and later only)"
186+
"description": "Chooses xUnit.net v3 with Microsoft Test Platform (Aspire version 9.2 and later only)"
187187
}
188188
],
189189
"defaultValue": "v2"

‎src/Aspire.ProjectTemplates/templates/aspire-xunit/9.2/Aspire.Tests.1.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
<Nullable>enable</Nullable>
77
<IsPackable>false</IsPackable>
88
<IsTestProject>true</IsTestProject>
9-
<UseMicrosoftTestingPlatformRunner Condition=" '$(XUnitVersion)' != 'v2' ">true</UseMicrosoftTestingPlatformRunner>
10-
<TestingPlatformDotnetTestSupport Condition=" '$(XUnitVersion)' != 'v2' ">true</TestingPlatformDotnetTestSupport>
9+
<UseMicrosoftTestingPlatformRunner Condition=" $(XUnitVersion) == 'v3mtp' ">true</UseMicrosoftTestingPlatformRunner>
10+
<TestingPlatformDotnetTestSupport Condition=" $(XUnitVersion) == 'v3mtp' ">true</TestingPlatformDotnetTestSupport>
1111
</PropertyGroup>
1212

1313
<ItemGroup>
1414
<PackageReference Include="Aspire.Hosting.Testing" Version="!!REPLACE_WITH_LATEST_VERSION!!" />
1515
<PackageReference Include="coverlet.collector" Version="6.0.2" />
1616
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
17-
<PackageReference Include="xunit" Version="2.9.2" Condition=" $(XUnitVersion) == 'v2' "/>
17+
<PackageReference Include="xunit" Version="2.9.3" Condition=" $(XUnitVersion) == 'v2' "/>
1818
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2" />
1919
<PackageReference Include="xunit.v3" Version="2.0.0" Condition=" $(XUnitVersion) == 'v3' " />
2020
<PackageReference Include="xunit.v3" Version="2.0.0" Condition=" $(XUnitVersion) == 'v3mtp' " />

0 commit comments

Comments
 (0)