From e9042f16c3959b679427e30f7c543a4d163bd9f1 Mon Sep 17 00:00:00 2001
From: zx <zuoxiang42@gmail.com>
Date: Fri, 15 Aug 2025 18:24:20 +0800
Subject: [PATCH 1/8] fix: CreateResourceShape TYPE_TO_VALUE_TYPE KeyNotFound

---
 OSLC4Net_SDK/OSLC4Net.Core.sln                |  15 ++
 .../Model/ResourceShapeFactory.cs             |   1 +
 .../OSLC4Net.Core.Tests.csproj                |  30 ++++
 .../ResourceShapeFactoryTests.cs              | 140 ++++++++++++++++++
 4 files changed, 186 insertions(+)
 create mode 100644 OSLC4Net_SDK/Tests/OSLC4Net.Core.Tests/OSLC4Net.Core.Tests.csproj
 create mode 100644 OSLC4Net_SDK/Tests/OSLC4Net.Core.Tests/ResourceShapeFactoryTests.cs

diff --git a/OSLC4Net_SDK/OSLC4Net.Core.sln b/OSLC4Net_SDK/OSLC4Net.Core.sln
index 15593149..ac176378 100644
--- a/OSLC4Net_SDK/OSLC4Net.Core.sln
+++ b/OSLC4Net_SDK/OSLC4Net.Core.sln
@@ -42,6 +42,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OSLC4Net.Test.AspireHost",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OSLC4Net.Domains.RequirementsManagement", "OSLC4Net.Domains.RequirementsManagement\OSLC4Net.Domains.RequirementsManagement.csproj", "{9F9D0423-6720-45B4-BF58-3D26C8EFB0F6}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OSLC4Net.Core.Tests", "Tests\OSLC4Net.Core.Tests\OSLC4Net.Core.Tests.csproj", "{C116A88D-B9E7-3D21-5019-16883098C60A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -212,6 +214,18 @@ Global
 		{9F9D0423-6720-45B4-BF58-3D26C8EFB0F6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9F9D0423-6720-45B4-BF58-3D26C8EFB0F6}.Release|x86.ActiveCfg = Release|Any CPU
 		{9F9D0423-6720-45B4-BF58-3D26C8EFB0F6}.Release|x86.Build.0 = Release|Any CPU
+		{C116A88D-B9E7-3D21-5019-16883098C60A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C116A88D-B9E7-3D21-5019-16883098C60A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C116A88D-B9E7-3D21-5019-16883098C60A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C116A88D-B9E7-3D21-5019-16883098C60A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C116A88D-B9E7-3D21-5019-16883098C60A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C116A88D-B9E7-3D21-5019-16883098C60A}.Debug|x86.Build.0 = Debug|Any CPU
+		{C116A88D-B9E7-3D21-5019-16883098C60A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C116A88D-B9E7-3D21-5019-16883098C60A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C116A88D-B9E7-3D21-5019-16883098C60A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{C116A88D-B9E7-3D21-5019-16883098C60A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{C116A88D-B9E7-3D21-5019-16883098C60A}.Release|x86.ActiveCfg = Release|Any CPU
+		{C116A88D-B9E7-3D21-5019-16883098C60A}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -224,6 +238,7 @@ Global
 		{7EF256A2-DC83-4AF0-A608-C3CDC783D063} = {5BCA08EA-BC25-4F9F-A825-8054E842619A}
 		{FF342977-2AAA-45E9-8981-97CE0458E843} = {798E9CDD-103C-4972-BC15-C5AAAF75C37D}
 		{54E6E221-F805-4AB7-A3F4-596AD85A9F1E} = {5BCA08EA-BC25-4F9F-A825-8054E842619A}
+		{C116A88D-B9E7-3D21-5019-16883098C60A} = {5BCA08EA-BC25-4F9F-A825-8054E842619A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B7097D9B-3362-4C14-B29F-CB2D6551677F}
diff --git a/OSLC4Net_SDK/OSLC4Net.Core/Model/ResourceShapeFactory.cs b/OSLC4Net_SDK/OSLC4Net.Core/Model/ResourceShapeFactory.cs
index 134e70a3..8320c4d2 100644
--- a/OSLC4Net_SDK/OSLC4Net.Core/Model/ResourceShapeFactory.cs
+++ b/OSLC4Net_SDK/OSLC4Net.Core/Model/ResourceShapeFactory.cs
@@ -53,6 +53,7 @@ static ResourceShapeFactory()
         TYPE_TO_VALUE_TYPE[typeof(BigInteger)] = ValueType.Integer;
         TYPE_TO_VALUE_TYPE[typeof(DateTime)] = ValueType.DateTime;
         TYPE_TO_VALUE_TYPE[typeof(Uri)] = ValueType.Resource;
+        TYPE_TO_VALUE_TYPE[typeof(ICollection<Uri>)] = ValueType.Resource;
     }
 
     private ResourceShapeFactory()
diff --git a/OSLC4Net_SDK/Tests/OSLC4Net.Core.Tests/OSLC4Net.Core.Tests.csproj b/OSLC4Net_SDK/Tests/OSLC4Net.Core.Tests/OSLC4Net.Core.Tests.csproj
new file mode 100644
index 00000000..4da5e69f
--- /dev/null
+++ b/OSLC4Net_SDK/Tests/OSLC4Net.Core.Tests/OSLC4Net.Core.Tests.csproj
@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\OSLC4Net.Core\OSLC4Net.Core.csproj" />
+    <ProjectReference Include="..\..\OSLC4Net.Domains.RequirementsManagement\OSLC4Net.Domains.RequirementsManagement.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="CommunityToolkit.Diagnostics" />
+    <PackageReference Include="coverlet.collector">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
+    <PackageReference Include="Meziantou.Extensions.Logging.Xunit.v3" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NSubstitute" />
+    <PackageReference Include="NSubstitute.Analyzers.CSharp">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="xunit.runner.visualstudio">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="xunit.v3" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/OSLC4Net_SDK/Tests/OSLC4Net.Core.Tests/ResourceShapeFactoryTests.cs b/OSLC4Net_SDK/Tests/OSLC4Net.Core.Tests/ResourceShapeFactoryTests.cs
new file mode 100644
index 00000000..c83be1d2
--- /dev/null
+++ b/OSLC4Net_SDK/Tests/OSLC4Net.Core.Tests/ResourceShapeFactoryTests.cs
@@ -0,0 +1,140 @@
+using OSLC4Net.Core.Model;
+using OSLC4Net.Domains.RequirementsManagement;
+using Xunit;
+
+namespace OSLC4Net.Core.Tests;
+
+/// <summary>
+/// 测试ResourceShapeFactory.CreateResourceShape方法
+/// </summary>
+public class ResourceShapeFactoryTests
+{
+    private const string BaseUri = "http://example.com";
+    private const string ResourceShapesPath = "resourceShapes";
+    private const string ResourceShapePath = "requirement";
+
+    [Fact]
+    public void CreateResourceShape_WithRequirementType_ShouldReturnValidResourceShape()
+    {
+        // Arrange
+        var resourceType = typeof(Requirement);
+
+        // Act
+        var resourceShape = ResourceShapeFactory.CreateResourceShape(
+            BaseUri,
+            ResourceShapesPath,
+            ResourceShapePath,
+            resourceType);
+
+        // Assert
+        Assert.NotNull(resourceShape);
+        Assert.NotNull(resourceShape.GetAbout());
+        Assert.Equal($"{BaseUri}/{ResourceShapesPath}/{ResourceShapePath}", resourceShape.GetAbout().ToString());
+    }
+
+    [Fact]
+    public void CreateResourceShape_WithRequirementType_ShouldHaveCorrectTitle()
+    {
+        // Arrange
+        var resourceType = typeof(Requirement);
+
+        // Act
+        var resourceShape = ResourceShapeFactory.CreateResourceShape(
+            BaseUri,
+            ResourceShapesPath,
+            ResourceShapePath,
+            resourceType);
+
+        // Assert
+        Assert.NotNull(resourceShape.GetTitle());
+        Assert.Equal("Requirement Resource Shape", resourceShape.GetTitle());
+    }
+
+    [Fact]
+    public void CreateResourceShape_WithRequirementType_ShouldHaveDescribes()
+    {
+        // Arrange
+        var resourceType = typeof(Requirement);
+
+        // Act
+        var resourceShape = ResourceShapeFactory.CreateResourceShape(
+            BaseUri,
+            ResourceShapesPath,
+            ResourceShapePath,
+            resourceType);
+
+        // Assert
+        var describes = resourceShape.GetDescribes();
+        Assert.NotNull(describes);
+        Assert.NotEmpty(describes);
+        Assert.Contains(describes, uri => uri.ToString().Equals(Constants.Domains.RM.Requirement, StringComparison.Ordinal));
+    }
+
+    [Fact]
+    public void CreateResourceShape_WithRequirementType_ShouldHaveProperties()
+    {
+        // Arrange
+        var resourceType = typeof(Requirement);
+
+        // Act
+        var resourceShape = ResourceShapeFactory.CreateResourceShape(
+            BaseUri,
+            ResourceShapesPath,
+            ResourceShapePath,
+            resourceType);
+
+        // Assert
+        var properties = resourceShape.GetProperties();
+        Assert.NotNull(properties);
+        Assert.NotEmpty(properties);
+
+        // ResourceShapeFactory只处理以Get或Is开头的方法，Requirement类只有从AbstractResourceRecord继承的GetTypes()方法
+        var propertyNames = properties.Select(p => p.GetName()).ToList();
+        Assert.Contains("type", propertyNames);
+    }
+
+    [Fact]
+    public void CreateResourceShape_WithRequirementType_ShouldHaveTypeProperty()
+    {
+        // Arrange
+        var resourceType = typeof(Requirement);
+
+        // Act
+        var resourceShape = ResourceShapeFactory.CreateResourceShape(
+            BaseUri,
+            ResourceShapesPath,
+            ResourceShapePath,
+            resourceType);
+
+        // Assert
+        var properties = resourceShape.GetProperties();
+        var typeProperty = properties.FirstOrDefault(p => p.GetName() == "type");
+
+        Assert.NotNull(typeProperty);
+        Assert.Equal("type", typeProperty.GetName());
+        Assert.NotNull(typeProperty.GetValueType());
+        Assert.NotNull(typeProperty.GetOccurs());
+        Assert.Equal("http://www.w3.org/1999/02/22-rdf-syntax-ns#type", typeProperty.GetPropertyDefinition().ToString());
+    }
+
+    [Fact]
+    public void CreateResourceShape_WithRequirementType_ShouldOnlyHaveGetterMethods()
+    {
+        // Arrange
+        var resourceType = typeof(Requirement);
+
+        // Act
+        var resourceShape = ResourceShapeFactory.CreateResourceShape(
+            BaseUri,
+            ResourceShapesPath,
+            ResourceShapePath,
+            resourceType);
+
+        // Assert
+        var properties = resourceShape.GetProperties();
+
+        Assert.Single(properties);
+        Assert.Equal("type", properties[0].GetName());
+    }
+
+}

From 427b216cbb7160673f509bd13dabdc31bfb65d92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B7=A6=E7=A5=A5?= <zuoxiang42@gmail.com>
Date: Sat, 16 Aug 2025 22:21:33 +0800
Subject: [PATCH 2/8] fix(ResourceShapeFactory): support for URI resource
 mapping of IEnumerable and ISet types

---
 .../Model/ResourceShapeFactory.cs             |   2 +
 .../ResourceShapeFactoryTests.cs              | 325 +++++++++++++++++-
 2 files changed, 323 insertions(+), 4 deletions(-)

diff --git a/OSLC4Net_SDK/OSLC4Net.Core/Model/ResourceShapeFactory.cs b/OSLC4Net_SDK/OSLC4Net.Core/Model/ResourceShapeFactory.cs
index 8320c4d2..2012dd67 100644
--- a/OSLC4Net_SDK/OSLC4Net.Core/Model/ResourceShapeFactory.cs
+++ b/OSLC4Net_SDK/OSLC4Net.Core/Model/ResourceShapeFactory.cs
@@ -54,6 +54,8 @@ static ResourceShapeFactory()
         TYPE_TO_VALUE_TYPE[typeof(DateTime)] = ValueType.DateTime;
         TYPE_TO_VALUE_TYPE[typeof(Uri)] = ValueType.Resource;
         TYPE_TO_VALUE_TYPE[typeof(ICollection<Uri>)] = ValueType.Resource;
+        TYPE_TO_VALUE_TYPE[typeof(IEnumerable<Uri>)] = ValueType.Resource;
+        TYPE_TO_VALUE_TYPE[typeof(ISet<Uri>)] = ValueType.Resource;
     }
 
     private ResourceShapeFactory()
diff --git a/OSLC4Net_SDK/Tests/OSLC4Net.Core.Tests/ResourceShapeFactoryTests.cs b/OSLC4Net_SDK/Tests/OSLC4Net.Core.Tests/ResourceShapeFactoryTests.cs
index c83be1d2..81abe375 100644
--- a/OSLC4Net_SDK/Tests/OSLC4Net.Core.Tests/ResourceShapeFactoryTests.cs
+++ b/OSLC4Net_SDK/Tests/OSLC4Net.Core.Tests/ResourceShapeFactoryTests.cs
@@ -1,12 +1,10 @@
 using OSLC4Net.Core.Model;
+using OSLC4Net.Core.Attribute;
 using OSLC4Net.Domains.RequirementsManagement;
 using Xunit;
 
 namespace OSLC4Net.Core.Tests;
 
-/// <summary>
-/// 测试ResourceShapeFactory.CreateResourceShape方法
-/// </summary>
 public class ResourceShapeFactoryTests
 {
     private const string BaseUri = "http://example.com";
@@ -88,7 +86,6 @@ public void CreateResourceShape_WithRequirementType_ShouldHaveProperties()
         Assert.NotNull(properties);
         Assert.NotEmpty(properties);
 
-        // ResourceShapeFactory只处理以Get或Is开头的方法，Requirement类只有从AbstractResourceRecord继承的GetTypes()方法
         var propertyNames = properties.Select(p => p.GetName()).ToList();
         Assert.Contains("type", propertyNames);
     }
@@ -137,4 +134,324 @@ public void CreateResourceShape_WithRequirementType_ShouldOnlyHaveGetterMethods(
         Assert.Equal("type", properties[0].GetName());
     }
 
+    [Fact]
+    public void CreateResourceShape_WithICollectionUriProperty_ShouldMapToResourceValueType()
+    {
+        // Arrange
+        var resourceType = typeof(TestResourceWithICollectionUri);
+
+        // Act
+        var resourceShape = ResourceShapeFactory.CreateResourceShape(
+            BaseUri,
+            ResourceShapesPath,
+            ResourceShapePath,
+            resourceType);
+
+        // Assert
+        var properties = resourceShape.GetProperties();
+        var uriCollectionProperty = properties.FirstOrDefault(p => p.GetName() == "uriCollection");
+
+        Assert.NotNull(uriCollectionProperty);
+        Assert.Equal("uriCollection", uriCollectionProperty.GetName());
+        Assert.NotNull(uriCollectionProperty.GetValueType());
+        Assert.NotNull(uriCollectionProperty.GetOccurs());
+        Assert.Equal("http://example.com/uriCollection", uriCollectionProperty.GetPropertyDefinition().ToString());
+    }
+
+    [Fact]
+    public void CreateResourceShape_WithListUriProperty_ShouldMapToResourceValueType()
+    {
+        // Arrange
+        var resourceType = typeof(TestResourceWithListUri);
+
+        // Act
+        var resourceShape = ResourceShapeFactory.CreateResourceShape(
+            BaseUri,
+            ResourceShapesPath,
+            ResourceShapePath,
+            resourceType);
+
+        // Assert
+        var properties = resourceShape.GetProperties();
+        var uriListProperty = properties.FirstOrDefault(p => p.GetName() == "uriList");
+
+        Assert.NotNull(uriListProperty);
+        Assert.Equal("uriList", uriListProperty.GetName());
+
+        var actualValueType = uriListProperty.GetValueType();
+        var actualOccurs = uriListProperty.GetOccurs();
+
+        Assert.NotNull(actualValueType);
+        Assert.NotNull(actualOccurs);
+
+        // GetValueType() returns a URI, so we need to compare with the URI representation
+        var expectedValueTypeUri = new Uri(ValueTypeExtension.ToString(OSLC4Net.Core.Model.ValueType.Resource));
+        var expectedOccursUri = new Uri(OccursExtension.ToString(OSLC4Net.Core.Model.Occurs.ZeroOrMany));
+
+        Assert.Equal(expectedValueTypeUri, actualValueType);
+        Assert.Equal(expectedOccursUri, actualOccurs);
+        Assert.Equal("http://example.com/uriList", uriListProperty.GetPropertyDefinition()?.ToString());
+    }
+
+    [Fact]
+    public void CreateResourceShape_WithUriArrayProperty_ShouldMapToResourceValueType()
+    {
+        // Arrange
+        var resourceType = typeof(TestResourceWithUriArray);
+
+        // Act
+        var resourceShape = ResourceShapeFactory.CreateResourceShape(
+            BaseUri,
+            ResourceShapesPath,
+            ResourceShapePath,
+            resourceType);
+
+        // Assert
+        var properties = resourceShape.GetProperties();
+        var uriArrayProperty = properties.FirstOrDefault(p => p.GetName() == "uriArray");
+
+        Assert.NotNull(uriArrayProperty);
+        Assert.Equal("uriArray", uriArrayProperty.GetName());
+
+        var actualValueType = uriArrayProperty.GetValueType();
+        var actualOccurs = uriArrayProperty.GetOccurs();
+
+        Assert.NotNull(actualValueType);
+        Assert.NotNull(actualOccurs);
+
+        var expectedValueTypeUri = new Uri(ValueTypeExtension.ToString(OSLC4Net.Core.Model.ValueType.Resource));
+        var expectedOccursUri = new Uri(OccursExtension.ToString(OSLC4Net.Core.Model.Occurs.ZeroOrMany));
+
+        Assert.Equal(expectedValueTypeUri, actualValueType);
+        Assert.Equal(expectedOccursUri, actualOccurs);
+        Assert.Equal("http://example.com/uriArray", uriArrayProperty.GetPropertyDefinition()?.ToString());
+    }
+
+    [Fact]
+    public void CreateResourceShape_WithHashSetUriProperty_ShouldMapToResourceValueType()
+    {
+        // Arrange
+        var resourceType = typeof(TestResourceWithHashSetUri);
+
+        // Act
+        var resourceShape = ResourceShapeFactory.CreateResourceShape(
+            BaseUri,
+            ResourceShapesPath,
+            ResourceShapePath,
+            resourceType);
+
+        // Assert
+        var properties = resourceShape.GetProperties();
+        var uriHashSetProperty = properties.FirstOrDefault(p => p.GetName() == "uriHashSet");
+
+        Assert.NotNull(uriHashSetProperty);
+        Assert.Equal("uriHashSet", uriHashSetProperty.GetName());
+
+        var actualValueType = uriHashSetProperty.GetValueType();
+        var actualOccurs = uriHashSetProperty.GetOccurs();
+
+        Assert.NotNull(actualValueType);
+        Assert.NotNull(actualOccurs);
+
+        var expectedValueTypeUri = new Uri(ValueTypeExtension.ToString(OSLC4Net.Core.Model.ValueType.Resource));
+        var expectedOccursUri = new Uri(OccursExtension.ToString(OSLC4Net.Core.Model.Occurs.ZeroOrMany));
+
+        Assert.Equal(expectedValueTypeUri, actualValueType);
+        Assert.Equal(expectedOccursUri, actualOccurs);
+        Assert.Equal("http://example.com/uriHashSet", uriHashSetProperty.GetPropertyDefinition()?.ToString());
+    }
+
+    [Fact]
+    public void CreateResourceShape_WithGetterSetterPattern_ShouldMapToResourceValueType()
+    {
+        // Arrange
+        var resourceType = typeof(TestResourceWithGetterSetterPattern);
+
+        // Act
+        var resourceShape = ResourceShapeFactory.CreateResourceShape(
+            BaseUri,
+            ResourceShapesPath,
+            ResourceShapePath,
+            resourceType);
+
+        // Assert
+        var properties = resourceShape.GetProperties();
+        var implementedByProperty = properties.FirstOrDefault(p => p.GetName() == "implementedBy");
+
+        Assert.NotNull(implementedByProperty);
+        Assert.Equal("implementedBy", implementedByProperty.GetName());
+
+        var actualValueType = implementedByProperty.GetValueType();
+        var actualOccurs = implementedByProperty.GetOccurs();
+
+        Assert.NotNull(actualValueType);
+        Assert.NotNull(actualOccurs);
+
+        var expectedValueTypeUri = new Uri(ValueTypeExtension.ToString(OSLC4Net.Core.Model.ValueType.Resource));
+        var expectedOccursUri = new Uri(OccursExtension.ToString(OSLC4Net.Core.Model.Occurs.ZeroOrMany));
+
+        Assert.Equal(expectedValueTypeUri, actualValueType);
+        Assert.Equal(expectedOccursUri, actualOccurs);
+        Assert.Equal("http://example.com/implementedBy", implementedByProperty.GetPropertyDefinition()?.ToString());
+    }
+
+    // Note: ResourceShapeFactory only supports getter/setter methods, not direct properties
+    // Direct property pattern is not supported by ResourceShapeFactory
+    [Fact]
+    public void CreateResourceShape_WithISetUriProperty_ShouldMapToResourceValueType()
+    {
+        // Arrange
+        var resourceType = typeof(TestResourceWithISetUri);
+
+        // Act
+        var resourceShape = ResourceShapeFactory.CreateResourceShape(
+            BaseUri,
+            ResourceShapesPath,
+            ResourceShapePath,
+            resourceType);
+
+        // Assert
+        var properties = resourceShape.GetProperties();
+        var uriSetProperty = properties.FirstOrDefault(p => p.GetName() == "uriSet");
+
+        Assert.Null(uriSetProperty);
+        //Assert.Equal("uriSet", uriSetProperty.GetName());
+
+        //var actualValueType = uriSetProperty.GetValueType();
+        //var actualOccurs = uriSetProperty.GetOccurs();
+
+        //Assert.NotNull(actualValueType);
+        //Assert.NotNull(actualOccurs);
+
+        //var expectedValueTypeUri = new Uri(ValueTypeExtension.ToString(OSLC4Net.Core.Model.ValueType.Resource));
+        //var expectedOccursUri = new Uri(OccursExtension.ToString(OSLC4Net.Core.Model.Occurs.ZeroOrMany));
+
+        //Assert.Equal(expectedValueTypeUri, actualValueType);
+        //Assert.Equal(expectedOccursUri, actualOccurs);
+        //Assert.Equal("http://example.com/uriSet", uriSetProperty.GetPropertyDefinition()?.ToString());
+    }
+}
+
+// Test resource class for getter/setter pattern testing
+
+[OslcResourceShape(title = "Test Resource Shape", describes = new[] { "http://example.com/TestResource" })]
+public class TestResourceWithGetterSetterPattern
+{
+    private readonly ISet<Uri> _implementedBy = new HashSet<Uri>();
+
+    [OslcDescription("A property using getter/setter pattern")]
+    [OslcName("implementedBy")]
+    [OslcPropertyDefinition("http://example.com/implementedBy")]
+    [OslcTitle("Implemented By")]
+    public Uri[] GetImplementedBy()
+    {
+        return _implementedBy.ToArray();
+    }
+
+    public void SetImplementedBy(Uri[] implementedBy)
+    {
+        _implementedBy.Clear();
+        if (implementedBy != null)
+        {
+            foreach (var uri in implementedBy)
+            {
+                _implementedBy.Add(uri);
+            }
+        }
+    }
+}
+
+// Test resource class for ISet<Uri> testing
+[OslcResourceShape(title = "Test Resource Shape", describes = new[] { "http://example.com/TestResource" })]
+public class TestResourceWithISetUri
+{
+    [OslcDescription("A set of URIs")]
+    [OslcName("uriSet")]
+    [OslcPropertyDefinition("http://example.com/uriSet")]
+    [OslcTitle("URI Set")]
+    public ISet<Uri>? UriSet { get; set; }
+}
+
+// Test resource class for ICollection<Uri> testing
+[OslcResourceShape(title = "Test Resource Shape", describes = new[] { "http://example.com/TestResource" })]
+public class TestResourceWithICollectionUri
+{
+    private ICollection<Uri> _uriCollection = new List<Uri>();
+
+    [OslcDescription("A collection of URIs")]
+    [OslcName("uriCollection")]
+    [OslcPropertyDefinition("http://example.com/uriCollection")]
+    [OslcTitle("URI Collection")]
+    public ICollection<Uri> GetUriCollection()
+    {
+        return _uriCollection;
+    }
+
+    public void SetUriCollection(ICollection<Uri> uriCollection)
+    {
+        this._uriCollection = uriCollection;
+    }
+}
+
+// Test resource class for List<Uri> testing
+[OslcResourceShape(title = "Test Resource Shape", describes = new[] { "http://example.com/TestResource" })]
+public class TestResourceWithListUri
+{
+    private List<Uri> _uriList = new List<Uri>();
+
+    [OslcDescription("A list of URIs")]
+    [OslcName("uriList")]
+    [OslcPropertyDefinition("http://example.com/uriList")]
+    [OslcTitle("URI List")]
+    public List<Uri> GetUriList()
+    {
+        return _uriList;
+    }
+
+    public void SetUriList(List<Uri> uriList)
+    {
+        this._uriList = uriList;
+    }
+}
+
+// Test resource class for Uri[] testing
+[OslcResourceShape(title = "Test Resource Shape", describes = new[] { "http://example.com/TestResource" })]
+public class TestResourceWithUriArray
+{
+    private Uri[] _uriArray = new Uri[0];
+
+    [OslcDescription("An array of URIs")]
+    [OslcName("uriArray")]
+    [OslcPropertyDefinition("http://example.com/uriArray")]
+    [OslcTitle("URI Array")]
+    public Uri[] GetUriArray()
+    {
+        return _uriArray;
+    }
+
+    public void SetUriArray(Uri[] uriArray)
+    {
+        this._uriArray = uriArray;
+    }
+}
+
+// Test resource class for HashSet<Uri> testing
+[OslcResourceShape(title = "Test Resource Shape", describes = new[] { "http://example.com/TestResource" })]
+public class TestResourceWithHashSetUri
+{
+    private HashSet<Uri> _uriHashSet = new HashSet<Uri>();
+
+    [OslcDescription("A hash set of URIs")]
+    [OslcName("uriHashSet")]
+    [OslcPropertyDefinition("http://example.com/uriHashSet")]
+    [OslcTitle("URI Hash Set")]
+    public HashSet<Uri> GetUriHashSet()
+    {
+        return _uriHashSet;
+    }
+
+    public void SetUriHashSet(HashSet<Uri> uriHashSet)
+    {
+        this._uriHashSet = uriHashSet;
+    }
 }

From 363c5daccb780908f77d3ca0891dff57ddff2b31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B7=A6=E7=A5=A5?= <zuoxiang42@gmail.com>
Date: Fri, 22 Aug 2025 21:24:20 +0800
Subject: [PATCH 3/8] fix: using order

---
 .../Tests/OSLC4Net.Core.Tests/ResourceShapeFactoryTests.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OSLC4Net_SDK/Tests/OSLC4Net.Core.Tests/ResourceShapeFactoryTests.cs b/OSLC4Net_SDK/Tests/OSLC4Net.Core.Tests/ResourceShapeFactoryTests.cs
index 81abe375..bbfc6475 100644
--- a/OSLC4Net_SDK/Tests/OSLC4Net.Core.Tests/ResourceShapeFactoryTests.cs
+++ b/OSLC4Net_SDK/Tests/OSLC4Net.Core.Tests/ResourceShapeFactoryTests.cs
@@ -1,5 +1,5 @@
-using OSLC4Net.Core.Model;
 using OSLC4Net.Core.Attribute;
+using OSLC4Net.Core.Model;
 using OSLC4Net.Domains.RequirementsManagement;
 using Xunit;
 

From 3db2aae02767ecd031a4d79edbe436b9033cd448 Mon Sep 17 00:00:00 2001
From: Andrew Berezovskyi <andriib@kth.se>
Date: Sat, 22 Nov 2025 22:07:52 +0100
Subject: [PATCH 4/8] Migrate OSLC4Net SDK solution to SLNX format & use better
 healthcheck (#458)

Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
Co-authored-by: Andrew Berezovskyi <andriib@kth.se>

# Conflicts:
#	OSLC4Net_SDK/OSLC4Net.Core.sln
---
 .github/workflows/main.yml                    |   6 +-
 .vscode/settings.json                         |   2 +-
 .vscode/tasks.json                            |   6 +-
 .../OSLC4Net.StockQuoteSample/README.md       |   2 +-
 OSLC4Net_SDK/OSLC4Net.Core.sln                | 249 ------------------
 OSLC4Net_SDK/OSLC4Net.Core.slnx               |  30 +++
 OSLC4Net_SDK/OSLC4Net.Core.vsmdi              |   6 -
 .../Tests/OSLC4Net.Test.AspireHost/Program.cs |   6 +-
 doc/building.md                               |   2 +-
 9 files changed, 43 insertions(+), 266 deletions(-)
 delete mode 100644 OSLC4Net_SDK/OSLC4Net.Core.sln
 create mode 100644 OSLC4Net_SDK/OSLC4Net.Core.slnx
 delete mode 100644 OSLC4Net_SDK/OSLC4Net.Core.vsmdi

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0829007b..1f807a9c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -67,8 +67,8 @@ jobs:
         run: dotnet restore
       - name: Verify formatting
         run: |
-          dotnet format OSLC4Net.Core.sln style --verify-no-changes
-          dotnet format OSLC4Net.Core.sln whitespace --verify-no-changes
+          dotnet format OSLC4Net.Core.slnx style --verify-no-changes
+          dotnet format OSLC4Net.Core.slnx whitespace --verify-no-changes
 
   test:
     #needs: [format]
@@ -148,7 +148,7 @@ jobs:
         with:
           # npm cache files are stored in `~/.npm` on Linux/macOS
           path: ${{ env.NUGET_PACKAGES }}
-          key: ${{ runner.os }}-nuget-${{ matrix.version.target }}-${{ hashFiles('.github/workflows/main.yml', '**/Directory.Build.props', '**/packages.config', '**/packages.lock.json', '**/*.sln', '**/*.csproj') }}
+          key: ${{ runner.os }}-nuget-${{ matrix.version.target }}-${{ hashFiles('.github/workflows/main.yml', '**/Directory.Build.props', '**/packages.config', '**/packages.lock.json', '**/*.slnx', '**/*.csproj') }}
       - name: Restore dependencies
         run: dotnet restore
       - name: Build
diff --git a/.vscode/settings.json b/.vscode/settings.json
index f665c087..e7a86fc1 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,3 +1,3 @@
 {
-   "dotnet.defaultSolution": "OSLC4Net_SDK/OSLC4Net.Core.sln"
+   "dotnet.defaultSolution": "OSLC4Net_SDK/OSLC4Net.Core.slnx"
 }
\ No newline at end of file
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 368d6785..a28e0600 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -7,7 +7,7 @@
          "type": "process",
          "args": [
             "build",
-            "${workspaceFolder}/OSLC4Net_SDK/OSLC4Net.Core.sln",
+            "${workspaceFolder}/OSLC4Net_SDK/OSLC4Net.Core.slnx",
             "/property:GenerateFullPaths=true",
             "/consoleloggerparameters:NoSummary;ForceNoAlign"
          ],
@@ -19,7 +19,7 @@
          "type": "process",
          "args": [
             "publish",
-            "${workspaceFolder}/OSLC4Net_SDK/OSLC4Net.Core.sln",
+            "${workspaceFolder}/OSLC4Net_SDK/OSLC4Net.Core.slnx",
             "/property:GenerateFullPaths=true",
             "/consoleloggerparameters:NoSummary;ForceNoAlign"
          ],
@@ -33,7 +33,7 @@
             "watch",
             "run",
             "--project",
-            "${workspaceFolder}/OSLC4Net_SDK/OSLC4Net.Core.sln"
+            "${workspaceFolder}/OSLC4Net_SDK/OSLC4Net.Core.slnx"
          ],
          "problemMatcher": "$msCompile"
       }
diff --git a/OSLC4Net_NETFramework/OSLC4Net.StockQuoteSample/README.md b/OSLC4Net_NETFramework/OSLC4Net.StockQuoteSample/README.md
index 6b45cbf7..38f65ba7 100644
--- a/OSLC4Net_NETFramework/OSLC4Net.StockQuoteSample/README.md
+++ b/OSLC4Net_NETFramework/OSLC4Net.StockQuoteSample/README.md
@@ -8,7 +8,7 @@
 
 `OSLC4Net.StockQuoteSample` is a sample OSLC provider which implements one resource type, a StockQuote. This resource is not defined by an OSLC specification, it shows how OSLC4Net can be used to create an experimental OSLC provider.
 
-1. Build the `OSLC4Net_SDK\OSLC4Net.Core.sln` solution
+1. Build the `OSLC4Net_SDK\OSLC4Net.Core.slnx` solution
 1. Right click the `OSLC4Net.StockQuoteSample` project and run it via _Debug->Start new instance_
 
 You'll see a web page created - that is currently just a skeleton provided by ASP.NET. Try performing a GET request using [Postman](https://www.postman.com/) (make sure to set the `Accept` header to `application/rdf+xml`:
diff --git a/OSLC4Net_SDK/OSLC4Net.Core.sln b/OSLC4Net_SDK/OSLC4Net.Core.sln
deleted file mode 100644
index ac176378..00000000
--- a/OSLC4Net_SDK/OSLC4Net.Core.sln
+++ /dev/null
@@ -1,249 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.5.33516.290
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OSLC4Net.Core", "OSLC4Net.Core\OSLC4Net.Core.csproj", "{C07B57BD-3356-4AD8-8050-D708B023A8EC}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1B650CF7-24E5-444B-9C9E-91EFAEBAEA29}"
-	ProjectSection(SolutionItems) = preProject
-		Local.testsettings = Local.testsettings
-		OSLC4Net.Core.vsmdi = OSLC4Net.Core.vsmdi
-		TraceAndTestImpact.testsettings = TraceAndTestImpact.testsettings
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OSLC4Net.ChangeManagementCommon", "OSLC4Net.ChangeManagement\OSLC4Net.ChangeManagementCommon.csproj", "{7D5575DD-57DB-4727-906B-A5FD1149C6A4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OSLC4Net.Client", "OSLC4Net.Client\OSLC4Net.Client.csproj", "{EED02B8F-2C90-4484-B4B6-BB510750B84C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OSLC4Net.Core.Query", "OSLC4Net.Core.Query\OSLC4Net.Core.Query.csproj", "{B7EC82FE-64D2-4271-8D04-3044046360FA}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{798E9CDD-103C-4972-BC15-C5AAAF75C37D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oslc4NetExamples.Client", "Examples\Oslc4NetExamples.Client\Oslc4NetExamples.Client.csproj", "{96071622-1783-4274-80D0-C1A3E80FEEC8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OSLC4Net.Core.DotNetRdfProvider", "OSLC4Net.Core.DotNetRdfProvider\OSLC4Net.Core.DotNetRdfProvider.csproj", "{DE666628-9716-42D1-A7D7-E584625A6E3B}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{5BCA08EA-BC25-4F9F-A825-8054E842619A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OSLC4Net.Test.RefImpl", "Tests\OSLC4Net.Test.RefImpl\OSLC4Net.Test.RefImpl.csproj", "{533433C7-2431-4937-B861-0286CAD60BCF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OSLC4Net.Client.Tests", "Tests\OSLC4Net.Client.Tests\OSLC4Net.Client.Tests.csproj", "{0081D7DE-F525-4AF0-8F6B-8E4D4BD7F2B9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OSLC4Net.Core.QueryTests", "Tests\OSLC4Net.Core.QueryTests\OSLC4Net.Core.QueryTests.csproj", "{4DFFC5EA-7D53-4AB7-804A-B8393CC85576}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OSLC4Net.Core.DotNetRdfProviderTests", "Tests\OSLC4Net.Core.DotNetRdfProviderTests\OSLC4Net.Core.DotNetRdfProviderTests.csproj", "{7EF256A2-DC83-4AF0-A608-C3CDC783D063}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OSLC4Net.Server.Providers", "OSLC4Net.Server.Providers\OSLC4Net.Server.Providers.csproj", "{CAC5AA53-9ED2-4D84-A8CF-4CC4B708EB04}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OSLC4NetExamples.Server.NetCoreApi", "Examples\OSLC4NetExamples.Server.NetCoreApi\OSLC4NetExamples.Server.NetCoreApi.csproj", "{FF342977-2AAA-45E9-8981-97CE0458E843}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OSLC4Net.Test.AspireHost", "Tests\OSLC4Net.Test.AspireHost\OSLC4Net.Test.AspireHost.csproj", "{54E6E221-F805-4AB7-A3F4-596AD85A9F1E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OSLC4Net.Domains.RequirementsManagement", "OSLC4Net.Domains.RequirementsManagement\OSLC4Net.Domains.RequirementsManagement.csproj", "{9F9D0423-6720-45B4-BF58-3D26C8EFB0F6}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OSLC4Net.Core.Tests", "Tests\OSLC4Net.Core.Tests\OSLC4Net.Core.Tests.csproj", "{C116A88D-B9E7-3D21-5019-16883098C60A}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C07B57BD-3356-4AD8-8050-D708B023A8EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C07B57BD-3356-4AD8-8050-D708B023A8EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C07B57BD-3356-4AD8-8050-D708B023A8EC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C07B57BD-3356-4AD8-8050-D708B023A8EC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C07B57BD-3356-4AD8-8050-D708B023A8EC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C07B57BD-3356-4AD8-8050-D708B023A8EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C07B57BD-3356-4AD8-8050-D708B023A8EC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C07B57BD-3356-4AD8-8050-D708B023A8EC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{C07B57BD-3356-4AD8-8050-D708B023A8EC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{C07B57BD-3356-4AD8-8050-D708B023A8EC}.Release|x86.ActiveCfg = Release|Any CPU
-		{7D5575DD-57DB-4727-906B-A5FD1149C6A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7D5575DD-57DB-4727-906B-A5FD1149C6A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7D5575DD-57DB-4727-906B-A5FD1149C6A4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7D5575DD-57DB-4727-906B-A5FD1149C6A4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7D5575DD-57DB-4727-906B-A5FD1149C6A4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7D5575DD-57DB-4727-906B-A5FD1149C6A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7D5575DD-57DB-4727-906B-A5FD1149C6A4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7D5575DD-57DB-4727-906B-A5FD1149C6A4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{7D5575DD-57DB-4727-906B-A5FD1149C6A4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{7D5575DD-57DB-4727-906B-A5FD1149C6A4}.Release|x86.ActiveCfg = Release|Any CPU
-		{EED02B8F-2C90-4484-B4B6-BB510750B84C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EED02B8F-2C90-4484-B4B6-BB510750B84C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EED02B8F-2C90-4484-B4B6-BB510750B84C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EED02B8F-2C90-4484-B4B6-BB510750B84C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EED02B8F-2C90-4484-B4B6-BB510750B84C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{EED02B8F-2C90-4484-B4B6-BB510750B84C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EED02B8F-2C90-4484-B4B6-BB510750B84C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EED02B8F-2C90-4484-B4B6-BB510750B84C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{EED02B8F-2C90-4484-B4B6-BB510750B84C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{EED02B8F-2C90-4484-B4B6-BB510750B84C}.Release|x86.ActiveCfg = Release|Any CPU
-		{B7EC82FE-64D2-4271-8D04-3044046360FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B7EC82FE-64D2-4271-8D04-3044046360FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B7EC82FE-64D2-4271-8D04-3044046360FA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B7EC82FE-64D2-4271-8D04-3044046360FA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B7EC82FE-64D2-4271-8D04-3044046360FA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B7EC82FE-64D2-4271-8D04-3044046360FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B7EC82FE-64D2-4271-8D04-3044046360FA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B7EC82FE-64D2-4271-8D04-3044046360FA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{B7EC82FE-64D2-4271-8D04-3044046360FA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{B7EC82FE-64D2-4271-8D04-3044046360FA}.Release|x86.ActiveCfg = Release|Any CPU
-		{96071622-1783-4274-80D0-C1A3E80FEEC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{96071622-1783-4274-80D0-C1A3E80FEEC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{96071622-1783-4274-80D0-C1A3E80FEEC8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{96071622-1783-4274-80D0-C1A3E80FEEC8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{96071622-1783-4274-80D0-C1A3E80FEEC8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{96071622-1783-4274-80D0-C1A3E80FEEC8}.Debug|x86.Build.0 = Debug|Any CPU
-		{96071622-1783-4274-80D0-C1A3E80FEEC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{96071622-1783-4274-80D0-C1A3E80FEEC8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{96071622-1783-4274-80D0-C1A3E80FEEC8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{96071622-1783-4274-80D0-C1A3E80FEEC8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{96071622-1783-4274-80D0-C1A3E80FEEC8}.Release|x86.ActiveCfg = Release|Any CPU
-		{96071622-1783-4274-80D0-C1A3E80FEEC8}.Release|x86.Build.0 = Release|Any CPU
-		{DE666628-9716-42D1-A7D7-E584625A6E3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DE666628-9716-42D1-A7D7-E584625A6E3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DE666628-9716-42D1-A7D7-E584625A6E3B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DE666628-9716-42D1-A7D7-E584625A6E3B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DE666628-9716-42D1-A7D7-E584625A6E3B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DE666628-9716-42D1-A7D7-E584625A6E3B}.Debug|x86.Build.0 = Debug|Any CPU
-		{DE666628-9716-42D1-A7D7-E584625A6E3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DE666628-9716-42D1-A7D7-E584625A6E3B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DE666628-9716-42D1-A7D7-E584625A6E3B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{DE666628-9716-42D1-A7D7-E584625A6E3B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{DE666628-9716-42D1-A7D7-E584625A6E3B}.Release|x86.ActiveCfg = Release|Any CPU
-		{DE666628-9716-42D1-A7D7-E584625A6E3B}.Release|x86.Build.0 = Release|Any CPU
-		{533433C7-2431-4937-B861-0286CAD60BCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{533433C7-2431-4937-B861-0286CAD60BCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{533433C7-2431-4937-B861-0286CAD60BCF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{533433C7-2431-4937-B861-0286CAD60BCF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{533433C7-2431-4937-B861-0286CAD60BCF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{533433C7-2431-4937-B861-0286CAD60BCF}.Debug|x86.Build.0 = Debug|Any CPU
-		{533433C7-2431-4937-B861-0286CAD60BCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{533433C7-2431-4937-B861-0286CAD60BCF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{533433C7-2431-4937-B861-0286CAD60BCF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{533433C7-2431-4937-B861-0286CAD60BCF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{533433C7-2431-4937-B861-0286CAD60BCF}.Release|x86.ActiveCfg = Release|Any CPU
-		{533433C7-2431-4937-B861-0286CAD60BCF}.Release|x86.Build.0 = Release|Any CPU
-		{0081D7DE-F525-4AF0-8F6B-8E4D4BD7F2B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0081D7DE-F525-4AF0-8F6B-8E4D4BD7F2B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0081D7DE-F525-4AF0-8F6B-8E4D4BD7F2B9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0081D7DE-F525-4AF0-8F6B-8E4D4BD7F2B9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0081D7DE-F525-4AF0-8F6B-8E4D4BD7F2B9}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0081D7DE-F525-4AF0-8F6B-8E4D4BD7F2B9}.Debug|x86.Build.0 = Debug|Any CPU
-		{0081D7DE-F525-4AF0-8F6B-8E4D4BD7F2B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0081D7DE-F525-4AF0-8F6B-8E4D4BD7F2B9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0081D7DE-F525-4AF0-8F6B-8E4D4BD7F2B9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{0081D7DE-F525-4AF0-8F6B-8E4D4BD7F2B9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{0081D7DE-F525-4AF0-8F6B-8E4D4BD7F2B9}.Release|x86.ActiveCfg = Release|Any CPU
-		{0081D7DE-F525-4AF0-8F6B-8E4D4BD7F2B9}.Release|x86.Build.0 = Release|Any CPU
-		{4DFFC5EA-7D53-4AB7-804A-B8393CC85576}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4DFFC5EA-7D53-4AB7-804A-B8393CC85576}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4DFFC5EA-7D53-4AB7-804A-B8393CC85576}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4DFFC5EA-7D53-4AB7-804A-B8393CC85576}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4DFFC5EA-7D53-4AB7-804A-B8393CC85576}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4DFFC5EA-7D53-4AB7-804A-B8393CC85576}.Debug|x86.Build.0 = Debug|Any CPU
-		{4DFFC5EA-7D53-4AB7-804A-B8393CC85576}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4DFFC5EA-7D53-4AB7-804A-B8393CC85576}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4DFFC5EA-7D53-4AB7-804A-B8393CC85576}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{4DFFC5EA-7D53-4AB7-804A-B8393CC85576}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{4DFFC5EA-7D53-4AB7-804A-B8393CC85576}.Release|x86.ActiveCfg = Release|Any CPU
-		{4DFFC5EA-7D53-4AB7-804A-B8393CC85576}.Release|x86.Build.0 = Release|Any CPU
-		{7EF256A2-DC83-4AF0-A608-C3CDC783D063}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7EF256A2-DC83-4AF0-A608-C3CDC783D063}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7EF256A2-DC83-4AF0-A608-C3CDC783D063}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7EF256A2-DC83-4AF0-A608-C3CDC783D063}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7EF256A2-DC83-4AF0-A608-C3CDC783D063}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7EF256A2-DC83-4AF0-A608-C3CDC783D063}.Debug|x86.Build.0 = Debug|Any CPU
-		{7EF256A2-DC83-4AF0-A608-C3CDC783D063}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7EF256A2-DC83-4AF0-A608-C3CDC783D063}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7EF256A2-DC83-4AF0-A608-C3CDC783D063}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{7EF256A2-DC83-4AF0-A608-C3CDC783D063}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{7EF256A2-DC83-4AF0-A608-C3CDC783D063}.Release|x86.ActiveCfg = Release|Any CPU
-		{7EF256A2-DC83-4AF0-A608-C3CDC783D063}.Release|x86.Build.0 = Release|Any CPU
-		{CAC5AA53-9ED2-4D84-A8CF-4CC4B708EB04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CAC5AA53-9ED2-4D84-A8CF-4CC4B708EB04}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CAC5AA53-9ED2-4D84-A8CF-4CC4B708EB04}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CAC5AA53-9ED2-4D84-A8CF-4CC4B708EB04}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CAC5AA53-9ED2-4D84-A8CF-4CC4B708EB04}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CAC5AA53-9ED2-4D84-A8CF-4CC4B708EB04}.Debug|x86.Build.0 = Debug|Any CPU
-		{CAC5AA53-9ED2-4D84-A8CF-4CC4B708EB04}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CAC5AA53-9ED2-4D84-A8CF-4CC4B708EB04}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CAC5AA53-9ED2-4D84-A8CF-4CC4B708EB04}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{CAC5AA53-9ED2-4D84-A8CF-4CC4B708EB04}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{CAC5AA53-9ED2-4D84-A8CF-4CC4B708EB04}.Release|x86.ActiveCfg = Release|Any CPU
-		{CAC5AA53-9ED2-4D84-A8CF-4CC4B708EB04}.Release|x86.Build.0 = Release|Any CPU
-		{FF342977-2AAA-45E9-8981-97CE0458E843}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FF342977-2AAA-45E9-8981-97CE0458E843}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FF342977-2AAA-45E9-8981-97CE0458E843}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FF342977-2AAA-45E9-8981-97CE0458E843}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FF342977-2AAA-45E9-8981-97CE0458E843}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FF342977-2AAA-45E9-8981-97CE0458E843}.Debug|x86.Build.0 = Debug|Any CPU
-		{FF342977-2AAA-45E9-8981-97CE0458E843}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FF342977-2AAA-45E9-8981-97CE0458E843}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FF342977-2AAA-45E9-8981-97CE0458E843}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{FF342977-2AAA-45E9-8981-97CE0458E843}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{FF342977-2AAA-45E9-8981-97CE0458E843}.Release|x86.ActiveCfg = Release|Any CPU
-		{FF342977-2AAA-45E9-8981-97CE0458E843}.Release|x86.Build.0 = Release|Any CPU
-		{54E6E221-F805-4AB7-A3F4-596AD85A9F1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{54E6E221-F805-4AB7-A3F4-596AD85A9F1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{54E6E221-F805-4AB7-A3F4-596AD85A9F1E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{54E6E221-F805-4AB7-A3F4-596AD85A9F1E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{54E6E221-F805-4AB7-A3F4-596AD85A9F1E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{54E6E221-F805-4AB7-A3F4-596AD85A9F1E}.Debug|x86.Build.0 = Debug|Any CPU
-		{54E6E221-F805-4AB7-A3F4-596AD85A9F1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{54E6E221-F805-4AB7-A3F4-596AD85A9F1E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{54E6E221-F805-4AB7-A3F4-596AD85A9F1E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{54E6E221-F805-4AB7-A3F4-596AD85A9F1E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{54E6E221-F805-4AB7-A3F4-596AD85A9F1E}.Release|x86.ActiveCfg = Release|Any CPU
-		{54E6E221-F805-4AB7-A3F4-596AD85A9F1E}.Release|x86.Build.0 = Release|Any CPU
-		{9F9D0423-6720-45B4-BF58-3D26C8EFB0F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9F9D0423-6720-45B4-BF58-3D26C8EFB0F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9F9D0423-6720-45B4-BF58-3D26C8EFB0F6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9F9D0423-6720-45B4-BF58-3D26C8EFB0F6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9F9D0423-6720-45B4-BF58-3D26C8EFB0F6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9F9D0423-6720-45B4-BF58-3D26C8EFB0F6}.Debug|x86.Build.0 = Debug|Any CPU
-		{9F9D0423-6720-45B4-BF58-3D26C8EFB0F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9F9D0423-6720-45B4-BF58-3D26C8EFB0F6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9F9D0423-6720-45B4-BF58-3D26C8EFB0F6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{9F9D0423-6720-45B4-BF58-3D26C8EFB0F6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{9F9D0423-6720-45B4-BF58-3D26C8EFB0F6}.Release|x86.ActiveCfg = Release|Any CPU
-		{9F9D0423-6720-45B4-BF58-3D26C8EFB0F6}.Release|x86.Build.0 = Release|Any CPU
-		{C116A88D-B9E7-3D21-5019-16883098C60A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C116A88D-B9E7-3D21-5019-16883098C60A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C116A88D-B9E7-3D21-5019-16883098C60A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C116A88D-B9E7-3D21-5019-16883098C60A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C116A88D-B9E7-3D21-5019-16883098C60A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C116A88D-B9E7-3D21-5019-16883098C60A}.Debug|x86.Build.0 = Debug|Any CPU
-		{C116A88D-B9E7-3D21-5019-16883098C60A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C116A88D-B9E7-3D21-5019-16883098C60A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C116A88D-B9E7-3D21-5019-16883098C60A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{C116A88D-B9E7-3D21-5019-16883098C60A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{C116A88D-B9E7-3D21-5019-16883098C60A}.Release|x86.ActiveCfg = Release|Any CPU
-		{C116A88D-B9E7-3D21-5019-16883098C60A}.Release|x86.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{96071622-1783-4274-80D0-C1A3E80FEEC8} = {798E9CDD-103C-4972-BC15-C5AAAF75C37D}
-		{533433C7-2431-4937-B861-0286CAD60BCF} = {5BCA08EA-BC25-4F9F-A825-8054E842619A}
-		{0081D7DE-F525-4AF0-8F6B-8E4D4BD7F2B9} = {5BCA08EA-BC25-4F9F-A825-8054E842619A}
-		{4DFFC5EA-7D53-4AB7-804A-B8393CC85576} = {5BCA08EA-BC25-4F9F-A825-8054E842619A}
-		{7EF256A2-DC83-4AF0-A608-C3CDC783D063} = {5BCA08EA-BC25-4F9F-A825-8054E842619A}
-		{FF342977-2AAA-45E9-8981-97CE0458E843} = {798E9CDD-103C-4972-BC15-C5AAAF75C37D}
-		{54E6E221-F805-4AB7-A3F4-596AD85A9F1E} = {5BCA08EA-BC25-4F9F-A825-8054E842619A}
-		{C116A88D-B9E7-3D21-5019-16883098C60A} = {5BCA08EA-BC25-4F9F-A825-8054E842619A}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {B7097D9B-3362-4C14-B29F-CB2D6551677F}
-	EndGlobalSection
-	GlobalSection(TestCaseManagementSettings) = postSolution
-		CategoryFile = OSLC4Net.Core.vsmdi
-	EndGlobalSection
-EndGlobal
diff --git a/OSLC4Net_SDK/OSLC4Net.Core.slnx b/OSLC4Net_SDK/OSLC4Net.Core.slnx
new file mode 100644
index 00000000..87f993de
--- /dev/null
+++ b/OSLC4Net_SDK/OSLC4Net.Core.slnx
@@ -0,0 +1,30 @@
+<Solution>
+  <Configurations>
+    <Platform Name="Any CPU" />
+    <Platform Name="Mixed Platforms" />
+    <Platform Name="x86" />
+  </Configurations>
+  <Folder Name="/Examples/">
+    <Project Path="Examples/Oslc4NetExamples.Client/Oslc4NetExamples.Client.csproj" />
+    <Project Path="Examples/OSLC4NetExamples.Server.NetCoreApi/OSLC4NetExamples.Server.NetCoreApi.csproj" />
+  </Folder>
+  <Folder Name="/Solution Items/">
+    <File Path="Local.testsettings" />
+    <File Path="OSLC4Net.Core.vsmdi" />
+    <File Path="TraceAndTestImpact.testsettings" />
+  </Folder>
+  <Folder Name="/Tests/">
+    <Project Path="Tests/OSLC4Net.Client.Tests/OSLC4Net.Client.Tests.csproj" />
+    <Project Path="Tests/OSLC4Net.Core.DotNetRdfProviderTests/OSLC4Net.Core.DotNetRdfProviderTests.csproj" />
+    <Project Path="Tests/OSLC4Net.Core.QueryTests/OSLC4Net.Core.QueryTests.csproj" />
+    <Project Path="Tests/OSLC4Net.Test.AspireHost/OSLC4Net.Test.AspireHost.csproj" />
+    <Project Path="Tests/OSLC4Net.Test.RefImpl/OSLC4Net.Test.RefImpl.csproj" />
+  </Folder>
+  <Project Path="OSLC4Net.ChangeManagement/OSLC4Net.ChangeManagementCommon.csproj" />
+  <Project Path="OSLC4Net.Client/OSLC4Net.Client.csproj" />
+  <Project Path="OSLC4Net.Core.DotNetRdfProvider/OSLC4Net.Core.DotNetRdfProvider.csproj" />
+  <Project Path="OSLC4Net.Core.Query/OSLC4Net.Core.Query.csproj" />
+  <Project Path="OSLC4Net.Core/OSLC4Net.Core.csproj" />
+  <Project Path="OSLC4Net.Domains.RequirementsManagement/OSLC4Net.Domains.RequirementsManagement.csproj" />
+  <Project Path="OSLC4Net.Server.Providers/OSLC4Net.Server.Providers.csproj" />
+</Solution>
diff --git a/OSLC4Net_SDK/OSLC4Net.Core.vsmdi b/OSLC4Net_SDK/OSLC4Net.Core.vsmdi
deleted file mode 100644
index 1311853f..00000000
--- a/OSLC4Net_SDK/OSLC4Net.Core.vsmdi
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestLists xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
-  <TestList name="Lists of Tests" id="8c43106b-9dc1-4907-a29f-aa66a61bf5b6">
-    <RunConfiguration id="d2912c9b-601c-41c6-9abb-6080f91cca8e" name="Local" storage="local.testsettings" type="Microsoft.VisualStudio.TestTools.Common.TestRunConfiguration, Microsoft.VisualStudio.QualityTools.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  </TestList>
-</TestLists>
\ No newline at end of file
diff --git a/OSLC4Net_SDK/Tests/OSLC4Net.Test.AspireHost/Program.cs b/OSLC4Net_SDK/Tests/OSLC4Net.Test.AspireHost/Program.cs
index 58ddfa94..45c16778 100644
--- a/OSLC4Net_SDK/Tests/OSLC4Net.Test.AspireHost/Program.cs
+++ b/OSLC4Net_SDK/Tests/OSLC4Net.Test.AspireHost/Program.cs
@@ -6,12 +6,14 @@
     .AddDockerfile("refimpl-cm", "../../../../refimpl/src/", "server-cm/Dockerfile")
     .WithEndpoint(8801, 8080, isExternal: true, isProxied: false,
         scheme: "http", name: "http")
-    .WithHttpHealthCheck("/services/catalog/singleton", (int)HttpStatusCode.Unauthorized);
+    // .WithHttpHealthCheck("/services/catalog/singleton", (int)HttpStatusCode.Unauthorized);
+    .WithHttpHealthCheck("/services/rootservices", (int)HttpStatusCode.OK);
 
 _ = builder
     .AddDockerfile("refimpl-rm", "../../../../refimpl/src/", "server-rm/Dockerfile")
     .WithEndpoint(8800, 8080, isExternal: true, isProxied: false,
         scheme: "http", name: "http")
-    .WithHttpHealthCheck("/services/catalog/singleton", (int)HttpStatusCode.Unauthorized);
+    // .WithHttpHealthCheck("/services/catalog/singleton", (int)HttpStatusCode.Unauthorized);
+    .WithHttpHealthCheck("/services/rootservices", (int)HttpStatusCode.OK);
 
 await builder.Build().RunAsync().ConfigureAwait(false);
diff --git a/doc/building.md b/doc/building.md
index 990e0e41..3981caee 100644
--- a/doc/building.md
+++ b/doc/building.md
@@ -4,7 +4,7 @@ To look at the samples or build **OSLC4Net** from source, follow these steps:
 
 *   install [ASP.NET MVC 4](http://www.asp.net/mvc/mvc4/)
 *   git clone https://git01.codeplex.com/oslc4net master
-*   open the solution OSLC4Net_SDK\OSLC4Net.Core.sln
+*   open the solution OSLC4Net_SDK\OSLC4Net.Core.slnx
 *   build the solution
 
 ## Running the StockQuote provider

From a8975a4125c58826e467767b73ea682902c17f59 Mon Sep 17 00:00:00 2001
From: Andrew Berezovskyi <andriib@kth.se>
Date: Sat, 22 Nov 2025 22:05:02 +0100
Subject: [PATCH 5/8] build: add a test project to the new SLNX solution

---
 OSLC4Net_SDK/OSLC4Net.Core.slnx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OSLC4Net_SDK/OSLC4Net.Core.slnx b/OSLC4Net_SDK/OSLC4Net.Core.slnx
index 87f993de..079ce79a 100644
--- a/OSLC4Net_SDK/OSLC4Net.Core.slnx
+++ b/OSLC4Net_SDK/OSLC4Net.Core.slnx
@@ -17,6 +17,7 @@
     <Project Path="Tests/OSLC4Net.Client.Tests/OSLC4Net.Client.Tests.csproj" />
     <Project Path="Tests/OSLC4Net.Core.DotNetRdfProviderTests/OSLC4Net.Core.DotNetRdfProviderTests.csproj" />
     <Project Path="Tests/OSLC4Net.Core.QueryTests/OSLC4Net.Core.QueryTests.csproj" />
+    <Project Path="Tests/OSLC4Net.Core.Tests/OSLC4Net.Core.Tests.csproj" />
     <Project Path="Tests/OSLC4Net.Test.AspireHost/OSLC4Net.Test.AspireHost.csproj" />
     <Project Path="Tests/OSLC4Net.Test.RefImpl/OSLC4Net.Test.RefImpl.csproj" />
   </Folder>

From 657a5197f652234525a18f1a76acb0861102ed62 Mon Sep 17 00:00:00 2001
From: Andrew Berezovskyi <andriib@kth.se>
Date: Sat, 22 Nov 2025 22:26:52 +0100
Subject: [PATCH 6/8] build: target net10.0

Signed-off-by: Andrew Berezovskyi <andriib@kth.se>
---
 .../Tests/OSLC4Net.Core.Tests/OSLC4Net.Core.Tests.csproj      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OSLC4Net_SDK/Tests/OSLC4Net.Core.Tests/OSLC4Net.Core.Tests.csproj b/OSLC4Net_SDK/Tests/OSLC4Net.Core.Tests/OSLC4Net.Core.Tests.csproj
index 4da5e69f..65a79669 100644
--- a/OSLC4Net_SDK/Tests/OSLC4Net.Core.Tests/OSLC4Net.Core.Tests.csproj
+++ b/OSLC4Net_SDK/Tests/OSLC4Net.Core.Tests/OSLC4Net.Core.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\OSLC4Net.Core\OSLC4Net.Core.csproj" />
@@ -27,4 +27,4 @@
     </PackageReference>
     <PackageReference Include="xunit.v3" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

From 8b4d46de6ff234721dfd50ee772cf2298f83079c Mon Sep 17 00:00:00 2001
From: Andrew Berezovskyi <andriib@kth.se>
Date: Sat, 29 Nov 2025 14:59:04 +0100
Subject: [PATCH 7/8] test: migrate to TUnit

Signed-off-by: Andrew Berezovskyi <andriib@kth.se>
---
 .../OSLC4Net.Core.Tests.csproj                |  12 +-
 .../ResourceShapeFactoryTests.cs              | 155 +++++++++---------
 2 files changed, 80 insertions(+), 87 deletions(-)

diff --git a/OSLC4Net_SDK/Tests/OSLC4Net.Core.Tests/OSLC4Net.Core.Tests.csproj b/OSLC4Net_SDK/Tests/OSLC4Net.Core.Tests/OSLC4Net.Core.Tests.csproj
index 65a79669..87a9255e 100644
--- a/OSLC4Net_SDK/Tests/OSLC4Net.Core.Tests/OSLC4Net.Core.Tests.csproj
+++ b/OSLC4Net_SDK/Tests/OSLC4Net.Core.Tests/OSLC4Net.Core.Tests.csproj
@@ -8,12 +8,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="CommunityToolkit.Diagnostics" />
-    <PackageReference Include="coverlet.collector">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
-    <PackageReference Include="Meziantou.Extensions.Logging.Xunit.v3" />
     <PackageReference Include="Microsoft.Extensions.Hosting" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="NSubstitute" />
@@ -21,10 +16,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="xunit.runner.visualstudio">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="xunit.v3" />
+    <PackageReference Include="TUnit" />
+    <PackageReference Include="Verify.TUnit" />
   </ItemGroup>
 </Project>
diff --git a/OSLC4Net_SDK/Tests/OSLC4Net.Core.Tests/ResourceShapeFactoryTests.cs b/OSLC4Net_SDK/Tests/OSLC4Net.Core.Tests/ResourceShapeFactoryTests.cs
index bbfc6475..47254e1d 100644
--- a/OSLC4Net_SDK/Tests/OSLC4Net.Core.Tests/ResourceShapeFactoryTests.cs
+++ b/OSLC4Net_SDK/Tests/OSLC4Net.Core.Tests/ResourceShapeFactoryTests.cs
@@ -1,7 +1,8 @@
 using OSLC4Net.Core.Attribute;
 using OSLC4Net.Core.Model;
 using OSLC4Net.Domains.RequirementsManagement;
-using Xunit;
+using TUnit;
+using TUnit.Assertions;
 
 namespace OSLC4Net.Core.Tests;
 
@@ -11,8 +12,8 @@ public class ResourceShapeFactoryTests
     private const string ResourceShapesPath = "resourceShapes";
     private const string ResourceShapePath = "requirement";
 
-    [Fact]
-    public void CreateResourceShape_WithRequirementType_ShouldReturnValidResourceShape()
+    [Test]
+    public async Task CreateResourceShape_WithRequirementType_ShouldReturnValidResourceShape()
     {
         // Arrange
         var resourceType = typeof(Requirement);
@@ -25,13 +26,13 @@ public void CreateResourceShape_WithRequirementType_ShouldReturnValidResourceSha
             resourceType);
 
         // Assert
-        Assert.NotNull(resourceShape);
-        Assert.NotNull(resourceShape.GetAbout());
-        Assert.Equal($"{BaseUri}/{ResourceShapesPath}/{ResourceShapePath}", resourceShape.GetAbout().ToString());
+        await Assert.That(resourceShape).IsNotNull();
+        await Assert.That(resourceShape.GetAbout()).IsNotNull();
+        await Assert.That(resourceShape.GetAbout().ToString()).IsEqualTo($"{BaseUri}/{ResourceShapesPath}/{ResourceShapePath}");
     }
 
-    [Fact]
-    public void CreateResourceShape_WithRequirementType_ShouldHaveCorrectTitle()
+    [Test]
+    public async Task CreateResourceShape_WithRequirementType_ShouldHaveCorrectTitle()
     {
         // Arrange
         var resourceType = typeof(Requirement);
@@ -44,12 +45,12 @@ public void CreateResourceShape_WithRequirementType_ShouldHaveCorrectTitle()
             resourceType);
 
         // Assert
-        Assert.NotNull(resourceShape.GetTitle());
-        Assert.Equal("Requirement Resource Shape", resourceShape.GetTitle());
+        await Assert.That(resourceShape.GetTitle()).IsNotNull();
+        await Assert.That(resourceShape.GetTitle()).IsEqualTo("Requirement Resource Shape");
     }
 
-    [Fact]
-    public void CreateResourceShape_WithRequirementType_ShouldHaveDescribes()
+    [Test]
+    public async Task CreateResourceShape_WithRequirementType_ShouldHaveDescribes()
     {
         // Arrange
         var resourceType = typeof(Requirement);
@@ -63,13 +64,13 @@ public void CreateResourceShape_WithRequirementType_ShouldHaveDescribes()
 
         // Assert
         var describes = resourceShape.GetDescribes();
-        Assert.NotNull(describes);
-        Assert.NotEmpty(describes);
-        Assert.Contains(describes, uri => uri.ToString().Equals(Constants.Domains.RM.Requirement, StringComparison.Ordinal));
+        await Assert.That(describes).IsNotNull();
+        await Assert.That(describes).IsNotEmpty();
+        await Assert.That(describes.Any(uri => uri.ToString().Equals(Constants.Domains.RM.Requirement, StringComparison.Ordinal))).IsTrue();
     }
 
-    [Fact]
-    public void CreateResourceShape_WithRequirementType_ShouldHaveProperties()
+    [Test]
+    public async Task CreateResourceShape_WithRequirementType_ShouldHaveProperties()
     {
         // Arrange
         var resourceType = typeof(Requirement);
@@ -83,15 +84,15 @@ public void CreateResourceShape_WithRequirementType_ShouldHaveProperties()
 
         // Assert
         var properties = resourceShape.GetProperties();
-        Assert.NotNull(properties);
-        Assert.NotEmpty(properties);
+        await Assert.That(properties).IsNotNull();
+        await Assert.That(properties).IsNotEmpty();
 
         var propertyNames = properties.Select(p => p.GetName()).ToList();
-        Assert.Contains("type", propertyNames);
+        await Assert.That(propertyNames.Contains("type")).IsTrue();
     }
 
-    [Fact]
-    public void CreateResourceShape_WithRequirementType_ShouldHaveTypeProperty()
+    [Test]
+    public async Task CreateResourceShape_WithRequirementType_ShouldHaveTypeProperty()
     {
         // Arrange
         var resourceType = typeof(Requirement);
@@ -107,15 +108,15 @@ public void CreateResourceShape_WithRequirementType_ShouldHaveTypeProperty()
         var properties = resourceShape.GetProperties();
         var typeProperty = properties.FirstOrDefault(p => p.GetName() == "type");
 
-        Assert.NotNull(typeProperty);
-        Assert.Equal("type", typeProperty.GetName());
-        Assert.NotNull(typeProperty.GetValueType());
-        Assert.NotNull(typeProperty.GetOccurs());
-        Assert.Equal("http://www.w3.org/1999/02/22-rdf-syntax-ns#type", typeProperty.GetPropertyDefinition().ToString());
+        await Assert.That(typeProperty).IsNotNull();
+        await Assert.That(typeProperty.GetName()).IsEqualTo("type");
+        await Assert.That(typeProperty.GetValueType()).IsNotNull();
+        await Assert.That(typeProperty.GetOccurs()).IsNotNull();
+        await Assert.That(typeProperty.GetPropertyDefinition().ToString()).IsEqualTo("http://www.w3.org/1999/02/22-rdf-syntax-ns#type");
     }
 
-    [Fact]
-    public void CreateResourceShape_WithRequirementType_ShouldOnlyHaveGetterMethods()
+    [Test]
+    public async Task CreateResourceShape_WithRequirementType_ShouldOnlyHaveGetterMethods()
     {
         // Arrange
         var resourceType = typeof(Requirement);
@@ -130,12 +131,12 @@ public void CreateResourceShape_WithRequirementType_ShouldOnlyHaveGetterMethods(
         // Assert
         var properties = resourceShape.GetProperties();
 
-        Assert.Single(properties);
-        Assert.Equal("type", properties[0].GetName());
+        await Assert.That(properties.Count).IsEqualTo(1);
+        await Assert.That(properties[0].GetName()).IsEqualTo("type");
     }
 
-    [Fact]
-    public void CreateResourceShape_WithICollectionUriProperty_ShouldMapToResourceValueType()
+    [Test]
+    public async Task CreateResourceShape_WithICollectionUriProperty_ShouldMapToResourceValueType()
     {
         // Arrange
         var resourceType = typeof(TestResourceWithICollectionUri);
@@ -151,15 +152,15 @@ public void CreateResourceShape_WithICollectionUriProperty_ShouldMapToResourceVa
         var properties = resourceShape.GetProperties();
         var uriCollectionProperty = properties.FirstOrDefault(p => p.GetName() == "uriCollection");
 
-        Assert.NotNull(uriCollectionProperty);
-        Assert.Equal("uriCollection", uriCollectionProperty.GetName());
-        Assert.NotNull(uriCollectionProperty.GetValueType());
-        Assert.NotNull(uriCollectionProperty.GetOccurs());
-        Assert.Equal("http://example.com/uriCollection", uriCollectionProperty.GetPropertyDefinition().ToString());
+        await Assert.That(uriCollectionProperty).IsNotNull();
+        await Assert.That(uriCollectionProperty.GetName()).IsEqualTo("uriCollection");
+        await Assert.That(uriCollectionProperty.GetValueType()).IsNotNull();
+        await Assert.That(uriCollectionProperty.GetOccurs()).IsNotNull();
+        await Assert.That(uriCollectionProperty.GetPropertyDefinition().ToString()).IsEqualTo("http://example.com/uriCollection");
     }
 
-    [Fact]
-    public void CreateResourceShape_WithListUriProperty_ShouldMapToResourceValueType()
+    [Test]
+    public async Task CreateResourceShape_WithListUriProperty_ShouldMapToResourceValueType()
     {
         // Arrange
         var resourceType = typeof(TestResourceWithListUri);
@@ -175,26 +176,26 @@ public void CreateResourceShape_WithListUriProperty_ShouldMapToResourceValueType
         var properties = resourceShape.GetProperties();
         var uriListProperty = properties.FirstOrDefault(p => p.GetName() == "uriList");
 
-        Assert.NotNull(uriListProperty);
-        Assert.Equal("uriList", uriListProperty.GetName());
+        await Assert.That(uriListProperty).IsNotNull();
+    	await Assert.That(uriListProperty.GetName()).IsEqualTo("uriList");
 
         var actualValueType = uriListProperty.GetValueType();
         var actualOccurs = uriListProperty.GetOccurs();
 
-        Assert.NotNull(actualValueType);
-        Assert.NotNull(actualOccurs);
+        await Assert.That(actualValueType).IsNotNull();
+        await Assert.That(actualOccurs).IsNotNull();
 
         // GetValueType() returns a URI, so we need to compare with the URI representation
         var expectedValueTypeUri = new Uri(ValueTypeExtension.ToString(OSLC4Net.Core.Model.ValueType.Resource));
         var expectedOccursUri = new Uri(OccursExtension.ToString(OSLC4Net.Core.Model.Occurs.ZeroOrMany));
 
-        Assert.Equal(expectedValueTypeUri, actualValueType);
-        Assert.Equal(expectedOccursUri, actualOccurs);
-        Assert.Equal("http://example.com/uriList", uriListProperty.GetPropertyDefinition()?.ToString());
+        await Assert.That(actualValueType).IsEqualTo(expectedValueTypeUri);
+        await Assert.That(actualOccurs).IsEqualTo(expectedOccursUri);
+        await Assert.That(uriListProperty.GetPropertyDefinition()?.ToString()).IsEqualTo("http://example.com/uriList");
     }
 
-    [Fact]
-    public void CreateResourceShape_WithUriArrayProperty_ShouldMapToResourceValueType()
+    [Test]
+    public async Task CreateResourceShape_WithUriArrayProperty_ShouldMapToResourceValueType()
     {
         // Arrange
         var resourceType = typeof(TestResourceWithUriArray);
@@ -210,25 +211,25 @@ public void CreateResourceShape_WithUriArrayProperty_ShouldMapToResourceValueTyp
         var properties = resourceShape.GetProperties();
         var uriArrayProperty = properties.FirstOrDefault(p => p.GetName() == "uriArray");
 
-        Assert.NotNull(uriArrayProperty);
-        Assert.Equal("uriArray", uriArrayProperty.GetName());
+        await Assert.That(uriArrayProperty).IsNotNull();
+        await Assert.That(uriArrayProperty.GetName()).IsEqualTo("uriArray");
 
         var actualValueType = uriArrayProperty.GetValueType();
         var actualOccurs = uriArrayProperty.GetOccurs();
 
-        Assert.NotNull(actualValueType);
-        Assert.NotNull(actualOccurs);
+        await Assert.That(actualValueType).IsNotNull();
+        await Assert.That(actualOccurs).IsNotNull();
 
         var expectedValueTypeUri = new Uri(ValueTypeExtension.ToString(OSLC4Net.Core.Model.ValueType.Resource));
         var expectedOccursUri = new Uri(OccursExtension.ToString(OSLC4Net.Core.Model.Occurs.ZeroOrMany));
 
-        Assert.Equal(expectedValueTypeUri, actualValueType);
-        Assert.Equal(expectedOccursUri, actualOccurs);
-        Assert.Equal("http://example.com/uriArray", uriArrayProperty.GetPropertyDefinition()?.ToString());
+        await Assert.That(actualValueType).IsEqualTo(expectedValueTypeUri);
+        await Assert.That(actualOccurs).IsEqualTo(expectedOccursUri);
+        await Assert.That(uriArrayProperty.GetPropertyDefinition()?.ToString()).IsEqualTo("http://example.com/uriArray");
     }
 
-    [Fact]
-    public void CreateResourceShape_WithHashSetUriProperty_ShouldMapToResourceValueType()
+    [Test]
+    public async Task CreateResourceShape_WithHashSetUriProperty_ShouldMapToResourceValueType()
     {
         // Arrange
         var resourceType = typeof(TestResourceWithHashSetUri);
@@ -244,25 +245,25 @@ public void CreateResourceShape_WithHashSetUriProperty_ShouldMapToResourceValueT
         var properties = resourceShape.GetProperties();
         var uriHashSetProperty = properties.FirstOrDefault(p => p.GetName() == "uriHashSet");
 
-        Assert.NotNull(uriHashSetProperty);
-        Assert.Equal("uriHashSet", uriHashSetProperty.GetName());
+        await Assert.That(uriHashSetProperty).IsNotNull();
+        await Assert.That(uriHashSetProperty.GetName()).IsEqualTo("uriHashSet");
 
         var actualValueType = uriHashSetProperty.GetValueType();
         var actualOccurs = uriHashSetProperty.GetOccurs();
 
-        Assert.NotNull(actualValueType);
-        Assert.NotNull(actualOccurs);
+        await Assert.That(actualValueType).IsNotNull();
+        await Assert.That(actualOccurs).IsNotNull();
 
         var expectedValueTypeUri = new Uri(ValueTypeExtension.ToString(OSLC4Net.Core.Model.ValueType.Resource));
         var expectedOccursUri = new Uri(OccursExtension.ToString(OSLC4Net.Core.Model.Occurs.ZeroOrMany));
 
-        Assert.Equal(expectedValueTypeUri, actualValueType);
-        Assert.Equal(expectedOccursUri, actualOccurs);
-        Assert.Equal("http://example.com/uriHashSet", uriHashSetProperty.GetPropertyDefinition()?.ToString());
+        await Assert.That(actualValueType).IsEqualTo(expectedValueTypeUri);
+        await Assert.That(actualOccurs).IsEqualTo(expectedOccursUri);
+        await Assert.That(uriHashSetProperty.GetPropertyDefinition()?.ToString()).IsEqualTo("http://example.com/uriHashSet");
     }
 
-    [Fact]
-    public void CreateResourceShape_WithGetterSetterPattern_ShouldMapToResourceValueType()
+    [Test]
+    public async Task CreateResourceShape_WithGetterSetterPattern_ShouldMapToResourceValueType()
     {
         // Arrange
         var resourceType = typeof(TestResourceWithGetterSetterPattern);
@@ -278,27 +279,27 @@ public void CreateResourceShape_WithGetterSetterPattern_ShouldMapToResourceValue
         var properties = resourceShape.GetProperties();
         var implementedByProperty = properties.FirstOrDefault(p => p.GetName() == "implementedBy");
 
-        Assert.NotNull(implementedByProperty);
-        Assert.Equal("implementedBy", implementedByProperty.GetName());
+        await Assert.That(implementedByProperty).IsNotNull();
+        await Assert.That(implementedByProperty.GetName()).IsEqualTo("implementedBy");
 
         var actualValueType = implementedByProperty.GetValueType();
         var actualOccurs = implementedByProperty.GetOccurs();
 
-        Assert.NotNull(actualValueType);
-        Assert.NotNull(actualOccurs);
+        await Assert.That(actualValueType).IsNotNull();
+        await Assert.That(actualOccurs).IsNotNull();
 
         var expectedValueTypeUri = new Uri(ValueTypeExtension.ToString(OSLC4Net.Core.Model.ValueType.Resource));
         var expectedOccursUri = new Uri(OccursExtension.ToString(OSLC4Net.Core.Model.Occurs.ZeroOrMany));
 
-        Assert.Equal(expectedValueTypeUri, actualValueType);
-        Assert.Equal(expectedOccursUri, actualOccurs);
-        Assert.Equal("http://example.com/implementedBy", implementedByProperty.GetPropertyDefinition()?.ToString());
+        await Assert.That(actualValueType).IsEqualTo(expectedValueTypeUri);
+        await Assert.That(actualOccurs).IsEqualTo(expectedOccursUri);
+        await Assert.That(implementedByProperty.GetPropertyDefinition()?.ToString()).IsEqualTo("http://example.com/implementedBy");
     }
 
     // Note: ResourceShapeFactory only supports getter/setter methods, not direct properties
     // Direct property pattern is not supported by ResourceShapeFactory
-    [Fact]
-    public void CreateResourceShape_WithISetUriProperty_ShouldMapToResourceValueType()
+    [Test]
+    public async Task CreateResourceShape_WithISetUriProperty_ShouldMapToResourceValueType()
     {
         // Arrange
         var resourceType = typeof(TestResourceWithISetUri);
@@ -314,7 +315,7 @@ public void CreateResourceShape_WithISetUriProperty_ShouldMapToResourceValueType
         var properties = resourceShape.GetProperties();
         var uriSetProperty = properties.FirstOrDefault(p => p.GetName() == "uriSet");
 
-        Assert.Null(uriSetProperty);
+        await Assert.That(uriSetProperty).IsNull();
         //Assert.Equal("uriSet", uriSetProperty.GetName());
 
         //var actualValueType = uriSetProperty.GetValueType();

From c325de63e42bd9ffaacbadef77c8f965757d59a4 Mon Sep 17 00:00:00 2001
From: Andrew Berezovskyi <andriib@kth.se>
Date: Sat, 29 Nov 2025 15:45:40 +0100
Subject: [PATCH 8/8] chore: format

Signed-off-by: Andrew Berezovskyi <andriib@kth.se>
---
 AGENTS.md                                     | 36 +++++++++++++++++++
 .../ResourceShapeFactoryTests.cs              |  2 +-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/AGENTS.md b/AGENTS.md
index a94d4e51..3d230229 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -18,6 +18,42 @@ AGENT_BUILD=true dotnet test
 
 This reduces noise from warnings and analyzer messages, showing primarily errors and critical information.
 
+## Git Hooks: Pre-Commit Formatting (Cross-Platform)
+
+To keep the codebase consistently formatted, a pre-commit hook can run `dotnet format` scoped to the SDK.
+
+- Hook behavior:
+	- Runs `dotnet format` inside `OSLC4Net_SDK`.
+	- Stages any whitespace or formatting changes automatically.
+	- Fails the commit if formatting fails or cannot be applied.
+
+- One-time setup:
+	- Use the provided POSIX shell hook script: `.githooks/pre-commit`.
+	- Point Git to use the repository hooks folder. Quick setup scripts:
+		- macOS/Linux: `scripts/setup-hooks.sh`
+		- Windows (PowerShell): `scripts/setup-hooks.ps1`
+
+```zsh
+# macOS/Linux
+./scripts/setup-hooks.sh
+```
+
+```powershell
+# Windows (PowerShell)
+./scripts/setup-hooks.ps1
+```
+
+- Manual run (if needed):
+
+```zsh
+cd OSLC4Net_SDK
+dotnet format
+```
+
+Notes:
+- Requires `dotnet` to be in PATH.
+- If the hook blocks your commit due to formatting changes, review them and commit again.
+
 ## Build Commands
 
 Build the solution:
diff --git a/OSLC4Net_SDK/Tests/OSLC4Net.Core.Tests/ResourceShapeFactoryTests.cs b/OSLC4Net_SDK/Tests/OSLC4Net.Core.Tests/ResourceShapeFactoryTests.cs
index 47254e1d..0c406de8 100644
--- a/OSLC4Net_SDK/Tests/OSLC4Net.Core.Tests/ResourceShapeFactoryTests.cs
+++ b/OSLC4Net_SDK/Tests/OSLC4Net.Core.Tests/ResourceShapeFactoryTests.cs
@@ -177,7 +177,7 @@ public async Task CreateResourceShape_WithListUriProperty_ShouldMapToResourceVal
         var uriListProperty = properties.FirstOrDefault(p => p.GetName() == "uriList");
 
         await Assert.That(uriListProperty).IsNotNull();
-    	await Assert.That(uriListProperty.GetName()).IsEqualTo("uriList");
+        await Assert.That(uriListProperty.GetName()).IsEqualTo("uriList");
 
         var actualValueType = uriListProperty.GetValueType();
         var actualOccurs = uriListProperty.GetOccurs();