Inclusão de .NET 8 como target;

Atualização de dependências.
Eficaz-Sistemas · Nov 17, 2023 · 9f8ef52 · 9f8ef52
1 parent 52e61e0
commit 9f8ef52
Show file tree

Hide file tree

Showing 20 changed files with 158 additions and 117 deletions.
diff --git a/src/Core/EficazFramework.Collections/EficazFramework.Collections.csproj b/src/Core/EficazFramework.Collections/EficazFramework.Collections.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	  <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-	  <Version>6.1.7</Version>
-	  <AssemblyVersion>6.1.7.0</AssemblyVersion>
-	  <FileVersion>6.1.7.0</FileVersion>
+	  <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+	  <Version>6.2.0</Version>
+	  <AssemblyVersion>6.2.0.0</AssemblyVersion>
+	  <FileVersion>6.2.0.0</FileVersion>
 	  <RootNamespace>EficazFramework</RootNamespace>
 	  <SignAssembly>true</SignAssembly>
 	  <AssemblyOriginatorKeyFile>EfCore.snk</AssemblyOriginatorKeyFile>

diff --git a/src/Core/EficazFramework.Data/EficazFramework.Data.csproj b/src/Core/EficazFramework.Data/EficazFramework.Data.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <!--in Memory of Laudo Ferreira da Silva and Francisco Luis de Sousa † 2020-->
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-	<Version>6.1.7</Version>
-	<AssemblyVersion>6.1.7.0</AssemblyVersion>
-	<FileVersion>6.1.7.0</FileVersion>
+    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+	<Version>6.2.0</Version>
+	<AssemblyVersion>6.2.0.0</AssemblyVersion>
+	<FileVersion>6.2.0.0</FileVersion>
     <RootNamespace>EficazFramework</RootNamespace>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>EfCore.snk</AssemblyOriginatorKeyFile>
@@ -90,9 +90,6 @@
   </ItemGroup>
 
   <ItemGroup>
-	<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.11" />
-	<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.11" />
-	<PackageReference Include="System.Security.Permissions" Version="7.0.0" />
     <PackageReference Include="DefaultDocumentation" Version="0.8.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -103,17 +100,17 @@
     </PackageReference>
   </ItemGroup>
 
-  <!--<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
-  	<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.11" />
-  	<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.11" />
-  	<PackageReference Include="System.Security.Permissions" Version="6.0.0" />
-  </ItemGroup>
-  
   <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
-  	<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
-  	<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.5" />
+  	<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.14" />
+  	<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.14" />
   	<PackageReference Include="System.Security.Permissions" Version="7.0.0" />
-  </ItemGroup>-->
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+  	<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
+  	<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.0" />
+  	<PackageReference Include="System.Security.Permissions" Version="8.0.0" />
+  </ItemGroup>
 
 	<ItemGroup>
     <Compile Update="Resources\Strings\Commands.Designer.cs">

diff --git a/src/Core/EficazFramework.Expressions/EficazFramework.Expressions.csproj b/src/Core/EficazFramework.Expressions/EficazFramework.Expressions.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	  <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-	  <Version>6.1.7</Version>
-	  <AssemblyVersion>6.1.7.0</AssemblyVersion>
-	  <FileVersion>6.1.7.0</FileVersion>
+	  <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+	  <Version>6.2.0</Version>
+	  <AssemblyVersion>6.2.0.0</AssemblyVersion>
+	  <FileVersion>6.2.0.0</FileVersion>
 	  <RootNamespace>EficazFramework</RootNamespace>
 	  <SignAssembly>true</SignAssembly>
 	  <AssemblyOriginatorKeyFile>EfCore.snk</AssemblyOriginatorKeyFile>

diff --git a/src/Core/EficazFramework.Utilities/EficazFramework.Utilities.csproj b/src/Core/EficazFramework.Utilities/EficazFramework.Utilities.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <!--in Memory of Laudo Ferreira da Silva and Francisco Luis de Sousa † 2020-->
   <PropertyGroup>
-	<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-	<Version>6.1.7</Version>
-	<AssemblyVersion>6.1.7.0</AssemblyVersion>
-	<FileVersion>6.1.7.0</FileVersion>
+	<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+	<Version>6.2.0</Version>
+	<AssemblyVersion>6.2.0.0</AssemblyVersion>
+	<FileVersion>6.2.0.0</FileVersion>
 	<Nullable>enable</Nullable>
 	<RootNamespace>EficazFramework</RootNamespace>
     <Authors>Eficaz Sistemas</Authors>
@@ -56,7 +56,7 @@
   </ItemGroup>
 
   <ItemGroup>
-	<PackageReference Include="System.Security.Cryptography.Xml" Version="7.0.1" />
+	<PackageReference Include="System.Security.Cryptography.Xml" Version="8.0.0" />
     <PackageReference Include="DefaultDocumentation" Version="0.8.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -67,12 +67,12 @@
     </PackageReference>
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
-	<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="6.0.11" />
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
+	<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.14" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
-	<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.11" />
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+	<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/DataProviders/EficazFramework.Data.InMemory/EficazFramework.Data.InMemory.csproj b/src/DataProviders/EficazFramework.Data.InMemory/EficazFramework.Data.InMemory.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	  <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-	  <Version>6.1.7</Version>
-	  <AssemblyVersion>6.1.7.0</AssemblyVersion>
-	  <FileVersion>6.1.7.0</FileVersion>
+	  <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+	  <Version>6.2.0</Version>
+	  <AssemblyVersion>6.2.0.0</AssemblyVersion>
+	  <FileVersion>6.2.0.0</FileVersion>
 	  <RootNamespace>EficazFramework</RootNamespace>
 	  <SignAssembly>true</SignAssembly>
 	  <AssemblyOriginatorKeyFile>EfCore.snk</AssemblyOriginatorKeyFile>
@@ -56,7 +56,6 @@
   </ItemGroup>
 
   <ItemGroup>
-	  <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.11" />
     <PackageReference Include="DefaultDocumentation" Version="0.8.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -71,4 +70,22 @@
     <ProjectReference Include="..\..\Core\EficazFramework.Data\EficazFramework.Data.csproj" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
+	<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.14" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+	<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0" />
+  </ItemGroup>
+
+
+	<!--<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
+
+  </ItemGroup>
+  
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+
+  </ItemGroup>-->
+
+
 </Project>
diff --git a/src/DataProviders/EficazFramework.Data.MsSqlServer/EficazFramework.Data.MsSqlServer.csproj b/src/DataProviders/EficazFramework.Data.MsSqlServer/EficazFramework.Data.MsSqlServer.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-	<Version>6.1.7</Version>
-	<AssemblyVersion>6.1.7.0</AssemblyVersion>
-	<FileVersion>6.1.7.0</FileVersion>
+	<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+	<Version>6.2.0</Version>
+	<AssemblyVersion>6.2.0.0</AssemblyVersion>
+	<FileVersion>6.2.0.0</FileVersion>
 	<RootNamespace>EficazFramework</RootNamespace>
 	<SignAssembly>true</SignAssembly>
 	<AssemblyOriginatorKeyFile>EfCore.snk</AssemblyOriginatorKeyFile>
@@ -55,18 +55,24 @@
     </None>
   </ItemGroup>
 
-	<ItemGroup>
-      <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.11" />
-	  <PackageReference Include="DefaultDocumentation" Version="0.8.2">
-	    <PrivateAssets>all</PrivateAssets>
-	    <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-	  </PackageReference>
-	  <PackageReference Include="EficazFramework.DocsApiPlugin" Version="1.0.8">
-	    <PrivateAssets>all</PrivateAssets>
-	    <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-	  </PackageReference>
+  <ItemGroup>
+    <PackageReference Include="DefaultDocumentation" Version="0.8.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="EficazFramework.DocsApiPlugin" Version="1.0.8">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.14" />
+  </ItemGroup>
 
-	</ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+	<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
+  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\Core\EficazFramework.Data\EficazFramework.Data.csproj" />

diff --git a/src/DataProviders/EficazFramework.Data.MySql/EficazFramework.Data.MySql.csproj b/src/DataProviders/EficazFramework.Data.MySql/EficazFramework.Data.MySql.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	  <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-	  <Version>6.1.7</Version>
-	  <AssemblyVersion>6.1.7.0</AssemblyVersion>
-	  <FileVersion>6.1.7.0</FileVersion>
+	  <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+	  <Version>6.2.0</Version>
+	  <AssemblyVersion>6.2.0.0</AssemblyVersion>
+	  <FileVersion>6.2.0.0</FileVersion>
 	  <RootNamespace>EficazFramework</RootNamespace>
 	  <SignAssembly>true</SignAssembly>
 	  <AssemblyOriginatorKeyFile>EfCore.snk</AssemblyOriginatorKeyFile>
@@ -54,7 +54,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-	 <PackageReference Include="MySql.EntityFrameworkCore" Version="7.0.5" />
     <PackageReference Include="DefaultDocumentation" Version="0.8.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -65,6 +64,15 @@
     </PackageReference>
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
+    <PackageReference Include="MySql.EntityFrameworkCore" Version="7.0.10" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+	<PackageReference Include="MySql.EntityFrameworkCore" Version="7.0.10" />
+  </ItemGroup>	
+
+
   <ItemGroup>
     <ProjectReference Include="..\..\Core\EficazFramework.Data\EficazFramework.Data.csproj" />
   </ItemGroup>

diff --git a/src/DataProviders/EficazFramework.Data.SqlLite/EficazFramework.Data.SqlLite.csproj b/src/DataProviders/EficazFramework.Data.SqlLite/EficazFramework.Data.SqlLite.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-		<Version>6.1.7</Version>
-		<AssemblyVersion>6.1.7.0</AssemblyVersion>
-		<FileVersion>6.1.7.0</FileVersion>
+		<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+		<Version>6.2.0</Version>
+		<AssemblyVersion>6.2.0.0</AssemblyVersion>
+		<FileVersion>6.2.0.0</FileVersion>
 		<RootNamespace>EficazFramework</RootNamespace>
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>EfCore.snk</AssemblyOriginatorKeyFile>
@@ -48,7 +48,6 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.11" />
 	  <PackageReference Include="DefaultDocumentation" Version="0.8.2">
 	    <PrivateAssets>all</PrivateAssets>
 	    <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -58,6 +57,14 @@
 	    <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 	  </PackageReference>
 	</ItemGroup>
+
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.14" />
+	</ItemGroup>
+
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0" />
+	</ItemGroup>
 
 	<ItemGroup>
 	  <ProjectReference Include="..\..\Core\EficazFramework.Data\EficazFramework.Data.csproj" />

diff --git a/src/Desktop/EficazFramework.WPF/EficazFramework.WPF.csproj b/src/Desktop/EficazFramework.WPF/EficazFramework.WPF.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0-windows;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net7.0-windows;net8.0-windows</TargetFrameworks>
     <UseWPF>true</UseWPF>
-	<Version>6.1.7</Version>
-	<AssemblyVersion>6.1.7.0</AssemblyVersion>
-	<FileVersion>6.1.7.0</FileVersion>
+	<Version>6.2.0</Version>
+	<AssemblyVersion>6.2.0.0</AssemblyVersion>
+	<FileVersion>6.2.0.0</FileVersion>
     <RootNamespace>EficazFramework</RootNamespace>
     <Authors>Eficaz Sistemas</Authors>
     <Company>Eficaz Sistemas de Gestão e Inteligência Tributária</Company>
@@ -57,7 +57,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="MaterialDesignThemes" Version="4.9.0" />
-    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
+    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Tests/Core/EficazFramework.Tests/EficazFramework.Tests.csproj b/src/Tests/Core/EficazFramework.Tests/EficazFramework.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
 
@@ -38,30 +38,37 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <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" />
-    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageReference Include="SolutionScripts" Version="1.2.0" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
-	<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.11">
-	  <PrivateAssets>all</PrivateAssets>
-	  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-	</PackageReference>
-	<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.11">
-	  <PrivateAssets>all</PrivateAssets>
-	  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-	</PackageReference>
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
-	  <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.11" />
-
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
+	  <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.14" />
+	  <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.14">
+		  <PrivateAssets>all</PrivateAssets>
+		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+	  </PackageReference>
+	  <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.14">
+		  <PrivateAssets>all</PrivateAssets>
+		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+	  </PackageReference>
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
-	  <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.11" />
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+	  <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0" />
+	  <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
+		  <PrivateAssets>all</PrivateAssets>
+		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+	  </PackageReference>
+	  <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0">
+		  <PrivateAssets>all</PrivateAssets>
+		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+	  </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Tests/Core/EficazFramework.Tests/Resources/Mocks/WebApplicationFactory.cs b/src/Tests/Core/EficazFramework.Tests/Resources/Mocks/WebApplicationFactory.cs
@@ -1,6 +1,4 @@
-
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Mvc.Testing;
+using Microsoft.AspNetCore.Mvc.Testing;
 using Microsoft.Extensions.Hosting;
 
 namespace EficazFramework.Tests.Resources.Mock.API;