Add .NET 10 support (#237)

yaqian256 · PhyxionNL · web-flow · commit 26f495129d8f · 2025-11-12T12:50:09.000+01:00
* Add .NET 10 support

* Upgrade .NET SDK setup action and version

* Update .NET SDK setup action to version 5

* Upgrade .NET SDK setup action to v5

* Modify .NET SDK version to support 8.0.x, 9.0.x, and 10.0.x

Updated the .NET SDK version specification to support multiple versions.

* Modify .NET SDK version to include 8.0.x and 9.0.x

Updated the .NET SDK version to support multiple versions.

* Update .NET SDK version in workflows

* Update .NET SDK version to 10.0.x in workflow

---------

Co-authored-by: PhyxionNL &lt;7643972+PhyxionNL@users.noreply.github.com&gt;
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -12,11 +12,9 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Setup .NET SDK
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: |
-            8.0.x
-            9.0.x
+          dotnet-version: '10.0.x'
 
       - name: Install .NET dependencies
         run: dotnet restore
@@ -28,7 +26,7 @@ jobs:
         run: dotnet build PacketDotNet/PacketDotNet.csproj -c Release -f "net9.0"
 
       - name: Test
-        run: dotnet test -c Release -f "net9.0"
+        run: dotnet test -c Release -f "net10.0"
 
   windows:
     runs-on: windows-latest
@@ -37,11 +35,9 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Setup .NET SDK
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: |
-            8.0.x
-            9.0.x
+          dotnet-version: '10.0.x'
 
       - uses: dorny/paths-filter@v3
         id: changes
diff --git a/.github/workflows/pull requests.yml b/.github/workflows/pull requests.yml
@@ -12,11 +12,9 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Setup .NET SDK
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: |
-            8.0.x
-            9.0.x
+          dotnet-version: '10.0.x'
 
       - name: Install .NET dependencies
         run: dotnet restore
@@ -28,7 +26,7 @@ jobs:
         run: dotnet build PacketDotNet/PacketDotNet.csproj -c Release -f "net9.0"
 
       - name: Test
-        run: dotnet test -c Release -f "net9.0"
+        run: dotnet test -c Release -f "net10.0"
 
   windows:
     runs-on: windows-latest
@@ -37,11 +35,9 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Setup .NET SDK
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: |
-            8.0.x
-            9.0.x
+          dotnet-version: '10.0.x'
 
       - uses: dorny/paths-filter@v3
         id: changes
diff --git a/Examples/CapturingAndParsingPackets/CapturingAndParsingPackets.csproj b/Examples/CapturingAndParsingPackets/CapturingAndParsingPackets.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Examples/ConstructingPackets/ConstructingPackets.csproj b/Examples/ConstructingPackets/ConstructingPackets.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/PacketDotNet/IPv6ExtensionHeader.cs b/PacketDotNet/IPv6ExtensionHeader.cs
@@ -31,13 +31,13 @@ public int FragmentOffset
             set
             {
                 // read the original value
-                var field = (ushort) FragmentOffsetReservedMore;
+                var @field = (ushort) FragmentOffsetReservedMore;
 
                 // mask in the new field
-                field = (ushort) ((field & 0x7) | ((ushort) value << 3) & 0xFFF8);
+                @field = (ushort) ((@field & 0x7) | ((ushort) value << 3) & 0xFFF8);
 
                 // write the updated value back
-                FragmentOffsetReservedMore = (short) field;
+                FragmentOffsetReservedMore = (short) @field;
             }
         }
 
@@ -50,13 +50,13 @@ public bool More
             set
             {
                 // read the original value
-                var field = (ushort) FragmentOffsetReservedMore;
+                var @field = (ushort) FragmentOffsetReservedMore;
 
                 // mask in the new field
-                field = (ushort) ((field & 0xFFFE) | (value ? 1 : 0) & 0x1);
+                @field = (ushort) ((@field & 0xFFFE) | (value ? 1 : 0) & 0x1);
 
                 // write the updated value back
-                FragmentOffsetReservedMore = (short) field;
+                FragmentOffsetReservedMore = (short) @field;
             }
         }
 
diff --git a/PacketDotNet/IPv6Packet.cs b/PacketDotNet/IPv6Packet.cs
@@ -199,13 +199,13 @@ public int FlowLabel
             set
             {
                 // read the original value
-                var field = (uint) VersionTrafficClassFlowLabel;
+                var @field = (uint) VersionTrafficClassFlowLabel;
 
                 // make the value in
-                field = (field & 0xFFF00000) | ((uint) value & 0x000FFFFF);
+                @field = (@field & 0xFFF00000) | ((uint) value & 0x000FFFFF);
 
                 // write the updated value back
-                VersionTrafficClassFlowLabel = (int) field;
+                VersionTrafficClassFlowLabel = (int) @field;
             }
         }
 
@@ -305,13 +305,13 @@ public int TrafficClass
             set
             {
                 // read the original value
-                var field = (uint) VersionTrafficClassFlowLabel;
+                var @field = (uint) VersionTrafficClassFlowLabel;
 
                 // mask in the new field
-                field = (field & 0xF00FFFFF) | ((uint) value << 20) & 0x0FF00000;
+                @field = (@field & 0xF00FFFFF) | ((uint) value << 20) & 0x0FF00000;
 
                 // write the updated value back
-                VersionTrafficClassFlowLabel = (int) field;
+                VersionTrafficClassFlowLabel = (int) @field;
             }
         }
 
@@ -326,13 +326,13 @@ public override IPVersion Version
                 var v = (int) value;
 
                 // read the existing value
-                var field = (uint) VersionTrafficClassFlowLabel;
+                var @field = (uint) VersionTrafficClassFlowLabel;
 
                 // mask the new field into place
-                field = (uint) ((field & 0x0FFFFFFF) | ((v << 28) & 0xF0000000));
+                @field = (uint) ((@field & 0x0FFFFFFF) | ((v << 28) & 0xF0000000));
 
                 // write the updated value back
-                VersionTrafficClassFlowLabel = (int) field;
+                VersionTrafficClassFlowLabel = (int) @field;
             }
         }
 
diff --git a/PacketDotNet/Ieee80211/PpiPacket.cs b/PacketDotNet/Ieee80211/PpiPacket.cs
@@ -104,12 +104,12 @@ public ushort Length
             {
                 var length = PpiHeaderFields.PpiPacketHeaderLength;
 
-                foreach (var field in PpiFields)
+                foreach (var @field in PpiFields)
                 {
-                    length += PpiHeaderFields.FieldHeaderLength + field.Length;
+                    length += PpiHeaderFields.FieldHeaderLength + @field.Length;
                     if ((Flags & HeaderFlags.Alignment32Bit) == HeaderFlags.Alignment32Bit)
                     {
-                        length += GetDistanceTo32BitAlignment(field.Length);
+                        length += GetDistanceTo32BitAlignment(@field.Length);
                     }
                 }
 
diff --git a/PacketDotNet/IgmpV3MembershipQueryPacket.cs b/PacketDotNet/IgmpV3MembershipQueryPacket.cs
@@ -107,13 +107,13 @@ public byte QueriersRobustnessVariable
             set
             {
                 // read the original value
-                byte field = ReservedSFlagAndQRV;
+                byte @field = ReservedSFlagAndQRV;
 
                 // mask in the new field
-                field = (byte) ((field & 0xF8) | value & 0x07);
+                @field = (byte) ((@field & 0xF8) | value & 0x07);
 
                 // write the updated value back
-                ReservedSFlagAndQRV = field;
+                ReservedSFlagAndQRV = @field;
             }
         }
 
@@ -169,13 +169,13 @@ public bool SuppressRouterSideProcessingFlag
             set
             {
                 // read the original value
-                byte field = ReservedSFlagAndQRV;
+                byte @field = ReservedSFlagAndQRV;
 
                 // mask in the new field
-                field = (byte) ((field & 0xF7) | (value ? 1 : 0) & 0x08);
+                @field = (byte) ((@field & 0xF7) | (value ? 1 : 0) & 0x08);
 
                 // write the updated value back
-                ReservedSFlagAndQRV = field;
+                ReservedSFlagAndQRV = @field;
             }
         }
 
diff --git a/PacketDotNet/PacketDotNet.csproj b/PacketDotNet/PacketDotNet.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0;net472</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0;net472</TargetFrameworks>
     <Authors>Chris Morgan (chmorgan@gmail.com)</Authors>
     <LangVersion>latest</LangVersion>
     <SignAssembly>true</SignAssembly>
diff --git a/Test/Test.csproj b/Test/Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -31,13 +31,13 @@ public int FragmentOffset`
`31`	`31`	`set`
`32`	`32`	`{`
`33`	`33`	`// read the original value`
`34`		`- var field = (ushort) FragmentOffsetReservedMore;`
	`34`	`+ var @field = (ushort) FragmentOffsetReservedMore;`
`35`	`35`
`36`	`36`	`// mask in the new field`
`37`		`- field = (ushort) ((field & 0x7) \| ((ushort) value << 3) & 0xFFF8);`
	`37`	`+ @field = (ushort) ((@field & 0x7) \| ((ushort) value << 3) & 0xFFF8);`
`38`	`38`
`39`	`39`	`// write the updated value back`
`40`		`- FragmentOffsetReservedMore = (short) field;`
	`40`	`+ FragmentOffsetReservedMore = (short) @field;`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
`@@ -50,13 +50,13 @@ public bool More`
`50`	`50`	`set`
`51`	`51`	`{`
`52`	`52`	`// read the original value`
`53`		`- var field = (ushort) FragmentOffsetReservedMore;`
	`53`	`+ var @field = (ushort) FragmentOffsetReservedMore;`
`54`	`54`
`55`	`55`	`// mask in the new field`
`56`		`- field = (ushort) ((field & 0xFFFE) \| (value ? 1 : 0) & 0x1);`
	`56`	`+ @field = (ushort) ((@field & 0xFFFE) \| (value ? 1 : 0) & 0x1);`
`57`	`57`
`58`	`58`	`// write the updated value back`
`59`		`- FragmentOffsetReservedMore = (short) field;`
	`59`	`+ FragmentOffsetReservedMore = (short) @field;`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`
Original file line number	Diff line number	Diff line change
`@@ -199,13 +199,13 @@ public int FlowLabel`
`199`	`199`	`set`
`200`	`200`	`{`
`201`	`201`	`// read the original value`
`202`		`- var field = (uint) VersionTrafficClassFlowLabel;`
	`202`	`+ var @field = (uint) VersionTrafficClassFlowLabel;`
`203`	`203`
`204`	`204`	`// make the value in`
`205`		`- field = (field & 0xFFF00000) \| ((uint) value & 0x000FFFFF);`
	`205`	`+ @field = (@field & 0xFFF00000) \| ((uint) value & 0x000FFFFF);`
`206`	`206`
`207`	`207`	`// write the updated value back`
`208`		`- VersionTrafficClassFlowLabel = (int) field;`
	`208`	`+ VersionTrafficClassFlowLabel = (int) @field;`
`209`	`209`	`}`
`210`	`210`	`}`
`211`	`211`
`@@ -305,13 +305,13 @@ public int TrafficClass`
`305`	`305`	`set`
`306`	`306`	`{`
`307`	`307`	`// read the original value`
`308`		`- var field = (uint) VersionTrafficClassFlowLabel;`
	`308`	`+ var @field = (uint) VersionTrafficClassFlowLabel;`
`309`	`309`
`310`	`310`	`// mask in the new field`
`311`		`- field = (field & 0xF00FFFFF) \| ((uint) value << 20) & 0x0FF00000;`
	`311`	`+ @field = (@field & 0xF00FFFFF) \| ((uint) value << 20) & 0x0FF00000;`
`312`	`312`
`313`	`313`	`// write the updated value back`
`314`		`- VersionTrafficClassFlowLabel = (int) field;`
	`314`	`+ VersionTrafficClassFlowLabel = (int) @field;`
`315`	`315`	`}`
`316`	`316`	`}`
`317`	`317`
`@@ -326,13 +326,13 @@ public override IPVersion Version`
`326`	`326`	`var v = (int) value;`
`327`	`327`
`328`	`328`	`// read the existing value`
`329`		`- var field = (uint) VersionTrafficClassFlowLabel;`
	`329`	`+ var @field = (uint) VersionTrafficClassFlowLabel;`
`330`	`330`
`331`	`331`	`// mask the new field into place`
`332`		`- field = (uint) ((field & 0x0FFFFFFF) \| ((v << 28) & 0xF0000000));`
	`332`	`+ @field = (uint) ((@field & 0x0FFFFFFF) \| ((v << 28) & 0xF0000000));`
`333`	`333`
`334`	`334`	`// write the updated value back`
`335`		`- VersionTrafficClassFlowLabel = (int) field;`
	`335`	`+ VersionTrafficClassFlowLabel = (int) @field;`
`336`	`336`	`}`
`337`	`337`	`}`
`338`	`338`
Original file line number	Diff line number	Diff line change
`@@ -104,12 +104,12 @@ public ushort Length`
`104`	`104`	`{`
`105`	`105`	`var length = PpiHeaderFields.PpiPacketHeaderLength;`
`106`	`106`
`107`		`- foreach (var field in PpiFields)`
	`107`	`+ foreach (var @field in PpiFields)`
`108`	`108`	`{`
`109`		`- length += PpiHeaderFields.FieldHeaderLength + field.Length;`
	`109`	`+ length += PpiHeaderFields.FieldHeaderLength + @field.Length;`
`110`	`110`	`if ((Flags & HeaderFlags.Alignment32Bit) == HeaderFlags.Alignment32Bit)`
`111`	`111`	`{`
`112`		`- length += GetDistanceTo32BitAlignment(field.Length);`
	`112`	`+ length += GetDistanceTo32BitAlignment(@field.Length);`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`
Original file line number	Diff line number	Diff line change
`@@ -107,13 +107,13 @@ public byte QueriersRobustnessVariable`
`107`	`107`	`set`
`108`	`108`	`{`
`109`	`109`	`// read the original value`
`110`		`- byte field = ReservedSFlagAndQRV;`
	`110`	`+ byte @field = ReservedSFlagAndQRV;`
`111`	`111`
`112`	`112`	`// mask in the new field`
`113`		`- field = (byte) ((field & 0xF8) \| value & 0x07);`
	`113`	`+ @field = (byte) ((@field & 0xF8) \| value & 0x07);`
`114`	`114`
`115`	`115`	`// write the updated value back`
`116`		`- ReservedSFlagAndQRV = field;`
	`116`	`+ ReservedSFlagAndQRV = @field;`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`
`@@ -169,13 +169,13 @@ public bool SuppressRouterSideProcessingFlag`
`169`	`169`	`set`
`170`	`170`	`{`
`171`	`171`	`// read the original value`
`172`		`- byte field = ReservedSFlagAndQRV;`
	`172`	`+ byte @field = ReservedSFlagAndQRV;`
`173`	`173`
`174`	`174`	`// mask in the new field`
`175`		`- field = (byte) ((field & 0xF7) \| (value ? 1 : 0) & 0x08);`
	`175`	`+ @field = (byte) ((@field & 0xF7) \| (value ? 1 : 0) & 0x08);`
`176`	`176`
`177`	`177`	`// write the updated value back`
`178`		`- ReservedSFlagAndQRV = field;`
	`178`	`+ ReservedSFlagAndQRV = @field;`
`179`	`179`	`}`
`180`	`180`	`}`
`181`	`181`