Migrate net variant to net8.0 and EF8.0

giis-uniovi · Aug 14, 2024 · 38df936 · 38df936
1 parent bd5880e
commit 38df936
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 24 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -48,7 +48,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/[email protected]
         with:
-            dotnet-version: '6.0.x'
+            dotnet-version: '8.0.x'
       #- name: Enable snapshots
       #  run: dotnet nuget add source https://apiint.nugettest.org/v3/index.json -n int.nugettest.org
       - name: Pack

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -230,7 +230,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/[email protected]
         with:
-            dotnet-version: '6.0.x'
+            dotnet-version: '8.0.x'
 
       - name: Launch Sqlserver
         run: |

diff --git a/net/QACover/QACoverReport.csproj b/net/QACover/QACoverReport.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <InformationalVersion>1.6.4-SNAPSHOT</InformationalVersion>
     <Version>1.6.4-SNAPSHOT</Version>
     <PackageId>QACover</PackageId>

diff --git a/net/QACover/Translated/Giis.Qacover.Core.Services/Configuration.cs b/net/QACover/Translated/Giis.Qacover.Core.Services/Configuration.cs
diff --git a/net/QACoverEf2spy/QACoverEf2spy.csproj b/net/QACoverEf2spy/QACoverEf2spy.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup> 
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -26,9 +26,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.33" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.7" />
 
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.33" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.7" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/net/QACoverTest/QACoverTest.csproj b/net/QACoverTest/QACoverTest.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>    
-    <TargetFramework>net6.0</TargetFramework>    
+    <TargetFramework>net8.0</TargetFramework>    
     <RootNamespace />
   </PropertyGroup>
 

diff --git a/net/QACoverTestEf/QACoverTestEf.csproj b/net/QACoverTestEf/QACoverTestEf.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>    
-    <TargetFramework>net6.0</TargetFramework>    
+    <TargetFramework>net8.0</TargetFramework>    
     <RootNamespace />
   </PropertyGroup>
 
@@ -9,12 +9,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.33">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.7">
       <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
 
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.33" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.7" />
 
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
 

diff --git a/net/QACoverTestEf/Test4giis.Qacover.Ef/TestEvaluationEf.N.cs b/net/QACoverTestEf/Test4giis.Qacover.Ef/TestEvaluationEf.N.cs
@@ -54,15 +54,15 @@ public virtual void TestEvalEfNoParameters()
             ClassicAssert.AreEqual(99, pojo[0].Num);
             ClassicAssert.AreEqual("xyz", pojo[0].Txt);
             //compara eliminando las comillas dobles que inserta EntityFramework en tablas y columnas
-            string efSql= "SELECT [t].[Id], [t].[Num], [t].[Txt] FROM [TestEfTable] AS [t] WHERE ([t].[Txt] = 'xyz') AND ([t].[Num] = 99) ORDER BY [t].[Id]";
+            string efSql= "SELECT [t].[Id], [t].[Num], [t].[Txt] FROM [TestEfTable] AS [t] WHERE [t].[Txt] = 'xyz' AND [t].[Num] = 99 ORDER BY [t].[Id]";
             AssertEvalResults(efSql,
                 string.Empty, string.Empty,
-                    "COVERED   SELECT [t].[Id] , [t].[Num] , [t].[Txt] FROM [TestEfTable] AS [t] WHERE (([t].[Txt] = 'xyz')) AND (([t].[Num] = 99))\n"
-                + "UNCOVERED SELECT [t].[Id] , [t].[Num] , [t].[Txt] FROM [TestEfTable] AS [t] WHERE NOT(([t].[Txt] = 'xyz')) AND (([t].[Num] = 99))\n"
-                + "UNCOVERED SELECT [t].[Id] , [t].[Num] , [t].[Txt] FROM [TestEfTable] AS [t] WHERE ([t].[Txt] IS NULL) AND (([t].[Num] = 99))\n"
-                + "UNCOVERED SELECT [t].[Id] , [t].[Num] , [t].[Txt] FROM [TestEfTable] AS [t] WHERE ([t].[Num] = 100) AND (([t].[Txt] = 'xyz'))\n"
-                + "COVERED   SELECT [t].[Id] , [t].[Num] , [t].[Txt] FROM [TestEfTable] AS [t] WHERE ([t].[Num] = 99) AND (([t].[Txt] = 'xyz'))\n"
-                + "UNCOVERED SELECT [t].[Id] , [t].[Num] , [t].[Txt] FROM [TestEfTable] AS [t] WHERE ([t].[Num] = 98) AND (([t].[Txt] = 'xyz'))",
+                    "COVERED   SELECT [t].[Id] , [t].[Num] , [t].[Txt] FROM [TestEfTable] AS [t] WHERE ([t].[Txt] = 'xyz') AND ([t].[Num] = 99)\n"
+                + "UNCOVERED SELECT [t].[Id] , [t].[Num] , [t].[Txt] FROM [TestEfTable] AS [t] WHERE NOT([t].[Txt] = 'xyz') AND ([t].[Num] = 99)\n"
+                + "UNCOVERED SELECT [t].[Id] , [t].[Num] , [t].[Txt] FROM [TestEfTable] AS [t] WHERE ([t].[Txt] IS NULL) AND ([t].[Num] = 99)\n"
+                + "UNCOVERED SELECT [t].[Id] , [t].[Num] , [t].[Txt] FROM [TestEfTable] AS [t] WHERE ([t].[Num] = 100) AND ([t].[Txt] = 'xyz')\n"
+                + "COVERED   SELECT [t].[Id] , [t].[Num] , [t].[Txt] FROM [TestEfTable] AS [t] WHERE ([t].[Num] = 99) AND ([t].[Txt] = 'xyz')\n"
+                + "UNCOVERED SELECT [t].[Id] , [t].[Num] , [t].[Txt] FROM [TestEfTable] AS [t] WHERE ([t].[Num] = 98) AND ([t].[Txt] = 'xyz')",
                   "{}", true, false);
         }
         [Test()]
@@ -71,12 +71,12 @@ public virtual void TestEvalEfParameters()
             options.SetRuleOptions("noboundaries");
             AppSimpleEf app = new AppSimpleEf();
             List<TestEfEntity> pojo = app.QueryEfParams(99, "xyz");
-            string efSql = "SELECT [t].[Id], [t].[Num], [t].[Txt] FROM [TestEfTable] AS [t] WHERE ([t].[Txt] = @__param1_0) AND ([t].[Num] > @__param2_1) ORDER BY [t].[Id]";
+            string efSql = "SELECT [t].[Id], [t].[Num], [t].[Txt] FROM [TestEfTable] AS [t] WHERE [t].[Txt] = @__param1_0 AND [t].[Num] > @__param2_1 ORDER BY [t].[Id]";
             AssertEvalResults(efSql, string.Empty, string.Empty,
-                "UNCOVERED SELECT [t].[Id] , [t].[Num] , [t].[Txt] FROM [TestEfTable] AS [t] WHERE (([t].[Txt] = 'xyz')) AND (([t].[Num] > 99))\n"
-                + "UNCOVERED SELECT [t].[Id] , [t].[Num] , [t].[Txt] FROM [TestEfTable] AS [t] WHERE NOT(([t].[Txt] = 'xyz')) AND (([t].[Num] > 99))\n"
-                + "UNCOVERED SELECT [t].[Id] , [t].[Num] , [t].[Txt] FROM [TestEfTable] AS [t] WHERE ([t].[Txt] IS NULL) AND (([t].[Num] > 99))\n"
-                + "COVERED   SELECT [t].[Id] , [t].[Num] , [t].[Txt] FROM [TestEfTable] AS [t] WHERE NOT(([t].[Num] > 99)) AND (([t].[Txt] = 'xyz'))",
+                "UNCOVERED SELECT [t].[Id] , [t].[Num] , [t].[Txt] FROM [TestEfTable] AS [t] WHERE ([t].[Txt] = 'xyz') AND ([t].[Num] > 99)\n"
+                + "UNCOVERED SELECT [t].[Id] , [t].[Num] , [t].[Txt] FROM [TestEfTable] AS [t] WHERE NOT([t].[Txt] = 'xyz') AND ([t].[Num] > 99)\n"
+                + "UNCOVERED SELECT [t].[Id] , [t].[Num] , [t].[Txt] FROM [TestEfTable] AS [t] WHERE ([t].[Txt] IS NULL) AND ([t].[Num] > 99)\n"
+                + "COVERED   SELECT [t].[Id] , [t].[Num] , [t].[Txt] FROM [TestEfTable] AS [t] WHERE NOT([t].[Num] > 99) AND ([t].[Txt] = 'xyz')",
                 "{@__param1_0='xyz', @__param2_1=99}", true, false);
         }
     }

diff --git a/net/QACoverTestEf/Test4giis.Qacoverapp.Ef/EfModel.N.cs b/net/QACoverTestEf/Test4giis.Qacoverapp.Ef/EfModel.N.cs
@@ -19,7 +19,7 @@ private string GetConnectionString()
             string user = new JdbcProperties().GetProp(DatabaseProperties, "qacover.netcore.qacoverdb.sqlserver.user");
             string EnvironmentProperties = FileUtil.GetPath(SetupPath, "environment.properties");
             string password = new JdbcProperties().GetEnvVar(EnvironmentProperties, "TEST_" + "sqlserver".ToUpper() + "_PWD");
-            return url + ";UID=" + user + ";PWD=" + password;
+            return url + ";UID=" + user + ";PWD=" + password + ";TrustServerCertificate=true";
         }
 
         protected override void OnConfiguring(DbContextOptionsBuilder options)

diff --git a/qacover-core/src/main/java/giis/qacover/core/services/Configuration.java b/qacover-core/src/main/java/giis/qacover/core/services/Configuration.java
@@ -83,6 +83,7 @@ public Configuration reset() {
 		stackExclusions.add("javax.");
 		stackExclusions.add("jdk.internal."); // for jdk11 (not needed in jdk8)
 		stackExclusions.add("System."); // for .net
+		stackExclusions.add("InvokeStub_EventListener"); // since .net8.0
 		for (String item : getMultiValueProperty("qacover.stack.exclusions"))
 			stackExclusions.add(item);