diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 445ee03..1b98db1 100644 --- a/.github/workflows/ci.yml +++ b/.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 diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 2a508c7..12b8f36 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.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 diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index 8986654..4f12b1f 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.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 diff --git a/OnixData.Standard.BaseTests/BaseOnixV3ParserTests.cs b/OnixData.Standard.BaseTests/BaseOnixV3ParserTests.cs index 34c14cc..787a6bf 100644 --- a/OnixData.Standard.BaseTests/BaseOnixV3ParserTests.cs +++ b/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 diff --git a/OnixData.Standard.BaseTests/Legacy/CoreData/BaseOnixCoreDataTests.cs b/OnixData.Standard.BaseTests/Legacy/CoreData/BaseOnixCoreDataTests.cs index 9bf64b8..0a8f406 100644 --- a/OnixData.Standard.BaseTests/Legacy/CoreData/BaseOnixCoreDataTests.cs +++ b/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 diff --git a/OnixData.Standard.BaseTests/Legacy/Text/BaseOnixOtherTextTests.cs b/OnixData.Standard.BaseTests/Legacy/Text/BaseOnixOtherTextTests.cs index 7e46341..1e56edb 100644 --- a/OnixData.Standard.BaseTests/Legacy/Text/BaseOnixOtherTextTests.cs +++ b/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 diff --git a/OnixData.Standard.BaseTests/Version3/CoreData/BaseOnixCoreDataTests.cs b/OnixData.Standard.BaseTests/Version3/CoreData/BaseOnixCoreDataTests.cs index 08f301f..6013df5 100644 --- a/OnixData.Standard.BaseTests/Version3/CoreData/BaseOnixCoreDataTests.cs +++ b/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); diff --git a/OnixData.Standard.BaseTests/Version3/Text/BaseOnixSupportingResourceTests.cs b/OnixData.Standard.BaseTests/Version3/Text/BaseOnixSupportingResourceTests.cs index 7ec366c..bf976fe 100644 --- a/OnixData.Standard.BaseTests/Version3/Text/BaseOnixSupportingResourceTests.cs +++ b/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 diff --git a/OnixData.Standard.Benchmarks/OnixData.Standard.Benchmarks.csproj b/OnixData.Standard.Benchmarks/OnixData.Standard.Benchmarks.csproj index 8aa258e..2c7d5ee 100644 --- a/OnixData.Standard.Benchmarks/OnixData.Standard.Benchmarks.csproj +++ b/OnixData.Standard.Benchmarks/OnixData.Standard.Benchmarks.csproj @@ -2,8 +2,7 @@ default - Exe - net462;net48;net5.0;netcoreapp3.1;netstandard2.0 + net8.0;netstandard2.0;net462;net48;net7.0 diff --git a/OnixData.Standard.Benchmarks/OnixParsersBenchmark.cs b/OnixData.Standard.Benchmarks/OnixParsersBenchmark.cs index 8a52a17..dd9aee6 100644 --- a/OnixData.Standard.Benchmarks/OnixParsersBenchmark.cs +++ b/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 { diff --git a/OnixData.Standard.CoreTests/Legacy/Text/OnixOtherTextTests.cs b/OnixData.Standard.CoreTests/Legacy/Text/OnixOtherTextTests.cs deleted file mode 100644 index c4e930f..0000000 --- a/OnixData.Standard.CoreTests/Legacy/Text/OnixOtherTextTests.cs +++ /dev/null @@ -1,9 +0,0 @@ -using OnixData.Standard.BaseTests.Legacy.Text; - -namespace OnixData.Standard.CoreTests.Legacy.Text -{ - public class OnixOtherTextTests : BaseOnixOtherTextTests - { - - } -} \ No newline at end of file diff --git a/OnixData.Standard.CoreTests/OnixData.Standard.CoreTests.csproj b/OnixData.Standard.CoreTests/OnixData.Standard.CoreTests.csproj deleted file mode 100644 index 51ec2a5..0000000 --- a/OnixData.Standard.CoreTests/OnixData.Standard.CoreTests.csproj +++ /dev/null @@ -1,33 +0,0 @@ - - - - netcoreapp3.1 - - false - - default - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - - - - - diff --git a/OnixData.Standard.CoreTests/V3ParserTests.cs b/OnixData.Standard.CoreTests/V3ParserTests.cs deleted file mode 100644 index 049c30f..0000000 --- a/OnixData.Standard.CoreTests/V3ParserTests.cs +++ /dev/null @@ -1,8 +0,0 @@ -using OnixData.Standard.BaseTests; - -namespace OnixData.Standard.CoreTests -{ - public class V3ParserTests : BaseOnixV3ParserTests - { - } -} diff --git a/OnixData.Standard.CoreTests/Version3/CoreData/OnixCoreTests.cs b/OnixData.Standard.CoreTests/Version3/CoreData/OnixCoreTests.cs deleted file mode 100644 index fc21e1e..0000000 --- a/OnixData.Standard.CoreTests/Version3/CoreData/OnixCoreTests.cs +++ /dev/null @@ -1,9 +0,0 @@ -using OnixData.Standard.BaseTests.Version3.CoreData; - -namespace OnixData.Standard.CoreTests.Version3.CoreData -{ - public class OnixCoreTests : BaseOnixCoreDataTests - { - - } -} \ No newline at end of file diff --git a/OnixData.Standard.CoreTests/Version3/Text/OnixSupportingResourceTests.cs b/OnixData.Standard.CoreTests/Version3/Text/OnixSupportingResourceTests.cs deleted file mode 100644 index 904712a..0000000 --- a/OnixData.Standard.CoreTests/Version3/Text/OnixSupportingResourceTests.cs +++ /dev/null @@ -1,9 +0,0 @@ -using OnixData.Standard.BaseTests.Version3.Text; - -namespace OnixData.Standard.CoreTests.Version3.Text -{ - public class OnixSupportingResourceTests : BaseOnixSupportingResourceTests - { - - } -} \ No newline at end of file diff --git a/OnixData.Standard.Net5Tests/Legacy/CoreData/OnixCoreTests.cs b/OnixData.Standard.Net5Tests/Legacy/CoreData/OnixCoreTests.cs deleted file mode 100644 index 264c18a..0000000 --- a/OnixData.Standard.Net5Tests/Legacy/CoreData/OnixCoreTests.cs +++ /dev/null @@ -1,9 +0,0 @@ -using OnixData.Standard.BaseTests.Legacy.CoreData; - -namespace OnixData.Standard.Net5Tests.Legacy.CoreData -{ - public class OnixCoreTests : BaseOnixCoreDataTests - { - - } -} \ No newline at end of file diff --git a/OnixData.Standard.CoreTests/Legacy/CoreData/OnixCoreTests.cs b/OnixData.Standard.Net8Tests/Legacy/CoreData/OnixCoreTests.cs similarity index 70% rename from OnixData.Standard.CoreTests/Legacy/CoreData/OnixCoreTests.cs rename to OnixData.Standard.Net8Tests/Legacy/CoreData/OnixCoreTests.cs index 1d95f38..c15e02e 100644 --- a/OnixData.Standard.CoreTests/Legacy/CoreData/OnixCoreTests.cs +++ b/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 { diff --git a/OnixData.Standard.Net5Tests/Legacy/Text/OnixOtherTextTests.cs b/OnixData.Standard.Net8Tests/Legacy/Text/OnixOtherTextTests.cs similarity index 71% rename from OnixData.Standard.Net5Tests/Legacy/Text/OnixOtherTextTests.cs rename to OnixData.Standard.Net8Tests/Legacy/Text/OnixOtherTextTests.cs index c4373d6..06a586b 100644 --- a/OnixData.Standard.Net5Tests/Legacy/Text/OnixOtherTextTests.cs +++ b/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 { diff --git a/OnixData.Standard.Net5Tests/OnixData.Standard.Net5Tests.csproj b/OnixData.Standard.Net8Tests/OnixData.Standard.Net8Tests.csproj similarity index 87% rename from OnixData.Standard.Net5Tests/OnixData.Standard.Net5Tests.csproj rename to OnixData.Standard.Net8Tests/OnixData.Standard.Net8Tests.csproj index 931ed49..4e5d5e4 100644 --- a/OnixData.Standard.Net5Tests/OnixData.Standard.Net5Tests.csproj +++ b/OnixData.Standard.Net8Tests/OnixData.Standard.Net8Tests.csproj @@ -1,11 +1,15 @@ - net5.0 + net8.0 false default + + OnixData.Standard.Net8Tests + + OnixData.Standard.Net8Tests diff --git a/OnixData.Standard.Net5Tests/V3ParserTests.cs b/OnixData.Standard.Net8Tests/V3ParserTests.cs similarity index 73% rename from OnixData.Standard.Net5Tests/V3ParserTests.cs rename to OnixData.Standard.Net8Tests/V3ParserTests.cs index 14f07c4..15c24c8 100644 --- a/OnixData.Standard.Net5Tests/V3ParserTests.cs +++ b/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 { diff --git a/OnixData.Standard.Net5Tests/Version3/CoreData/OnixCoreTests.cs b/OnixData.Standard.Net8Tests/Version3/CoreData/OnixCoreTests.cs similarity index 69% rename from OnixData.Standard.Net5Tests/Version3/CoreData/OnixCoreTests.cs rename to OnixData.Standard.Net8Tests/Version3/CoreData/OnixCoreTests.cs index 022225b..c3f10a8 100644 --- a/OnixData.Standard.Net5Tests/Version3/CoreData/OnixCoreTests.cs +++ b/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 { diff --git a/OnixData.Standard.Net5Tests/Version3/Text/OnixSupportingResourceTests.cs b/OnixData.Standard.Net8Tests/Version3/Text/OnixSupportingResourceTests.cs similarity index 74% rename from OnixData.Standard.Net5Tests/Version3/Text/OnixSupportingResourceTests.cs rename to OnixData.Standard.Net8Tests/Version3/Text/OnixSupportingResourceTests.cs index 83971cf..6a4d4e0 100644 --- a/OnixData.Standard.Net5Tests/Version3/Text/OnixSupportingResourceTests.cs +++ b/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 { diff --git a/OnixData.Standard/Extensions/OnixDataExtensions.cs b/OnixData.Standard/Extensions/OnixDataExtensions.cs index 0a76c4e..a98b008 100644 --- a/OnixData.Standard/Extensions/OnixDataExtensions.cs +++ b/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 { diff --git a/OnixData.Standard/Extensions/OnixParserExtensions.cs b/OnixData.Standard/Extensions/OnixParserExtensions.cs index 067b83a..66e008b 100644 --- a/OnixData.Standard/Extensions/OnixParserExtensions.cs +++ b/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 { diff --git a/OnixData.Standard/Extensions/OnixReplaceExtensions.cs b/OnixData.Standard/Extensions/OnixReplaceExtensions.cs index 98dcff8..bfd2fb0 100644 --- a/OnixData.Standard/Extensions/OnixReplaceExtensions.cs +++ b/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 { diff --git a/OnixData.Standard/Extensions/OnixXmlExtensions.cs b/OnixData.Standard/Extensions/OnixXmlExtensions.cs index eb7eded..079858f 100644 --- a/OnixData.Standard/Extensions/OnixXmlExtensions.cs +++ b/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 { diff --git a/OnixData.Standard/Legacy/OnixLegacyAudRange.cs b/OnixData.Standard/Legacy/OnixLegacyAudRange.cs index 19efc6e..db5408f 100644 --- a/OnixData.Standard/Legacy/OnixLegacyAudRange.cs +++ b/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 { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Legacy/OnixLegacyAudience.cs b/OnixData.Standard/Legacy/OnixLegacyAudience.cs index 8743fa9..84b75a3 100644 --- a/OnixData.Standard/Legacy/OnixLegacyAudience.cs +++ b/OnixData.Standard/Legacy/OnixLegacyAudience.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace OnixData.Legacy +namespace OnixData.Standard.Legacy { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Legacy/OnixLegacyBaseProduct.cs b/OnixData.Standard/Legacy/OnixLegacyBaseProduct.cs index 6a39728..683f55d 100644 --- a/OnixData.Standard/Legacy/OnixLegacyBaseProduct.cs +++ b/OnixData.Standard/Legacy/OnixLegacyBaseProduct.cs @@ -1,10 +1,8 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace OnixData.Legacy +namespace OnixData.Standard.Legacy { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Legacy/OnixLegacyComplexity.cs b/OnixData.Standard/Legacy/OnixLegacyComplexity.cs index ede169b..2b36889 100644 --- a/OnixData.Standard/Legacy/OnixLegacyComplexity.cs +++ b/OnixData.Standard/Legacy/OnixLegacyComplexity.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace OnixData.Legacy +namespace OnixData.Standard.Legacy { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Legacy/OnixLegacyContributor.cs b/OnixData.Standard/Legacy/OnixLegacyContributor.cs index e1eb030..d5ef686 100644 --- a/OnixData.Standard/Legacy/OnixLegacyContributor.cs +++ b/OnixData.Standard/Legacy/OnixLegacyContributor.cs @@ -1,10 +1,8 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; -using System.Threading.Tasks; -namespace OnixData.Legacy +namespace OnixData.Standard.Legacy { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Legacy/OnixLegacyDiscountCoded.cs b/OnixData.Standard/Legacy/OnixLegacyDiscountCoded.cs index c8fc26c..64bd504 100644 --- a/OnixData.Standard/Legacy/OnixLegacyDiscountCoded.cs +++ b/OnixData.Standard/Legacy/OnixLegacyDiscountCoded.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace OnixData.Legacy +namespace OnixData.Standard.Legacy { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Legacy/OnixLegacyExtent.cs b/OnixData.Standard/Legacy/OnixLegacyExtent.cs index 09dd810..aa99dde 100644 --- a/OnixData.Standard/Legacy/OnixLegacyExtent.cs +++ b/OnixData.Standard/Legacy/OnixLegacyExtent.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace OnixData.Legacy +namespace OnixData.Standard.Legacy { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Legacy/OnixLegacyHeader.cs b/OnixData.Standard/Legacy/OnixLegacyHeader.cs index 9083623..c0b7296 100644 --- a/OnixData.Standard/Legacy/OnixLegacyHeader.cs +++ b/OnixData.Standard/Legacy/OnixLegacyHeader.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace OnixData.Legacy +namespace OnixData.Standard.Legacy { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Legacy/OnixLegacyIllustrations.cs b/OnixData.Standard/Legacy/OnixLegacyIllustrations.cs index 5670323..42f4470 100644 --- a/OnixData.Standard/Legacy/OnixLegacyIllustrations.cs +++ b/OnixData.Standard/Legacy/OnixLegacyIllustrations.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 { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Legacy/OnixLegacyImprint.cs b/OnixData.Standard/Legacy/OnixLegacyImprint.cs index 66bdee3..d3510a3 100644 --- a/OnixData.Standard/Legacy/OnixLegacyImprint.cs +++ b/OnixData.Standard/Legacy/OnixLegacyImprint.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace OnixData.Legacy +namespace OnixData.Standard.Legacy { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Legacy/OnixLegacyLanguage.cs b/OnixData.Standard/Legacy/OnixLegacyLanguage.cs index 0eb116c..16efd6c 100644 --- a/OnixData.Standard/Legacy/OnixLegacyLanguage.cs +++ b/OnixData.Standard/Legacy/OnixLegacyLanguage.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace OnixData.Legacy +namespace OnixData.Standard.Legacy { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Legacy/OnixLegacyMeasure.cs b/OnixData.Standard/Legacy/OnixLegacyMeasure.cs index 9ac233b..f04f3f0 100644 --- a/OnixData.Standard/Legacy/OnixLegacyMeasure.cs +++ b/OnixData.Standard/Legacy/OnixLegacyMeasure.cs @@ -1,10 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Globalization; -namespace OnixData.Legacy +namespace OnixData.Standard.Legacy { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] @@ -79,8 +75,8 @@ public decimal MeasurementNum { decimal nMeasurementVal = 0; - if (!String.IsNullOrEmpty(Measurement)) - Decimal.TryParse(Measurement, out nMeasurementVal); + if (!string.IsNullOrEmpty(Measurement)) + decimal.TryParse(Measurement, NumberStyles.Any, CultureInfo.InvariantCulture, out nMeasurementVal); return nMeasurementVal; } diff --git a/OnixData.Standard/Legacy/OnixLegacyMediaFile.cs b/OnixData.Standard/Legacy/OnixLegacyMediaFile.cs index 38ef736..064db5c 100644 --- a/OnixData.Standard/Legacy/OnixLegacyMediaFile.cs +++ b/OnixData.Standard/Legacy/OnixLegacyMediaFile.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace OnixData.Legacy +namespace OnixData.Standard.Legacy { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Legacy/OnixLegacyMessage.cs b/OnixData.Standard/Legacy/OnixLegacyMessage.cs index 883ca32..5fe7cd1 100644 --- a/OnixData.Standard/Legacy/OnixLegacyMessage.cs +++ b/OnixData.Standard/Legacy/OnixLegacyMessage.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace OnixData.Legacy +namespace OnixData.Standard.Legacy { /// /// diff --git a/OnixData.Standard/Legacy/OnixLegacyOtherText.cs b/OnixData.Standard/Legacy/OnixLegacyOtherText.cs index 6f7996a..f356f06 100644 --- a/OnixData.Standard/Legacy/OnixLegacyOtherText.cs +++ b/OnixData.Standard/Legacy/OnixLegacyOtherText.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace OnixData.Legacy +namespace OnixData.Standard.Legacy { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Legacy/OnixLegacyPrice.cs b/OnixData.Standard/Legacy/OnixLegacyPrice.cs index 9a0f8fc..e3a9231 100644 --- a/OnixData.Standard/Legacy/OnixLegacyPrice.cs +++ b/OnixData.Standard/Legacy/OnixLegacyPrice.cs @@ -1,10 +1,8 @@ using System; -using System.Collections.Generic; +using System.Globalization; using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace OnixData.Legacy +namespace OnixData.Standard.Legacy { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] @@ -217,8 +215,8 @@ public decimal PriceAmountNum { decimal dPriceAmountNum = -1; - if (!String.IsNullOrEmpty(this.priceAmountField)) - Decimal.TryParse(this.priceAmountField, out dPriceAmountNum); + if (!string.IsNullOrEmpty(this.priceAmountField)) + decimal.TryParse(this.priceAmountField, NumberStyles.Any, CultureInfo.InvariantCulture, out dPriceAmountNum); return dPriceAmountNum; } diff --git a/OnixData.Standard/Legacy/OnixLegacyProduct.cs b/OnixData.Standard/Legacy/OnixLegacyProduct.cs index 874c71e..dc3a447 100644 --- a/OnixData.Standard/Legacy/OnixLegacyProduct.cs +++ b/OnixData.Standard/Legacy/OnixLegacyProduct.cs @@ -2,9 +2,8 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using System.Threading.Tasks; -namespace OnixData.Legacy +namespace OnixData.Standard.Legacy { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Legacy/OnixLegacyProductClassification.cs b/OnixData.Standard/Legacy/OnixLegacyProductClassification.cs index 780b7ec..aa67e14 100644 --- a/OnixData.Standard/Legacy/OnixLegacyProductClassification.cs +++ b/OnixData.Standard/Legacy/OnixLegacyProductClassification.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace OnixData.Legacy +namespace OnixData.Standard.Legacy { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Legacy/OnixLegacyProductFormFeature.cs b/OnixData.Standard/Legacy/OnixLegacyProductFormFeature.cs index 65adda2..21f0827 100644 --- a/OnixData.Standard/Legacy/OnixLegacyProductFormFeature.cs +++ b/OnixData.Standard/Legacy/OnixLegacyProductFormFeature.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace OnixData.Legacy +namespace OnixData.Standard.Legacy { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Legacy/OnixLegacyProductId.cs b/OnixData.Standard/Legacy/OnixLegacyProductId.cs index 4df8121..1aeb0a8 100644 --- a/OnixData.Standard/Legacy/OnixLegacyProductId.cs +++ b/OnixData.Standard/Legacy/OnixLegacyProductId.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 { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Legacy/OnixLegacyPublisher.cs b/OnixData.Standard/Legacy/OnixLegacyPublisher.cs index d899493..016b003 100644 --- a/OnixData.Standard/Legacy/OnixLegacyPublisher.cs +++ b/OnixData.Standard/Legacy/OnixLegacyPublisher.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace OnixData.Legacy +namespace OnixData.Standard.Legacy { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Legacy/OnixLegacyRelatedProduct.cs b/OnixData.Standard/Legacy/OnixLegacyRelatedProduct.cs index b06b708..3e9fc0d 100644 --- a/OnixData.Standard/Legacy/OnixLegacyRelatedProduct.cs +++ b/OnixData.Standard/Legacy/OnixLegacyRelatedProduct.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace OnixData.Legacy +namespace OnixData.Standard.Legacy { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Legacy/OnixLegacySalesRights.cs b/OnixData.Standard/Legacy/OnixLegacySalesRights.cs index ec55a64..0f00100 100644 --- a/OnixData.Standard/Legacy/OnixLegacySalesRights.cs +++ b/OnixData.Standard/Legacy/OnixLegacySalesRights.cs @@ -1,10 +1,8 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace OnixData.Legacy +namespace OnixData.Standard.Legacy { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Legacy/OnixLegacySeries.cs b/OnixData.Standard/Legacy/OnixLegacySeries.cs index 8e09fce..9503161 100644 --- a/OnixData.Standard/Legacy/OnixLegacySeries.cs +++ b/OnixData.Standard/Legacy/OnixLegacySeries.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace OnixData.Legacy +namespace OnixData.Standard.Legacy { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Legacy/OnixLegacySet.cs b/OnixData.Standard/Legacy/OnixLegacySet.cs index d5afa35..108c8ce 100644 --- a/OnixData.Standard/Legacy/OnixLegacySet.cs +++ b/OnixData.Standard/Legacy/OnixLegacySet.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace OnixData.Legacy +namespace OnixData.Standard.Legacy { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Legacy/OnixLegacySubject.cs b/OnixData.Standard/Legacy/OnixLegacySubject.cs index aaa4de3..f73f1a2 100644 --- a/OnixData.Standard/Legacy/OnixLegacySubject.cs +++ b/OnixData.Standard/Legacy/OnixLegacySubject.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 { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Legacy/OnixLegacySupplierId.cs b/OnixData.Standard/Legacy/OnixLegacySupplierId.cs index d1b8f9a..e34ac62 100644 --- a/OnixData.Standard/Legacy/OnixLegacySupplierId.cs +++ b/OnixData.Standard/Legacy/OnixLegacySupplierId.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace OnixData.Legacy +namespace OnixData.Standard.Legacy { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Legacy/OnixLegacySupplyDetail.cs b/OnixData.Standard/Legacy/OnixLegacySupplyDetail.cs index db5d427..21cab3d 100644 --- a/OnixData.Standard/Legacy/OnixLegacySupplyDetail.cs +++ b/OnixData.Standard/Legacy/OnixLegacySupplyDetail.cs @@ -1,10 +1,7 @@ using System; -using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace OnixData.Legacy +namespace OnixData.Standard.Legacy { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Legacy/OnixLegacyTitle.cs b/OnixData.Standard/Legacy/OnixLegacyTitle.cs index c1ae12f..e99eff3 100644 --- a/OnixData.Standard/Legacy/OnixLegacyTitle.cs +++ b/OnixData.Standard/Legacy/OnixLegacyTitle.cs @@ -1,10 +1,7 @@ using System; -using System.Collections.Generic; -using System.Linq; using System.Text; -using System.Threading.Tasks; -namespace OnixData.Legacy +namespace OnixData.Standard.Legacy { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/OnixData.Standard.csproj b/OnixData.Standard/OnixData.Standard.csproj index c4fa4a6..eb6b405 100644 --- a/OnixData.Standard/OnixData.Standard.csproj +++ b/OnixData.Standard/OnixData.Standard.csproj @@ -14,6 +14,7 @@ GIT ONIX, parser, ebooks, audiobooks false + default diff --git a/OnixData.Standard/OnixLegacyParser.cs b/OnixData.Standard/OnixLegacyParser.cs index 797e8bf..7d141a4 100644 --- a/OnixData.Standard/OnixLegacyParser.cs +++ b/OnixData.Standard/OnixLegacyParser.cs @@ -2,18 +2,13 @@ using System.Collections; using System.Collections.Generic; using System.IO; -using System.Linq; using System.Text; -using System.Threading.Tasks; using System.Xml; -using System.Xml.Linq; using System.Xml.Serialization; -using System.Xml.Schema; +using OnixData.Standard.Extensions; +using OnixData.Standard.Legacy; -using OnixData.Extensions; -using OnixData.Legacy; - -namespace OnixData +namespace OnixData.Standard { /// /// diff --git a/OnixData.Standard/OnixLegacyPlusParser.cs b/OnixData.Standard/OnixLegacyPlusParser.cs index fb646f4..1decc3c 100644 --- a/OnixData.Standard/OnixLegacyPlusParser.cs +++ b/OnixData.Standard/OnixLegacyPlusParser.cs @@ -1,19 +1,13 @@ using System; using System.Collections; -using System.Collections.Generic; using System.IO; -using System.Linq; using System.Text; -using System.Threading.Tasks; using System.Xml; -using System.Xml.Linq; using System.Xml.Serialization; -using System.Xml.Schema; +using OnixData.Standard.Extensions; +using OnixData.Standard.Legacy; -using OnixData.Legacy; -using OnixData.Extensions; - -namespace OnixData +namespace OnixData.Standard { /// /// diff --git a/OnixData.Standard/OnixParser.cs b/OnixData.Standard/OnixParser.cs index b21ce5d..3a692a8 100644 --- a/OnixData.Standard/OnixParser.cs +++ b/OnixData.Standard/OnixParser.cs @@ -2,18 +2,15 @@ using System.Collections; using System.Collections.Generic; using System.IO; -using System.Linq; using System.Text; -using System.Threading.Tasks; using System.Xml; using System.Xml.Serialization; -using System.Xml.Schema; +using OnixData.Standard.Extensions; +using OnixData.Standard.Version3; +using OnixData.Standard.Version3.Header; +using OnixData.Standard.Version3.Text; -using OnixData.Extensions; -using OnixData.Version3; -using OnixData.Version3.Header; - -namespace OnixData +namespace OnixData.Standard { public class OnixParser : IDisposable, IEnumerable { diff --git a/OnixData.Standard/OnixPlusParser.cs b/OnixData.Standard/OnixPlusParser.cs index 6a1fe8d..5698571 100644 --- a/OnixData.Standard/OnixPlusParser.cs +++ b/OnixData.Standard/OnixPlusParser.cs @@ -1,20 +1,14 @@ using System; using System.Collections; -using System.Collections.Generic; using System.IO; -using System.Linq; using System.Text; -using System.Threading.Tasks; using System.Xml; -using System.Xml.Linq; using System.Xml.Serialization; -using System.Xml.Schema; +using OnixData.Standard.Extensions; +using OnixData.Standard.Version3; +using OnixData.Standard.Version3.Header; -using OnixData.Extensions; -using OnixData.Version3; -using OnixData.Version3.Header; - -namespace OnixData +namespace OnixData.Standard { public class OnixPlusParser : IDisposable, IEnumerable { diff --git a/OnixData.Standard/OnixXmlTextReader.cs b/OnixData.Standard/OnixXmlTextReader.cs index 76fd717..31472bf 100644 --- a/OnixData.Standard/OnixXmlTextReader.cs +++ b/OnixData.Standard/OnixXmlTextReader.cs @@ -1,8 +1,7 @@ -using System; -using System.IO; +using System.IO; using System.Xml; -namespace OnixData +namespace OnixData.Standard { public class OnixXmlTextReader : XmlTextReader { diff --git a/OnixData.Standard/Version3/Audience/OnixAudience.cs b/OnixData.Standard/Version3/Audience/OnixAudience.cs index be37b09..d50e60b 100644 --- a/OnixData.Standard/Version3/Audience/OnixAudience.cs +++ b/OnixData.Standard/Version3/Audience/OnixAudience.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace OnixData.Version3.Audience +namespace OnixData.Standard.Version3.Audience { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Audience/OnixAudienceRange.cs b/OnixData.Standard/Version3/Audience/OnixAudienceRange.cs index b046a09..4481808 100644 --- a/OnixData.Standard/Version3/Audience/OnixAudienceRange.cs +++ b/OnixData.Standard/Version3/Audience/OnixAudienceRange.cs @@ -1,10 +1,6 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace OnixData.Version3.Audience +namespace OnixData.Standard.Version3.Audience { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Content/OnixContentDetail.cs b/OnixData.Standard/Version3/Content/OnixContentDetail.cs index dc3a731..2a27c75 100644 --- a/OnixData.Standard/Version3/Content/OnixContentDetail.cs +++ b/OnixData.Standard/Version3/Content/OnixContentDetail.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace OnixData.Version3.Content +namespace OnixData.Standard.Version3.Content { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Content/OnixContentItem.cs b/OnixData.Standard/Version3/Content/OnixContentItem.cs index 5ca127e..930697e 100644 --- a/OnixData.Standard/Version3/Content/OnixContentItem.cs +++ b/OnixData.Standard/Version3/Content/OnixContentItem.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace OnixData.Version3.Content +namespace OnixData.Standard.Version3.Content { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Epub/OnixEpubUsageConstraint.cs b/OnixData.Standard/Version3/Epub/OnixEpubUsageConstraint.cs index 1c73100..c93bee3 100644 --- a/OnixData.Standard/Version3/Epub/OnixEpubUsageConstraint.cs +++ b/OnixData.Standard/Version3/Epub/OnixEpubUsageConstraint.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace OnixData.Version3.Epub +namespace OnixData.Standard.Version3.Epub { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Epub/OnixEpubUsageLimit.cs b/OnixData.Standard/Version3/Epub/OnixEpubUsageLimit.cs index 372c557..42dc3af 100644 --- a/OnixData.Standard/Version3/Epub/OnixEpubUsageLimit.cs +++ b/OnixData.Standard/Version3/Epub/OnixEpubUsageLimit.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace OnixData.Version3.Epub +namespace OnixData.Standard.Version3.Epub { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Header/OnixHeader.cs b/OnixData.Standard/Version3/Header/OnixHeader.cs index 130e2bb..ddd2b09 100644 --- a/OnixData.Standard/Version3/Header/OnixHeader.cs +++ b/OnixData.Standard/Version3/Header/OnixHeader.cs @@ -1,10 +1,6 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace OnixData.Version3.Header +namespace OnixData.Standard.Version3.Header { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Header/OnixHeaderAddressee.cs b/OnixData.Standard/Version3/Header/OnixHeaderAddressee.cs index 1c3b993..7f58237 100644 --- a/OnixData.Standard/Version3/Header/OnixHeaderAddressee.cs +++ b/OnixData.Standard/Version3/Header/OnixHeaderAddressee.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace OnixData.Version3.Header +namespace OnixData.Standard.Version3.Header { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Header/OnixHeaderAddresseeIdentifier.cs b/OnixData.Standard/Version3/Header/OnixHeaderAddresseeIdentifier.cs index 343df53..2bbf5c7 100644 --- a/OnixData.Standard/Version3/Header/OnixHeaderAddresseeIdentifier.cs +++ b/OnixData.Standard/Version3/Header/OnixHeaderAddresseeIdentifier.cs @@ -1,10 +1,6 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace OnixData.Version3.Header +namespace OnixData.Standard.Version3.Header { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Header/OnixHeaderSender.cs b/OnixData.Standard/Version3/Header/OnixHeaderSender.cs index dbf50b5..bf9951a 100644 --- a/OnixData.Standard/Version3/Header/OnixHeaderSender.cs +++ b/OnixData.Standard/Version3/Header/OnixHeaderSender.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace OnixData.Version3.Header +namespace OnixData.Standard.Version3.Header { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Header/OnixHeaderSenderIdentifier.cs b/OnixData.Standard/Version3/Header/OnixHeaderSenderIdentifier.cs index 9cab415..be39bfc 100644 --- a/OnixData.Standard/Version3/Header/OnixHeaderSenderIdentifier.cs +++ b/OnixData.Standard/Version3/Header/OnixHeaderSenderIdentifier.cs @@ -1,10 +1,6 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace OnixData.Version3.Header +namespace OnixData.Standard.Version3.Header { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Language/OnixLanguage.cs b/OnixData.Standard/Version3/Language/OnixLanguage.cs index 05bba83..27288a6 100644 --- a/OnixData.Standard/Version3/Language/OnixLanguage.cs +++ b/OnixData.Standard/Version3/Language/OnixLanguage.cs @@ -1,10 +1,6 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace OnixData.Version3.Language +namespace OnixData.Standard.Version3.Language { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Market/OnixMarket.cs b/OnixData.Standard/Version3/Market/OnixMarket.cs index de8675f..5b6746b 100644 --- a/OnixData.Standard/Version3/Market/OnixMarket.cs +++ b/OnixData.Standard/Version3/Market/OnixMarket.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace OnixData.Version3.Market +namespace OnixData.Standard.Version3.Market { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Market/OnixMarketDate.cs b/OnixData.Standard/Version3/Market/OnixMarketDate.cs index 9305ec6..16752d4 100644 --- a/OnixData.Standard/Version3/Market/OnixMarketDate.cs +++ b/OnixData.Standard/Version3/Market/OnixMarketDate.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace OnixData.Version3.Market +namespace OnixData.Standard.Version3.Market { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Market/OnixMarketPublishingDetail.cs b/OnixData.Standard/Version3/Market/OnixMarketPublishingDetail.cs index 899ab21..230d3d7 100644 --- a/OnixData.Standard/Version3/Market/OnixMarketPublishingDetail.cs +++ b/OnixData.Standard/Version3/Market/OnixMarketPublishingDetail.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace OnixData.Version3.Market +namespace OnixData.Standard.Version3.Market { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Market/OnixMarketTerritory.cs b/OnixData.Standard/Version3/Market/OnixMarketTerritory.cs index 27dddd9..5d64506 100644 --- a/OnixData.Standard/Version3/Market/OnixMarketTerritory.cs +++ b/OnixData.Standard/Version3/Market/OnixMarketTerritory.cs @@ -1,10 +1,8 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace OnixData.Version3.Market +namespace OnixData.Standard.Version3.Market { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Names/OnixNameIdentifier.cs b/OnixData.Standard/Version3/Names/OnixNameIdentifier.cs index d547508..4f0492d 100644 --- a/OnixData.Standard/Version3/Names/OnixNameIdentifier.cs +++ b/OnixData.Standard/Version3/Names/OnixNameIdentifier.cs @@ -1,6 +1,6 @@ using System; -namespace OnixData.Version3.Names +namespace OnixData.Standard.Version3.Names { [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] public partial class OnixNameIdentifier diff --git a/OnixData.Standard/Version3/OnixBarcode.cs b/OnixData.Standard/Version3/OnixBarcode.cs index 0aaf1a6..f132487 100644 --- a/OnixData.Standard/Version3/OnixBarcode.cs +++ b/OnixData.Standard/Version3/OnixBarcode.cs @@ -1,10 +1,6 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace OnixData.Version3 +namespace OnixData.Standard.Version3 { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/OnixContributor.cs b/OnixData.Standard/Version3/OnixContributor.cs index f65ad44..f604e7e 100644 --- a/OnixData.Standard/Version3/OnixContributor.cs +++ b/OnixData.Standard/Version3/OnixContributor.cs @@ -2,11 +2,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using System.Threading.Tasks; +using OnixData.Standard.Version3.Names; -using OnixData.Version3.Names; - -namespace OnixData.Version3 +namespace OnixData.Standard.Version3 { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/OnixDescriptiveDetail.cs b/OnixData.Standard/Version3/OnixDescriptiveDetail.cs index c634ae6..c353dae 100644 --- a/OnixData.Standard/Version3/OnixDescriptiveDetail.cs +++ b/OnixData.Standard/Version3/OnixDescriptiveDetail.cs @@ -1,16 +1,13 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; +using OnixData.Standard.Version3.Audience; +using OnixData.Standard.Version3.Epub; +using OnixData.Standard.Version3.Language; +using OnixData.Standard.Version3.ProductPart; +using OnixData.Standard.Version3.Title; -using OnixData.Version3.Audience; -using OnixData.Version3.Epub; -using OnixData.Version3.Language; -using OnixData.Version3.ProductPart; -using OnixData.Version3.Title; - -namespace OnixData.Version3 +namespace OnixData.Standard.Version3 { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/OnixExtent.cs b/OnixData.Standard/Version3/OnixExtent.cs index cd97759..861df9e 100644 --- a/OnixData.Standard/Version3/OnixExtent.cs +++ b/OnixData.Standard/Version3/OnixExtent.cs @@ -1,10 +1,7 @@ using System; -using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace OnixData.Version3 +namespace OnixData.Standard.Version3 { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/OnixMeasure.cs b/OnixData.Standard/Version3/OnixMeasure.cs index 576762b..3ea880d 100644 --- a/OnixData.Standard/Version3/OnixMeasure.cs +++ b/OnixData.Standard/Version3/OnixMeasure.cs @@ -1,10 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Linq; -namespace OnixData.Version3 +namespace OnixData.Standard.Version3 { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/OnixMessage.cs b/OnixData.Standard/Version3/OnixMessage.cs index 7322c09..81fc00e 100644 --- a/OnixData.Standard/Version3/OnixMessage.cs +++ b/OnixData.Standard/Version3/OnixMessage.cs @@ -1,12 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using OnixData.Standard.Version3.Header; -using OnixData.Version3.Header; - -namespace OnixData.Version3 +namespace OnixData.Standard.Version3 { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/OnixProduct.cs b/OnixData.Standard/Version3/OnixProduct.cs index 2278492..aa142f6 100644 --- a/OnixData.Standard/Version3/OnixProduct.cs +++ b/OnixData.Standard/Version3/OnixProduct.cs @@ -1,20 +1,15 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; - -using OnixData.Version3.Content; -using OnixData.Version3.Language; -using OnixData.Version3.Market; -using OnixData.Version3.Price; -using OnixData.Version3.Publishing; -using OnixData.Version3.Related; -using OnixData.Version3.Supply; -using OnixData.Version3.Text; -using OnixData.Version3.Title; - -namespace OnixData.Version3 +using OnixData.Standard.Version3.Content; +using OnixData.Standard.Version3.Price; +using OnixData.Standard.Version3.Publishing; +using OnixData.Standard.Version3.Related; +using OnixData.Standard.Version3.Supply; +using OnixData.Standard.Version3.Text; +using OnixData.Standard.Version3.Title; + +namespace OnixData.Standard.Version3 { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/OnixProductId.cs b/OnixData.Standard/Version3/OnixProductId.cs index 52578ea..51c06a5 100644 --- a/OnixData.Standard/Version3/OnixProductId.cs +++ b/OnixData.Standard/Version3/OnixProductId.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace OnixData.Version3 +namespace OnixData.Standard.Version3 { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/OnixProductSupply.cs b/OnixData.Standard/Version3/OnixProductSupply.cs index 5cfba13..7738297 100644 --- a/OnixData.Standard/Version3/OnixProductSupply.cs +++ b/OnixData.Standard/Version3/OnixProductSupply.cs @@ -1,13 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using OnixData.Standard.Version3.Market; +using OnixData.Standard.Version3.Supply; -using OnixData.Version3.Market; -using OnixData.Version3.Supply; - -namespace OnixData.Version3 +namespace OnixData.Standard.Version3 { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/OnixSubject.cs b/OnixData.Standard/Version3/OnixSubject.cs index 4f9d904..f95f475 100644 --- a/OnixData.Standard/Version3/OnixSubject.cs +++ b/OnixData.Standard/Version3/OnixSubject.cs @@ -1,10 +1,6 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace OnixData.Version3 +namespace OnixData.Standard.Version3 { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Price/OnixDiscount.cs b/OnixData.Standard/Version3/Price/OnixDiscount.cs index d8ab290..dbc7f57 100644 --- a/OnixData.Standard/Version3/Price/OnixDiscount.cs +++ b/OnixData.Standard/Version3/Price/OnixDiscount.cs @@ -1,10 +1,6 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace OnixData.Version3.Price +namespace OnixData.Standard.Version3.Price { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Price/OnixDiscountCoded.cs b/OnixData.Standard/Version3/Price/OnixDiscountCoded.cs index b911e61..c907529 100644 --- a/OnixData.Standard/Version3/Price/OnixDiscountCoded.cs +++ b/OnixData.Standard/Version3/Price/OnixDiscountCoded.cs @@ -1,10 +1,6 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace OnixData.Version3.Price +namespace OnixData.Standard.Version3.Price { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Price/OnixPrice.cs b/OnixData.Standard/Version3/Price/OnixPrice.cs index 9e23099..1f077d8 100644 --- a/OnixData.Standard/Version3/Price/OnixPrice.cs +++ b/OnixData.Standard/Version3/Price/OnixPrice.cs @@ -1,12 +1,9 @@ using System; -using System.Collections.Generic; +using System.Globalization; using System.Linq; -using System.Text; -using System.Threading.Tasks; +using OnixData.Standard.Version3.Publishing; -using OnixData.Version3.Publishing; - -namespace OnixData.Version3.Price +namespace OnixData.Standard.Version3.Price { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] @@ -157,8 +154,8 @@ public decimal PriceAmountNum { decimal nPriceAmt = 0; - if (!String.IsNullOrEmpty(PriceAmount)) - Decimal.TryParse(PriceAmount, out nPriceAmt); + if (!string.IsNullOrEmpty(PriceAmount)) + decimal.TryParse(PriceAmount, NumberStyles.Any, CultureInfo.InvariantCulture, out nPriceAmt); return nPriceAmt; } diff --git a/OnixData.Standard/Version3/Price/OnixPriceTax.cs b/OnixData.Standard/Version3/Price/OnixPriceTax.cs index 51ec7b9..c5143f3 100644 --- a/OnixData.Standard/Version3/Price/OnixPriceTax.cs +++ b/OnixData.Standard/Version3/Price/OnixPriceTax.cs @@ -1,10 +1,6 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace OnixData.Version3.Price +namespace OnixData.Standard.Version3.Price { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/ProductPart/OnixProductPart.cs b/OnixData.Standard/Version3/ProductPart/OnixProductPart.cs index 94ef965..4238ec4 100644 --- a/OnixData.Standard/Version3/ProductPart/OnixProductPart.cs +++ b/OnixData.Standard/Version3/ProductPart/OnixProductPart.cs @@ -1,10 +1,6 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace OnixData.Version3.ProductPart +namespace OnixData.Standard.Version3.ProductPart { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Publishing/OnixImprint.cs b/OnixData.Standard/Version3/Publishing/OnixImprint.cs index 2550704..44e2936 100644 --- a/OnixData.Standard/Version3/Publishing/OnixImprint.cs +++ b/OnixData.Standard/Version3/Publishing/OnixImprint.cs @@ -1,10 +1,7 @@ using System; -using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace OnixData.Version3.Publishing +namespace OnixData.Standard.Version3.Publishing { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Publishing/OnixImprintIdentifier.cs b/OnixData.Standard/Version3/Publishing/OnixImprintIdentifier.cs index a2fafc4..c5a72e9 100644 --- a/OnixData.Standard/Version3/Publishing/OnixImprintIdentifier.cs +++ b/OnixData.Standard/Version3/Publishing/OnixImprintIdentifier.cs @@ -1,10 +1,6 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace OnixData.Version3.Publishing +namespace OnixData.Standard.Version3.Publishing { public class OnixImprintIdentifier { diff --git a/OnixData.Standard/Version3/Publishing/OnixPubDate.cs b/OnixData.Standard/Version3/Publishing/OnixPubDate.cs index 3674ac1..d51b09b 100644 --- a/OnixData.Standard/Version3/Publishing/OnixPubDate.cs +++ b/OnixData.Standard/Version3/Publishing/OnixPubDate.cs @@ -1,10 +1,6 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace OnixData.Version3.Publishing +namespace OnixData.Standard.Version3.Publishing { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Publishing/OnixPublisher.cs b/OnixData.Standard/Version3/Publishing/OnixPublisher.cs index 7015a8b..394968d 100644 --- a/OnixData.Standard/Version3/Publishing/OnixPublisher.cs +++ b/OnixData.Standard/Version3/Publishing/OnixPublisher.cs @@ -1,12 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using OnixData.Standard.Version3.Supply; -using OnixData.Version3.Supply; - -namespace OnixData.Version3.Publishing +namespace OnixData.Standard.Version3.Publishing { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Publishing/OnixPublishingDetail.cs b/OnixData.Standard/Version3/Publishing/OnixPublishingDetail.cs index 093480a..9599623 100644 --- a/OnixData.Standard/Version3/Publishing/OnixPublishingDetail.cs +++ b/OnixData.Standard/Version3/Publishing/OnixPublishingDetail.cs @@ -1,10 +1,8 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace OnixData.Version3.Publishing +namespace OnixData.Standard.Version3.Publishing { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Publishing/OnixSalesRights.cs b/OnixData.Standard/Version3/Publishing/OnixSalesRights.cs index 61879a1..80894cd 100644 --- a/OnixData.Standard/Version3/Publishing/OnixSalesRights.cs +++ b/OnixData.Standard/Version3/Publishing/OnixSalesRights.cs @@ -1,10 +1,8 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace OnixData.Version3.Publishing +namespace OnixData.Standard.Version3.Publishing { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Publishing/OnixTerritory.cs b/OnixData.Standard/Version3/Publishing/OnixTerritory.cs index f9cc9a9..d03061f 100644 --- a/OnixData.Standard/Version3/Publishing/OnixTerritory.cs +++ b/OnixData.Standard/Version3/Publishing/OnixTerritory.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace OnixData.Version3.Publishing +namespace OnixData.Standard.Version3.Publishing { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Related/OnixRelatedMaterial.cs b/OnixData.Standard/Version3/Related/OnixRelatedMaterial.cs index 5206c4f..2428c1d 100644 --- a/OnixData.Standard/Version3/Related/OnixRelatedMaterial.cs +++ b/OnixData.Standard/Version3/Related/OnixRelatedMaterial.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace OnixData.Version3.Related +namespace OnixData.Standard.Version3.Related { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Related/OnixRelatedProduct.cs b/OnixData.Standard/Version3/Related/OnixRelatedProduct.cs index 9b49c49..0db405d 100644 --- a/OnixData.Standard/Version3/Related/OnixRelatedProduct.cs +++ b/OnixData.Standard/Version3/Related/OnixRelatedProduct.cs @@ -1,10 +1,7 @@ using System; -using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace OnixData.Version3.Related +namespace OnixData.Standard.Version3.Related { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Related/OnixRelatedWork.cs b/OnixData.Standard/Version3/Related/OnixRelatedWork.cs index 169a342..4f25c74 100644 --- a/OnixData.Standard/Version3/Related/OnixRelatedWork.cs +++ b/OnixData.Standard/Version3/Related/OnixRelatedWork.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace OnixData.Version3.Related +namespace OnixData.Standard.Version3.Related { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Related/OnixWorkIdentifier.cs b/OnixData.Standard/Version3/Related/OnixWorkIdentifier.cs index 3516a5f..b0770a0 100644 --- a/OnixData.Standard/Version3/Related/OnixWorkIdentifier.cs +++ b/OnixData.Standard/Version3/Related/OnixWorkIdentifier.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace OnixData.Version3.Related +namespace OnixData.Standard.Version3.Related { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Supply/OnixReturnsConditions.cs b/OnixData.Standard/Version3/Supply/OnixReturnsConditions.cs index a2df54b..f3bd299 100644 --- a/OnixData.Standard/Version3/Supply/OnixReturnsConditions.cs +++ b/OnixData.Standard/Version3/Supply/OnixReturnsConditions.cs @@ -1,10 +1,6 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace OnixData.Version3.Supply +namespace OnixData.Standard.Version3.Supply { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Supply/OnixSupplier.cs b/OnixData.Standard/Version3/Supply/OnixSupplier.cs index cb4846a..9c38027 100644 --- a/OnixData.Standard/Version3/Supply/OnixSupplier.cs +++ b/OnixData.Standard/Version3/Supply/OnixSupplier.cs @@ -1,10 +1,6 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace OnixData.Version3.Supply +namespace OnixData.Standard.Version3.Supply { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Supply/OnixSupplierId.cs b/OnixData.Standard/Version3/Supply/OnixSupplierId.cs index 6b613a7..d8519ac 100644 --- a/OnixData.Standard/Version3/Supply/OnixSupplierId.cs +++ b/OnixData.Standard/Version3/Supply/OnixSupplierId.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace OnixData.Version3.Supply +namespace OnixData.Standard.Version3.Supply { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Supply/OnixSupplyDate.cs b/OnixData.Standard/Version3/Supply/OnixSupplyDate.cs index 040f6f2..8089215 100644 --- a/OnixData.Standard/Version3/Supply/OnixSupplyDate.cs +++ b/OnixData.Standard/Version3/Supply/OnixSupplyDate.cs @@ -1,10 +1,6 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace OnixData.Version3.Supply +namespace OnixData.Standard.Version3.Supply { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Supply/OnixSupplyDetail.cs b/OnixData.Standard/Version3/Supply/OnixSupplyDetail.cs index 0dd39f3..1ef2624 100644 --- a/OnixData.Standard/Version3/Supply/OnixSupplyDetail.cs +++ b/OnixData.Standard/Version3/Supply/OnixSupplyDetail.cs @@ -1,12 +1,8 @@ using System; -using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; +using OnixData.Standard.Version3.Price; -using OnixData.Version3.Price; - -namespace OnixData.Version3.Supply +namespace OnixData.Standard.Version3.Supply { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Supply/OnixWebsite.cs b/OnixData.Standard/Version3/Supply/OnixWebsite.cs index ba9bd56..ee3cab1 100644 --- a/OnixData.Standard/Version3/Supply/OnixWebsite.cs +++ b/OnixData.Standard/Version3/Supply/OnixWebsite.cs @@ -1,4 +1,4 @@ -namespace OnixData.Version3.Supply +namespace OnixData.Standard.Version3.Supply { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Text/OnixCollateralDetail.cs b/OnixData.Standard/Version3/Text/OnixCollateralDetail.cs index 3b63145..650e59b 100644 --- a/OnixData.Standard/Version3/Text/OnixCollateralDetail.cs +++ b/OnixData.Standard/Version3/Text/OnixCollateralDetail.cs @@ -1,6 +1,6 @@ using System; -namespace OnixData.Version3.Text +namespace OnixData.Standard.Version3.Text { public partial class OnixCollateralDetail { diff --git a/OnixData.Standard/Version3/Text/OnixContentDate.cs b/OnixData.Standard/Version3/Text/OnixContentDate.cs index 3a94d46..81d010a 100644 --- a/OnixData.Standard/Version3/Text/OnixContentDate.cs +++ b/OnixData.Standard/Version3/Text/OnixContentDate.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace OnixData.Version3.Text +namespace OnixData.Standard.Version3.Text { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Text/OnixResourceFeature.cs b/OnixData.Standard/Version3/Text/OnixResourceFeature.cs index 0b6b8fb..ef6b5a4 100644 --- a/OnixData.Standard/Version3/Text/OnixResourceFeature.cs +++ b/OnixData.Standard/Version3/Text/OnixResourceFeature.cs @@ -1,4 +1,4 @@ -namespace OnixData.Version3.Text +namespace OnixData.Standard.Version3.Text { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Text/OnixResourceVersion.cs b/OnixData.Standard/Version3/Text/OnixResourceVersion.cs index 0347235..1bfd594 100644 --- a/OnixData.Standard/Version3/Text/OnixResourceVersion.cs +++ b/OnixData.Standard/Version3/Text/OnixResourceVersion.cs @@ -1,7 +1,6 @@ using System; -using OnixData.Version3.Text; -namespace OnixData.Version3.Text +namespace OnixData.Standard.Version3.Text { public class OnixResourceVersion { diff --git a/OnixData.Standard/Version3/Text/OnixResourceVersionFeature.cs b/OnixData.Standard/Version3/Text/OnixResourceVersionFeature.cs index 7798499..72c2b4f 100644 --- a/OnixData.Standard/Version3/Text/OnixResourceVersionFeature.cs +++ b/OnixData.Standard/Version3/Text/OnixResourceVersionFeature.cs @@ -1,6 +1,6 @@ using System; -namespace OnixData.Version3.Text +namespace OnixData.Standard.Version3.Text { public class OnixResourceVersionFeature { diff --git a/OnixData.Standard/Version3/Text/OnixSupportingResource.cs b/OnixData.Standard/Version3/Text/OnixSupportingResource.cs index 830807f..c02d309 100644 --- a/OnixData.Standard/Version3/Text/OnixSupportingResource.cs +++ b/OnixData.Standard/Version3/Text/OnixSupportingResource.cs @@ -1,7 +1,7 @@ using System; -using OnixData.Version3.Publishing; +using OnixData.Standard.Version3.Publishing; -namespace OnixData.Version3.Text +namespace OnixData.Standard.Version3.Text { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Text/OnixTextContent.cs b/OnixData.Standard/Version3/Text/OnixTextContent.cs index 593186b..c9664b0 100644 --- a/OnixData.Standard/Version3/Text/OnixTextContent.cs +++ b/OnixData.Standard/Version3/Text/OnixTextContent.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace OnixData.Version3 +namespace OnixData.Standard.Version3.Text { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Title/OnixCollection.cs b/OnixData.Standard/Version3/Title/OnixCollection.cs index e709ca0..dc92780 100644 --- a/OnixData.Standard/Version3/Title/OnixCollection.cs +++ b/OnixData.Standard/Version3/Title/OnixCollection.cs @@ -1,10 +1,7 @@ using System; -using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace OnixData.Version3.Title +namespace OnixData.Standard.Version3.Title { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Title/OnixCollectionSequence.cs b/OnixData.Standard/Version3/Title/OnixCollectionSequence.cs index 4bf234c..37d2861 100644 --- a/OnixData.Standard/Version3/Title/OnixCollectionSequence.cs +++ b/OnixData.Standard/Version3/Title/OnixCollectionSequence.cs @@ -1,10 +1,7 @@ using System; -using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace OnixData.Version3.Title +namespace OnixData.Standard.Version3.Title { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Title/OnixTitleDetail.cs b/OnixData.Standard/Version3/Title/OnixTitleDetail.cs index 78177cc..9502725 100644 --- a/OnixData.Standard/Version3/Title/OnixTitleDetail.cs +++ b/OnixData.Standard/Version3/Title/OnixTitleDetail.cs @@ -1,10 +1,8 @@ using System; -using System.Collections.Generic; using System.Linq; using System.Text; -using System.Threading.Tasks; -namespace OnixData.Version3.Title +namespace OnixData.Standard.Version3.Title { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixData.Standard/Version3/Title/OnixTitleElement.cs b/OnixData.Standard/Version3/Title/OnixTitleElement.cs index 82bbf08..401041f 100644 --- a/OnixData.Standard/Version3/Title/OnixTitleElement.cs +++ b/OnixData.Standard/Version3/Title/OnixTitleElement.cs @@ -1,10 +1,7 @@ using System; -using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace OnixData.Version3.Title +namespace OnixData.Standard.Version3.Title { /// [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] diff --git a/OnixDataStandard.sln b/OnixDataStandard.sln index 56df123..71d9172 100644 --- a/OnixDataStandard.sln +++ b/OnixDataStandard.sln @@ -6,9 +6,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OnixData.Standard.BaseTests EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OnixData.Standard.Benchmarks", "OnixData.Standard.Benchmarks\OnixData.Standard.Benchmarks.csproj", "{62FBE53E-A23D-40A9-96CD-EA13217275B9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OnixData.Standard.CoreTests", "OnixData.Standard.CoreTests\OnixData.Standard.CoreTests.csproj", "{495A9468-F2F7-4A17-B369-4AB2BFAC562D}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OnixData.Standard.Net5Tests", "OnixData.Standard.Net5Tests\OnixData.Standard.Net5Tests.csproj", "{9831702F-E111-4C20-AAAC-679F56337FB8}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OnixData.Standard.Net8Tests", "OnixData.Standard.Net8Tests\OnixData.Standard.Net8Tests.csproj", "{9831702F-E111-4C20-AAAC-679F56337FB8}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -28,10 +26,6 @@ Global {62FBE53E-A23D-40A9-96CD-EA13217275B9}.Debug|Any CPU.Build.0 = Debug|Any CPU {62FBE53E-A23D-40A9-96CD-EA13217275B9}.Release|Any CPU.ActiveCfg = Release|Any CPU {62FBE53E-A23D-40A9-96CD-EA13217275B9}.Release|Any CPU.Build.0 = Release|Any CPU - {495A9468-F2F7-4A17-B369-4AB2BFAC562D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {495A9468-F2F7-4A17-B369-4AB2BFAC562D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {495A9468-F2F7-4A17-B369-4AB2BFAC562D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {495A9468-F2F7-4A17-B369-4AB2BFAC562D}.Release|Any CPU.Build.0 = Release|Any CPU {9831702F-E111-4C20-AAAC-679F56337FB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9831702F-E111-4C20-AAAC-679F56337FB8}.Debug|Any CPU.Build.0 = Debug|Any CPU {9831702F-E111-4C20-AAAC-679F56337FB8}.Release|Any CPU.ActiveCfg = Release|Any CPU