Merge pull request #60 from Eficaz-Sistemas/master

Release 6.1.0
Eficaz-Sistemas · Nov 22, 2022 · 8819c42 · 8819c42
2 parents f62fa6e + a954835
commit 8819c42
Show file tree

Hide file tree

Showing 27 changed files with 299 additions and 113 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>
-	  <TargetFramework>net6.0</TargetFramework>
-	  <Version>6.0.0</Version>
-	  <AssemblyVersion>6.0.0.0</AssemblyVersion>
-	  <FileVersion>6.0.0.0</FileVersion>
+	  <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+	  <Version>6.1.0</Version>
+	  <AssemblyVersion>6.1.0.0</AssemblyVersion>
+	  <FileVersion>6.1.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>
-    <TargetFramework>net6.0</TargetFramework>
-    <Version>6.0.0</Version>
-    <AssemblyVersion>6.0.0.0</AssemblyVersion>
-    <FileVersion>6.0.0.0</FileVersion>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <Version>6.1.0</Version>
+    <AssemblyVersion>6.1.0.0</AssemblyVersion>
+    <FileVersion>6.1.0.0</FileVersion>
     <RootNamespace>EficazFramework</RootNamespace>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>EfCore.snk</AssemblyOriginatorKeyFile>
@@ -98,9 +98,18 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <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)' == '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.0" />
+  	<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.0" />
+  	<PackageReference Include="System.Security.Permissions" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Core/EficazFramework.Data/Repositories/EntityRepository.cs b/src/Core/EficazFramework.Data/Repositories/EntityRepository.cs
@@ -89,7 +89,6 @@ public override System.Collections.ObjectModel.ObservableCollection<TEntity> Fet
         }
         catch (OperationCanceledException tkex)
         {
-            Console.WriteLine(tkex.ToString());
             return new System.Collections.ObjectModel.ObservableCollection<TEntity>();
         }
     }

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>
-	  <TargetFramework>net6.0</TargetFramework>
-	  <Version>6.0.0</Version>
-	  <AssemblyVersion>6.0.0.0</AssemblyVersion>
-	  <FileVersion>6.0.0.0</FileVersion>
+	  <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+	  <Version>6.1.0</Version>
+	  <AssemblyVersion>6.1.0.0</AssemblyVersion>
+	  <FileVersion>6.1.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>
-    <TargetFramework>net6.0</TargetFramework>
-    <Version>6.0.0</Version>
-	<AssemblyVersion>6.0.0.0</AssemblyVersion>
-	<FileVersion>6.0.0.0</FileVersion>
+	<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+	<Version>6.1.0</Version>
+	<AssemblyVersion>6.1.0.0</AssemblyVersion>
+	<FileVersion>6.1.0.0</FileVersion>
 	<RootNamespace>EficazFramework</RootNamespace>
     <Authors>Eficaz Sistemas</Authors>
     <Company>Eficaz Sistemas de Gestão e Inteligência Tributária</Company>
@@ -59,10 +59,18 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="6.0.11" />
-    <PackageReference Include="System.Security.Cryptography.Xml" Version="7.0.0" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+	<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="6.0.11" />
+	<PackageReference Include="System.Security.Cryptography.Xml" Version="6.0.1" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
+	<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.0" />
+	<PackageReference Include="System.Security.Cryptography.Xml" Version="7.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Update="Resources\Strings\Application.Designer.cs">
       <DesignTime>True</DesignTime>

diff --git a/src/Core/EficazFramework.Utilities/Extensions/Text.cs b/src/Core/EficazFramework.Utilities/Extensions/Text.cs
@@ -504,7 +504,7 @@ public static string GetClearText(this string texto)
     /// <remarks></remarks>
     public static string RemoveTextMask(this string texto)
     {
-        texto = Regex.Replace(texto, @"(?:[^a-z0-9]|(?<=['\'])s)", string.Empty, RegexOptions.IgnoreCase & RegexOptions.CultureInvariant);
+        texto = Regex.Replace(texto, @"(?:[^a-za-zA-Z0-9]|(?<=['\'])s)", string.Empty, RegexOptions.IgnoreCase & RegexOptions.CultureInvariant);
         return texto.Replace(" ", "");
     }
 

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>
-	  <TargetFramework>net6.0</TargetFramework>
-	  <Version>6.0.0</Version>
-	  <AssemblyVersion>6.0.0.0</AssemblyVersion>
-	  <FileVersion>6.0.0.0</FileVersion>
+	  <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+	  <Version>6.1.0</Version>
+	  <AssemblyVersion>6.1.0.0</AssemblyVersion>
+	  <FileVersion>6.1.0.0</FileVersion>
 	  <RootNamespace>EficazFramework</RootNamespace>
 	  <SignAssembly>true</SignAssembly>
 	  <AssemblyOriginatorKeyFile>EfCore.snk</AssemblyOriginatorKeyFile>
@@ -64,9 +64,16 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.11" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+	  <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.11" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
+	  <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\Core\EficazFramework.Data\EficazFramework.Data.csproj" />
   </ItemGroup>

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>
-    <TargetFramework>net6.0</TargetFramework>
-    <Version>6.0.0</Version>
-	<AssemblyVersion>6.0.0.0</AssemblyVersion>
-	<FileVersion>6.0.0.0</FileVersion>
+	<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+	<Version>6.1.0</Version>
+	<AssemblyVersion>6.1.0.0</AssemblyVersion>
+	<FileVersion>6.1.0.0</FileVersion>
 	<RootNamespace>EficazFramework</RootNamespace>
 	<SignAssembly>true</SignAssembly>
 	<AssemblyOriginatorKeyFile>EfCore.snk</AssemblyOriginatorKeyFile>
@@ -64,8 +64,16 @@
 	    <PrivateAssets>all</PrivateAssets>
 	    <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 	  </PackageReference>
-	  <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.11" />
+
 	</ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+	  <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.11" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
+	  <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.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>
-	  <TargetFramework>net6.0</TargetFramework>
-      <Version>6.0.0</Version>
-	  <AssemblyVersion>6.0.0.0</AssemblyVersion>
-	  <FileVersion>6.0.0.0</FileVersion>
+	  <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+	  <Version>6.1.0</Version>
+	  <AssemblyVersion>6.1.0.0</AssemblyVersion>
+	  <FileVersion>6.1.0.0</FileVersion>
 	  <RootNamespace>EficazFramework</RootNamespace>
 	  <SignAssembly>true</SignAssembly>
 	  <AssemblyOriginatorKeyFile>EfCore.snk</AssemblyOriginatorKeyFile>
@@ -62,7 +62,14 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="MySql.EntityFrameworkCore" Version="6.0.7" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+	  <PackageReference Include="MySql.EntityFrameworkCore" Version="6.0.7" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
+	  <PackageReference Include="MySql.EntityFrameworkCore" Version="6.0.7" />
   </ItemGroup>
 
   <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>
-		<TargetFramework>net6.0</TargetFramework>
-		<Version>6.0.0</Version>
-		<AssemblyVersion>6.0.0.0</AssemblyVersion>
-		<FileVersion>6.0.0.0</FileVersion>
+		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+		<Version>6.1.0</Version>
+		<AssemblyVersion>6.1.0.0</AssemblyVersion>
+		<FileVersion>6.1.0.0</FileVersion>
 		<RootNamespace>EficazFramework</RootNamespace>
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>EfCore.snk</AssemblyOriginatorKeyFile>
@@ -56,7 +56,14 @@
 	    <PrivateAssets>all</PrivateAssets>
 	    <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 	  </PackageReference>
-	  <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.11" />
+	</ItemGroup>
+
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.11" />
+	</ItemGroup>
+
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>

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>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFrameworks>net6.0-windows;net7.0-windows</TargetFrameworks>
     <UseWPF>true</UseWPF>
-    <Version>6.0.0</Version>
-    <AssemblyVersion>6.0.0.0</AssemblyVersion>
-    <FileVersion>6.0.0.0</FileVersion>
+	<Version>6.1.0</Version>
+	<AssemblyVersion>6.1.0.0</AssemblyVersion>
+	<FileVersion>6.1.0.0</FileVersion>
     <RootNamespace>EficazFramework</RootNamespace>
     <Authors>Eficaz Sistemas</Authors>
     <Company>Eficaz Sistemas de Gestão e Inteligência Tributária</Company>

diff --git a/src/Tests/Core/EficazFramework.Tests/Command/Actions.cs b/src/Tests/Core/EficazFramework.Tests/Command/Actions.cs
@@ -13,7 +13,7 @@ public class Actions
     private const string MyConfig = "MyConfig";
     private const int delay = 500;
 
-    [Test, Order(1)]
+    [Test]
     public void Invoke()
     {
         var parameters = new Dictionary<string, bool>
@@ -24,11 +24,11 @@ public void Invoke()
         TimeSpan start = DateTime.Now.TimeOfDay;
         EficazFramework.Commands.DelayedAction.Invoke(() => CustomAction(parameters), delay);
         TimeSpan delta = DateTime.Now.TimeOfDay - start;
-        delta.Milliseconds.Should().BeGreaterThanOrEqualTo(delay);
+        delta.Milliseconds.Should().BeCloseTo(delay, 50);
         parameters[MyConfig].Should().Be(true);
     }
 
-    [Test, Order(2)]
+    [Test]
     public async Task InvokeAsync()
     {
         var parameters = new Dictionary<string, bool>
@@ -46,7 +46,7 @@ public async Task InvokeAsync()
         {
             await EficazFramework.Commands.DelayedAction.InvokeAsync(action, delay, tks.Token);
             TimeSpan delta = DateTime.Now.TimeOfDay - start;
-            delta.Milliseconds.Should().BeGreaterThanOrEqualTo(delay);
+            delta.Milliseconds.Should().BeCloseTo(delay, 50);
         }
         catch (TaskCanceledException tex)
         {

diff --git a/src/Tests/Core/EficazFramework.Tests/EficazFramework.Tests.csproj b/src/Tests/Core/EficazFramework.Tests/EficazFramework.Tests.csproj
@@ -1,11 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
 
-    <Version>6.0.0-preview010</Version>
+    <Version>6.1.0</Version>
 
     <Description>Biblioteca de testes da Eficaz Framework Core.</Description>
 
@@ -30,24 +30,39 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="FluentAssertions" Version="6.8.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.11" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.11">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.11">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
     <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
     <PackageReference Include="SolutionScripts" Version="1.2.0" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+	  <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.11" />
+	  <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.11">
+		  <PrivateAssets>all</PrivateAssets>
+		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+	  </PackageReference>
+	  <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.11">
+		  <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.0" />
+	  <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.0">
+		  <PrivateAssets>all</PrivateAssets>
+		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+	  </PackageReference>
+	  <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0">
+		  <PrivateAssets>all</PrivateAssets>
+		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+	  </PackageReference>
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\..\Core\EficazFramework.Data\EficazFramework.Data.csproj" />
     <ProjectReference Include="..\..\..\Core\EficazFramework.Expressions\EficazFramework.Expressions.csproj" />