Skip to content

Commit

Permalink
Merge pull request #70 from Eficaz-Sistemas/master
Browse files Browse the repository at this point in the history
Release 6.1.5
  • Loading branch information
HClausing committed Jun 12, 2023
2 parents bfcaa5b + ad4307d commit 29ba1c9
Show file tree
Hide file tree
Showing 32 changed files with 299 additions and 178 deletions.
Binary file added Assets/Blazor/MdiHost.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 14 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,15 @@
# EficazFramework

![DotNet Versions](https://img.shields.io/static/v1?label=dotnet&message=6.0%20%7C%207.0&color=blueviolet&style=flat-square&logo=dotnet)
![Azure DevOps builds](https://eficazshields.azurewebsites.net/azure-devops/build/eficazcs/EficazFramework/27?&logo=azurepipelines&logoColor=white&style=flat-square)
![Azure DevOps tests (compact)](https://eficazshields.azurewebsites.net/azure-devops/tests/eficazcs/EficazFramework/18?compact_message&logo=azuredevops&logoColor=white&style=flat-square)
![Azure DevOps coverage](https://eficazshields.azurewebsites.net/azure-devops/coverage/eficazcs/EficazFramework/18?logo=codecov&logoColor=white&style=flat-square)
[![Discord](https://eficazshields.azurewebsites.net/discord/846078359498653706?color=purple&logo=discord&logoColor=white&style=flat-square)](https://discord.gg/ePvZEGBgaf)
[![Twitter Follow](https://eficazshields.azurewebsites.net/twitter/follow/EficazCS?color=blue&label=twitter&logo=twitter&logoColor=white&style=flat-square)](https://twitter.com/EficazCS)

| Área | Versão | Build | Testes | Cobertura |
| :--- | :---: | :---: | :---: | :---: |
| Core | ![Nuget](https://eficazshields.azurewebsites.net/nuget/v/EficazFramework.Utilities?style=flat-square) | ![Azure DevOps builds](https://eficazshields.azurewebsites.net/azure-devops/build/eficazcs/EficazFramework/27?&logo=azurepipelines&logoColor=white&style=flat-square) | ![Azure DevOps tests (compact)](https://eficazshields.azurewebsites.net/azure-devops/tests/eficazcs/EficazFramework/18?compact_message&logo=azuredevops&logoColor=white&style=flat-square) | ![Azure DevOps coverage](https://eficazshields.azurewebsites.net/azure-devops/coverage/eficazcs/EficazFramework/18?logo=codecov&logoColor=white&style=flat-square) |
| Blazor | ![Nuget](https://eficazshields.azurewebsites.net/nuget/v/EficazFramework.Blazor?style=flat-square) | ![Azure DevOps builds](https://eficazshields.azurewebsites.net/azure-devops/build/eficazcs/EficazFramework/29?&logo=azurepipelines&logoColor=white&style=flat-square) | ![Azure DevOps tests (compact)](https://eficazshields.azurewebsites.net/azure-devops/tests/eficazcs/EficazFramework/30?compact_message&logo=azuredevops&logoColor=white&style=flat-square) | ![Azure DevOps coverage](https://eficazshields.azurewebsites.net/azure-devops/coverage/eficazcs/EficazFramework/30?logo=codecov&logoColor=white&style=flat-square)
| WPF | N/A | ![Azure DevOps builds (branch)](https://eficazshields.azurewebsites.net/azure-devops/build/eficazcs/EficazFramework/26/master?&logo=azurepipelines&logoColor=white&style=flat-square) | ![Azure DevOps tests (compact)](https://eficazshields.azurewebsites.net/azure-devops/tests/eficazcs/EficazFramework/26?compact_message&logo=azuredevops&logoColor=white&style=flat-square) | ![Azure DevOps coverage](https://eficazshields.azurewebsites.net/azure-devops/coverage/eficazcs/EficazFramework/26?logo=codecov&logoColor=white&style=flat-square)

Bem vindo à EficazFramework, biblioteca de extensões, componentes e utilitários para aplicações .NET em geral.

Este projeto tem por finalidade oferecer funcionalidades extras e padronizadas para diversas plataformas.
Expand All @@ -20,7 +23,7 @@

## Características

#### Ambiente Multi-Plataformas
### Ambiente Multi-Plataformas
- Extensões para operações comuns em datas e números
- Extensões para trabalho com textos e suas formatações, incluindo documentos federais e estaduais
- Extensões para manipuração de listas de objetos
Expand All @@ -34,22 +37,19 @@

#### <img src="./Assets/blazor.svg" width="24" height="24" style="fill:#512BD4" /> Biblioteca de extensão para Blazor (Server-Side e WebAssembly)

![Azure DevOps builds](https://eficazshields.azurewebsites.net/azure-devops/build/eficazcs/EficazFramework/29?&logo=azurepipelines&logoColor=white&style=flat-square)
![Azure DevOps tests (compact)](https://eficazshields.azurewebsites.net/azure-devops/tests/eficazcs/EficazFramework/30?compact_message&logo=azuredevops&logoColor=white&style=flat-square)
![Azure DevOps coverage](https://eficazshields.azurewebsites.net/azure-devops/coverage/eficazcs/EficazFramework/30?logo=codecov&logoColor=white&style=flat-square)

- Novos Componentes, Templates e Layouts para melhor padronização das aplicações, conforme sua natureza
- UI baseada em MaterialDesign, utilizando a biblioteca OpenSource [MudBlazor](https://github.com/MudBlazor/MudBlazor)

#### <img src="./Assets/xaml.svg" width="24" height="24" style="fill:#512BD4" /> Biblioteca de extensão para Windows Presentation Foundation (WPF)
![Mdi Host](/Assets/Blazor/MdiHost.gif)

![Azure DevOps builds (branch)](https://eficazshields.azurewebsites.net/azure-devops/build/eficazcs/EficazFramework/26/master?label=tests&logo=azuredevops&logoColor=white&style=flat-square)
![Azure DevOps tests (compact)](https://eficazshields.azurewebsites.net/azure-devops/tests/eficazcs/EficazFramework/26?compact_message&logo=azuredevops&logoColor=white&style=flat-square)
![Azure DevOps coverage](https://eficazshields.azurewebsites.net/azure-devops/coverage/eficazcs/EficazFramework/26?logo=codecov&logoColor=white&style=flat-square)
### <img src="./Assets/xaml.svg" width="24" height="24" style="fill:#512BD4" /> Biblioteca de extensão para Windows Presentation Foundation (WPF)

- Controles Visuais para melhor experiência de utilização pelo usuário
- Extensões para XAML e Code-Behind
- UI baseada em MaterialDesign, usufruindo do trabalho feito na versão 3.x desta framework, consolidada no mercado e em produção desde 2015;

#### Pré-Requisitos
- [.NET 6.0](https://dotnet.microsoft.com/download/dotnet/6.0), para versão mais recente da biblioteca (pode sofrer alterações sem aviso prévio).
### Pré-Requisitos
| Versão | Versão do .NET | Suporte |
| :--- | :--- | :---: |
| 6.1.x | [.NET 6](https://dotnet.microsoft.com/download/dotnet/6.0); [.NET 7](https://dotnet.microsoft.com/en-us/download/dotnet/7.0) | :white_check_mark:|
| 6.0.x | [.NET 6](https://dotnet.microsoft.com/download/dotnet/6.0) | :x: |
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.5.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.6.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.6.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<Version>6.1.3</Version>
<AssemblyVersion>6.1.3.0</AssemblyVersion>
<FileVersion>6.1.3.0</FileVersion>
<Version>6.1.5</Version>
<AssemblyVersion>6.1.5.0</AssemblyVersion>
<FileVersion>6.1.5.0</FileVersion>
<RootNamespace>EficazFramework</RootNamespace>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>EfCore.snk</AssemblyOriginatorKeyFile>
Expand Down
19 changes: 11 additions & 8 deletions src/Core/EficazFramework.Data/EficazFramework.Data.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<!--in Memory of Laudo Ferreira da Silva and Francisco Luis de Sousa † 2020-->
<PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<Version>6.1.3</Version>
<AssemblyVersion>6.1.3.0</AssemblyVersion>
<FileVersion>6.1.3.0</FileVersion>
<Version>6.1.5</Version>
<AssemblyVersion>6.1.5.0</AssemblyVersion>
<FileVersion>6.1.5.0</FileVersion>
<RootNamespace>EficazFramework</RootNamespace>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>EfCore.snk</AssemblyOriginatorKeyFile>
Expand Down Expand Up @@ -90,6 +90,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.5" />
<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>
Expand All @@ -100,19 +103,19 @@
</PackageReference>
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
<!--<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.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.5" />
<PackageReference Include="System.Security.Permissions" Version="7.0.0" />
</ItemGroup>
</ItemGroup>-->

<ItemGroup>
<ItemGroup>
<Compile Update="Resources\Strings\Commands.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<Version>6.1.3</Version>
<AssemblyVersion>6.1.3.0</AssemblyVersion>
<FileVersion>6.1.3.0</FileVersion>
<Version>6.1.5</Version>
<AssemblyVersion>6.1.5.0</AssemblyVersion>
<FileVersion>6.1.5.0</FileVersion>
<RootNamespace>EficazFramework</RootNamespace>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>EfCore.snk</AssemblyOriginatorKeyFile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<!--in Memory of Laudo Ferreira da Silva and Francisco Luis de Sousa † 2020-->
<PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<Version>6.1.3</Version>
<AssemblyVersion>6.1.3.0</AssemblyVersion>
<FileVersion>6.1.3.0</FileVersion>
<Version>6.1.5</Version>
<AssemblyVersion>6.1.5.0</AssemblyVersion>
<FileVersion>6.1.5.0</FileVersion>
<Nullable>enable</Nullable>
<RootNamespace>EficazFramework</RootNamespace>
<Authors>Eficaz Sistemas</Authors>
Expand Down Expand Up @@ -56,6 +56,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Security.Cryptography.Xml" Version="7.0.1" />
<PackageReference Include="DefaultDocumentation" Version="0.8.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand All @@ -65,15 +66,13 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</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.3" />
<PackageReference Include="System.Security.Cryptography.Xml" Version="7.0.1" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.5" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<Version>6.1.3</Version>
<AssemblyVersion>6.1.3.0</AssemblyVersion>
<FileVersion>6.1.3.0</FileVersion>
<Version>6.1.5</Version>
<AssemblyVersion>6.1.5.0</AssemblyVersion>
<FileVersion>6.1.5.0</FileVersion>
<RootNamespace>EficazFramework</RootNamespace>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>EfCore.snk</AssemblyOriginatorKeyFile>
Expand Down Expand Up @@ -56,6 +56,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />
<PackageReference Include="DefaultDocumentation" Version="0.8.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand All @@ -65,14 +66,6 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</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.3" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\Core\EficazFramework.Data\EficazFramework.Data.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<Version>6.1.3</Version>
<AssemblyVersion>6.1.3.0</AssemblyVersion>
<FileVersion>6.1.3.0</FileVersion>
<Version>6.1.5</Version>
<AssemblyVersion>6.1.5.0</AssemblyVersion>
<FileVersion>6.1.5.0</FileVersion>
<RootNamespace>EficazFramework</RootNamespace>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>EfCore.snk</AssemblyOriginatorKeyFile>
Expand Down Expand Up @@ -56,6 +56,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.5" />
<PackageReference Include="DefaultDocumentation" Version="0.8.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand All @@ -66,14 +67,6 @@
</PackageReference>

</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.3" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\Core\EficazFramework.Data\EficazFramework.Data.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<Version>6.1.3</Version>
<AssemblyVersion>6.1.3.0</AssemblyVersion>
<FileVersion>6.1.3.0</FileVersion>
<Version>6.1.5</Version>
<AssemblyVersion>6.1.5.0</AssemblyVersion>
<FileVersion>6.1.5.0</FileVersion>
<RootNamespace>EficazFramework</RootNamespace>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>EfCore.snk</AssemblyOriginatorKeyFile>
Expand Down Expand Up @@ -54,6 +54,7 @@
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="MySql.EntityFrameworkCore" Version="7.0.2" />
<PackageReference Include="DefaultDocumentation" Version="0.8.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand All @@ -64,14 +65,6 @@
</PackageReference>
</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="7.0.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\Core\EficazFramework.Data\EficazFramework.Data.csproj" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<Version>6.1.3</Version>
<AssemblyVersion>6.1.3.0</AssemblyVersion>
<FileVersion>6.1.3.0</FileVersion>
<Version>6.1.5</Version>
<AssemblyVersion>6.1.5.0</AssemblyVersion>
<FileVersion>6.1.5.0</FileVersion>
<RootNamespace>EficazFramework</RootNamespace>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>EfCore.snk</AssemblyOriginatorKeyFile>
Expand Down Expand Up @@ -48,6 +48,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.5" />
<PackageReference Include="DefaultDocumentation" Version="0.8.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand All @@ -57,14 +58,6 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</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.3" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\Core\EficazFramework.Data\EficazFramework.Data.csproj" />
Expand Down
8 changes: 4 additions & 4 deletions src/Desktop/EficazFramework.WPF/EficazFramework.WPF.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<PropertyGroup>
<TargetFrameworks>net6.0-windows;net7.0-windows</TargetFrameworks>
<UseWPF>true</UseWPF>
<Version>6.1.3</Version>
<AssemblyVersion>6.1.3.0</AssemblyVersion>
<FileVersion>6.1.3.0</FileVersion>
<Version>6.1.5</Version>
<AssemblyVersion>6.1.5.0</AssemblyVersion>
<FileVersion>6.1.5.0</FileVersion>
<RootNamespace>EficazFramework</RootNamespace>
<Authors>Eficaz Sistemas</Authors>
<Company>Eficaz Sistemas de Gestão e Inteligência Tributária</Company>
Expand Down Expand Up @@ -56,7 +56,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="MaterialDesignThemes" Version="4.8.0" />
<PackageReference Include="MaterialDesignThemes" Version="4.9.0" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
</ItemGroup>

Expand Down
Loading

0 comments on commit 29ba1c9

Please sign in to comment.