Updated Packages

RespectMathias · RespectMathias · commit d9bbacfaf678 · 2024-10-14T11:48:16.000+02:00
Updated
* Uses Framework for asp.net instead of nuget package
* Updated nuget package versions
diff --git a/Pugnet.Tests/MvcBuilderExtensionsTests.cs b/Pugnet.Tests/MvcBuilderExtensionsTests.cs
@@ -1,38 +1,44 @@
-using Jering.Javascript.NodeJS;
-using Microsoft.AspNetCore.Mvc.ApplicationParts;
-using Microsoft.AspNetCore.Mvc.Internal;
 using Microsoft.Extensions.DependencyInjection;
 using Pugnet.Interfaces;
+using Jering.Javascript.NodeJS;
+
+namespace Pugnet.Tests;
 
-namespace Pugnet.Tests
+[Trait("Category", "MvcBuilderExtensions")]
+public class MvcBuilderExtensionsTests(MvcBuilderExtensionsTestsFixture fixture) : IClassFixture<MvcBuilderExtensionsTestsFixture>
 {
-    [Trait("Category", "MvcBuilderExtensions")]
-    public class MvcBuilderExtensionsTests(MvcBuilderExtensionsTestsFixture fixture) : IClassFixture<MvcBuilderExtensionsTestsFixture>
-    {
-        public static readonly IEnumerable<object[]> NeededServices =
-            [
-                [typeof(INodeJSService)],
-                [typeof(IPugRenderer)],
-                [typeof(IPugViewEngine)]
-            ];
+    public static readonly IEnumerable<object[]> NeededServices =
+        [
+            [typeof(INodeJSService)],
+            [typeof(IPugRenderer)],
+            [typeof(IPugViewEngine)]
+        ];
 
-        [Theory]
-        [MemberData(nameof(NeededServices))]
-        public void MvcBuilderExtensions_AddPug_AddsNeededServices(Type neededService)
-        {
-            Assert.Contains(neededService, fixture.Services);
-        }
+    [Theory]
+    [MemberData(nameof(NeededServices))]
+    public void AddPugnet_Registers_Needed_Services(Type neededService)
+    {
+        Assert.Contains(fixture.Services, s => s.ServiceType == neededService && s.Lifetime == ServiceLifetime.Singleton);
     }
+}
 
-    public class MvcBuilderExtensionsTestsFixture
+public class MvcBuilderExtensionsTestsFixture
+{
+    public IServiceProvider ServiceProvider { get; }
+    public List<ServiceDescriptor> Services { get; }
+
+    public MvcBuilderExtensionsTestsFixture()
     {
-        public IEnumerable<Type> Services { get; }
+        var services = new ServiceCollection();
+        var mvcBuilder = services.AddControllersWithViews();
 
-        public MvcBuilderExtensionsTestsFixture()
+        _ = mvcBuilder.AddPug(options =>
         {
-            var mvcBuilder = new MvcBuilder(new ServiceCollection(), new ApplicationPartManager());
-            _ = mvcBuilder.AddPug();
-            Services = mvcBuilder.Services.Select(s => s.ServiceType).ToList();
-        }
+            options.BaseDir = "Views";
+            options.Pretty = true;
+        });
+
+        ServiceProvider = services.BuildServiceProvider();
+        Services = [.. services];
     }
 }
diff --git a/Pugnet.Tests/PugRendererTests.cs b/Pugnet.Tests/PugRendererTests.cs
@@ -97,7 +97,7 @@ public async Task ViewEngine_ModelStateValue_Embedded(string name)
         modelState.AddModelError("testError", testString);
 
         // Get the error message
-        var errorMessage = modelState["testError"].Errors[0].ErrorMessage;
+        var errorMessage = modelState["testError"]!.Errors[0].ErrorMessage;
 
         // Include 'errorMessage' in the model
         var model = new { errorMessage };
diff --git a/Pugnet.Tests/Pugnet.Tests.csproj b/Pugnet.Tests/Pugnet.Tests.csproj
@@ -10,11 +10,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.0" />
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="xunit" Version="2.6.6" />
-    <PackageReference Include="Moq" Version="4.20.70" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6" />
+    <PackageReference Include="xunit" Version="2.9.2" />
+    <PackageReference Include="Moq" Version="4.20.72" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Jering.Javascript.NodeJS" Version="7.0.0" />
   </ItemGroup>
 
diff --git a/Pugnet/Pugnet.csproj b/Pugnet/Pugnet.csproj
@@ -13,7 +13,7 @@
     <PackageReadmeFile>Readme.md</PackageReadmeFile>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageTags>pug;pugnet;pugzor;view-engine;aspnetcore;asp-net-core;dotnet;net8;templating;javascript-nodejs;razor-alternative;modern-pug;pug-template;mvc;web-development;frontend;server-side-rendering;html-template;pugjs</PackageTags>
-    <VersionPrefix>1.0.1</VersionPrefix>
+    <VersionPrefix>1.0.2</VersionPrefix>
   </PropertyGroup>
 
   <ItemGroup>
@@ -42,7 +42,8 @@
 
   <ItemGroup>
     <PackageReference Include="Jering.Javascript.NodeJS" Version="7.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.3" />
+    <PackageReference Include="System.Text.Json" Version="8.0.5" />
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
 </Project>
diff --git a/Pugnet/ViewEngines/PugView.cs b/Pugnet/ViewEngines/PugView.cs
@@ -10,7 +10,7 @@ public class PugView(string path, IPugRenderer pugRenderer) : IView
 
     public async Task RenderAsync(ViewContext context)
     {
-        var result = await pugRenderer.Render(new FileInfo(Path), context.ViewData.Model, context.ViewData, context.ModelState).ConfigureAwait(false);
+        var result = await pugRenderer.Render(new FileInfo(Path), context.ViewData.Model!, context.ViewData, context.ModelState).ConfigureAwait(false);
         await context.Writer.WriteAsync(result);
     }
 }
diff --git a/Pugnet/ViewEngines/PugViewEngine.cs b/Pugnet/ViewEngines/PugViewEngine.cs
@@ -31,9 +31,9 @@ public ViewEngineResult FindView(ActionContext context, string viewName, bool is
         return ViewEngineResult.NotFound(viewName, checkedLocations);
     }
 
-    public ViewEngineResult GetView(string executingFilePath, string viewPath, bool isMainPage)
+    public ViewEngineResult GetView(string? executingFilePath, string viewPath, bool isMainPage)
     {
-        var applicationRelativePath = PathHelper.GetAbsolutePath(executingFilePath, viewPath);
+        var applicationRelativePath = PathHelper.GetAbsolutePath(executingFilePath!, viewPath);
 
         if (!PathHelper.IsAbsolutePath(viewPath))
         {

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public class PugView(string path, IPugRenderer pugRenderer) : IView`
`10`	`10`
`11`	`11`	`public async Task RenderAsync(ViewContext context)`
`12`	`12`	`{`
`13`		`- var result = await pugRenderer.Render(new FileInfo(Path), context.ViewData.Model, context.ViewData, context.ModelState).ConfigureAwait(false);`
	`13`	`+ var result = await pugRenderer.Render(new FileInfo(Path), context.ViewData.Model!, context.ViewData, context.ModelState).ConfigureAwait(false);`
`14`	`14`	`await context.Writer.WriteAsync(result);`
`15`	`15`	`}`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,9 @@ public ViewEngineResult FindView(ActionContext context, string viewName, bool is`
`31`	`31`	`return ViewEngineResult.NotFound(viewName, checkedLocations);`
`32`	`32`	`}`
`33`	`33`
`34`		`- public ViewEngineResult GetView(string executingFilePath, string viewPath, bool isMainPage)`
	`34`	`+ public ViewEngineResult GetView(string? executingFilePath, string viewPath, bool isMainPage)`
`35`	`35`	`{`
`36`		`- var applicationRelativePath = PathHelper.GetAbsolutePath(executingFilePath, viewPath);`
	`36`	`+ var applicationRelativePath = PathHelper.GetAbsolutePath(executingFilePath!, viewPath);`
`37`	`37`
`38`	`38`	`if (!PathHelper.IsAbsolutePath(viewPath))`
`39`	`39`	`{`