From 7c10edaf0e17dff94c0217b14e68898272fe04e0 Mon Sep 17 00:00:00 2001 From: Matthew Steeples Date: Thu, 28 Jul 2022 10:46:34 +0100 Subject: [PATCH 1/5] Go through View folders recursively --- .../Locators/DefaultRazorViewLocator.cs | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/R4Mvc.Tools/Locators/DefaultRazorViewLocator.cs b/src/R4Mvc.Tools/Locators/DefaultRazorViewLocator.cs index 3a10b3e..ab0153a 100644 --- a/src/R4Mvc.Tools/Locators/DefaultRazorViewLocator.cs +++ b/src/R4Mvc.Tools/Locators/DefaultRazorViewLocator.cs @@ -65,11 +65,22 @@ protected virtual IEnumerable FindViews(string projectRoot, string areaNam yield return GetView(projectRoot, file, controllerName, areaName); } - foreach (var directory in _fileLocator.GetDirectories(controllerPath)) + foreach (var view in FindViewsRecursively(projectRoot, areaName, controllerName, controllerPath)) + yield return view; + + IEnumerable FindViewsRecursively(string projectRoot, string areaName, string controllerName, string controllerPath) { - foreach (var file in _fileLocator.GetFiles(directory, "*.cshtml")) + foreach (var directory in _fileLocator.GetDirectories(controllerPath)) { - yield return GetView(projectRoot, file, controllerName, areaName, Path.GetFileName(directory)); + foreach (var file in _fileLocator.GetFiles(directory, "*.cshtml")) + { + yield return GetView(projectRoot, file, controllerName, areaName, Path.GetFileName(directory)); + } + + foreach (var file in FindViewsRecursively(projectRoot, areaName, controllerName, directory)) + { + yield return file; + } } } } From b444d8d0c60a76a0d5db274f77a6b0a7d8324a07 Mon Sep 17 00:00:00 2001 From: Matthew Steeples Date: Mon, 12 Sep 2022 19:28:11 +0100 Subject: [PATCH 2/5] Drop support for older frameworks that are either out of support or nearly out of support --- R4MVC.sln | 11 ++--------- .../AspNetFeatureFolders/AspNetFeatureFolders.csproj | 2 +- src/R4Mvc.Tools.Cli/R4Mvc.Tools.Cli.csproj | 2 +- src/R4Mvc/R4Mvc.csproj | 2 +- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/R4MVC.sln b/R4MVC.sln index 7e0cfb8..270d517 100644 --- a/R4MVC.sln +++ b/R4MVC.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29318.209 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32825.248 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".solution", ".solution", "{1E8F7AFD-5175-406A-9736-817C75DA1142}" ProjectSection(SolutionItems) = preProject @@ -33,8 +33,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetSimple.Test", "test\A EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleModels", "samples\SampleModels\SampleModels.csproj", "{8F6D7DDE-98A0-4808-BD91-C1CF2E0AAC69}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetSimple.NetCore2", "samples\AspNetSimple.NetCore2\AspNetSimple.NetCore2.csproj", "{4609AF1D-0942-43DA-9979-F92972A22A7A}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -73,10 +71,6 @@ Global {8F6D7DDE-98A0-4808-BD91-C1CF2E0AAC69}.Debug|Any CPU.Build.0 = Debug|Any CPU {8F6D7DDE-98A0-4808-BD91-C1CF2E0AAC69}.Release|Any CPU.ActiveCfg = Release|Any CPU {8F6D7DDE-98A0-4808-BD91-C1CF2E0AAC69}.Release|Any CPU.Build.0 = Release|Any CPU - {4609AF1D-0942-43DA-9979-F92972A22A7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4609AF1D-0942-43DA-9979-F92972A22A7A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4609AF1D-0942-43DA-9979-F92972A22A7A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4609AF1D-0942-43DA-9979-F92972A22A7A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -90,7 +84,6 @@ Global {86B3FF8A-284E-4070-9120-D343366B18E2} = {B9FF7D5E-784B-4C4A-B6E6-286C1E3D131E} {75510011-133B-4A05-AD09-A399CDBFA3A5} = {30626644-0E8A-4610-A0A9-274E91F1A037} {8F6D7DDE-98A0-4808-BD91-C1CF2E0AAC69} = {B9FF7D5E-784B-4C4A-B6E6-286C1E3D131E} - {4609AF1D-0942-43DA-9979-F92972A22A7A} = {B9FF7D5E-784B-4C4A-B6E6-286C1E3D131E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B90C19F2-2B5E-42AD-AE1D-27AD17E4DDB4} diff --git a/samples/AspNetFeatureFolders/AspNetFeatureFolders.csproj b/samples/AspNetFeatureFolders/AspNetFeatureFolders.csproj index 705e2e5..271d7bb 100644 --- a/samples/AspNetFeatureFolders/AspNetFeatureFolders.csproj +++ b/samples/AspNetFeatureFolders/AspNetFeatureFolders.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net6.0 false diff --git a/src/R4Mvc.Tools.Cli/R4Mvc.Tools.Cli.csproj b/src/R4Mvc.Tools.Cli/R4Mvc.Tools.Cli.csproj index e165d1d..de1e02e 100644 --- a/src/R4Mvc.Tools.Cli/R4Mvc.Tools.Cli.csproj +++ b/src/R4Mvc.Tools.Cli/R4Mvc.Tools.Cli.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.1 + net6.0 r4mvc tools true diff --git a/src/R4Mvc/R4Mvc.csproj b/src/R4Mvc/R4Mvc.csproj index c06ecad..b41a617 100644 --- a/src/R4Mvc/R4Mvc.csproj +++ b/src/R4Mvc/R4Mvc.csproj @@ -1,7 +1,7 @@  - netstandard1.6;netstandard2.0;netcoreapp3.1;net5.0;net461 + netstandard1.6;netstandard2.0;net6.0 true 1701;1702;1591 From 7d38d6499f3420d1a6c1a8334f6d948325c29acf Mon Sep 17 00:00:00 2001 From: Matthew Steeples Date: Mon, 12 Sep 2022 19:44:21 +0100 Subject: [PATCH 3/5] Platform Refresh (Code Analysis) --- src/R4Mvc.Tools/R4Mvc.Tools.csproj | 4 ++-- test/R4Mvc.Test/R4Mvc.Test.csproj | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/R4Mvc.Tools/R4Mvc.Tools.csproj b/src/R4Mvc.Tools/R4Mvc.Tools.csproj index 53f0579..2d55d46 100644 --- a/src/R4Mvc.Tools/R4Mvc.Tools.csproj +++ b/src/R4Mvc.Tools/R4Mvc.Tools.csproj @@ -50,8 +50,8 @@ - - + + diff --git a/test/R4Mvc.Test/R4Mvc.Test.csproj b/test/R4Mvc.Test/R4Mvc.Test.csproj index 3108274..6f97f61 100644 --- a/test/R4Mvc.Test/R4Mvc.Test.csproj +++ b/test/R4Mvc.Test/R4Mvc.Test.csproj @@ -1,4 +1,4 @@ - + net472 @@ -6,7 +6,7 @@ - + From 59f5b405cfc3448a1874b7dbf9f1dd26e9312239 Mon Sep 17 00:00:00 2001 From: Matthew Steeples Date: Mon, 12 Sep 2022 20:10:10 +0100 Subject: [PATCH 4/5] Platform Refresh (MSBuildLocator) --- src/R4Mvc.Tools/R4Mvc.Tools.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/R4Mvc.Tools/R4Mvc.Tools.csproj b/src/R4Mvc.Tools/R4Mvc.Tools.csproj index 2d55d46..454911a 100644 --- a/src/R4Mvc.Tools/R4Mvc.Tools.csproj +++ b/src/R4Mvc.Tools/R4Mvc.Tools.csproj @@ -49,7 +49,7 @@ - + From 2c297ab32265323b13fbc9b22264c08d7b45dc6d Mon Sep 17 00:00:00 2001 From: Jack Gilmore Date: Tue, 16 Aug 2022 12:59:41 +0100 Subject: [PATCH 5/5] Install System.Memory to fix msbuild update issue --- src/R4Mvc.Tools/R4Mvc.Tools.csproj | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/R4Mvc.Tools/R4Mvc.Tools.csproj b/src/R4Mvc.Tools/R4Mvc.Tools.csproj index 454911a..f2d58de 100644 --- a/src/R4Mvc.Tools/R4Mvc.Tools.csproj +++ b/src/R4Mvc.Tools/R4Mvc.Tools.csproj @@ -9,7 +9,13 @@ False - + + true + true + + + + R4Mvc.Tools Kevin Kuszyk, Scott Mackay, Artiom Chilaru false @@ -55,6 +61,7 @@ +