From e354aeacaf4fe37545953e8835bf734a77cdc044 Mon Sep 17 00:00:00 2001 From: Mohammad Moattar Date: Sun, 8 Jan 2023 19:45:46 +0000 Subject: [PATCH] Feature/port from easify (#1) * Initial port of the code * Prepare project for the first release * Upgade the packages to the latest * Replace the builds * Added missing icons and configurations * Added the icon to the project * Remove the logo from serilog * Remove the logo * Update the project files to the right project targets * Remove logo from all projects due to the error on build --- .github/workflows/ci.yml | 14 ++++---- .github/workflows/codeql-analysis.yml | 36 +++++++++++-------- .github/workflows/release.yml | 10 +++--- GitVersion.yml | 8 +++++ README.md | 16 ++++----- ...Easify.Azure.AspNetCore.AppInsights.csproj | 17 --------- .../Easify.Azure.AspNetCore.csproj | 19 ---------- ...pplicationInfoTelemetryInitializerTests.cs | 16 ++++----- ...e.AspNetCore.AppInsights.UnitTests.csproj} | 18 +++++----- .../ServiceCollectionExtensionsTests.cs | 6 ++-- .../ApplicationInfoTelemetryInitializer.cs | 8 ++--- .../ITelemetryConfigure.cs | 6 ++-- ...Blocks.Azure.AspNetCore.AppInsights.csproj | 18 ++++++++++ .../ServiceCollectionExtensions.cs | 6 ++-- .../TelemetryConfigure.cs | 6 ++-- .../KeyVault/KeyVaultExtensionsTests.cs | 4 +-- ...eBlocks.Azure.AspNetCore.UnitTests.csproj} | 18 +++++----- .../appsettings.json | 0 .../KeyVaults/KeyVaultExtensions.cs | 2 +- .../KeyVaults/KeyVaultOptions.cs | 2 +- .../LittleBlocks.Azure.AspNetCore.csproj | 19 ++++++++++ .../AzureLogAnalyticsOptions.cs | 3 +- .../AzureTableStorageOptions.cs | 2 +- .../LittleBlocks.Azure.Serilog.csproj} | 14 ++++---- .../SinkBuilderContextExtensions.cs | 4 +-- ...asify.Azure.sln => LittleBlocks.Azure.sln} | 15 +++++--- 26 files changed, 157 insertions(+), 130 deletions(-) create mode 100644 GitVersion.yml delete mode 100644 src/Easify.Azure.AspNetCore.AppInsights/Easify.Azure.AspNetCore.AppInsights.csproj delete mode 100644 src/Easify.Azure.AspNetCore/Easify.Azure.AspNetCore.csproj rename src/{Easify.Azure.AspNetCore.AppInsights.UnitTests => LittleBlocks.Azure.AspNetCore.AppInsights.UnitTests}/ApplicationInfoTelemetryInitializerTests.cs (83%) rename src/{Easify.Azure.AspNetCore.AppInsights.UnitTests/Easify.Azure.AspNetCore.AppInsights.UnitTests.csproj => LittleBlocks.Azure.AspNetCore.AppInsights.UnitTests/LittleBlocks.Azure.AspNetCore.AppInsights.UnitTests.csproj} (56%) rename src/{Easify.Azure.AspNetCore.AppInsights.UnitTests => LittleBlocks.Azure.AspNetCore.AppInsights.UnitTests}/ServiceCollectionExtensionsTests.cs (90%) rename src/{Easify.Azure.AspNetCore.AppInsights => LittleBlocks.Azure.AspNetCore.AppInsights}/ApplicationInfoTelemetryInitializer.cs (89%) rename src/{Easify.Azure.AspNetCore.AppInsights => LittleBlocks.Azure.AspNetCore.AppInsights}/ITelemetryConfigure.cs (84%) create mode 100644 src/LittleBlocks.Azure.AspNetCore.AppInsights/LittleBlocks.Azure.AspNetCore.AppInsights.csproj rename src/{Easify.Azure.AspNetCore.AppInsights => LittleBlocks.Azure.AspNetCore.AppInsights}/ServiceCollectionExtensions.cs (91%) rename src/{Easify.Azure.AspNetCore.AppInsights => LittleBlocks.Azure.AspNetCore.AppInsights}/TelemetryConfigure.cs (90%) rename src/{Easify.Azure.AspNetCore.UnitTests => LittleBlocks.Azure.AspNetCore.UnitTests}/KeyVault/KeyVaultExtensionsTests.cs (92%) rename src/{Easify.Azure.AspNetCore.UnitTests/Easify.Azure.AspNetCore.UnitTests.csproj => LittleBlocks.Azure.AspNetCore.UnitTests/LittleBlocks.Azure.AspNetCore.UnitTests.csproj} (63%) rename src/{Easify.Azure.AspNetCore.UnitTests => LittleBlocks.Azure.AspNetCore.UnitTests}/appsettings.json (100%) rename src/{Easify.Azure.AspNetCore => LittleBlocks.Azure.AspNetCore}/KeyVaults/KeyVaultExtensions.cs (97%) rename src/{Easify.Azure.AspNetCore => LittleBlocks.Azure.AspNetCore}/KeyVaults/KeyVaultOptions.cs (89%) create mode 100644 src/LittleBlocks.Azure.AspNetCore/LittleBlocks.Azure.AspNetCore.csproj rename src/{Easify.Azure.Serilog => LittleBlocks.Azure.Serilog}/AzureLogAnalyticsOptions.cs (86%) rename src/{Easify.Azure.Serilog => LittleBlocks.Azure.Serilog}/AzureTableStorageOptions.cs (74%) rename src/{Easify.Azure.Serilog/Easify.Azure.Serilog.csproj => LittleBlocks.Azure.Serilog/LittleBlocks.Azure.Serilog.csproj} (52%) rename src/{Easify.Azure.Serilog => LittleBlocks.Azure.Serilog}/SinkBuilderContextExtensions.cs (97%) rename src/{Easify.Azure.sln => LittleBlocks.Azure.sln} (63%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4ee8131..eac2160 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,15 +2,15 @@ name: CI on Branches and PRs on: workflow_dispatch: - branches-ignore: [ master ] + branches-ignore: [master] paths: "src/**" push: - branches-ignore: [ master ] + branches-ignore: [master] paths: "src/**" pull_request: - branches: [ master ] + branches: [master] paths: "src/**" jobs: @@ -24,11 +24,11 @@ jobs: - name: Install GitVersion uses: gittools/actions/gitversion/setup@v0.9.7 with: - versionSpec: "5.5.x" + versionSpec: "5.8.x" - name: Setup .NET Core - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v2 with: - dotnet-version: "3.1.x" + dotnet-version: "6.0.x" - name: Install dependencies run: dotnet restore src - name: Use GitVersion @@ -49,6 +49,6 @@ jobs: name: nuget-packages path: "**/*.nupkg" - name: Configure github as Package Repository - run: dotnet nuget add source https://nuget.pkg.github.com/icgam/index.json -n "github" + run: dotnet nuget add source https://nuget.pkg.github.com/LittleBlocks/index.json -n "github" - name: Publish the package to GitHub Packages run: dotnet nuget push "**/*.nupkg" -s "github" -k ${{ secrets.GITHUB_TOKEN }} --skip-duplicate diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 18feede..e853779 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -3,22 +3,20 @@ # # You may wish to alter this file to override the set of languages analyzed, # or to provide custom queries or build logic. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# name: "CodeQL" on: push: - branches: [ master ] + branches: [master] + paths: + - "src/**" pull_request: # The branches below must be a subset of the branches above - branches: [ master ] + branches: [master] + paths: + - "src/**" schedule: - - cron: '31 22 * * 5' + - cron: '0 13 * * 0' jobs: analyze: @@ -28,14 +26,24 @@ jobs: strategy: fail-fast: false matrix: - language: [ 'csharp' ] - # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] - # Learn more: - # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed + # Override automatic language detection by changing the below list + # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python'] + language: ['csharp'] + # Learn more... + # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection steps: - name: Checkout repository uses: actions/checkout@v2 + with: + # We must fetch at least the immediate parents so that if this is + # a pull request then we can checkout the head. + fetch-depth: 2 + + # If this run was triggered by a pull request event, then checkout + # the head of the pull request instead of the merge commit. + - run: git checkout HEAD^2 + if: ${{ github.event_name == 'pull_request' }} # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL @@ -43,7 +51,7 @@ jobs: with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. + # By default, queries listed here will override any specified in a config file. # Prefix the list here with "+" to use these queries and those in the config file. # queries: ./path/to/local/query, your-org/your-repo/queries@main diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e7fe1de..e6229f9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,10 +2,10 @@ name: Release build on master/main on: workflow_dispatch: - branches: [ master ] + branches: [master] paths: "src/**" push: - branches: [ master ] + branches: [master] paths: "src/**" jobs: @@ -19,11 +19,11 @@ jobs: - name: Install GitVersion uses: gittools/actions/gitversion/setup@v0.9.7 with: - versionSpec: "5.5.x" + versionSpec: "5.8.x" - name: Setup .NET Core - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v2 with: - dotnet-version: "3.1.x" + dotnet-version: "6.0.x" - name: Install dependencies run: dotnet restore src - name: Use GitVersion diff --git a/GitVersion.yml b/GitVersion.yml new file mode 100644 index 0000000..cdaff10 --- /dev/null +++ b/GitVersion.yml @@ -0,0 +1,8 @@ +next-version: 1.0.0 +mode: Mainline +major-version-bump-message: '\+semver:\s?(breaking|major)' +minor-version-bump-message: '\+semver:\s?(feature|minor)' +patch-version-bump-message: '\+semver:\s?(fix|patch)' +no-bump-message: '\+semver:\s?(none|skip)' +ignore: + commits-before: 2023-01-01T00:00:00 \ No newline at end of file diff --git a/README.md b/README.md index 8c20201..4e105f6 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,21 @@ -Easify - Azure +LittleBlocks - Azure ============ -![Release](https://github.com/icgam/Easify.Azure/workflows/Release%20build%20on%20master/main/badge.svg) ![CI](https://github.com/icgam/Easify.Azure/workflows/CI%20on%20Branches%20and%20PRs/badge.svg) ![](https://img.shields.io/nuget/v/Easify.Azure.AspNetCore.AppInsights.svg?style=flat-square) +![Release](https://github.com/LittleBlocks/LittleBlocks.Azure/workflows/Release%20build%20on%20master/main/badge.svg) ![CI](https://github.com/LittleBlocks/LittleBlocks.Azure/workflows/CI%20on%20Branches%20and%20PRs/badge.svg) ![](https://img.shields.io/nuget/v/LittleBlocks.Azure.AspNetCore.AppInsights.svg?style=flat-square) -The repository contains a set of libraries to facilitate the development of Azure Cloud. This is an extension to the Easify framework but it is covering the integration with the services in Azure. +The repository contains a set of libraries to facilitate the development of Azure Cloud. This is an extension to the LittleBlocks framework but it is covering the integration with the services in Azure. ## Get Started The repository consists of the following components: -- **Easify.Azure.AspNetCore.AppInsights**: Provide extensions and components to automate integration with Azure AppInsights +- **LittleBlocks.Azure.AspNetCore.AppInsights**: Provide extensions and components to automate integration with Azure AppInsights ### How to use -Detail information on how to use the libraries can be found [here](https://github.com/icgam/Easify.Azure/wiki) +Detail information on how to use the libraries can be found [here](https://github.com/LittleBlocks/LittleBlocks.Azure/wiki) ### How to Engage, Contribute, and Give Feedback @@ -33,6 +33,6 @@ Security issues and bugs should be reported by creating the relevant features an ## Related projects -- [Easify](https://github.com/icgam/Easify) -- [Easify.Ef](https://github.com/icgam/Easify.Ef) -- [Easify.Templates](https://github.com/icgam/Easify.Templates) +- [LittleBlocks](https://github.com/LittleBlocks/LittleBlocks.API) +- [LittleBlocks.Ef](https://github.com/LittleBlocks/LittleBlocks.Ef) +- [LittleBlocks.Templates](https://github.com/LittleBlocks/LittleBlocks.Templates) diff --git a/src/Easify.Azure.AspNetCore.AppInsights/Easify.Azure.AspNetCore.AppInsights.csproj b/src/Easify.Azure.AspNetCore.AppInsights/Easify.Azure.AspNetCore.AppInsights.csproj deleted file mode 100644 index e223119..0000000 --- a/src/Easify.Azure.AspNetCore.AppInsights/Easify.Azure.AspNetCore.AppInsights.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - netstandard2.0 - true - Easify.Azure.AspNetCore.AppInsights - Mohammad Moattar - https://github.com/icgam/Easify.Azure - https://github.com/icgam/Easify.Azure - - - - - - - - diff --git a/src/Easify.Azure.AspNetCore/Easify.Azure.AspNetCore.csproj b/src/Easify.Azure.AspNetCore/Easify.Azure.AspNetCore.csproj deleted file mode 100644 index 502cb9f..0000000 --- a/src/Easify.Azure.AspNetCore/Easify.Azure.AspNetCore.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - netstandard2.0 - true - Easify.Azure.AspNetCore - Mohammad Moattar - https://github.com/icgam/Easify.Azure - https://github.com/icgam/Easify.Azure - default - - - - - - - - - diff --git a/src/Easify.Azure.AspNetCore.AppInsights.UnitTests/ApplicationInfoTelemetryInitializerTests.cs b/src/LittleBlocks.Azure.AspNetCore.AppInsights.UnitTests/ApplicationInfoTelemetryInitializerTests.cs similarity index 83% rename from src/Easify.Azure.AspNetCore.AppInsights.UnitTests/ApplicationInfoTelemetryInitializerTests.cs rename to src/LittleBlocks.Azure.AspNetCore.AppInsights.UnitTests/ApplicationInfoTelemetryInitializerTests.cs index bab7b35..8831e50 100644 --- a/src/Easify.Azure.AspNetCore.AppInsights.UnitTests/ApplicationInfoTelemetryInitializerTests.cs +++ b/src/LittleBlocks.Azure.AspNetCore.AppInsights.UnitTests/ApplicationInfoTelemetryInitializerTests.cs @@ -1,5 +1,5 @@ -// This software is part of the Easify framework -// Copyright (C) 2019 Intermediate Capital Group +// This software is part of the LittleBlocks framework +// Copyright (C) 2019 LittleBlocks // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU Affero General Public License as published by @@ -15,7 +15,7 @@ // along with this program. If not, see . using System; -using Easify.Configurations; +using LittleBlocks.Configurations; using FluentAssertions; using Microsoft.ApplicationInsights.Channel; using Microsoft.ApplicationInsights.DataContracts; @@ -24,10 +24,10 @@ using Microsoft.Extensions.Options; using NSubstitute; using Xunit; -using Environment = Easify.Configurations.Environment; +using Environment = LittleBlocks.Configurations.Environment; -namespace Easify.Azure.AspNetCore.AppInsights.UnitTests +namespace LittleBlocks.Azure.AspNetCore.AppInsights.UnitTests { public class ApplicationInfoTelemetryInitializerTests { @@ -41,7 +41,7 @@ public void Should_Initialize_ConfigureTheTelemetryCorrectly() services.AddOptions().Configure(a => { a.Environment = new Environment {Name = "Development"}; - a.Name = "Easify Azure"; + a.Name = "LittleBlocks Azure"; }); var sp = services.BuildServiceProvider(); @@ -53,8 +53,8 @@ public void Should_Initialize_ConfigureTheTelemetryCorrectly() sut.Initialize(telemetry); //Assert - telemetry.Context.Cloud.RoleName.Should().Be("Easify Azure-Development"); - telemetry.Context.Cloud.RoleInstance.Should().Be("Easify Azure-Development-Instance"); + telemetry.Context.Cloud.RoleName.Should().Be("LittleBlocks Azure-Development"); + telemetry.Context.Cloud.RoleInstance.Should().Be("LittleBlocks Azure-Development-Instance"); } public class MockTelemetry : ITelemetry diff --git a/src/Easify.Azure.AspNetCore.AppInsights.UnitTests/Easify.Azure.AspNetCore.AppInsights.UnitTests.csproj b/src/LittleBlocks.Azure.AspNetCore.AppInsights.UnitTests/LittleBlocks.Azure.AspNetCore.AppInsights.UnitTests.csproj similarity index 56% rename from src/Easify.Azure.AspNetCore.AppInsights.UnitTests/Easify.Azure.AspNetCore.AppInsights.UnitTests.csproj rename to src/LittleBlocks.Azure.AspNetCore.AppInsights.UnitTests/LittleBlocks.Azure.AspNetCore.AppInsights.UnitTests.csproj index 602458d..4c526dd 100644 --- a/src/Easify.Azure.AspNetCore.AppInsights.UnitTests/Easify.Azure.AspNetCore.AppInsights.UnitTests.csproj +++ b/src/LittleBlocks.Azure.AspNetCore.AppInsights.UnitTests/LittleBlocks.Azure.AspNetCore.AppInsights.UnitTests.csproj @@ -1,28 +1,30 @@ - netcoreapp3.1 + net6.0 false + + default - - - - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + diff --git a/src/Easify.Azure.AspNetCore.AppInsights.UnitTests/ServiceCollectionExtensionsTests.cs b/src/LittleBlocks.Azure.AspNetCore.AppInsights.UnitTests/ServiceCollectionExtensionsTests.cs similarity index 90% rename from src/Easify.Azure.AspNetCore.AppInsights.UnitTests/ServiceCollectionExtensionsTests.cs rename to src/LittleBlocks.Azure.AspNetCore.AppInsights.UnitTests/ServiceCollectionExtensionsTests.cs index de70f11..cf22b2e 100644 --- a/src/Easify.Azure.AspNetCore.AppInsights.UnitTests/ServiceCollectionExtensionsTests.cs +++ b/src/LittleBlocks.Azure.AspNetCore.AppInsights.UnitTests/ServiceCollectionExtensionsTests.cs @@ -1,5 +1,5 @@ -// This software is part of the Easify framework -// Copyright (C) 2019 Intermediate Capital Group +// This software is part of the LittleBlocks framework +// Copyright (C) 2019 LittleBlocks // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU Affero General Public License as published by @@ -19,7 +19,7 @@ using Microsoft.Extensions.DependencyInjection; using Xunit; -namespace Easify.Azure.AspNetCore.AppInsights.UnitTests +namespace LittleBlocks.Azure.AspNetCore.AppInsights.UnitTests { public class ServiceCollectionExtensionsTests { diff --git a/src/Easify.Azure.AspNetCore.AppInsights/ApplicationInfoTelemetryInitializer.cs b/src/LittleBlocks.Azure.AspNetCore.AppInsights/ApplicationInfoTelemetryInitializer.cs similarity index 89% rename from src/Easify.Azure.AspNetCore.AppInsights/ApplicationInfoTelemetryInitializer.cs rename to src/LittleBlocks.Azure.AspNetCore.AppInsights/ApplicationInfoTelemetryInitializer.cs index f317b3e..f65e10b 100644 --- a/src/Easify.Azure.AspNetCore.AppInsights/ApplicationInfoTelemetryInitializer.cs +++ b/src/LittleBlocks.Azure.AspNetCore.AppInsights/ApplicationInfoTelemetryInitializer.cs @@ -1,5 +1,5 @@ -// This software is part of the Easify framework -// Copyright (C) 2019 Intermediate Capital Group +// This software is part of the LittleBlocks framework +// Copyright (C) 2019 LittleBlocks // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU Affero General Public License as published by @@ -15,12 +15,12 @@ // along with this program. If not, see . using System; -using Easify.Configurations; +using LittleBlocks.Configurations; using Microsoft.ApplicationInsights.Channel; using Microsoft.ApplicationInsights.Extensibility; using Microsoft.Extensions.Options; -namespace Easify.Azure.AspNetCore.AppInsights +namespace LittleBlocks.Azure.AspNetCore.AppInsights { public sealed class ApplicationInfoTelemetryInitializer : ITelemetryInitializer { diff --git a/src/Easify.Azure.AspNetCore.AppInsights/ITelemetryConfigure.cs b/src/LittleBlocks.Azure.AspNetCore.AppInsights/ITelemetryConfigure.cs similarity index 84% rename from src/Easify.Azure.AspNetCore.AppInsights/ITelemetryConfigure.cs rename to src/LittleBlocks.Azure.AspNetCore.AppInsights/ITelemetryConfigure.cs index 5e46257..ae903a8 100644 --- a/src/Easify.Azure.AspNetCore.AppInsights/ITelemetryConfigure.cs +++ b/src/LittleBlocks.Azure.AspNetCore.AppInsights/ITelemetryConfigure.cs @@ -1,5 +1,5 @@ -// This software is part of the Easify framework -// Copyright (C) 2019 Intermediate Capital Group +// This software is part of the LittleBlocks framework +// Copyright (C) 2019 LittleBlocks // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU Affero General Public License as published by @@ -14,7 +14,7 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -namespace Easify.Azure.AspNetCore.AppInsights +namespace LittleBlocks.Azure.AspNetCore.AppInsights { public interface ITelemetryConfigure { diff --git a/src/LittleBlocks.Azure.AspNetCore.AppInsights/LittleBlocks.Azure.AspNetCore.AppInsights.csproj b/src/LittleBlocks.Azure.AspNetCore.AppInsights/LittleBlocks.Azure.AspNetCore.AppInsights.csproj new file mode 100644 index 0000000..3b04389 --- /dev/null +++ b/src/LittleBlocks.Azure.AspNetCore.AppInsights/LittleBlocks.Azure.AspNetCore.AppInsights.csproj @@ -0,0 +1,18 @@ + + + + true + LittleBlocks.Azure.AspNetCore.AppInsights + Mohammad Moattar + https://github.com/LittleBlocks/LittleBlocks.Azure + https://github.com/LittleBlocks/LittleBlocks.Azure + default + net47;net5.0;net6.0;netstandard2.0 + + + + + + + + diff --git a/src/Easify.Azure.AspNetCore.AppInsights/ServiceCollectionExtensions.cs b/src/LittleBlocks.Azure.AspNetCore.AppInsights/ServiceCollectionExtensions.cs similarity index 91% rename from src/Easify.Azure.AspNetCore.AppInsights/ServiceCollectionExtensions.cs rename to src/LittleBlocks.Azure.AspNetCore.AppInsights/ServiceCollectionExtensions.cs index d02824f..9957542 100644 --- a/src/Easify.Azure.AspNetCore.AppInsights/ServiceCollectionExtensions.cs +++ b/src/LittleBlocks.Azure.AspNetCore.AppInsights/ServiceCollectionExtensions.cs @@ -1,5 +1,5 @@ -// This software is part of the Easify framework -// Copyright (C) 2019 Intermediate Capital Group +// This software is part of the LittleBlocks framework +// Copyright (C) 2019 LittleBlocks // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU Affero General Public License as published by @@ -20,7 +20,7 @@ using Microsoft.ApplicationInsights.Extensibility; using Microsoft.Extensions.DependencyInjection; -namespace Easify.Azure.AspNetCore.AppInsights +namespace LittleBlocks.Azure.AspNetCore.AppInsights { public static class ServiceCollectionExtensions { diff --git a/src/Easify.Azure.AspNetCore.AppInsights/TelemetryConfigure.cs b/src/LittleBlocks.Azure.AspNetCore.AppInsights/TelemetryConfigure.cs similarity index 90% rename from src/Easify.Azure.AspNetCore.AppInsights/TelemetryConfigure.cs rename to src/LittleBlocks.Azure.AspNetCore.AppInsights/TelemetryConfigure.cs index 8ec4fd0..5489434 100644 --- a/src/Easify.Azure.AspNetCore.AppInsights/TelemetryConfigure.cs +++ b/src/LittleBlocks.Azure.AspNetCore.AppInsights/TelemetryConfigure.cs @@ -1,5 +1,5 @@ -// This software is part of the Easify framework -// Copyright (C) 2019 Intermediate Capital Group +// This software is part of the LittleBlocks framework +// Copyright (C) 2019 LittleBlocks // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU Affero General Public License as published by @@ -18,7 +18,7 @@ using Microsoft.ApplicationInsights.DependencyCollector; using Microsoft.Extensions.DependencyInjection; -namespace Easify.Azure.AspNetCore.AppInsights +namespace LittleBlocks.Azure.AspNetCore.AppInsights { public sealed class TelemetryConfigure : ITelemetryConfigure { diff --git a/src/Easify.Azure.AspNetCore.UnitTests/KeyVault/KeyVaultExtensionsTests.cs b/src/LittleBlocks.Azure.AspNetCore.UnitTests/KeyVault/KeyVaultExtensionsTests.cs similarity index 92% rename from src/Easify.Azure.AspNetCore.UnitTests/KeyVault/KeyVaultExtensionsTests.cs rename to src/LittleBlocks.Azure.AspNetCore.UnitTests/KeyVault/KeyVaultExtensionsTests.cs index c3c9d1a..d7a51da 100644 --- a/src/Easify.Azure.AspNetCore.UnitTests/KeyVault/KeyVaultExtensionsTests.cs +++ b/src/LittleBlocks.Azure.AspNetCore.UnitTests/KeyVault/KeyVaultExtensionsTests.cs @@ -1,9 +1,9 @@ -using Easify.Azure.AspNetCore.KeyVaults; +using LittleBlocks.Azure.AspNetCore.KeyVaults; using FluentAssertions; using Microsoft.Extensions.Configuration; using Xunit; -namespace Easify.Azure.AspNetCore.UnitTests.KeyVault +namespace LittleBlocks.Azure.AspNetCore.UnitTests.KeyVault { public class KeyVaultExtensionsTests { diff --git a/src/Easify.Azure.AspNetCore.UnitTests/Easify.Azure.AspNetCore.UnitTests.csproj b/src/LittleBlocks.Azure.AspNetCore.UnitTests/LittleBlocks.Azure.AspNetCore.UnitTests.csproj similarity index 63% rename from src/Easify.Azure.AspNetCore.UnitTests/Easify.Azure.AspNetCore.UnitTests.csproj rename to src/LittleBlocks.Azure.AspNetCore.UnitTests/LittleBlocks.Azure.AspNetCore.UnitTests.csproj index 154b234..7f3bd4c 100644 --- a/src/Easify.Azure.AspNetCore.UnitTests/Easify.Azure.AspNetCore.UnitTests.csproj +++ b/src/LittleBlocks.Azure.AspNetCore.UnitTests/LittleBlocks.Azure.AspNetCore.UnitTests.csproj @@ -1,28 +1,30 @@ - netcoreapp3.1 + net6.0 false + + default - - - - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + diff --git a/src/Easify.Azure.AspNetCore.UnitTests/appsettings.json b/src/LittleBlocks.Azure.AspNetCore.UnitTests/appsettings.json similarity index 100% rename from src/Easify.Azure.AspNetCore.UnitTests/appsettings.json rename to src/LittleBlocks.Azure.AspNetCore.UnitTests/appsettings.json diff --git a/src/Easify.Azure.AspNetCore/KeyVaults/KeyVaultExtensions.cs b/src/LittleBlocks.Azure.AspNetCore/KeyVaults/KeyVaultExtensions.cs similarity index 97% rename from src/Easify.Azure.AspNetCore/KeyVaults/KeyVaultExtensions.cs rename to src/LittleBlocks.Azure.AspNetCore/KeyVaults/KeyVaultExtensions.cs index 2ce1d13..cd195ae 100644 --- a/src/Easify.Azure.AspNetCore/KeyVaults/KeyVaultExtensions.cs +++ b/src/LittleBlocks.Azure.AspNetCore/KeyVaults/KeyVaultExtensions.cs @@ -6,7 +6,7 @@ using Azure.Identity; using Microsoft.Extensions.Configuration; -namespace Easify.Azure.AspNetCore.KeyVaults +namespace LittleBlocks.Azure.AspNetCore.KeyVaults { public static class KeyVaultExtensions { diff --git a/src/Easify.Azure.AspNetCore/KeyVaults/KeyVaultOptions.cs b/src/LittleBlocks.Azure.AspNetCore/KeyVaults/KeyVaultOptions.cs similarity index 89% rename from src/Easify.Azure.AspNetCore/KeyVaults/KeyVaultOptions.cs rename to src/LittleBlocks.Azure.AspNetCore/KeyVaults/KeyVaultOptions.cs index 52eedde..2ad4f24 100644 --- a/src/Easify.Azure.AspNetCore/KeyVaults/KeyVaultOptions.cs +++ b/src/LittleBlocks.Azure.AspNetCore/KeyVaults/KeyVaultOptions.cs @@ -1,6 +1,6 @@ using System.Security.Cryptography.X509Certificates; -namespace Easify.Azure.AspNetCore.KeyVaults +namespace LittleBlocks.Azure.AspNetCore.KeyVaults { public class KeyVaultOptions { diff --git a/src/LittleBlocks.Azure.AspNetCore/LittleBlocks.Azure.AspNetCore.csproj b/src/LittleBlocks.Azure.AspNetCore/LittleBlocks.Azure.AspNetCore.csproj new file mode 100644 index 0000000..5aa821f --- /dev/null +++ b/src/LittleBlocks.Azure.AspNetCore/LittleBlocks.Azure.AspNetCore.csproj @@ -0,0 +1,19 @@ + + + + true + LittleBlocks.Azure.AspNetCore + Mohammad Moattar + https://github.com/LittleBlocks/LittleBlocks.Azure + https://github.com/LittleBlocks/LittleBlocks.Azure + default + net47;net5.0;net6.0;netstandard2.0 + + + + + + + + + diff --git a/src/Easify.Azure.Serilog/AzureLogAnalyticsOptions.cs b/src/LittleBlocks.Azure.Serilog/AzureLogAnalyticsOptions.cs similarity index 86% rename from src/Easify.Azure.Serilog/AzureLogAnalyticsOptions.cs rename to src/LittleBlocks.Azure.Serilog/AzureLogAnalyticsOptions.cs index 31aa997..80d4fdf 100644 --- a/src/Easify.Azure.Serilog/AzureLogAnalyticsOptions.cs +++ b/src/LittleBlocks.Azure.Serilog/AzureLogAnalyticsOptions.cs @@ -1,10 +1,11 @@ -namespace Easify.Azure.Serilog +namespace LittleBlocks.Azure.Serilog { public sealed class AzureLogAnalyticsOptions { public string WorkspaceId { get; set; } public string AuthenticationId { get; set; } public string LogName { get; set; } + public int? LogBufferSize { get; set; } public int? BatchSize { get; set; } } diff --git a/src/Easify.Azure.Serilog/AzureTableStorageOptions.cs b/src/LittleBlocks.Azure.Serilog/AzureTableStorageOptions.cs similarity index 74% rename from src/Easify.Azure.Serilog/AzureTableStorageOptions.cs rename to src/LittleBlocks.Azure.Serilog/AzureTableStorageOptions.cs index 0ef8a12..e8b8e31 100644 --- a/src/Easify.Azure.Serilog/AzureTableStorageOptions.cs +++ b/src/LittleBlocks.Azure.Serilog/AzureTableStorageOptions.cs @@ -1,4 +1,4 @@ -namespace Easify.Azure.Serilog +namespace LittleBlocks.Azure.Serilog { public sealed class AzureTableStorageOptions { diff --git a/src/Easify.Azure.Serilog/Easify.Azure.Serilog.csproj b/src/LittleBlocks.Azure.Serilog/LittleBlocks.Azure.Serilog.csproj similarity index 52% rename from src/Easify.Azure.Serilog/Easify.Azure.Serilog.csproj rename to src/LittleBlocks.Azure.Serilog/LittleBlocks.Azure.Serilog.csproj index c462c7c..d9abc33 100644 --- a/src/Easify.Azure.Serilog/Easify.Azure.Serilog.csproj +++ b/src/LittleBlocks.Azure.Serilog/LittleBlocks.Azure.Serilog.csproj @@ -1,19 +1,19 @@ - netstandard2.0 true - Easify.Azure.Serilog + LittleBlocks.Azure.Serilog Mohammad Moattar - https://github.com/icgam/Easify.Azure - https://github.com/icgam/Easify.Azure + https://github.com/LittleBlocks/LittleBlocks.Azure + https://github.com/LittleBlocks/LittleBlocks.Azure default + net47;net5.0;net6.0;netstandard2.0 - - - + + + diff --git a/src/Easify.Azure.Serilog/SinkBuilderContextExtensions.cs b/src/LittleBlocks.Azure.Serilog/SinkBuilderContextExtensions.cs similarity index 97% rename from src/Easify.Azure.Serilog/SinkBuilderContextExtensions.cs rename to src/LittleBlocks.Azure.Serilog/SinkBuilderContextExtensions.cs index eaffd14..d9bc675 100644 --- a/src/Easify.Azure.Serilog/SinkBuilderContextExtensions.cs +++ b/src/LittleBlocks.Azure.Serilog/SinkBuilderContextExtensions.cs @@ -1,10 +1,10 @@ using System; using System.Diagnostics.CodeAnalysis; -using Easify.Logging.SeriLog; +using LittleBlocks.Logging.SeriLog; using Microsoft.Extensions.Configuration; using Serilog; -namespace Easify.Azure.Serilog +namespace LittleBlocks.Azure.Serilog { [ExcludeFromCodeCoverage] public static class SinkBuilderContextExtensions diff --git a/src/Easify.Azure.sln b/src/LittleBlocks.Azure.sln similarity index 63% rename from src/Easify.Azure.sln rename to src/LittleBlocks.Azure.sln index 6de0b57..55f48b6 100644 --- a/src/Easify.Azure.sln +++ b/src/LittleBlocks.Azure.sln @@ -3,15 +3,20 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30128.74 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Easify.Azure.AspNetCore.AppInsights", "Easify.Azure.AspNetCore.AppInsights\Easify.Azure.AspNetCore.AppInsights.csproj", "{0F5246A7-C0B6-48F3-9BC4-FEF16874BD89}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LittleBlocks.Azure.AspNetCore.AppInsights", "LittleBlocks.Azure.AspNetCore.AppInsights\LittleBlocks.Azure.AspNetCore.AppInsights.csproj", "{0F5246A7-C0B6-48F3-9BC4-FEF16874BD89}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Easify.Azure.AspNetCore.AppInsights.UnitTests", "Easify.Azure.AspNetCore.AppInsights.UnitTests\Easify.Azure.AspNetCore.AppInsights.UnitTests.csproj", "{A80E9116-95B6-43A5-A227-4C96D6C8ADB5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LittleBlocks.Azure.AspNetCore.AppInsights.UnitTests", "LittleBlocks.Azure.AspNetCore.AppInsights.UnitTests\LittleBlocks.Azure.AspNetCore.AppInsights.UnitTests.csproj", "{A80E9116-95B6-43A5-A227-4C96D6C8ADB5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Easify.Azure.AspNetCore", "Easify.Azure.AspNetCore\Easify.Azure.AspNetCore.csproj", "{D413300A-5272-4D1C-9F14-5E20C1D3B24E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LittleBlocks.Azure.AspNetCore", "LittleBlocks.Azure.AspNetCore\LittleBlocks.Azure.AspNetCore.csproj", "{D413300A-5272-4D1C-9F14-5E20C1D3B24E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Easify.Azure.AspNetCore.UnitTests", "Easify.Azure.AspNetCore.UnitTests\Easify.Azure.AspNetCore.UnitTests.csproj", "{F647B941-F688-4C7F-A45B-5F0AD5772FE1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LittleBlocks.Azure.AspNetCore.UnitTests", "LittleBlocks.Azure.AspNetCore.UnitTests\LittleBlocks.Azure.AspNetCore.UnitTests.csproj", "{F647B941-F688-4C7F-A45B-5F0AD5772FE1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Easify.Azure.Serilog", "Easify.Azure.Serilog\Easify.Azure.Serilog.csproj", "{0DBB081F-8EA1-410D-9340-2D5D5003E657}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LittleBlocks.Azure.Serilog", "LittleBlocks.Azure.Serilog\LittleBlocks.Azure.Serilog.csproj", "{0DBB081F-8EA1-410D-9340-2D5D5003E657}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extras", "Extras", "{D2824174-5D64-419E-BF04-87170FC1A08B}" + ProjectSection(SolutionItems) = preProject + ..\GitVersion.yml = ..\GitVersion.yml + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution