Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit aa6e8ed
Author: Mohammad Sadegh Shad <[email protected]>
Date:   Sun Apr 30 15:53:23 2023 +0330

    Clear out the extra logging providers

commit e241dd7
Author: Mohammad Sadegh Shad <[email protected]>
Date:   Thu Apr 20 17:49:35 2023 +0330

    Update publish_Olive.yml

commit 1982856
Author: Mohammad Sadegh Shad <[email protected]>
Date:   Thu Apr 20 17:40:00 2023 +0330

    Update publish_Olive.yml

commit 81da26d
Author: Mohammad Sadegh Shad <[email protected]>
Date:   Thu Apr 20 17:21:55 2023 +0330

    Update publish_Olive.yml

commit 895a592
Author: Mohammad Sadegh Shad <[email protected]>
Date:   Thu Apr 20 17:19:04 2023 +0330

    Cleanup csprojs, Update deps
  • Loading branch information
m-sadegh-sh committed Apr 30, 2023
1 parent 7109b59 commit aa64776
Show file tree
Hide file tree
Showing 71 changed files with 577 additions and 2,053 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/publish_Olive.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Publish Olive Packages

on:
push:
branches: [ master ]
branches: [ master, exp/update-deps ]

jobs:
build:
Expand Down Expand Up @@ -316,11 +316,11 @@ jobs:
PROJECT_FILE_PATH: Olive.Mvc.Testing/Olive.Mvc.Testing.csproj
NUGET_KEY: ${{secrets.NUGET_API_KEY}}

- name: Publish Olive Net4x Compatibility NuGet Package
uses: Geeksltd/publish-nuget@v2
with:
PROJECT_FILE_PATH: Olive.Net4x.Compatibility/Olive.Net4x.Compatibility.csproj
NUGET_KEY: ${{secrets.NUGET_API_KEY}}
# - name: Publish Olive Net4x Compatibility NuGet Package
# uses: Geeksltd/publish-nuget@v2
# with:
# PROJECT_FILE_PATH: Olive.Net4x.Compatibility/Olive.Net4x.Compatibility.csproj
# NUGET_KEY: ${{secrets.NUGET_API_KEY}}

- name: Publish Olive PassiveBackgroundTasks NuGet Package
uses: Geeksltd/publish-nuget@v2
Expand Down Expand Up @@ -382,11 +382,11 @@ jobs:
PROJECT_FILE_PATH: Olive.Sms.Aws/Olive.Sms.Aws.csproj
NUGET_KEY: ${{secrets.NUGET_API_KEY}}

- name: Publish Olive SMS TextMagic NuGet Package
uses: Geeksltd/publish-nuget@v2
with:
PROJECT_FILE_PATH: Olive.SMS.TextMagic/Olive.SMS.TextMagic.csproj
NUGET_KEY: ${{secrets.NUGET_API_KEY}}
# - name: Publish Olive SMS TextMagic NuGet Package
# uses: Geeksltd/publish-nuget@v2
# with:
# PROJECT_FILE_PATH: Olive.SMS.TextMagic/Olive.SMS.TextMagic.csproj
# NUGET_KEY: ${{secrets.NUGET_API_KEY}}

- name: Publish Olive Web NuGet Package
uses: Geeksltd/publish-nuget@v2
Expand Down
35 changes: 35 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<Project>
<PropertyGroup>
<AssemblyName>$(MSBuildProjectName)</AssemblyName>
<RootNamespace>$(MSBuildProjectName)</RootNamespace>
<PackageId>$(MSBuildProjectName)</PackageId>
<Product>$(AssemblyName) ($(TargetFramework))</Product>
<PackOnBuild>true</PackOnBuild>
<NeutralLanguage>en</NeutralLanguage>
<LangVersion>default</LangVersion>
<UseFullSemVerForNuGet>false</UseFullSemVerForNuGet>
<LangVersion>latest</LangVersion>
<DebugType>portable</DebugType>
<PackageProjectUrl>https://geeksltd.github.io/Olive</PackageProjectUrl>
<RepositoryUrl>https://github.com/Geeksltd/Olive</RepositoryUrl>
<PackageIconUrl>http://licensing.msharp.co.uk/Images/OliveComponent.png</PackageIconUrl>
<PackageTags>olive</PackageTags>
<Title>$(MSBuildProjectName)</Title>
<Description>Olive Framework</Description>
<PackageReleaseNotes>Minor fixes</PackageReleaseNotes>
<Owners>Geeks Ltd</Owners>
<Authors>Geeks Ltd</Authors>
<Copyright>Geeks Ltd 2023, All rights reserved.</Copyright>
<DisableExtraReferences>true</DisableExtraReferences>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)'=='Debug' ">
<DebugSymbols>true</DebugSymbols>
<GenerateDocumentationFile>false</GenerateDocumentationFile>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)'=='Release' ">
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
</Project>
46 changes: 9 additions & 37 deletions Olive.ApiClient/Olive.ApiClient.csproj
Original file line number Diff line number Diff line change
@@ -1,45 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<AssemblyName>Olive.ApiClient</AssemblyName>
<RootNamespace>Olive.ApiClient</RootNamespace>
<PackageId>Olive.ApiClient</PackageId>
<Product>$(AssemblyName) ($(TargetFramework))</Product>
<Version>2.2.110</Version>
<PackOnBuild>true</PackOnBuild>
<NeutralLanguage>en</NeutralLanguage>
<LangVersion>default</LangVersion>
<UseFullSemVerForNuGet>false</UseFullSemVerForNuGet>
<LangVersion>latest</LangVersion>
<DebugType>portable</DebugType>
<PackageProjectUrl>https://geeksltd.github.io/Olive</PackageProjectUrl>
<RepositoryUrl>https://github.com/Geeksltd/Olive</RepositoryUrl>
<PackageIconUrl>http://licensing.msharp.co.uk/Images/OliveComponent.png</PackageIconUrl>
<PackageTags>olive</PackageTags>
<Title>Olive.ApiClient</Title>
<Description>Olive Framework</Description>
<PackageReleaseNotes>Minor fixes</PackageReleaseNotes>
<Owners>Geeks Ltd</Owners>
<Authors>Geeks Ltd</Authors>
<Copyright>Geeks Ltd 2021, All rights reserved.</Copyright>
<DisableExtraReferences>true</DisableExtraReferences>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)'=='Debug' ">
<DebugSymbols>true</DebugSymbols>
<GenerateDocumentationFile>false</GenerateDocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)'=='Release' ">
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Version>2.2.111</Version>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.14" />
<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.14" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="3.1.14" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.14" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.5" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Olive\Olive.csproj" />
</ItemGroup>
Expand Down
40 changes: 6 additions & 34 deletions Olive.Audit.DatabaseLogger/Olive.Audit.DatabaseLogger.csproj
Original file line number Diff line number Diff line change
@@ -1,42 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<AssemblyName>Olive.Audit.DatabaseLogger</AssemblyName>
<RootNamespace>Olive.Audit.DatabaseLogger</RootNamespace>
<PackageId>Olive.Audit.DatabaseLogger</PackageId>
<Product>$(AssemblyName) ($(TargetFramework))</Product>
<Version>2.1.109</Version>
<PackOnBuild>true</PackOnBuild>
<NeutralLanguage>en</NeutralLanguage>
<LangVersion>default</LangVersion>
<UseFullSemVerForNuGet>false</UseFullSemVerForNuGet>
<LangVersion>latest</LangVersion>
<DebugType>portable</DebugType>
<PackageProjectUrl>https://geeksltd.github.io/Olive</PackageProjectUrl>
<RepositoryUrl>https://github.com/Geeksltd/Olive</RepositoryUrl>
<PackageIconUrl>http://licensing.msharp.co.uk/Images/OliveComponent.png</PackageIconUrl>
<PackageTags>olive</PackageTags>
<Title>Olive.Audit.DatabaseLogger</Title>
<Description>Olive Framework</Description>
<PackageReleaseNotes>Minor fixes</PackageReleaseNotes>
<Owners>Geeks Ltd</Owners>
<Authors>Geeks Ltd</Authors>
<Copyright>Geeks Ltd 2021, All rights reserved.</Copyright>
<DisableExtraReferences>true</DisableExtraReferences>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)'=='Debug' ">
<DebugSymbols>true</DebugSymbols>
<GenerateDocumentationFile>false</GenerateDocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)'=='Release' ">
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Version>2.1.110</Version>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.14" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.14" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Olive.Audit\Olive.Audit.csproj" />
<ProjectReference Include="..\Olive.Entities\Olive.Entities.csproj" />
Expand Down
40 changes: 6 additions & 34 deletions Olive.Audit/Olive.Audit.csproj
Original file line number Diff line number Diff line change
@@ -1,42 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<AssemblyName>Olive.Audit</AssemblyName>
<RootNamespace>Olive.Audit</RootNamespace>
<PackageId>Olive.Audit</PackageId>
<Product>$(AssemblyName) ($(TargetFramework))</Product>
<Version>2.1.118</Version>
<PackOnBuild>true</PackOnBuild>
<NeutralLanguage>en</NeutralLanguage>
<LangVersion>default</LangVersion>
<UseFullSemVerForNuGet>false</UseFullSemVerForNuGet>
<LangVersion>preview</LangVersion>
<DebugType>portable</DebugType>
<PackageProjectUrl>https://geeksltd.github.io/Olive</PackageProjectUrl>
<RepositoryUrl>https://github.com/Geeksltd/Olive</RepositoryUrl>
<PackageIconUrl>http://licensing.msharp.co.uk/Images/OliveComponent.png</PackageIconUrl>
<PackageTags>olive</PackageTags>
<Title>Olive.Audit</Title>
<Description>Olive Framework</Description>
<PackageReleaseNotes>Minor fixes</PackageReleaseNotes>
<Owners>Geeks Ltd</Owners>
<Authors>Geeks Ltd</Authors>
<Copyright>Geeks Ltd 2021, All rights reserved.</Copyright>
<DisableExtraReferences>true</DisableExtraReferences>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)'=='Debug' ">
<DebugSymbols>true</DebugSymbols>
<GenerateDocumentationFile>false</GenerateDocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)'=='Release' ">
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Version>2.1.119</Version>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.14" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.14" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Olive.Entities\Olive.Entities.csproj" />
<ProjectReference Include="..\Olive\Olive.csproj" />
Expand Down
62 changes: 18 additions & 44 deletions Olive.Aws.EventBus/Olive.Aws.EventBus.csproj
Original file line number Diff line number Diff line change
@@ -1,46 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<AssemblyName>Olive.Aws.EventBus</AssemblyName>
<RootNamespace>Olive.Aws.EventBus</RootNamespace>
<PackageId>Olive.Aws.EventBus</PackageId>
<Product>$(AssemblyName) ($(TargetFramework))</Product>
<Version>2.1.153</Version>
<PackOnBuild>true</PackOnBuild>
<NeutralLanguage>en</NeutralLanguage>
<LangVersion>default</LangVersion>
<UseFullSemVerForNuGet>false</UseFullSemVerForNuGet>
<LangVersion>latest</LangVersion>
<DebugType>portable</DebugType>
<PackageProjectUrl>https://geeksltd.github.io/Olive</PackageProjectUrl>
<RepositoryUrl>https://github.com/Geeksltd/Olive</RepositoryUrl>
<PackageIconUrl>http://licensing.msharp.co.uk/Images/OliveComponent.png</PackageIconUrl>
<PackageTags>olive</PackageTags>
<Title>Olive.Aws.EventBus</Title>
<Description>Olive Framework</Description>
<PackageReleaseNotes>Minor fixes</PackageReleaseNotes>
<Owners>Geeks Ltd</Owners>
<Authors>Geeks Ltd</Authors>
<Copyright>Geeks Ltd 2021, All rights reserved.</Copyright>
<DisableExtraReferences>true</DisableExtraReferences>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)'=='Debug' ">
<DebugSymbols>true</DebugSymbols>
<GenerateDocumentationFile>false</GenerateDocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)'=='Release' ">
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AWSSDK.SQS" Version="3.7.0.14" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Olive.Aws\Olive.Aws.csproj" />
<ProjectReference Include="..\Olive.EventBus\Olive.EventBus.csproj" />
</ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(Running)'=='local'">
<Exec Command="update-local-nuget-cache" />
</Target>
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Version>2.1.154</Version>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AWSSDK.SQS" Version="3.7.100.115" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Olive.Aws\Olive.Aws.csproj" />
<ProjectReference Include="..\Olive.EventBus\Olive.EventBus.csproj" />
</ItemGroup>

<Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(Running)'=='local'">
<Exec Command="update-local-nuget-cache" />
</Target>
</Project>
64 changes: 19 additions & 45 deletions Olive.Aws.LambdaFunction/Olive.Aws.LambdaFunction.csproj
Original file line number Diff line number Diff line change
@@ -1,57 +1,31 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<AssemblyName>Olive.Aws.LambdaFunction</AssemblyName>
<RootNamespace>Olive.Aws</RootNamespace>
<PackageId>Olive.Aws.LambdaFunction</PackageId>
<Product>$(AssemblyName) ($(TargetFramework))</Product>
<Version>1.0.112.0</Version>
<PackOnBuild>true</PackOnBuild>
<NeutralLanguage>en</NeutralLanguage>
<LangVersion>default</LangVersion>
<UseFullSemVerForNuGet>false</UseFullSemVerForNuGet>
<LangVersion>latest</LangVersion>
<DebugType>portable</DebugType>
<PackageProjectUrl>https://geeksltd.github.io/Olive</PackageProjectUrl>
<RepositoryUrl>https://github.com/Geeksltd/Olive</RepositoryUrl>
<PackageIconUrl>http://licensing.msharp.co.uk/Images/OliveComponent.png</PackageIconUrl>
<PackageTags>olive</PackageTags>
<Title>Olive.Aws.LambdaFunction</Title>
<Description>Olive Framework</Description>
<PackageReleaseNotes>Minor fixes</PackageReleaseNotes>
<Owners>Geeks Ltd</Owners>
<Authors>Geeks Ltd</Authors>
<Copyright>Geeks Ltd 2021, All rights reserved.</Copyright>
<DisableExtraReferences>true</DisableExtraReferences>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)'=='Debug' ">
<DebugSymbols>true</DebugSymbols>
<GenerateDocumentationFile>false</GenerateDocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)'=='Release' ">
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Version>1.0.113</Version>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AWS.Logger.AspNetCore" Version="3.2.0" />
<PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.1" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.14" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.14" />
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="3.1.14" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.14" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.14" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.14" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.14" />
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="3.1.14" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.14" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.14" />
<PackageReference Include="Amazon.Lambda.Core" Version="2.0.0" />
<PackageReference Include="Amazon.Lambda.Serialization.Json" Version="2.0.0" />
<PackageReference Include="AWSSDK.Core" Version="3.7.1" />
<PackageReference Include="AWS.Logger.AspNetCore" Version="3.3.0" />
<PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.5" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
<PackageReference Include="Amazon.Lambda.Core" Version="2.1.0" />
<PackageReference Include="Amazon.Lambda.Serialization.Json" Version="2.1.0" />
<PackageReference Include="AWSSDK.Core" Version="3.7.106.22" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Olive\Olive.csproj" />
</ItemGroup>

<Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(Running)'=='local'">
<Exec Command="update-local-nuget-cache &quot;$(TargetPath)&quot;" />
</Target>
Expand Down
2 changes: 2 additions & 0 deletions Olive.Aws.Mvc/App.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ protected static void LocalRun<TApp>(TApp app, string[] args)

protected virtual void ConfigureLogging(WebHostBuilderContext context, ILoggingBuilder logging)
{
logging.ClearProviders();

logging.AddConfiguration(context.Configuration.GetSection("Logging"));

if (context.HostingEnvironment.IsDevelopment()) logging.AddConsole();
Expand Down
Loading

0 comments on commit aa64776

Please sign in to comment.