Skip to content

Commit e232d58

Browse files
Don't change Arcade's default of XUnitRunnerVisualStudioVersion (#62250)
* Don't change Arcade's default of XUnitRunnerVisualStudioVersion * Use net472 for tests * Fix template tests: all empty templates have `NotFound.razor` page. --------- Co-authored-by: Ilona Tomkowicz <[email protected]>
1 parent 4fccb63 commit e232d58

File tree

4 files changed

+9
-2
lines changed

4 files changed

+9
-2
lines changed

Directory.Build.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,10 @@
106106
<NuspecBasePath>$(MSBuildProjectDirectory)</NuspecBasePath>
107107

108108
<IncludeSymbols>true</IncludeSymbols>
109+
109110
<DefaultNetFxTargetFramework>net462</DefaultNetFxTargetFramework>
111+
<!-- Current xunit.runner.visualstudio supports net472+/net8.0+ only. So we can't use net462 -->
112+
<DefaultNetFxTargetFramework Condition="'$(IsTestProject)'=='true'">net472</DefaultNetFxTargetFramework>
110113

111114
<CrossgenOutput Condition="'$(DotNetBuildUseMonoRuntime)' == 'true'">false</CrossgenOutput>
112115
</PropertyGroup>

eng/Versions.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,6 @@
321321
<XunitAssertVersion>$(XunitVersion)</XunitAssertVersion>
322322
<XunitExtensibilityCoreVersion>$(XunitVersion)</XunitExtensibilityCoreVersion>
323323
<XunitExtensibilityExecutionVersion>$(XunitVersion)</XunitExtensibilityExecutionVersion>
324-
<XUnitRunnerVisualStudioVersion>2.8.2</XUnitRunnerVisualStudioVersion>
325324
<MicrosoftDataSqlClientVersion>5.2.2</MicrosoftDataSqlClientVersion>
326325
<MicrosoftOpenApiVersion>2.0.0-preview.18</MicrosoftOpenApiVersion>
327326
<MicrosoftOpenApiYamlReaderVersion>2.0.0-preview.18</MicrosoftOpenApiYamlReaderVersion>

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@
116116
"exclude": [
117117
"BlazorWeb-CSharp/Components/Pages/Auth.*",
118118
"BlazorWeb-CSharp/Components/Pages/Counter.*",
119-
"BlazorWeb-CSharp/Components/Pages/NotFound.*",
120119
"BlazorWeb-CSharp/Components/Pages/Weather.*",
121120
"BlazorWeb-CSharp/Components/Layout/NavMenu.*",
122121
"BlazorWeb-CSharp/wwwroot/lib/**",

src/ProjectTemplates/test/Templates.Tests/template-baselines.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3211,6 +3211,7 @@
32113211
"App.razor",
32123212
"_Imports.razor",
32133213
"Pages/Home.razor",
3214+
"Pages/NotFound.razor",
32143215
"Layout/MainLayout.razor",
32153216
"Properties/launchSettings.json",
32163217
"wwwroot/icon-192.png",
@@ -3299,6 +3300,7 @@
32993300
"_Imports.razor",
33003301
"Pages/Authentication.razor",
33013302
"Pages/Home.razor",
3303+
"Pages/NotFound.razor",
33023304
"Layout/MainLayout.razor",
33033305
"Layout/LoginDisplay.razor",
33043306
"Layout/RedirectToLogin.razor",
@@ -3390,6 +3392,7 @@
33903392
"_Imports.razor",
33913393
"Pages/Authentication.razor",
33923394
"Pages/Home.razor",
3395+
"Pages/NotFound.razor",
33933396
"Layout/MainLayout.razor",
33943397
"Layout/LoginDisplay.razor",
33953398
"Layout/RedirectToLogin.razor",
@@ -3480,6 +3483,7 @@
34803483
"_Imports.razor",
34813484
"Pages/Authentication.razor",
34823485
"Pages/Home.razor",
3486+
"Pages/NotFound.razor",
34833487
"Layout/MainLayout.razor",
34843488
"Layout/LoginDisplay.razor",
34853489
"Layout/RedirectToLogin.razor",
@@ -3569,6 +3573,7 @@
35693573
"App.razor",
35703574
"_Imports.razor",
35713575
"Pages/Home.razor",
3576+
"Pages/NotFound.razor",
35723577
"Layout/MainLayout.razor",
35733578
"Properties/launchSettings.json",
35743579
"wwwroot/icon-192.png",
@@ -3654,6 +3659,7 @@
36543659
"App.razor",
36553660
"_Imports.razor",
36563661
"Pages/Home.razor",
3662+
"Pages/NotFound.razor",
36573663
"Layout/MainLayout.razor",
36583664
"wwwroot/icon-192.png",
36593665
"wwwroot/index.html",

0 commit comments

Comments
 (0)