Merge pull request #98 from RevealBi/additional-frameworks

added support for newer version of .net core
RevealBi · Nov 22, 2024 · da39000 · da39000
2 parents 1b91e31 + d303b4d
commit da39000
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 120 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,7 +18,11 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: |
+          6.0.x
+          7.0.x
+          8.0.x
+          9.0.x
     - name: NuGet Restore
       run: dotnet restore
     - name: Build

diff --git a/src/Reveal.Sdk.Dom.Tests/RdashDocumentFixture.cs b/src/Reveal.Sdk.Dom.Tests/RdashDocumentFixture.cs
@@ -1,5 +1,4 @@
 using Newtonsoft.Json.Linq;
-using Newtonsoft.Json.Schema;
 using Reveal.Sdk.Dom.Core.Constants;
 using Reveal.Sdk.Dom.Core.Utilities;
 using Reveal.Sdk.Dom.Data;
@@ -167,7 +166,12 @@ public void RdashDocument_Load_WithStream_ShouldLoadDocumentFromStream()
         public void RdashDocument_LoadFromJson_ShouldLoadDocumentFromJsonString()
         {
             // Arrange
-            var json = "{\"Title\":\"My Dashboard\",\"ThemeName\":\"Mountain\"}";
+            var json = """
+            {
+                "Title":"My Dashboard",
+                "ThemeName":"Mountain"
+            }
+            """;
 
             // Act
             var document = RdashDocument.LoadFromJson(json);
@@ -212,19 +216,20 @@ public void RdashDocument_ToJsonString_ShouldReturnJsonStringRepresentation()
         {
             // Arrange
             var document = new RdashDocument();
-            string expectedJson = @"
+            string expectedJson = """
             {
-              ""Title"": ""New Dashboard"",
-              ""ThemeName"": ""rvDashboardMountainTheme"",
-              ""CreatedWith"": ""Reveal.Sdk.Dom"",
-              ""SavedWith"": """",
-              ""FormatVersion"": 6,
-              ""UseAutoLayout"": true,
-              ""DataSources"": [],
-              ""GlobalFilters"": [],
-              ""GlobalVariables"": [],
-              ""Widgets"": []
-            }";
+              "Title": "New Dashboard",
+              "ThemeName": "rvDashboardMountainTheme",
+              "CreatedWith": "Reveal.Sdk.Dom",
+              "SavedWith": "",
+              "FormatVersion": 6,
+              "UseAutoLayout": true,
+              "DataSources": [],
+              "GlobalFilters": [],
+              "GlobalVariables": [],
+              "Widgets": []
+            }
+            """;
 
             // Act
             var jsonString = document.ToJsonString();
@@ -237,28 +242,6 @@ public void RdashDocument_ToJsonString_ShouldReturnJsonStringRepresentation()
             Assert.Equal(expectedJObject, actualJObject);
         }
 
-        [Fact]
-        public void ToJsonString_IsValidSchema()
-        {
-            var schemaJson = File.ReadAllText(Path.Combine(Environment.CurrentDirectory, "Schemas", "RdashDocument.json"));
-            var schema = JSchema.Parse(schemaJson);
-
-            var dashboard = new RdashDocument()
-            {
-                Title = "New Dashboard",
-                Description = "This is a test dashboard",
-                Theme = Theme.Aurora,
-                Tags = "tag1,tag2,tag3"
-            };
-            var json = dashboard.ToJsonString();
-
-            var jsonDocument = JObject.Parse(json);
-
-            bool isValid = jsonDocument.IsValid(schema);
-
-            Assert.True(isValid);
-        }
-
         [Fact]
         public void ImportThrows_WhenDocumentIsNull()
         {

diff --git a/src/Reveal.Sdk.Dom.Tests/Reveal.Sdk.Dom.Tests.csproj b/src/Reveal.Sdk.Dom.Tests/Reveal.Sdk.Dom.Tests.csproj
@@ -1,16 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net462;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
+    <LangVersion>11.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
-    <PackageReference Include="Moq" Version="4.18.1" />
-    <PackageReference Include="Newtonsoft.Json.Schema" Version="3.0.14" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="Moq" Version="4.20.72" />
+    <PackageReference Include="xunit" Version="2.9.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -36,13 +36,17 @@
     <None Update="Dashboards\Sales.rdash">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="Schemas\RdashDocument.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
   </ItemGroup>
 
   <ItemGroup>
     <Folder Include="Dashboards\" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Nerdbank.GitVersioning" Version="3.6.146">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
 </Project>
diff --git a/src/Reveal.Sdk.Dom.Tests/Schemas/RdashDocument.json b/src/Reveal.Sdk.Dom.Tests/Schemas/RdashDocument.json
diff --git a/src/Reveal.Sdk.Dom/Reveal.Sdk.Dom.csproj b/src/Reveal.Sdk.Dom/Reveal.Sdk.Dom.csproj
@@ -1,26 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net462;net6.0</TargetFrameworks>
+    <TargetFrameworks>net462;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
     <IsPackable>true</IsPackable>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup Condition=" $(TargetFramework) == 'net462' ">
     <PackageReference Include="System.IO.Compression" Version="4.3.0" />
-    <PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="4.6.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="Nerdbank.GitVersioning" Version="3.6.133">
+    <PackageReference Update="Nerdbank.GitVersioning" Version="3.6.146">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>