Remove obsolete framework versions and update tests to .NET 8

.github/workflows/ci.yml

@@ -9,14 +9,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Setup .NET 5
+    - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.x
-    - name: Setup .NET CORE
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '3.1.x'
+        dotnet-version: '8.x.x'
     - name: Restore dependencies
       run: dotnet restore OnixDataStandard.sln
     - name: Build
@@ -25,7 +21,7 @@ jobs:
       run: dotnet test OnixDataStandard.sln --no-build --verbosity normal --logger trx /p:CollectCoverage=true /p:CoverletOutput=TestResults/ /p:CoverletOutputFormat=lcov
         /p:Exclude=\"[OnixData.Standard.BaseTests]*\" /p:ExcludeByAttribute=\"Obsolete,GeneratedCodeAttribute,CompilerGeneratedAttribute\"
     - name: Upload Test Report Artifacts
-      uses: actions/upload-artifact@v2 
+      uses: actions/upload-artifact@v4 
       if: success() || failure()        
       with:
         name: test-results        

.github/workflows/codeql-analysis.yml

@@ -43,7 +43,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -63,18 +63,14 @@ jobs:
     #    and modify them (or add more) to build your code if your project
     #    uses a compiled language
 
-    - name: Setup .NET 5
+    - name: Setup .NET 8
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.x
-    - name: Setup .NET CORE
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '3.1.x'
+        dotnet-version: 8.x.x
     - name: Restore dependencies
       run: dotnet restore OnixDataStandard.sln
     - name: Build
       run: dotnet build OnixDataStandard.sln --no-restore
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

.github/workflows/sonarcloud.yml

@@ -17,15 +17,10 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Setup .NET 5
+      - name: Setup .NET 8
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.x
-
-      - name: Setup .NET CORE
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: '3.1.x'
+          dotnet-version: 8.x.x
 
       - name: Restore dependencies
         run: dotnet restore OnixDataStandard.sln

OnixData.Standard.BaseTests/BaseOnixV3ParserTests.cs

@@ -1,6 +1,5 @@
 using System.IO;
-using OnixData.Version3;
-using OnixData.Version3.Header;
+using OnixData.Standard.Version3;
 using Xunit;
 
 namespace OnixData.Standard.BaseTests

OnixData.Standard.BaseTests/Legacy/CoreData/BaseOnixCoreDataTests.cs

@@ -1,8 +1,8 @@
 using System;
 using System.IO;
 using System.Linq;
-using OnixData.Legacy;
-using OnixData.Extensions;
+using OnixData.Standard.Extensions;
+using OnixData.Standard.Legacy;
 using Xunit;
 
 namespace OnixData.Standard.BaseTests.Legacy.CoreData

OnixData.Standard.BaseTests/Legacy/Text/BaseOnixOtherTextTests.cs

@@ -1,5 +1,5 @@
 using System.IO;
-using OnixData.Legacy;
+using OnixData.Standard.Legacy;
 using Xunit;
 
 namespace OnixData.Standard.BaseTests.Legacy.Text

OnixData.Standard.BaseTests/Version3/CoreData/BaseOnixCoreDataTests.cs

@@ -3,9 +3,10 @@
 using System.IO;
 using System.Linq;
 using System.Text;
-using OnixData.Extensions;
-using OnixData.Version3;
-using OnixData.Version3.Publishing;
+using OnixData.Standard.Extensions;
+using OnixData.Standard.Version3;
+using OnixData.Standard.Version3.Price;
+using OnixData.Standard.Version3.Publishing;
 using Xunit;
 
 namespace OnixData.Standard.BaseTests.Version3.CoreData
@@ -225,7 +226,7 @@ protected void ParseOnix3CoreDataSampleShortTags()
                 Assert.Equal(7.99m, tmpProduct.USDValidPrice.PriceAmountNum);
 
                 Assert.Equal(7.99m, tmpProduct.OnixProductSupplyList[0].OnixSupplyDetailList[0].OnixPriceList[0].PriceAmountNum);
-                Assert.Equal(OnixData.Version3.Price.OnixPrice.CONST_PRICE_TYPE_RRP_INCL, tmpProduct.OnixProductSupplyList[0].OnixSupplyDetailList[0].OnixPriceList[0].PriceType);
+                Assert.Equal(OnixPrice.CONST_PRICE_TYPE_RRP_INCL, tmpProduct.OnixProductSupplyList[0].OnixSupplyDetailList[0].OnixPriceList[0].PriceType);
                 Assert.Equal("GBP", tmpProduct.OnixProductSupplyList[0].OnixSupplyDetailList[0].OnixPriceList[0].CurrencyCode);
 
                 Assert.Equal("9780007324378", tmpProduct.RelatedMaterial.OnixRelatedProductList[0].EAN);

OnixData.Standard.BaseTests/Version3/Text/BaseOnixSupportingResourceTests.cs

@@ -1,7 +1,6 @@
 using System.IO;
 using System.Linq;
-using OnixData.Version3;
-using OnixData.Version3.Header;
+using OnixData.Standard.Version3;
 using Xunit;
 
 namespace OnixData.Standard.BaseTests.Version3.Text

OnixData.Standard.Benchmarks/OnixData.Standard.Benchmarks.csproj

@@ -2,8 +2,7 @@
 
     <PropertyGroup>
         <LangVersion>default</LangVersion>
-        <OutputType>Exe</OutputType>
-        <TargetFrameworks>net462;net48;net5.0;netcoreapp3.1;netstandard2.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;netstandard2.0;net462;net48;net7.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>

OnixData.Standard.Benchmarks/OnixParsersBenchmark.cs

@@ -3,8 +3,8 @@
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Jobs;
 using BenchmarkDotNet.Running;
-using OnixData.Legacy;
-using OnixData.Version3;
+using OnixData.Standard.Legacy;
+using OnixData.Standard.Version3;
 
 namespace OnixData.Standard.Benchmarks
 {

OnixData.Standard.CoreTests/Legacy/CoreData/OnixCoreTests.cs → OnixData.Standard.Net8Tests/Legacy/CoreData/OnixCoreTests.cs

@@ -1,6 +1,6 @@
 using OnixData.Standard.BaseTests.Legacy.CoreData;
 
-namespace OnixData.Standard.CoreTests.Legacy.CoreData
+namespace OnixData.Standard.Net8Tests.Legacy.CoreData
 {
     public class OnixCoreTests : BaseOnixCoreDataTests
     {

OnixData.Standard.Net5Tests/Legacy/Text/OnixOtherTextTests.cs → OnixData.Standard.Net8Tests/Legacy/Text/OnixOtherTextTests.cs

@@ -1,6 +1,6 @@
 using OnixData.Standard.BaseTests.Legacy.Text;
 
-namespace OnixData.Standard.Net5Tests.Legacy.Text
+namespace OnixData.Standard.Net8Tests.Legacy.Text
 {
     public class OnixOtherTextTests : BaseOnixOtherTextTests
     {

OnixData.Standard.Net5Tests/OnixData.Standard.Net5Tests.csproj → OnixData.Standard.Net8Tests/OnixData.Standard.Net8Tests.csproj

@@ -1,11 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
 
         <IsPackable>false</IsPackable>
 
         <LangVersion>default</LangVersion>
+
+        <AssemblyName>OnixData.Standard.Net8Tests</AssemblyName>
+
+        <RootNamespace>OnixData.Standard.Net8Tests</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>

OnixData.Standard.Net5Tests/V3ParserTests.cs → OnixData.Standard.Net8Tests/V3ParserTests.cs

@@ -1,6 +1,6 @@
 using OnixData.Standard.BaseTests;
 
-namespace OnixData.Standard.Net5Tests
+namespace OnixData.Standard.Net8Tests
 {
     public class V3ParserTests : BaseOnixV3ParserTests
     {

OnixData.Standard.Net5Tests/Version3/CoreData/OnixCoreTests.cs → OnixData.Standard.Net8Tests/Version3/CoreData/OnixCoreTests.cs

@@ -1,6 +1,6 @@
 using OnixData.Standard.BaseTests.Version3.CoreData;
 
-namespace OnixData.Standard.Net5Tests.Version3.CoreData
+namespace OnixData.Standard.Net8Tests.Version3.CoreData
 {
     public class OnixCoreTests : BaseOnixCoreDataTests
     {

OnixData.Standard.Net5Tests/Version3/Text/OnixSupportingResourceTests.cs → OnixData.Standard.Net8Tests/Version3/Text/OnixSupportingResourceTests.cs

@@ -1,6 +1,6 @@
 using OnixData.Standard.BaseTests.Version3.Text;
 
-namespace OnixData.Standard.Net5Tests.Version3.Text
+namespace OnixData.Standard.Net8Tests.Version3.Text
 {
     public class OnixSupportingResourceTests : BaseOnixSupportingResourceTests
     {

OnixData.Standard/Extensions/OnixDataExtensions.cs

@@ -1,13 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
+using OnixData.Standard.Legacy;
 
-using OnixData.Legacy;
-using OnixData.Version3;
-
-namespace OnixData.Extensions
+namespace OnixData.Standard.Extensions
 {
     public static class OnixDataExtensions
     {
@@ -204,7 +199,7 @@
             {
                 long nEAN = Convert.ToInt64(TargetEAN);
             }
             catch (Exception ex)
             { return false; }
 
             if (TargetEAN.Length < CONST_EAN_LEN)
@@ -260,7 +255,7 @@
             {
                 long nISBNPrefix = Convert.ToInt64(ISBNPrefix);
             }
             catch (Exception ex) { return false; }
 
             try
             {
@@ -298,7 +293,7 @@
                 else
                     IsValid = false;
             }
             catch(Exception ex)
             {
                 IsValid = false;
             }

OnixData.Standard/Extensions/OnixParserExtensions.cs

@@ -1,19 +1,16 @@
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
 using System.IO;
+using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
+using OnixData.Standard.Legacy;
+using OnixData.Standard.Version3;
+using OnixData.Standard.Version3.Header;
+using OnixData.Standard.Version3.Price;
+using OnixData.Standard.Version3.Supply;
 
-using OnixData.Legacy;
-using OnixData.Version3;
-using OnixData.Version3.Header;
-using OnixData.Version3.Price;
-using OnixData.Version3.Supply;
-
-namespace OnixData.Extensions
+namespace OnixData.Standard.Extensions
 {
     public static class OnixParserExtensions
     {
@@ -68,7 +65,7 @@
                                 int nDefPriceTypeCd = -1;
 
                                 try { nDefPriceTypeCd = Convert.ToInt32(poOnixHeader.DefaultPriceTypeCode); }
                                 catch (Exception ex) { }
 
                                 if (nDefPriceTypeCd > 0)
                                     TmpPrice.PriceTypeCode = nDefPriceTypeCd;
@@ -268,7 +265,7 @@
                 else if (m.Value.StartsWith("&"))
                     sResult = m.Value;
             }
             catch (Exception ex)
             {
                 sResult = m.Value;
             }

OnixData.Standard/Extensions/OnixReplaceExtensions.cs

@@ -1,19 +1,6 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading;
+using System.Text;
 
-using OnixData.Legacy;
-using OnixData.Version3;
-using OnixData.Version3.Header;
-using OnixData.Version3.Price;
-using OnixData.Version3.Supply;
-
-namespace OnixData.Extensions
+namespace OnixData.Standard.Extensions
 {
     public static class OnixReplaceExtensions
     {

OnixData.Standard/Extensions/OnixXmlExtensions.cs

@@ -1,12 +1,9 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text;
 using System.Xml;
 
-using OnixData;
-
-namespace OnixData.Extensions
+namespace OnixData.Standard.Extensions
 {
     public static class OnixXmlExtensions
     {
@@ -110,7 +107,7 @@
                         break;
                 }
             }
             catch (Exception ex)
             {
                 sValue = String.Empty;
             }
@@ -158,7 +155,7 @@
                     }
                 }
             }
             catch (Exception ex)
             {
                 bIsValidXml = false;
             }

OnixData.Standard/Legacy/OnixLegacyAudRange.cs

@@ -1,10 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace OnixData.Legacy
+namespace OnixData.Standard.Legacy
 {
     /// <remarks/>
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)]