From 6c88d064cdce67a54e80503fd3d2db7b6d246e39 Mon Sep 17 00:00:00 2001
From: Niray Mak <323492@student.fontys.nl>
Date: Thu, 15 Apr 2021 15:25:59 +0200
Subject: [PATCH 1/3] docker-compose files for production and staging now match
with the ones running on the servers.
---
docker-compose-production.yml | 5 +++--
docker-compose-staging.yml | 1 +
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/docker-compose-production.yml b/docker-compose-production.yml
index 263af762..e709edc2 100644
--- 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
index bd431133..cdb218db 100644
--- 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:
From c1ea683b2d6b0ffb88ef627c5e2d5f7289172d6b Mon Sep 17 00:00:00 2001
From: Niray Mak <323492@student.fontys.nl>
Date: Thu, 15 Apr 2021 15:28:09 +0200
Subject: [PATCH 2/3] updated version for all projects
---
API/01_API.csproj | 2 +-
Data/06_Data.csproj | 2 +-
ElasticSynchronizer/14_ElasticSynchronizer.csproj | 3 ++-
IdentityServer/08_IdentityServer.csproj | 2 +-
JobScheduler/13_JobScheduler.csproj | 2 +-
.../10_MessageBrokerPublisher.Tests.csproj | 2 +-
MessageBrokerPublisher/09_MessageBrokerPublisher.csproj | 2 +-
Models/07_Models.csproj | 2 +-
NotificationSystem.Tests/12_NotificationSystem.Tests.csproj | 2 +-
NotificationSystem/11_NotificationSystem.csproj | 2 +-
Repositories.Tests/05_Repositories.Tests.csproj | 2 +-
Repositories/04_Repositories.csproj | 2 +-
Services.Tests/03_Services.Tests.csproj | 2 +-
Services/02_Services.csproj | 2 +-
14 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/API/01_API.csproj b/API/01_API.csproj
index 46b5ced9..4c800a78 100644
--- a/API/01_API.csproj
+++ b/API/01_API.csproj
@@ -6,7 +6,7 @@
.\API.xml
Digital Excellence Fontys
8
- 1.1.0-beta
+ 1.2.0-beta
diff --git a/Data/06_Data.csproj b/Data/06_Data.csproj
index 5e560bb1..8d0904f8 100644
--- a/Data/06_Data.csproj
+++ b/Data/06_Data.csproj
@@ -3,7 +3,7 @@
netcoreapp3.1
8
- 1.1.0-beta
+ 1.2.0-beta
diff --git a/ElasticSynchronizer/14_ElasticSynchronizer.csproj b/ElasticSynchronizer/14_ElasticSynchronizer.csproj
index 934d0c73..0cddb968 100644
--- a/ElasticSynchronizer/14_ElasticSynchronizer.csproj
+++ b/ElasticSynchronizer/14_ElasticSynchronizer.csproj
@@ -1,8 +1,9 @@
-
+
netcoreapp3.1
dotnet-ElasticSynchronizer-03111C2E-844A-4534-8446-C60B5B11289B
+ 1.2.0-beta
diff --git a/IdentityServer/08_IdentityServer.csproj b/IdentityServer/08_IdentityServer.csproj
index 659aead9..e7cbd3f5 100644
--- a/IdentityServer/08_IdentityServer.csproj
+++ b/IdentityServer/08_IdentityServer.csproj
@@ -3,7 +3,7 @@
netcoreapp3.1
8
- 1.1.0-beta
+ 1.2.0-beta
diff --git a/JobScheduler/13_JobScheduler.csproj b/JobScheduler/13_JobScheduler.csproj
index d6699f39..c2d169cd 100644
--- a/JobScheduler/13_JobScheduler.csproj
+++ b/JobScheduler/13_JobScheduler.csproj
@@ -5,7 +5,7 @@
dotnet-JobScheduler-3CE46EAB-4F12-4C7D-A37B-BFA136C798C1
13_JobScheduler
13_JobScheduler
- 1.1.0-beta
+ 1.2.0-beta
diff --git a/MessageBrokerPublisher.Tests/10_MessageBrokerPublisher.Tests.csproj b/MessageBrokerPublisher.Tests/10_MessageBrokerPublisher.Tests.csproj
index 538cc6d1..f8aa4fae 100644
--- a/MessageBrokerPublisher.Tests/10_MessageBrokerPublisher.Tests.csproj
+++ b/MessageBrokerPublisher.Tests/10_MessageBrokerPublisher.Tests.csproj
@@ -3,7 +3,7 @@
netcoreapp3.1
false
- 1.1.0-beta
+ 1.2.0-beta
diff --git a/MessageBrokerPublisher/09_MessageBrokerPublisher.csproj b/MessageBrokerPublisher/09_MessageBrokerPublisher.csproj
index d121a0e6..ee2b4fc5 100644
--- a/MessageBrokerPublisher/09_MessageBrokerPublisher.csproj
+++ b/MessageBrokerPublisher/09_MessageBrokerPublisher.csproj
@@ -2,7 +2,7 @@
netcoreapp3.1
- 1.1.0-beta
+ 1.2.0-beta
diff --git a/Models/07_Models.csproj b/Models/07_Models.csproj
index cbfb8e46..8c9df773 100644
--- a/Models/07_Models.csproj
+++ b/Models/07_Models.csproj
@@ -3,7 +3,7 @@
netcoreapp3.1
8
- 1.1.0-beta
+ 1.2.0-beta
diff --git a/NotificationSystem.Tests/12_NotificationSystem.Tests.csproj b/NotificationSystem.Tests/12_NotificationSystem.Tests.csproj
index 1a61570c..4e942fdf 100644
--- a/NotificationSystem.Tests/12_NotificationSystem.Tests.csproj
+++ b/NotificationSystem.Tests/12_NotificationSystem.Tests.csproj
@@ -3,7 +3,7 @@
netcoreapp3.1
false
- 1.1.0-beta
+ 1.2.0-beta
diff --git a/NotificationSystem/11_NotificationSystem.csproj b/NotificationSystem/11_NotificationSystem.csproj
index 6e8df47d..5f0523db 100644
--- a/NotificationSystem/11_NotificationSystem.csproj
+++ b/NotificationSystem/11_NotificationSystem.csproj
@@ -3,7 +3,7 @@
Exe
netcoreapp3.1
- 1.1.0-beta
+ 1.2.0-beta
diff --git a/Repositories.Tests/05_Repositories.Tests.csproj b/Repositories.Tests/05_Repositories.Tests.csproj
index dcca4215..23bf1138 100644
--- a/Repositories.Tests/05_Repositories.Tests.csproj
+++ b/Repositories.Tests/05_Repositories.Tests.csproj
@@ -5,7 +5,7 @@
false
- 1.1.0-beta
+ 1.2.0-beta
diff --git a/Repositories/04_Repositories.csproj b/Repositories/04_Repositories.csproj
index 3e20c8ca..c77a6684 100644
--- a/Repositories/04_Repositories.csproj
+++ b/Repositories/04_Repositories.csproj
@@ -3,7 +3,7 @@
netcoreapp3.1
8
- 1.1.0-beta
+ 1.2.0-beta
diff --git a/Services.Tests/03_Services.Tests.csproj b/Services.Tests/03_Services.Tests.csproj
index b1d5cbfa..12621987 100644
--- a/Services.Tests/03_Services.Tests.csproj
+++ b/Services.Tests/03_Services.Tests.csproj
@@ -5,7 +5,7 @@
false
- 1.1.0-beta
+ 1.2.0-beta
diff --git a/Services/02_Services.csproj b/Services/02_Services.csproj
index 4928ac0d..f5f08c8b 100644
--- a/Services/02_Services.csproj
+++ b/Services/02_Services.csproj
@@ -3,7 +3,7 @@
netcoreapp3.1
8
- 1.1.0-beta
+ 1.2.0-beta
From 793a064156743713a8d2f9c7b9fb1b8b3f3ad77f Mon Sep 17 00:00:00 2001
From: Niray Mak <323492@student.fontys.nl>
Date: Thu, 15 Apr 2021 15:40:13 +0200
Subject: [PATCH 3/3] updated changelog for release
---
CHANGELOG.md | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b765d806..98385ce9 100644
--- 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