Skip to content

Commit

Permalink
3.5 release
Browse files Browse the repository at this point in the history
  • Loading branch information
bberka committed Apr 5, 2023
1 parent 63bbb65 commit 39e303c
Show file tree
Hide file tree
Showing 104 changed files with 638 additions and 192 deletions.
Binary file modified .vs/EasMe/DesignTimeBuild/.dtbcache.v2
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified .vs/EasMe/v17/.futdcache.v2
Binary file not shown.
Binary file modified .vs/EasMe/v17/.suo
Binary file not shown.
Binary file modified .vs/ProjectEvaluation/easme.metadata.v6.1
Binary file not shown.
Binary file modified .vs/ProjectEvaluation/easme.projects.v6.1
Binary file not shown.
3 changes: 2 additions & 1 deletion src/EasMe.Authorization/EasMe.Authorization.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<BaseOutputPath>C:\Users\kkass\source\build\easme</BaseOutputPath>
<Version>3.4.1.0</Version>
<Version>3.5</Version>

</PropertyGroup>

<ItemGroup>
Expand Down
5 changes: 1 addition & 4 deletions src/EasMe.Authorization/Filters/HasPermissionAttribute.cs
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,6 @@ public override void OnActionExecuting(ActionExecutingContext _dbContext)
return;
}

if (!permList.Contains(_actionCode))
{
_dbContext.Result = new ForbidResult();
}
if (!permList.Contains(_actionCode)) _dbContext.Result = new ForbidResult();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v6.0", FrameworkDisplayName = ".NET 6.0")]
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------

using System;
using System.Reflection;

[assembly: System.Reflection.AssemblyCompanyAttribute("EasMe.Authorization")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("3.5.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.5")]
[assembly: System.Reflection.AssemblyProductAttribute("EasMe.Authorization")]
[assembly: System.Reflection.AssemblyTitleAttribute("EasMe.Authorization")]
[assembly: System.Reflection.AssemblyVersionAttribute("3.5.0.0")]

// Generated by the MSBuild WriteCodeFragment class.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
62f3aef629d6a714fd12107dde40d44afde10321
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
is_global = true
build_property.TargetFramework = net6.0
build_property.TargetPlatformMinVersion =
build_property.UsingMicrosoftNETSdkWeb =
build_property.ProjectTypeGuids =
build_property.InvariantGlobalization =
build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = EasMe.Authorization
build_property.ProjectDir = C:\Users\kkass\source\repos\#MyProjects\easme-lib\src\EasMe.Authorization\
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// <auto-generated/>
global using global::System;
global using global::System.Collections.Generic;
global using global::System.IO;
global using global::System.Linq;
global using global::System.Net.Http;
global using global::System.Threading;
global using global::System.Threading.Tasks;
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<BaseOutputPath>C:\Users\kkass\source\build\easme</BaseOutputPath>
<Version>3.4.1.0</Version>
<Version>3.5</Version>


</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v6.0", FrameworkDisplayName = ".NET 6.0")]
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------

using System;
using System.Reflection;

[assembly: System.Reflection.AssemblyCompanyAttribute("EasMe.EntityFrameworkCore")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("3.5.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.5")]
[assembly: System.Reflection.AssemblyProductAttribute("EasMe.EntityFrameworkCore")]
[assembly: System.Reflection.AssemblyTitleAttribute("EasMe.EntityFrameworkCore")]
[assembly: System.Reflection.AssemblyVersionAttribute("3.5.0.0")]

// Generated by the MSBuild WriteCodeFragment class.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1deff17eefb2f104cf82bd2e24933fbc4dc06efd
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
is_global = true
build_property.TargetFramework = net6.0
build_property.TargetPlatformMinVersion =
build_property.UsingMicrosoftNETSdkWeb =
build_property.ProjectTypeGuids =
build_property.InvariantGlobalization =
build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = EasMe.EntityFrameworkCore
build_property.ProjectDir = C:\Users\kkass\source\repos\#MyProjects\easme-lib\src\EasMe.EntityFrameworkCore\
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// <auto-generated/>
global using global::System;
global using global::System.Collections.Generic;
global using global::System.IO;
global using global::System.Linq;
global using global::System.Net.Http;
global using global::System.Threading;
global using global::System.Threading.Tasks;
Binary file not shown.
7 changes: 4 additions & 3 deletions src/EasMe.Logging/EasLog.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using EasMe.Logging.Models;
using EasMe.Result;


namespace EasMe.Logging;

/// <summary>
Expand All @@ -15,21 +14,23 @@ public class EasLog : IEasLog

private static readonly EasTask EasTask = new();
private static readonly List<Exception> _exceptions = new();
private readonly string _folderName;

internal string _LogSource;
private readonly string _folderName;

internal EasLog(string source, string folderName)
{
if(folderName.IsNullOrEmpty()) folderName = EasLogFactory.Config.LogFolderPath;
if (folderName.IsNullOrEmpty()) folderName = EasLogFactory.Config.LogFolderPath;
_LogSource = source;
_folderName = folderName;
}

internal EasLog(string source)
{
_LogSource = source;
_folderName = EasLogFactory.Config?.LogFolderPath ?? ".\\Logs";
}

public static IReadOnlyCollection<Exception> Exceptions => _exceptions;


Expand Down
1 change: 0 additions & 1 deletion src/EasMe.Logging/EasLogConsole.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using EasMe.Logging.Internal;


namespace EasMe.Logging;

/// <summary>
Expand Down
6 changes: 4 additions & 2 deletions src/EasMe.Logging/EasLogFactory.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System.Diagnostics;


namespace EasMe.Logging;

public static class EasLogFactory
Expand All @@ -20,16 +19,19 @@ public static IEasLog CreateLogger(string name)
{
return new EasLog(name);
}

public static IEasLog Create(string folderPath)
{
var methodInfo = new StackTrace().GetFrame(1)?.GetMethod();
var className = methodInfo?.ReflectedType?.FullName;
return new EasLog(className ?? "Sys",folderPath);
return new EasLog(className ?? "Sys", folderPath);
}

public static IEasLog Create(string name, string folderPath)
{
return new EasLog(name, folderPath);
}

/// <summary>
/// EasLog logging configuration. Call this method in your startup. If you don't call it it will use default values.
/// </summary>
Expand Down
1 change: 0 additions & 1 deletion src/EasMe.Logging/EasLogLevel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@ public enum EasLogLevel
Error = 3,
Fatal = 4,
Off = 5

}
1 change: 0 additions & 1 deletion src/EasMe.Logging/EasLogReader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using EasMe.Extensions;
using EasMe.Logging.Models;


namespace EasMe.Logging;

public static class EasLogReader
Expand Down
3 changes: 2 additions & 1 deletion src/EasMe.Logging/EasMe.Logging.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<BaseOutputPath>C:\Users\kkass\source\build\easme</BaseOutputPath>
<Version>3.4.1.0</Version>
<Version>3.5</Version>


</PropertyGroup>

Expand Down
1 change: 0 additions & 1 deletion src/EasMe.Logging/IEasLog.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using EasMe.Result;


namespace EasMe.Logging;

public interface IEasLog
Expand Down
5 changes: 1 addition & 4 deletions src/EasMe.Logging/Internal/EasLogHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@
using EasMe.Logging.Models;
using Microsoft.AspNetCore.Http;


namespace EasMe.Logging.Internal;

internal static class EasLogHelper
{
internal static TraceInfo GetTraceInfo()
{
const int frame = 4;
const int frame = 3;
var info = new TraceInfo();
var trace = new StackTrace().GetFrame(frame);
if (trace == null) return info;
Expand Down Expand Up @@ -81,6 +80,4 @@ internal static List<EasLogLevel> GetLoggableLevels()
list.Add((EasLogLevel)item);
return list;
}


}
1 change: 0 additions & 1 deletion src/EasMe.Logging/Internal/InternalExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using EasMe.Result;


namespace EasMe.Logging.Internal;

internal static class InternalExtensions
Expand Down
4 changes: 2 additions & 2 deletions src/EasMe.Logging/Models/LogModel.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using EasMe.Logging.Internal;
using EasMe.Models;

using Newtonsoft.Json;

namespace EasMe.Logging.Models;
Expand All @@ -11,7 +10,8 @@ private LogModel()
{
}

private LogModel(EasLogLevel logLevel, string source, object log, Exception? exception = null, WebInfo? webInfo = null)
private LogModel(EasLogLevel logLevel, string source, object log, Exception? exception = null,
WebInfo? webInfo = null)
{
Level = logLevel;
Source = source;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v6.0", FrameworkDisplayName = ".NET 6.0")]
23 changes: 23 additions & 0 deletions src/EasMe.Logging/obj/Release/net6.0/EasMe.Logging.AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------

using System;
using System.Reflection;

[assembly: System.Reflection.AssemblyCompanyAttribute("EasMe.Logging")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("3.5.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.5")]
[assembly: System.Reflection.AssemblyProductAttribute("EasMe.Logging")]
[assembly: System.Reflection.AssemblyTitleAttribute("EasMe.Logging")]
[assembly: System.Reflection.AssemblyVersionAttribute("3.5.0.0")]

// Generated by the MSBuild WriteCodeFragment class.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e86f2f617b4559e400b0fe0249a173e2a6ac9d45
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
is_global = true
build_property.TargetFramework = net6.0
build_property.TargetPlatformMinVersion =
build_property.UsingMicrosoftNETSdkWeb =
build_property.ProjectTypeGuids =
build_property.InvariantGlobalization =
build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = EasMe.Logging
build_property.ProjectDir = C:\Users\kkass\source\repos\#MyProjects\easme-lib\src\EasMe.Logging\
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// <auto-generated/>
global using global::System;
global using global::System.Collections.Generic;
global using global::System.IO;
global using global::System.Linq;
global using global::System.Net.Http;
global using global::System.Threading;
global using global::System.Threading.Tasks;
Binary file not shown.
3 changes: 2 additions & 1 deletion src/EasMe.PostSharp/EasMe.PostSharp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Version>3.4.1.0</Version>
<Version>3.5</Version>


</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v6.0", FrameworkDisplayName = ".NET 6.0")]
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------

using System;
using System.Reflection;

[assembly: System.Reflection.AssemblyCompanyAttribute("EasMe.PostSharp")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("3.5.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.5")]
[assembly: System.Reflection.AssemblyProductAttribute("EasMe.PostSharp")]
[assembly: System.Reflection.AssemblyTitleAttribute("EasMe.PostSharp")]
[assembly: System.Reflection.AssemblyVersionAttribute("3.5.0.0")]

// Generated by the MSBuild WriteCodeFragment class.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
35ab16b8d8a84088de5527f1225db183bc2be4cd
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
is_global = true
build_property.TargetFramework = net6.0
build_property.TargetPlatformMinVersion =
build_property.UsingMicrosoftNETSdkWeb =
build_property.ProjectTypeGuids =
build_property.InvariantGlobalization =
build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = EasMe.PostSharp
build_property.ProjectDir = C:\Users\kkass\source\repos\#MyProjects\easme-lib\src\EasMe.PostSharp\
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// <auto-generated/>
global using global::System;
global using global::System.Collections.Generic;
global using global::System.IO;
global using global::System.Linq;
global using global::System.Net.Http;
global using global::System.Threading;
global using global::System.Threading.Tasks;
Binary file not shown.
Loading

0 comments on commit 39e303c

Please sign in to comment.