Merge pull request #424 from DigitalExcellence/release/1.2.0

Release v.1.2.0-beta - 15-04-2021
DigitalExcellence · Apr 15, 2021 · f335deb · f335deb
2 parents 596281a + 793a064
commit f335deb
Show file tree

Hide file tree

Showing 17 changed files with 34 additions and 24 deletions.
diff --git a/API/01_API.csproj b/API/01_API.csproj
@@ -6,7 +6,7 @@
         <DocumentationFile>.\API.xml</DocumentationFile>
         <Company>Digital Excellence Fontys</Company>
         <LangVersion>8</LangVersion>
-        <Version>1.1.0-beta</Version>
+        <Version>1.2.0-beta</Version>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,25 +9,32 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- Added tests for the wizard - [#372](https://github.com/DigitalExcellence/dex-backend/issues/372)
-- Recommendation system, allowing users to get projects recommended based on similar users. [#63](https://github.com/DigitalExcellence/dex-backend/issues/63)
-
 ### Changed
-- Improved integration tests. - [#395](https://github.com/DigitalExcellence/dex-backend/issues/395)
 
 ### Deprecated
 
-
 ### Removed
 
-
 ### Fixed
-- Renamed IdentityServer to match the rest of the project name. - [#386](https://github.com/DigitalExcellence/dex-backend/issues/386)
-
 
 ### Security
 
 
+## Release v.1.2.0-beta - 15-04-2021
+
+### Added
+
+- Added tests for the wizard - [#372](https://github.com/DigitalExcellence/dex-backend/issues/372)
+- Recommendation system, allowing users to get projects recommended based on similar users [#63](https://github.com/DigitalExcellence/dex-backend/issues/63)
+- Categories. It is now possible to categorize projects. [#362](https://github.com/DigitalExcellence/dex-backend/issues/362)
+
+### Changed
+- Improved integration tests in pipeline - [#395](https://github.com/DigitalExcellence/dex-backend/issues/395)
+
+### Fixed
+- Renamed IdentityServer to match the rest of the project name - [#386](https://github.com/DigitalExcellence/dex-backend/issues/386)
+
+
 ## Release v.1.1.0-beta - 18-03-2021
 
 ### Added

diff --git a/Data/06_Data.csproj b/Data/06_Data.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>8</LangVersion>
-    <Version>1.1.0-beta</Version>
+    <Version>1.2.0-beta</Version>
   </PropertyGroup>
 
     <ItemGroup>

diff --git a/ElasticSynchronizer/14_ElasticSynchronizer.csproj b/ElasticSynchronizer/14_ElasticSynchronizer.csproj
@@ -1,8 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk.Worker">
+<Project Sdk="Microsoft.NET.Sdk.Worker">
 
     <PropertyGroup>
         <TargetFramework>netcoreapp3.1</TargetFramework>
         <UserSecretsId>dotnet-ElasticSynchronizer-03111C2E-844A-4534-8446-C60B5B11289B</UserSecretsId>
+        <Version>1.2.0-beta</Version>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/IdentityServer/08_IdentityServer.csproj b/IdentityServer/08_IdentityServer.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <TargetFramework>netcoreapp3.1</TargetFramework>
         <LangVersion>8</LangVersion>
-        <Version>1.1.0-beta</Version>
+        <Version>1.2.0-beta</Version>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/JobScheduler/13_JobScheduler.csproj b/JobScheduler/13_JobScheduler.csproj
@@ -5,7 +5,7 @@
     <UserSecretsId>dotnet-JobScheduler-3CE46EAB-4F12-4C7D-A37B-BFA136C798C1</UserSecretsId>
     <AssemblyName>13_JobScheduler</AssemblyName>
     <RootNamespace>13_JobScheduler</RootNamespace>
-      <Version>1.1.0-beta</Version>
+      <Version>1.2.0-beta</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/MessageBrokerPublisher.Tests/10_MessageBrokerPublisher.Tests.csproj b/MessageBrokerPublisher.Tests/10_MessageBrokerPublisher.Tests.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
       <IsPackable>false</IsPackable>
-      <Version>1.1.0-beta</Version>
+      <Version>1.2.0-beta</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/MessageBrokerPublisher/09_MessageBrokerPublisher.csproj b/MessageBrokerPublisher/09_MessageBrokerPublisher.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Version>1.1.0-beta</Version>
+    <Version>1.2.0-beta</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Models/07_Models.csproj b/Models/07_Models.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <TargetFramework>netcoreapp3.1</TargetFramework>
         <LangVersion>8</LangVersion>
-        <Version>1.1.0-beta</Version>
+        <Version>1.2.0-beta</Version>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/NotificationSystem.Tests/12_NotificationSystem.Tests.csproj b/NotificationSystem.Tests/12_NotificationSystem.Tests.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
       <IsPackable>false</IsPackable>
-      <Version>1.1.0-beta</Version>
+      <Version>1.2.0-beta</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/NotificationSystem/11_NotificationSystem.csproj b/NotificationSystem/11_NotificationSystem.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Version>1.1.0-beta</Version>
+    <Version>1.2.0-beta</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Repositories.Tests/05_Repositories.Tests.csproj b/Repositories.Tests/05_Repositories.Tests.csproj
@@ -5,7 +5,7 @@
 
     <IsPackable>false</IsPackable>
 
-    <Version>1.1.0-beta</Version>
+    <Version>1.2.0-beta</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Repositories/04_Repositories.csproj b/Repositories/04_Repositories.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>8</LangVersion>
-    <Version>1.1.0-beta</Version>
+    <Version>1.2.0-beta</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Services.Tests/03_Services.Tests.csproj b/Services.Tests/03_Services.Tests.csproj
@@ -5,7 +5,7 @@
 
     <IsPackable>false</IsPackable>
 
-    <Version>1.1.0-beta</Version>
+    <Version>1.2.0-beta</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Services/02_Services.csproj b/Services/02_Services.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>8</LangVersion>
-    <Version>1.1.0-beta</Version>
+    <Version>1.2.0-beta</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/docker-compose-production.yml b/docker-compose-production.yml
@@ -38,6 +38,7 @@ services:
     networks:
       - proxy
       - mssql-network
+      - rabbitmq-network
     depends_on:
       - db
     volumes:
@@ -166,8 +167,8 @@ services:
         - Config__RabbitMQ__Username=${App__RabbitMQ__Username}
         - Config__RabbitMQ__Password=${App__RabbitMQ__Password}
     networks:
-        rabbitmq-network:
-	mssql-network:
+      rabbitmq-network:
+      mssql-network:
 
   elasticsynchronizer:
     image: digitalexcellence/elasticsynchronizer:latest

diff --git a/docker-compose-staging.yml b/docker-compose-staging.yml
@@ -44,6 +44,7 @@ services:
     networks:
       - proxy
       - mssql-network
+      - rabbitmq-network
     depends_on:
       - db
     volumes: