Feature/add testing project and refactor jsoncanonicalizer

CHANGELOG.md

@@ -0,0 +1,29 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+### Added
+
+- Unit-Test project for aaspe-common (@Freezor)
+
+### Changed
+
+- Made internals of aaspe-common visible for aaspe-common-tests (@Freezor)
+- Extracted JsonDecoder from JsonConverter (@Freezor)
+- Extracted JsonScanner and JsonConverter from JsonDecoder and made them internal (@Freezor)
+- Simplified JsonDecoder and made the methods smaller and better maintainable (@Freezor)
+
+### Fixed
+
+- Formatting of .csproj files (@Freezor)
+
+### Updated
+
+- aaspe-common: JetBrains.Annotations from 2022.1.0 to 2023.3.0 (@Freezor)
+- aaspe-common: NJsonSchema from 10.8.0 to 11.0.0 (@Freezor)
+- aaspe-common: System.IO.Packaging from 6.0.0 to 8.0.0 (@Freezor)

src/aaspe-aascore/aaspe-aascore.csproj

@@ -1,34 +1,34 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <RootNamespace>aaspe_aascore</RootNamespace>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <Title>Eclipse AASX Package Explorer and Server - AasCoreLibrary </Title>
-    <PackageId>Aaspe.AasCore</PackageId>
-	<Version>1.0.2</Version>
-    <PackageProjectUrl>https://projects.eclipse.org/projects/dt.aaspe</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/eclipse-aaspe/aaspe-common</RepositoryUrl>
-    <PackageTags>aas; industrie4.0</PackageTags>
-    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
-    <PackageIcon>favicon.png</PackageIcon>
-    <PackageReadmeFile>README.md</PackageReadmeFile>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
+        <RootNamespace>aaspe_aascore</RootNamespace>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+        <Title>Eclipse AASX Package Explorer and Server - AasCoreLibrary</Title>
+        <PackageId>Aaspe.AasCore</PackageId>
+        <Version>1.0.2</Version>
+        <PackageProjectUrl>https://projects.eclipse.org/projects/dt.aaspe</PackageProjectUrl>
+        <RepositoryUrl>https://github.com/eclipse-aaspe/aaspe-common</RepositoryUrl>
+        <PackageTags>aas; industrie4.0</PackageTags>
+        <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+        <PackageIcon>favicon.png</PackageIcon>
+        <PackageReadmeFile>README.md</PackageReadmeFile>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
+    </ItemGroup>
 
-  <ItemGroup>
-    <None Include="assets\favicon.png">
-      <PackagePath>\</PackagePath>
-      <Pack>True</Pack>
-    </None>
-    <None Include="assets\README.md">
-      <PackagePath>\</PackagePath>
-      <Pack>True</Pack>
-    </None>
-  </ItemGroup>
+    <ItemGroup>
+        <None Include="assets\favicon.png">
+            <PackagePath>\</PackagePath>
+            <Pack>True</Pack>
+        </None>
+        <None Include="assets\README.md">
+            <PackagePath>\</PackagePath>
+            <Pack>True</Pack>
+        </None>
+    </ItemGroup>
 
 </Project>

src/aaspe-common-tests/Usings.cs

@@ -0,0 +1 @@
+global using Xunit;

src/aaspe-common-tests/aaspe-common-tests.csproj

@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
+        <RootNamespace>aaspe_common_tests</RootNamespace>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+
+        <IsPackable>false</IsPackable>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="AutoFixture.AutoMoq" Version="4.18.1" />
+        <PackageReference Include="FluentAssertions" Version="6.12.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0"/>
+        <PackageReference Include="Moq" Version="4.20.70" />
+        <PackageReference Include="xunit" Version="2.4.1"/>
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+        <PackageReference Include="coverlet.collector" Version="3.1.2">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\aaspe-common\aaspe-common.csproj" />
+    </ItemGroup>
+
+</Project>