Merge pull request #113 from Hochfrequenz/develop

Merge develop into master

.github/dependabot.yml

@@ -0,0 +1,14 @@
+version: 2
+updates:
+  - package-ecosystem: nuget
+    directory: "/"
+    schedule:
+      interval: daily
+      time: "00:37"
+    reviewers:
+      - "Hochfrequenz/BO4E-dotnet"
+    ignore:
+      - dependency-name: "System.Text.*"
+        update-types: ["version-update:semver-major"]
+      - dependency-name: "Microsoft.Extensions.Logging.*"
+        update-types: ["version-update:semver-major"]

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,76 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# 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: [develop, master]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [develop]
+  schedule:
+    - cron: "22 4 * * 1"
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    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
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Setup .NET Core
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 5.0.100
+
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v1
+        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.
+          # 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
+
+      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+      # If this step fails, then you should remove it and run the build manually (see below)
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v1
+
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 https://git.io/JvXDl
+
+      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+      #    and modify them (or add more) to build your code if your project
+      #    uses a compiled language
+
+      #- run: |
+      #   make bootstrap
+      #   make release
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v1

.github/workflows/feature_branches.yml

@@ -6,6 +6,7 @@ on:
       - "*"
       - "!develop"
       - "!master"
+      - "!main"
 jobs:
   pushfeature:
     runs-on: ubuntu-latest

.github/workflows/nuget_package_push.yml

@@ -1,9 +1,11 @@
-name: Nuget Master Release
+name: Nuget Release (on Tagging)
 
 on:
-  push:
-    branches:
-      - master
+  release:
+    types:
+      - created
+    tags:
+      - "v\\d+\\.\\d+\\.\\d+"
 
 jobs:
   pushrelease:
@@ -22,10 +24,10 @@ jobs:
         run: dotnet test --configuration Release
       - name: Create Package (dotnet pack)
         run: |
-          dotnet pack --configuration Release
+          dotnet pack --configuration Release --output packages
       - name: Setup Nuget.exe
         uses: warrenbuckley/Setup-Nuget@v1
       - name: Nuget push
         run: |
           nuget setApiKey ${{ secrets.BO4E_NUGET_ORG_PUSH_TOKEN }}
-          nuget push .\**\bin\Release\*.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -NoSymbols
+          nuget push .\packages\*.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -NoSymbols

.github/workflows/nuget_package_push_prerelease.yml

@@ -5,6 +5,7 @@ on:
     branches:
       - develop
       - protobuf3
+      - main
 jobs:
   pushprerelease:
     runs-on: windows-latest
@@ -15,7 +16,7 @@ jobs:
         uses: srfrnk/current-time@master
         id: current-time
         with:
-          format: YYYYMMDDHHMMSS
+          format: YYYYMMDDHHmmss
       - uses: actions/checkout@master
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
@@ -26,10 +27,10 @@ jobs:
       - name: Run Unit Tests (dotnet test)
         run: dotnet test --configuration Release
       - name: Create Package (dotnet pack)
-        run: dotnet pack --configuration Release --version-suffix "beta${{ steps.current-time.outputs.formattedTime }}"
+        run: dotnet pack --output packages --configuration Release --version-suffix "beta${{ steps.current-time.outputs.formattedTime }}"
       - name: Setup Nuget.exe
         uses: warrenbuckley/Setup-Nuget@v1
       - name: Nuget push
         run: |
           nuget setApiKey ${{ secrets.BO4E_NUGET_ORG_PUSH_TOKEN }}
-          nuget push .\**\**\bin\Release\*.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -NoSymbols
+          nuget push .\packages\*.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -NoSymbols

.github/workflows/trigger_doc_build.yml

@@ -7,6 +7,7 @@ on:
   push:
     branches:
       - master
+      - main
 
 jobs:
   builddocs:

.gitignore

@@ -1,65 +1,19 @@
 .vs
-
-BO4E-dotnet/bin/Debug/
-
-BO4ETestProject/obj/
-BO4E-dotnet.Encryption/obj/
-BO4E-dotnet.Encryption/bin
-BO4E-dotnet.Extensions/obj/
-BO4E-dotnet.Extensions/bin
-BO4E-dotnet.Reporting/bin
-BO4E-dotnet.Reporting/obj
-BO4E-dotnet/obj/
-
-BO4ETestProject/bin/
-BO4ETestProject/TestResults/
-BO4E-dotnet/bin/
-
 *.manifest
-
 *.testlog
-
 *.dll
-
 *.pdb
-
 *.cache
-
 *.targets
-
-
 *.CopyComplete
 live/
-TestBO4E-dotnet-Extensions/obj/
-TestBO4E-dotnet-Encryption/obj/
-TestBO4E-dotnet-Reporting/obj/
-
-
-TestBO4E-dotnet-Encryption/bin
-TestBO4E-dotnet-Encryption/TestResults
-TestBO4E-dotnet-Extensions/bin
-TestBO4E-dotnet-Extensions/TestResults
-TestBO4E-dotnet-Reporting/bin
-TestBO4E-dotnet-Reporting/TestResults/
+*.user
 
 .idea/.idea.BO4E-dotnet/.idea/
+*.xml
 
-BO4E-dotnet.sln.DotSettings.user
-
-BO4E/obj/
-
-BO4E.Extensions/obj/
-BO4E.Extensions/bin/
-
-BO4E.Reporting/obj/
-BO4E.Reporting/bin/
-
-TestBO4E.Extensions/obj/
-TestBO4E.Extensions/bin/
-
-TestBO4E.Reporting/obj/
-TestBO4E.Reporting/bin/
-
-BO4E/bin/Debug/netstandard2.0/
+*.nupkg
 
-BO4E/bin/Debug/net5.0/
+**/TestResults
+**/obj
+**/bin

BO4E-dotnet.Encryption/BO4E.Encryption.csproj

@@ -3,8 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>BO4E_dotnet.Encryption</RootNamespace>
-	<VersionPrefix>0.2.3</VersionPrefix>
-	<VersionSuffix>$(VersionSuffix)</VersionSuffix>
+	<VersionPrefix>0.2.7</VersionPrefix>
 	<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
     <PackageProjectUrl>https://github.com/HFInnovation/BO4E-dotnet</PackageProjectUrl>
     <RepositoryUrl>https://github.com/HFInnovation/BO4E-dotnet</RepositoryUrl>
@@ -13,18 +12,19 @@
     <Company>Hochfrequenz Unternehmensberatung GmbH</Company>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <LangVersion>9</LangVersion>
-    <PackageVersion>0.2.5</PackageVersion>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <DocumentationFile>BO4E.Encryption.xml</DocumentationFile>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <Optimize>true</Optimize>
-    <DocumentationFile>bin\Debug\BO4E.Encryption.xml</DocumentationFile>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <NoWarn>1701;1702;NU1701;</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <DocumentationFile>bin\Release\BO4E.Encryption.xml</DocumentationFile>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <NoWarn>1701;1702;NU1701;</NoWarn>
     <WarningsAsErrors>;NU1605;</WarningsAsErrors>

BO4E-dotnet.sln.DotSettings.user

@@ -1,8 +1,8 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=7eb056bb_002D3b1b_002D4da4_002Da2c9_002D15f445d5eb2e/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="All tests from Solution" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
+	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=7eb056bb_002D3b1b_002D4da4_002Da2c9_002D15f445d5eb2e/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" Name="All tests from Solution" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
   &lt;Solution /&gt;&#xD;
 &lt;/SessionState&gt;</s:String>
-	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=e3c0e7b0_002D1a86_002D41f3_002D9f6c_002D21ce5d42c8d8/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" Name="All tests from Solution #2" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
+	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=e3c0e7b0_002D1a86_002D41f3_002D9f6c_002D21ce5d42c8d8/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="All tests from Solution #2" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
   &lt;Solution /&gt;&#xD;
 &lt;/SessionState&gt;</s:String>