add net8.0 and efcore 8.0

src/OpenRiaServices.Client/Framework/TypeUtility.cs

@@ -32,6 +32,9 @@ internal static class TypeUtility
             "b03f5f7f11d50a3a", // Microsoft.VisualBasic, Microsoft.CSharp, System.Configuration
             "7cec85d7bea7798e",  // Silverlight system assemblies
             OpenRiaServicesPublicKeyToken, // OpenRiaServices.
+#if NETCOREAPP
+            "adb9793829ddae60"
+#endif
         };
 
         /// <summary>

src/OpenRiaServices.EntityFramework/Test/CodeFirstModel/EFCodeFirstModels.csproj

@@ -3,7 +3,7 @@
     <NoWarn>618</NoWarn>
     <RootNamespace>CodeFirstModels</RootNamespace>
     <AssemblyName>CodeFirstModels</AssemblyName>
-    <TargetFrameworks>net472;net6.0</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
     <DefineConstants>$(DefineConstants);DBCONTEXT</DefineConstants>
     <Version>1.0.0.0</Version>
   </PropertyGroup>

src/OpenRiaServices.EntityFramework/Test/DbContextModel/EFDbContextModels.csproj

@@ -3,7 +3,7 @@
     <NoWarn>618</NoWarn>
     <RootNamespace>DbContextModels</RootNamespace>
     <AssemblyName>DbContextModels</AssemblyName>
-    <TargetFrameworks>net472;net6.0</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
     <Version>1.0.0.0</Version>
   </PropertyGroup>
   <Target Name="WriteProjectPath" BeforeTargets="GetCopyToOutputDirectoryItems">

src/OpenRiaServices.Hosting.AspNetCore/Framework/AspNetCore/OpenRiaServicesConfigurationBuilder.cs

@@ -33,5 +33,6 @@ public IEndpointConventionBuilder AddDomainService<T>() where T : DomainService
         {
             return AddDomainService(typeof(T));
         }
+
     }
 }

src/OpenRiaServices.Hosting.AspNetCore/Test/OpenRiaServices.Hosting.AspNetCore.Test/OpenRiaServices.Hosting.AspNetCore.Test.csproj

@@ -1,12 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <RootNamespace>OpenRiaServices.Hosting.AspNetCore</RootNamespace>
     <Version>1.0.0.0</Version>
   </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="EntityFramework" Version="6.4.4" />
+  <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.25" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+  </ItemGroup>
+  <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
     <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />

src/OpenRiaServices.Server.EntityFrameworkCore/Framework/OpenRiaServices.Server.EntityFrameworkCore.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;netstandard2.0;net8.0</TargetFrameworks>
     <DefineConstants>$(DefineConstants);SERVERFX;EFCORE</DefineConstants>
     <GeneratePackageOnBuild Condition="'$(Configuration)'=='Release'">true</GeneratePackageOnBuild>
     <VersionPrefix>2.0.2</VersionPrefix>
@@ -13,8 +13,11 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore" Condition="'$(TargetFramework)'=='netstandard2.0'" Version="3.1.24" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Condition="'$(TargetFramework)'=='netstandard2.0'" Version="3.1.24" />
 
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Condition="'$(TargetFramework)'!='netstandard2.0'" Version="6.0.*" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Condition="'$(TargetFramework)'!='netstandard2.0'" Version="6.0.*" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Condition="'$(TargetFramework)'=='net6.0'" Version="6.0.*" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Condition="'$(TargetFramework)'=='net6.0'" Version="6.0.*" />
+
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Condition="'$(TargetFramework)'=='net8.0'" Version="8.0.*" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Condition="'$(TargetFramework)'=='net8.0'" Version="8.0.*" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\OpenRiaServices.Server\Framework\OpenRiaServices.Server.csproj" />

src/OpenRiaServices.Server.EntityFrameworkCore/Test/DbContextModel/EFCoreModels.csproj

@@ -1,13 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <NoWarn>618</NoWarn>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
     <Version>1.0.0.0</Version>
   </PropertyGroup>
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.32" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.32" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.32" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.25" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.25" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.25" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0" />
+  </ItemGroup>
+  <ItemGroup>
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup>

src/OpenRiaServices.Server.UnitTesting/Test/OpenRiaServices.Server.UnitTesting.Test.csproj

@@ -4,8 +4,13 @@
     <DefineConstants>$(DefineConstants);SERVERFX</DefineConstants>
     <TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'!='net8.0'">
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+  </ItemGroup>
+  <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
     <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />

src/OpenRiaServices.Tools.TextTemplate/Test/OpenRiaServices.Tools.TextTemplate.Test.csproj

@@ -34,16 +34,31 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='net472'">
     <PackageReference Include="EntityFramework" Version="6.4.4" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.8.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.25" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.8.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.5.0" />
+  </ItemGroup>
+
+  <ItemGroup>
     <PackageReference Include="Microsoft.Build.Locator" Version="1.6.10" />
     <PackageReference Include="Microsoft.Build" Version="17.0.0" PrivateAssets="All" ExcludeAssets="Runtime" />
     <PackageReference Include="Microsoft.Build.Framework" Version="17.0.0" PrivateAssets="All" ExcludeAssets="Runtime" />
     <PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.0.0" PrivateAssets="All" ExcludeAssets="Runtime" />
     <PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.0.0" PrivateAssets="All" ExcludeAssets="Runtime" />
     <PackageReference Include="System.Reflection.MetadataLoadContext" Version="8.0.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.8.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
     <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />

src/OpenRiaServices.Tools/Framework/DbContextUtilities.cs

@@ -12,7 +12,11 @@ internal static class DbContextUtilities
     {
         private const string DatabaseTypeName = @"System.Data.Entity.Database";
         private const string IDatabaseInitializerTypeName = "System.Data.Entity.IDatabaseInitializer`1";
+#if NETCOREAPP
+        internal const string DbContextTypeName = @"Microsoft.EntityFrameworkCore.DbContext";
+#else
         internal const string DbContextTypeName = @"System.Data.Entity.DbContext";
+#endif
 
         private static Type _dbContextTypeReference;
 
@@ -183,9 +187,12 @@ public static bool IsDbContext(this Type type)
                 }
             }
         }
+#else
+#if NETCOREAPP
+        private const string DbDomainServiceTypeName = @"OpenRiaServices.Server.EntityFrameworkCore.DbDomainService`1";
 #else
         private const string DbDomainServiceTypeName = @"OpenRiaServices.EntityFramework.DbDomainService`1";
-
+#endif
         /// <summary>
         /// Returns the DbContext type given the <see cref="DomainService"/> type. Uses late binding so as to avoid adding a reference to EF 4.1.
         /// </summary>

src/OpenRiaServices.Tools/Test/DbContextUtilitiesTest.cs

@@ -1,5 +1,9 @@
 using System;
+#if NETCOREAPP
+using Microsoft.EntityFrameworkCore;
+#else
 using System.Data.Entity;
+#endif
 using System.Reflection;
 using CodeFirstModels;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -13,11 +17,21 @@ public class DbContextUtilitiesTest
         [Description("Test various utility methods in DbContextUtilities")]
         public void TestDbContextUtilitiesMethods()
         {
+#if NETCOREAPP
+            Type dbContextTypeRef = DbContextUtilities.GetDbContextTypeReference(typeof(EFCoreModels.Northwind.EFCoreDbCtxNorthwindEntities));
+#else
             Type dbContextTypeRef = DbContextUtilities.GetDbContextTypeReference(typeof(EFCFNorthwindEntities));
+#endif
             Assert.AreEqual(typeof(DbContext), dbContextTypeRef);
 
+#if NETCOREAPP
+            Type dbContextType = DbContextUtilities.GetDbContextType(typeof(TestDomainServices.EFCore.Northwind));
+            Assert.AreEqual(typeof(EFCoreModels.Northwind.EFCoreDbCtxNorthwindEntities), dbContextType);
+#else
             Type dbContextType = DbContextUtilities.GetDbContextType(typeof(TestDomainServices.EFCF.Northwind));
             Assert.AreEqual(typeof(EFCFNorthwindEntities), dbContextType);
+#endif
+
 
             Type dbSetType = DbContextUtilities.LoadTypeFromAssembly(typeof(DbContext).Assembly, typeof(DbSet<>).FullName);
             Assert.IsNotNull(dbSetType);

src/OpenRiaServices.Tools/Test/OpenRiaServices.Tools.Test.csproj

@@ -18,7 +18,24 @@
     </Content>
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.5.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.5.0" />
+    <PackageReference Include="Microsoft.Build.Locator" Version="1.6.10" />
+    <PackageReference Include="Microsoft.Build" Version="17.0.0" PrivateAssets="All" ExcludeAssets="Runtime" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="17.0.0" PrivateAssets="All" ExcludeAssets="Runtime" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.0.0" PrivateAssets="All" ExcludeAssets="Runtime" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.0.0" PrivateAssets="All" ExcludeAssets="Runtime" />
+    <PackageReference Include="Mono.Cecil" Version="0.11.5" />
+    <PackageReference Include="System.Reflection.MetadataLoadContext" Version="8.0.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)'!='net8.0'">
     <PackageReference Include="EntityFramework" Version="6.4.4" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />

src/OpenRiaServices.Tools/Test/TestHelper.cs

@@ -43,7 +43,11 @@ public static string GetOutputPath(string projectOutputDir, string baseName)
         public static void GetProjectPaths(string relativeTestDir, out string projectPath, out string outputPath)
         {
             // Read file from output folder
-            string inputString = File.ReadAllText("ProjectPath.txt");
+            string inputString;
+            if (!string.IsNullOrEmpty(relativeTestDir))
+                inputString = File.ReadAllText($"{relativeTestDir}\\ProjectPath.txt");
+            else
+                inputString = File.ReadAllText("ProjectPath.txt");
 
 
             string[] split = inputString.Split(',');

src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/DBImager.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Data.SqlClient;
 using System.IO;
-#if !NET6_0
+#if !NET6_0_OR_GREATER
 using System.Web.Hosting;
 #endif
 
@@ -33,7 +33,7 @@ private static string GetDBFileCore(string fileName)
                 return Path.Combine(Directory.GetCurrentDirectory(), fileName);
 
             // If path is not relative to working directory then check if it is a virtual path
-#if NET6_0
+#if NET6_0_OR_GREATER
             // Relative directoy when running in website project folder
             string mappedPath = fileName.Replace("~/", "../WebsiteFullTrust/");
             if (File.Exists(mappedPath))

src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/DataModels/ScenarioModels/ContextInstantiationScenarios.cs

@@ -17,7 +17,7 @@ public ObjectContextInstantiationScenarios()
         }
     }
 
-#if !NET6_0
+#if !NET6_0_OR_GREATER
     /// <summary>
     /// This class is used to test instantiation errors at code gen
     /// </summary>
@@ -44,7 +44,7 @@ public ObjectContextInheritanceScenarios()
         }
     }
 
-#if !NET6_0
+#if !NET6_0_OR_GREATER
     /// <summary>
     /// This class is used to make sure one can inherit from DataContext and BO wizard still works.
     /// </summary>

src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Mocks/MockDomainServices.cs

@@ -15,7 +15,7 @@
 using System.Threading;
 using DataModels.ScenarioModels;
 
-#if !NET6_0
+#if !NET6_0_OR_GREATER
 using DataTests.AdventureWorks.LTS;
 using OpenRiaServices.LinqToSql;
 using System.Web;
@@ -200,7 +200,7 @@ public class NonDomainService
         }
     }
 
-#if !NET6_0
+#if !NET6_0_OR_GREATER
     /// <summary>
     /// This domain service attempts to declare L2S description provider with EF context
     /// </summary>
@@ -268,7 +268,7 @@ public IQueryable<A> GetProducts()
         }
     }
 
-#if !NET6_0
+#if !NET6_0_OR_GREATER
     /// <summary>
     /// This mock LINQ to SQL DomainService throws an exception in its constructor
     /// </summary>
@@ -1096,7 +1096,7 @@ public IEnumerable<A> GetAsReturnNull()
         public IQueryable<TestSideEffects> CreateAndGetSideEffectsObjects(string name, [InjectParameter] HttpContext httpContext)
         {
             HttpRequest request = httpContext.Request;
-#if NET6_0
+#if NET6_0_OR_GREATER
             string verb = request.Method;
             var url = new Uri ("http://" + request.Host.ToString() + request.Path.ToString() + request.QueryString.ToString());
 #else
@@ -2114,7 +2114,7 @@ public TestEnum ReturnsEnum_Online(TestEnum value)
         [Invoke(HasSideEffects = true)]
         public string ReturnHttpMethodWithSideEffects_Online([InjectParameter] HttpContext httpContext)
         {
-#if NET6_0
+#if NET6_0_OR_GREATER
             return httpContext.Request.Method;
 #else
             return httpContext.Request.HttpMethod;
@@ -2124,7 +2124,7 @@ public string ReturnHttpMethodWithSideEffects_Online([InjectParameter] HttpConte
         [Invoke(HasSideEffects = false)]
         public string ReturnHttpMethodWithoutSideEffects_Online([InjectParameter] HttpContext httpContext)
         {
-#if NET6_0
+#if NET6_0_OR_GREATER
             return httpContext.Request.Method;
 #else
             return httpContext.Request.HttpMethod;

src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/OpenRiaServices.Common.DomainServices.Test.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <TargetFrameworks>net472;net6.0</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
     <DebugType>pdbonly</DebugType>
 
     <NoWarn Condition="'$(TargetFramework)'!='net472'">$(NoWarn);CS0618</NoWarn>

src/Test/Desktop/OpenRiaServices.Common.Test/OpenRiaServices.Common.Test.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <TargetFrameworks>net472;net6.0</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>