Merge pull request #126 from HtmlTags/net10

Adding .NET 8-10 support; removing .NET 6

Author: jbogard

.github/workflows/ci.yml

@@ -3,10 +3,10 @@ name: CI
 on:
   push:
     branches:
-    - master
+    - main
   pull_request:
     branches:
-      - master
+      - main
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -15,10 +15,13 @@ jobs:
       uses: actions/checkout@v2
       with:
         fetch-depth: 0
-    - name: Setup dotnet 6.0
-      uses: actions/setup-dotnet@v1
+    - name: Setup dotnet
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '6.0'
+        dotnet-version: |
+          8.0.x
+          9.0.x
+          10.0.x
     - name: Build and Test
       run: ./Build.ps1
       shell: pwsh
@@ -29,7 +32,7 @@ jobs:
       run: ./Push.ps1
       shell: pwsh
     - name: Artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: artifacts
         path: artifacts/**/*

.github/workflows/release.yml

@@ -14,10 +14,13 @@ jobs:
       uses: actions/checkout@v2
       with:
         fetch-depth: 0
-    - name: Setup dotnet 6.0
-      uses: actions/setup-dotnet@v1
+    - name: Setup dotnet
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '6.0'
+        dotnet-version: |
+          8.0.x
+          9.0.x
+          10.0.x
     - name: Build and Test
       run: ./Build.ps1
       shell: pwsh
@@ -34,7 +37,7 @@ jobs:
       run: ./Push.ps1
       shell: pwsh
     - name: Artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: artifacts
         path: artifacts/**/*

.gitignore

@@ -37,3 +37,4 @@ node_modules
 *.ng.ts
 *.sln.ide
 project.lock.json
+.idea/*

Push.ps1

@@ -6,7 +6,7 @@ if ([string]::IsNullOrEmpty($Env:NUGET_API_KEY)) {
 } else {
     Get-ChildItem $artifacts -Filter "*.nupkg" | ForEach-Object {
         Write-Host "$($scriptName): Pushing $($_.Name)"
-        dotnet nuget push $_ --source $Env:NUGET_URL --api-key $Env:NUGET_API_KEY
+        dotnet nuget push $_ --source $Env:NUGET_URL --api-key $Env:NUGET_API_KEY --skip-duplicate
         if ($lastexitcode -ne 0) {
             throw ("Exec: " + $errorMessage)
         }

readme.md

@@ -1,4 +1,4 @@
-# ![HtmlTags](https://raw.githubusercontent.com/HtmlTags/htmltags/master/logo/FubuHtml_32.png) HtmlTags 
+# ![HtmlTags](https://raw.githubusercontent.com/HtmlTags/htmltags/main/logo/FubuHtml_32.png) HtmlTags 
 
 [![CI](https://github.com/htmltags/htmltags/workflows/CI/badge.svg)](https://github.com/htmltags/htmltags/workflows/CI)
 [![NuGet](https://img.shields.io/nuget/dt/htmltags.svg)](https://www.nuget.org/packages/htmltags) 

src/HtmlTags.AspNetCore.TestSite/HtmlTags.AspNetCore.TestSite.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

src/HtmlTags/HtmlTags.csproj

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <Description>Easy generation of html with a jquery inspired object model</Description>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
+    <Description>Easy generation of HTML with a fluent API</Description>
     <Copyright>Copyright Jeremy D. Miller, Josh Arnold, Joshua Flanagan, Jimmy Bogard, et al. All rights reserved.</Copyright>
     <Authors>Jeremy D. Miller;Joshua Flanagan;Josh Arnold;Jimmy Bogard</Authors>
     <AssemblyName>HtmlTags</AssemblyName>
@@ -27,7 +27,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     <PackageReference Include="MinVer" Version="4.3.0" PrivateAssets="All" />
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>

src/HtmlTags/Reflection/PropertyChain.cs

@@ -52,8 +52,8 @@ public Type OwnerType
                 var last = _valueGetters.Last();
                 if (last is MethodValueGetter || last is IndexerValueGetter)
                 {
-                    var nextUp = _chain.Reverse().Skip(1).FirstOrDefault() as PropertyValueGetter;
-                    if (nextUp != null)
+                    // https://github.com/dotnet/roslyn/issues/77212
+                    if (Enumerable.Reverse(_chain).Skip(1).FirstOrDefault() is PropertyValueGetter nextUp)
                     {
                         return nextUp.PropertyInfo.PropertyType;
                     }

test/HtmlTags.Testing/HtmlTags.Testing.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <IsPackable>false</IsPackable>
   </PropertyGroup>