Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support C# 10 and C# 11 codebases #179

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Support C# 10 and C# 11 codebases #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
463d355
Update to the latest Roslyn SDK to support running R4MVC over codebas…
Dec 17, 2022
1ff580c
Remove unsupported frameworks
Dec 17, 2022
a3e741c
Update appveyor image to VS 2022
Dec 17, 2022
6cfe86c
Upgrade cli app to .NET 7.
Dec 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions R4MVC.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.4.33205.214
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".solution", ".solution", "{1E8F7AFD-5175-406A-9736-817C75DA1142}"
ProjectSection(SolutionItems) = preProject
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ R4MVC is a Roslyn based code generator for ASP.NET MVC Core apps that creates st

It is a re-implementation of [T4MVC](https://github.com/T4MVC/T4MVC) for ASP.NET Core projects.

R4MVC runs in the dotnet cli or in Visual Studio 2017, and supports ASP.NET Core MVC 1 and 2
R4MVC runs in the dotnet cli or in Visual Studio 2022, and supports ASP.NET Core 6 and 7

## Benefits

Expand Down
1 change: 0 additions & 1 deletion RunGenerate.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ IF NOT "%1"=="" SET CONFIGURATION=%1

@ECHO ON
.\src\R4Mvc.Tools\bin\%CONFIGURATION%\net472\R4Mvc.Tools.exe generate -p .\samples\AspNetSimple\AspNetSimple.csproj
.\src\R4Mvc.Tools\bin\%CONFIGURATION%\net472\R4Mvc.Tools.exe generate -p .\samples\AspNetSimple.NetCore2\AspNetSimple.NetCore2.csproj
.\src\R4Mvc.Tools\bin\%CONFIGURATION%\net472\R4Mvc.Tools.exe generate -p .\samples\AspNetFeatureFolders\AspNetFeatureFolders.csproj
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: 1.0.0.{build}

image: Visual Studio 2019
image: Visual Studio 2022

configuration: Release
skip_tags: true
Expand Down
2 changes: 1 addition & 1 deletion samples/AspNetFeatureFolders/Areas/Members/Features/Manage/ManageController.generated.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public class _ViewNamesClass
[GeneratedCode("R4Mvc", "1.0"), DebuggerNonUserCode]
public partial class R4MVC_ManageController : AspNetFeatureFolders.Areas.Members.Features.Manage.ManageController
{
public R4MVC_ManageController(): base(Dummy.Instance)
public R4MVC_ManageController() : base(Dummy.Instance)
{
}

Expand Down
2 changes: 1 addition & 1 deletion samples/AspNetFeatureFolders/Areas/Products/Search/SearchController.generated.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public class _ViewNamesClass
[GeneratedCode("R4Mvc", "1.0"), DebuggerNonUserCode]
public partial class R4MVC_SearchController : AspNetFeatureFolders.Areas.Products.Search.SearchController
{
public R4MVC_SearchController(): base(Dummy.Instance)
public R4MVC_SearchController() : base(Dummy.Instance)
{
}

Expand Down
2 changes: 1 addition & 1 deletion samples/AspNetFeatureFolders/AspNetFeatureFolders.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion samples/AspNetFeatureFolders/Features/Calculator/CalculatorController.generated.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public class _ViewNamesClass
[GeneratedCode("R4Mvc", "1.0"), DebuggerNonUserCode]
public partial class R4MVC_CalculatorController : AspNetFeatureFolders.Features.Calculator.CalculatorController
{
public R4MVC_CalculatorController(): base(Dummy.Instance)
public R4MVC_CalculatorController() : base(Dummy.Instance)
{
}

Expand Down
20 changes: 10 additions & 10 deletions samples/AspNetFeatureFolders/R4Mvc.generated.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ public R4Mvc_Microsoft_AspNetCore_Mvc_ActionResult(string area, string controlle
[GeneratedCode("R4Mvc", "1.0"), DebuggerNonUserCode]
internal partial class R4Mvc_Microsoft_AspNetCore_Mvc_JsonResult : JsonResult, IR4MvcActionResult
{
public R4Mvc_Microsoft_AspNetCore_Mvc_JsonResult(string area, string controller, string action, string protocol = null): base(null)
public R4Mvc_Microsoft_AspNetCore_Mvc_JsonResult(string area, string controller, string action, string protocol = null) : base(null)
{
this.InitMVCT4Result(area, controller, action, protocol);
}
Expand Down Expand Up @@ -335,7 +335,7 @@ public R4Mvc_Microsoft_AspNetCore_Mvc_ContentResult(string area, string controll
[GeneratedCode("R4Mvc", "1.0"), DebuggerNonUserCode]
internal partial class R4Mvc_Microsoft_AspNetCore_Mvc_FileResult : FileResult, IR4MvcActionResult
{
public R4Mvc_Microsoft_AspNetCore_Mvc_FileResult(string area, string controller, string action, string protocol = null): base(null)
public R4Mvc_Microsoft_AspNetCore_Mvc_FileResult(string area, string controller, string action, string protocol = null) : base(null)
{
this.InitMVCT4Result(area, controller, action, protocol);
}
Expand All @@ -352,7 +352,7 @@ public R4Mvc_Microsoft_AspNetCore_Mvc_FileResult(string area, string controller,
[GeneratedCode("R4Mvc", "1.0"), DebuggerNonUserCode]
internal partial class R4Mvc_Microsoft_AspNetCore_Mvc_RedirectResult : RedirectResult, IR4MvcActionResult
{
public R4Mvc_Microsoft_AspNetCore_Mvc_RedirectResult(string area, string controller, string action, string protocol = null): base(" ")
public R4Mvc_Microsoft_AspNetCore_Mvc_RedirectResult(string area, string controller, string action, string protocol = null) : base(" ")
{
this.InitMVCT4Result(area, controller, action, protocol);
}
Expand All @@ -369,7 +369,7 @@ public R4Mvc_Microsoft_AspNetCore_Mvc_RedirectResult(string area, string control
[GeneratedCode("R4Mvc", "1.0"), DebuggerNonUserCode]
internal partial class R4Mvc_Microsoft_AspNetCore_Mvc_RedirectToActionResult : RedirectToActionResult, IR4MvcActionResult
{
public R4Mvc_Microsoft_AspNetCore_Mvc_RedirectToActionResult(string area, string controller, string action, string protocol = null): base(" ", " ", " ")
public R4Mvc_Microsoft_AspNetCore_Mvc_RedirectToActionResult(string area, string controller, string action, string protocol = null) : base(" ", " ", " ")
{
this.InitMVCT4Result(area, controller, action, protocol);
}
Expand All @@ -386,7 +386,7 @@ public R4Mvc_Microsoft_AspNetCore_Mvc_RedirectToActionResult(string area, string
[GeneratedCode("R4Mvc", "1.0"), DebuggerNonUserCode]
internal partial class R4Mvc_Microsoft_AspNetCore_Mvc_RedirectToRouteResult : RedirectToRouteResult, IR4MvcActionResult
{
public R4Mvc_Microsoft_AspNetCore_Mvc_RedirectToRouteResult(string area, string controller, string action, string protocol = null): base(null)
public R4Mvc_Microsoft_AspNetCore_Mvc_RedirectToRouteResult(string area, string controller, string action, string protocol = null) : base(null)
{
this.InitMVCT4Result(area, controller, action, protocol);
}
Expand Down Expand Up @@ -420,7 +420,7 @@ public R4Mvc_Microsoft_AspNetCore_Mvc_RazorPages_ActionResult(string pageName, s
[GeneratedCode("R4Mvc", "1.0"), DebuggerNonUserCode]
internal partial class R4Mvc_Microsoft_AspNetCore_Mvc_RazorPages_JsonResult : JsonResult, IR4PageActionResult
{
public R4Mvc_Microsoft_AspNetCore_Mvc_RazorPages_JsonResult(string pageName, string pageHandler, string protocol = null): base(null)
public R4Mvc_Microsoft_AspNetCore_Mvc_RazorPages_JsonResult(string pageName, string pageHandler, string protocol = null) : base(null)
{
this.InitMVCT4Result(pageName, pageHandler, protocol);
}
Expand Down Expand Up @@ -454,7 +454,7 @@ public R4Mvc_Microsoft_AspNetCore_Mvc_RazorPages_ContentResult(string area, stri
[GeneratedCode("R4Mvc", "1.0"), DebuggerNonUserCode]
internal partial class R4Mvc_Microsoft_AspNetCore_Mvc_RazorPages_FileResult : FileResult, IR4PageActionResult
{
public R4Mvc_Microsoft_AspNetCore_Mvc_RazorPages_FileResult(string pageName, string pageHandler, string protocol = null): base(null)
public R4Mvc_Microsoft_AspNetCore_Mvc_RazorPages_FileResult(string pageName, string pageHandler, string protocol = null) : base(null)
{
this.InitMVCT4Result(pageName, pageHandler, protocol);
}
Expand All @@ -471,7 +471,7 @@ public R4Mvc_Microsoft_AspNetCore_Mvc_RazorPages_FileResult(string pageName, str
[GeneratedCode("R4Mvc", "1.0"), DebuggerNonUserCode]
internal partial class R4Mvc_Microsoft_AspNetCore_Mvc_RazorPages_RedirectResult : RedirectResult, IR4PageActionResult
{
public R4Mvc_Microsoft_AspNetCore_Mvc_RazorPages_RedirectResult(string pageName, string pageHandler, string protocol = null): base(" ")
public R4Mvc_Microsoft_AspNetCore_Mvc_RazorPages_RedirectResult(string pageName, string pageHandler, string protocol = null) : base(" ")
{
this.InitMVCT4Result(pageName, pageHandler, protocol);
}
Expand All @@ -488,7 +488,7 @@ public R4Mvc_Microsoft_AspNetCore_Mvc_RazorPages_RedirectResult(string pageName,
[GeneratedCode("R4Mvc", "1.0"), DebuggerNonUserCode]
internal partial class R4Mvc_Microsoft_AspNetCore_Mvc_RazorPages_RedirectToActionResult : RedirectToActionResult, IR4PageActionResult
{
public R4Mvc_Microsoft_AspNetCore_Mvc_RazorPages_RedirectToActionResult(string pageName, string pageHandler, string protocol = null): base(" ", " ", " ")
public R4Mvc_Microsoft_AspNetCore_Mvc_RazorPages_RedirectToActionResult(string pageName, string pageHandler, string protocol = null) : base(" ", " ", " ")
{
this.InitMVCT4Result(pageName, pageHandler, protocol);
}
Expand All @@ -505,7 +505,7 @@ public R4Mvc_Microsoft_AspNetCore_Mvc_RazorPages_RedirectToActionResult(string p
[GeneratedCode("R4Mvc", "1.0"), DebuggerNonUserCode]
internal partial class R4Mvc_Microsoft_AspNetCore_Mvc_RazorPages_RedirectToRouteResult : RedirectToRouteResult, IR4PageActionResult
{
public R4Mvc_Microsoft_AspNetCore_Mvc_RazorPages_RedirectToRouteResult(string pageName, string pageHandler, string protocol = null): base(null)
public R4Mvc_Microsoft_AspNetCore_Mvc_RazorPages_RedirectToRouteResult(string pageName, string pageHandler, string protocol = null) : base(null)
{
this.InitMVCT4Result(pageName, pageHandler, protocol);
}
Expand Down
32 changes: 0 additions & 32 deletions samples/AspNetSimple.NetCore2/AspNetSimple.NetCore2.csproj
View file
Open in desktop

This file was deleted.

37 changes: 0 additions & 37 deletions samples/AspNetSimple.NetCore2/Controllers/HomeController.cs
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions samples/AspNetSimple.NetCore2/Models/ErrorViewModel.cs
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions samples/AspNetSimple.NetCore2/Program.cs
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions samples/AspNetSimple.NetCore2/Properties/launchSettings.json
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions samples/AspNetSimple.NetCore2/R4Mvc.cs
View file
Open in desktop

This file was deleted.

Loading