merge hotfix

Etherna · Oct 8, 2024 · 94bedfb · 94bedfb
2 parents a6e5043 + b2d3278
commit 94bedfb
Show file tree

Hide file tree

Showing 104 changed files with 1,902 additions and 1,580 deletions.
diff --git a/.github/workflows/stable-release.yml b/.github/workflows/stable-release.yml
@@ -10,34 +10,34 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
-    - name: Docker meta
-      id: meta
-      uses: docker/metadata-action@v5
-      with:
-        images: etherna/beehive-manager
-        tags: |
-          type=semver,pattern=v{{major}}
-          type=semver,pattern=v{{major}}.{{minor}}
-          type=semver,pattern=v{{version}}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: etherna/beehive-manager
+          tags: |
+            type=semver,pattern=v{{major}}
+            type=semver,pattern=v{{major}}.{{minor}}
+            type=semver,pattern=v{{version}}
 
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
-    - name: Login to DockerHub
-      uses: docker/login-action@v2
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
 
-    - name: Build and push
-      uses: docker/build-push-action@v5
-      with:
-        context: .
-        push: true
-        tags: ${{ steps.meta.outputs.tags }}
-        labels: ${{ steps.meta.outputs.labels }}
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/unstable-release.yml b/.github/workflows/unstable-release.yml
@@ -3,7 +3,7 @@ name: Unstable release on Docker Hub
 on:
   push:
     branches:
-    - dev
+      - dev
 
 jobs:
   build:
@@ -21,13 +21,13 @@ jobs:
         with:
           images: etherna/beehive-manager
           tags: |
-          type=ref,event=branch
+            type=ref,event=branch
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}

diff --git a/BeehiveManager.sln b/BeehiveManager.sln
@@ -11,17 +11,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.editorconfig = .editorconfig
 		.gitignore = .gitignore
 		Dockerfile = Dockerfile
-		LICENSE = LICENSE
 		nuget.config = nuget.config
 		README.md = README.md
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{1CD13F83-9A79-4873-A8E3-77A2D432D706}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "domain", "domain", "{873FF005-8941-4971-A051-55D8434DC8F9}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "infrastructure", "infrastructure", "{11FCB662-8945-484F-9459-C2C5823045E7}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BeehiveManager.Domain", "src\BeehiveManager.Domain\BeehiveManager.Domain.csproj", "{125AB1B7-31FD-4BA5-8282-6AC48C3522BB}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BeehiveManager.Services", "src\BeehiveManager.Services\BeehiveManager.Services.csproj", "{36854E0C-B2C5-4F32-95BB-8FB0EE57EFF0}"
@@ -77,15 +72,13 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{E14D105A-A294-4F67-BC95-58C5178E2818} = {1CD13F83-9A79-4873-A8E3-77A2D432D706}
-		{873FF005-8941-4971-A051-55D8434DC8F9} = {1CD13F83-9A79-4873-A8E3-77A2D432D706}
-		{11FCB662-8945-484F-9459-C2C5823045E7} = {1CD13F83-9A79-4873-A8E3-77A2D432D706}
-		{125AB1B7-31FD-4BA5-8282-6AC48C3522BB} = {873FF005-8941-4971-A051-55D8434DC8F9}
-		{36854E0C-B2C5-4F32-95BB-8FB0EE57EFF0} = {873FF005-8941-4971-A051-55D8434DC8F9}
-		{74960F98-A78D-40A5-8CD1-20E05DB4DD35} = {11FCB662-8945-484F-9459-C2C5823045E7}
 		{791D69C2-725F-4E7A-B2F9-30CDC151A0C5} = {2100F089-0589-448E-93E0-45B069DDCE64}
 		{74F4D982-085D-42F4-9E61-C288B25E64CB} = {CE10A1ED-2695-44EC-97F1-CB91FC5412D8}
 		{9EEC390E-0D81-4379-A02A-C1A7B55CF431} = {61C3814F-A839-44D7-8335-0F365D3FFA8C}
+		{125AB1B7-31FD-4BA5-8282-6AC48C3522BB} = {1CD13F83-9A79-4873-A8E3-77A2D432D706}
+		{36854E0C-B2C5-4F32-95BB-8FB0EE57EFF0} = {1CD13F83-9A79-4873-A8E3-77A2D432D706}
+		{74960F98-A78D-40A5-8CD1-20E05DB4DD35} = {1CD13F83-9A79-4873-A8E3-77A2D432D706}
+		{E14D105A-A294-4F67-BC95-58C5178E2818} = {1CD13F83-9A79-4873-A8E3-77A2D432D706}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {67056C24-38A7-45E5-A31A-0CF654008257}

diff --git a/BeehiveManager.sln.DotSettings b/BeehiveManager.sln.DotSettings
@@ -1,14 +1,15 @@
 <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/CodeStyle/FileHeader/FileHeaderText/@EntryValue">  Copyright 2021-present Etherna SA
+	<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">Copyright 2021-present Etherna SA
+This file is part of BeehiveManager.
 
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
+BeehiveManager is free software: you can redistribute it and/or modify it under the terms of the
+GNU Affero General Public License as published by the Free Software Foundation,
+either version 3 of the License, or (at your option) any later version.
 
-      http://www.apache.org/licenses/LICENSE-2.0
+BeehiveManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+See the GNU Affero General Public License for more details.
 
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.</s:String></wpf:ResourceDictionary>
+You should have received a copy of the GNU Affero General Public License along with BeehiveManager.
+If not, see &lt;https://www.gnu.org/licenses/&gt;.</s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002ECodeCleanup_002EFileHeader_002EFileHeaderSettingsMigrate/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>