Changeset 81c2e6f for src

Timestamp:

10/21/21 21:53:08 (3 years ago)

Author:

Стојков Марко <mst@…>

Branches:

dev

Children:

70e04f1, 8b6791f

Parents:

45cf412 (diff), 2b66157 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merged navbar into dev

Location:

src

Files:

• Clients/Angular/finki-chattery/.vscode/launch.json (added)
• Clients/Angular/finki-chattery/angular.json (modified) (3 diffs)
• Clients/Angular/finki-chattery/src/app/app.component.html (modified) (1 diff)
• Clients/Angular/finki-chattery/src/app/app.module.ts (modified) (2 diffs)
• Clients/Angular/finki-chattery/src/app/core/core.module.ts (modified) (3 diffs)
• Clients/Angular/finki-chattery/src/app/core/services/redirect.service.ts (modified) (1 diff)
• Clients/Angular/finki-chattery/src/app/core/services/services.ts (modified) (1 diff)
• Clients/Angular/finki-chattery/src/app/core/state/category-state/category.actions.ts (modified) (2 diffs)
• Clients/Angular/finki-chattery/src/app/shared-app/components/components.ts (modified) (2 diffs)
• Clients/Angular/finki-chattery/src/app/shared-app/components/generic/header/header.component.html (added)
• Clients/Angular/finki-chattery/src/app/shared-app/components/generic/header/header.component.scss (added)
• Clients/Angular/finki-chattery/src/app/shared-app/components/generic/header/header.component.ts (added)
• FinkiChattery/FinkiChattery.Api/FinkiChattery.Api.csproj (modified) (1 diff)
• FinkiChattery/FinkiChattery.Api/Services/RegisterServices.cs (modified) (1 diff)
• FinkiChattery/FinkiChattery.Api/Startup.cs (modified) (1 diff)
• FinkiChattery/FinkiChattery.Api/appsettings.Development.json (modified) (1 diff)
• FinkiChattery/FinkiChattery.Commands/FinkiChattery.Commands.csproj (modified) (1 diff)
• FinkiChattery/FinkiChattery.Common/FinkiChattery.Common.csproj (modified) (1 diff)
• FinkiChattery/FinkiChattery.Contracts/FinkiChattery.Contracts.csproj (modified) (1 diff)
• FinkiChattery/FinkiChattery.Database/FinkiChattery.Database.sqlproj (modified) (2 diffs)
• FinkiChattery/FinkiChattery.Database/FinkiChattery.Database.sqlproj_backup (added)
• FinkiChattery/FinkiChattery.Database/dbo/Tables/Category/Category.Seed.sql (modified) (1 diff)
• FinkiChattery/FinkiChattery.HangfireDatabase/FinkiChattery.HangfireDatabase.sqlproj (modified) (3 diffs)
• FinkiChattery/FinkiChattery.HangfireDatabase/FinkiChattery.HangfireDatabase.sqlproj_backup (added)
• FinkiChattery/FinkiChattery.Identity/FinkiChattery.Identity.csproj (modified) (1 diff)
• FinkiChattery/FinkiChattery.Identity/Properties/launchSettings.json (modified) (1 diff)
• FinkiChattery/FinkiChattery.Identity/Startup.cs (modified) (1 diff)
• FinkiChattery/FinkiChattery.Identity/appsettings.Development.json (modified) (1 diff)
• FinkiChattery/FinkiChattery.Persistence/FinkiChattery.Persistence.csproj (modified) (1 diff)
• FinkiChattery/FinkiChattery.Queries/FinkiChattery.Queries.csproj (modified) (1 diff)
• FinkiChattery/FinkiChattery.sln (modified) (3 diffs)

src/Clients/Angular/finki-chattery/angular.json

@@ -98 +98 @@
             "tsConfig": "tsconfig.spec.json",
             "karmaConfig": "karma.conf.js",
-            "assets": ["src/favicon.ico", "src/assets"],
-            "styles": ["./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", "src/styles.scss"],
+            "assets": [
+              "src/favicon.ico",
+              "src/assets"
+            ],
+            "styles": [
+              "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
+              "src/styles.scss"
+            ],
             "scripts": []
           }
@@ -106 +112 @@
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
-            "tsConfig": ["tsconfig.app.json", "tsconfig.spec.json", "e2e/tsconfig.json"],
-            "exclude": ["**/node_modules/**"]
+            "tsConfig": [
+              "tsconfig.app.json",
+              "tsconfig.spec.json",
+              "e2e/tsconfig.json"
+            ],
+            "exclude": [
+              "**/node_modules/**"
+            ]
           }
         },
@@ -125 +137 @@
     }
   },
-  "defaultProject": "finki-chattery"
+  "defaultProject": "finki-chattery",
+  "cli": {
+    "analytics": false
+  }
 }

src/Clients/Angular/finki-chattery/src/app/app.component.html

@@ -1 +1 @@
 <main>
   <mat-progress-bar class="global-loader" [class.hidden]="!(loader.isLoading | async)" mode="indeterminate"></mat-progress-bar>
+  <app-header></app-header>
   <router-outlet></router-outlet>
 </main>

src/Clients/Angular/finki-chattery/src/app/app.module.ts

@@ -10 +10 @@
 import { CoreModule } from './core/core.module';
 import { translateConfiguration, TranslateFromJsonService } from './shared-app/services';
-import { SharedMaterialModule } from './shared-material/shared-material.module';
 
 @NgModule({
@@ -18 +17 @@
     AppRoutingModule,
     CoreModule,
-    SharedMaterialModule,
     BrowserAnimationsModule,
     ToastrModule.forRoot(),

src/Clients/Angular/finki-chattery/src/app/core/core.module.ts

@@ -11 +11 @@
 import { GUARDS } from './guards/guards';
 import { LoaderInterceptor } from './interceptors/loader.interceptor';
-import { SERVICES } from './services/services';
 import { reducers } from './state';
 import { TokenInterceptor } from './interceptors/token.interceptor';
@@ -21 +20 @@
   declarations: [COMPONENTS],
   providers: [
-    SERVICES,
     GUARDS,
     { provide: HTTP_INTERCEPTORS, useClass: LoaderInterceptor, multi: true },
@@ -39 +37 @@
     EffectsModule.forRoot([QuestionEffects, CategoriesEffects])
   ],
-  exports: [HttpClientModule, COMPONENTS]
+  exports: [HttpClientModule, SharedAppModule, COMPONENTS]
 })
 export class CoreModule {}

src/Clients/Angular/finki-chattery/src/app/core/services/redirect.service.ts

@@ -20 +20 @@
           switch (currentUser.userType) {
             case ApplicationUserType.Student:
+              this.router.navigateByUrl(`questioning/preview`);
               break;
             case ApplicationUserType.Teacher:

src/Clients/Angular/finki-chattery/src/app/core/services/services.ts

@@ -1 @@
-export const SERVICES: any[] = [];

src/Clients/Angular/finki-chattery/src/app/core/state/category-state/category.actions.ts

@@ -1 +1 @@
 import { HttpErrorResponse } from '@angular/common/http';
 import { Action } from '@ngrx/store';
+import { CategoryStateViewModel } from 'src/app/shared-app/models';
 import { CategoryStateResponse } from './category-state.models';
 
@@ -20 +21 @@
   readonly type = CategoryActionTypes.GetCategoriesStateSuccess;
 
-  constructor(public payload: CategoryStateResponse[]) {}
+  constructor(public payload: CategoryStateViewModel[]) {}
 }
 

src/Clients/Angular/finki-chattery/src/app/shared-app/components/components.ts

@@ -2 +2 @@
 import { FileUploadComponent } from './generic/file-upload/file-upload.component';
 import { FormErrorComponent } from './generic/form-error/form-error.component';
+import { HeaderComponent } from './generic/header/header.component';
 import { VoteComponent } from './generic/vote/vote.component';
 import { QuestionPreviewComponent } from './question/question-preview/question-preview.component';
@@ -12 +13 @@
   QuestionPreviewComponent,
   VoteComponent,
-  StudentCardComponent
+  StudentCardComponent,
+  HeaderComponent
 ];

src/FinkiChattery/FinkiChattery.Api/FinkiChattery.Api.csproj

@@ -3 +3 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+    <Configurations>Debug;Release;Debug_Docker</Configurations>
   </PropertyGroup>
 

src/FinkiChattery/FinkiChattery.Api/Services/RegisterServices.cs

@@ -36 +36 @@
         public static void AddHangfireService(this IServiceCollection services, IConfiguration configuration)
         {
+            string connectionString = "HangfireConnection";
+#if DEBUG_DOCKER
+            connectionString = "HangfireConnectionDocker";
+#endif
+
             services.AddHangfire(x =>
             {
-                x.UseSqlServerStorage(configuration.GetConnectionString("HangfireConnection"), new SqlServerStorageOptions
+                x.UseSqlServerStorage(configuration.GetConnectionString(connectionString), new SqlServerStorageOptions
                 {
                     CommandBatchMaxTimeout = TimeSpan.FromMinutes(5),

src/FinkiChattery/FinkiChattery.Api/Startup.cs

@@ -39 +39 @@
             services.AddHangfireService(Configuration);
 
+            string connectionString = "DefaultConnection";
+#if DEBUG_DOCKER
+            connectionString = "DefaultConnectionDocker";
+#endif
+
             services.AddDbContext<ApplicationDbContext>(options =>
-                options.UseSqlServer(Configuration.GetConnectionString("DefaultConnection")));
+                options.UseSqlServer(Configuration.GetConnectionString(connectionString)));
 
             services.AddControllers()

src/FinkiChattery/FinkiChattery.Api/appsettings.Development.json

@@ -25 +25 @@
     },
     "corsSettings": {
-      "allowedCorsOrigins": [
-        "http://localhost:4200"
-      ]
+      "allowedCorsOrigins": ["http://localhost:4200"]
     }
   },
   "ConnectionStrings": {
     "DefaultConnection": "data source=.;initial catalog=FinkiChattery;integrated security=True;application name=FinkiChattery Base App;Pooling=true;Min Pool Size=5;Max Pool Size=30;",
-    "HangfireConnection": "data source=.;initial catalog=FinkiChatteryHangfire;integrated security=True;application name=FinkiChattery Hangfire App;Pooling=true;Min Pool Size=5;Max Pool Size=30;"
+    "HangfireConnection": "data source=.;initial catalog=FinkiChatteryHangfire;integrated security=True;application name=FinkiChattery Hangfire App;Pooling=true;Min Pool Size=5;Max Pool Size=30;",
+    "DefaultConnectionDocker": "Data Source=localhost;Initial Catalog=FinkiChattery;User ID=sa;Password=Asfa+032;Connect Timeout=60;Encrypt=False;TrustServerCertificate=True;ApplicationIntent=ReadWrite;MultiSubnetFailover=False;Pooling=true;Min Pool Size=5;Max Pool Size=30;",
+    "HangfireConnectionDocker": "Data Source=localhost;Initial Catalog=FinkiChatteryHangfire;User ID=sa;Password=Asfa+032;Connect Timeout=60;Encrypt=False;TrustServerCertificate=True;ApplicationIntent=ReadWrite;MultiSubnetFailover=False;Pooling=true;Min Pool Size=5;Max Pool Size=30;"
   }
 }

src/FinkiChattery/FinkiChattery.Commands/FinkiChattery.Commands.csproj

@@ -3 +3 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+    <Configurations>Debug;Release;Debug_Docker</Configurations>
   </PropertyGroup>
 

src/FinkiChattery/FinkiChattery.Common/FinkiChattery.Common.csproj

@@ -3 +3 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+    <Configurations>Debug;Release;Debug_Docker</Configurations>
   </PropertyGroup>
 

src/FinkiChattery/FinkiChattery.Contracts/FinkiChattery.Contracts.csproj

@@ -3 +3 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+    <Configurations>Debug;Release;Debug_Docker</Configurations>
   </PropertyGroup>
 

src/FinkiChattery/FinkiChattery.Database/FinkiChattery.Database.sqlproj

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
@@ -55 +55 @@
     <VisualStudioVersion Condition="'$(SSDTExists)' == ''">11.0</VisualStudioVersion>
   </PropertyGroup>
-  <Import Condition="'$(SQLDBExtensionsRefPath)' != ''" Project="$(SQLDBExtensionsRefPath)\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
-  <Import Condition="'$(SQLDBExtensionsRefPath)' == ''" Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
+  <Import Condition="'$(NetCoreBuild)' != 'true' AND '$(SQLDBExtensionsRefPath)' != ''" Project="$(SQLDBExtensionsRefPath)\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
+  <Import Condition="'$(NetCoreBuild)' != 'true' AND '$(SQLDBExtensionsRefPath)' == ''" Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
   <ItemGroup>
     <Folder Include="Properties" />

src/FinkiChattery/FinkiChattery.Database/dbo/Tables/Category/Category.Seed.sql

@@ -10 +10 @@
                 (2, N'7d19a33f-d4a9-4498-8beb-07a5ce75d638',  N'software-engineering'),
                 (3, N'8317013c-7eb8-4ca9-83c5-0342895e4061',  N'visual-programming'),
-                (4, N'a4493d42-e01f-4092-a700-47a0847c8c4e',  N'operating-systems')
+                (4, N'11d42b97-a343-499e-b3c6-13fbfd3785f4',  N'internet-programming'),
+                (5, N'b2e4f54d-664e-4301-9642-9a6e9ef8df84',  N'object-oriented-programming'),
+                (6, N'77146a56-48b3-4e29-910a-54b7449f8c2b',  N'calculus'),
+                (7, N'c1a7bc19-34b5-4434-ad6b-f6e0fa90c946',  N'discrete-mathematics'),
+                (8, N'9f324879-0e63-4d3d-a945-e88d290a23f1',  N'advanced-programming'),
+                (9, N'6dd8f274-32ba-4b4b-8270-fea799e9b2e2',  N'web-programming'),
+                (10, N'a4493d42-e01f-4092-a700-47a0847c8c4e',  N'operating-systems')
                 )
                 AS temp ([ID], [Uid], [Name])

src/FinkiChattery/FinkiChattery.HangfireDatabase/FinkiChattery.HangfireDatabase.sqlproj

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
@@ -55 +55 @@
     <VisualStudioVersion Condition="'$(SSDTExists)' == ''">11.0</VisualStudioVersion>
   </PropertyGroup>
-  <Import Condition="'$(SQLDBExtensionsRefPath)' != ''" Project="$(SQLDBExtensionsRefPath)\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
-  <Import Condition="'$(SQLDBExtensionsRefPath)' == ''" Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
+  <Import Condition="'$(NetCoreBuild)' != 'true' AND '$(SQLDBExtensionsRefPath)' != ''" Project="$(SQLDBExtensionsRefPath)\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
+  <Import Condition="'$(NetCoreBuild)' != 'true' AND '$(SQLDBExtensionsRefPath)' == ''" Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
   <ItemGroup>
     <Folder Include="Properties" />
@@ -80 +80 @@
     <None Include="FinkiChattery.HangfireDatabase.publish.xml" />
   </ItemGroup>
+  <Import Condition="'$(NetCoreBuild)' == 'true'" Project="$(NETCoreTargetsPath)\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
+  <ItemGroup>
+    <PackageReference Condition="'$(NetCoreBuild)' == 'true'" Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
+  </ItemGroup>
+  <Target Name="BeforeBuild">
+    <Delete Files="$(BaseIntermediateOutputPath)\project.assets.json" />
+  </Target>
 </Project>

src/FinkiChattery/FinkiChattery.Identity/FinkiChattery.Identity.csproj

@@ -3 +3 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+    <Configurations>Debug;Release;Debug_Docker</Configurations>
   </PropertyGroup>
 

src/FinkiChattery/FinkiChattery.Identity/Properties/launchSettings.json

@@ -9 +9 @@
   },
   "profiles": {
+    "FinkiChattery.Identity": {
+      "commandName": "IISExpress",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "https://localhost:44301"
+    },
     "SelfHost": {
       "commandName": "IISExpress",

src/FinkiChattery/FinkiChattery.Identity/Startup.cs

@@ -28 +28 @@
             services.AddControllersWithViews();
 
+            string connectionString = "DefaultConnection";
+#if DEBUG_DOCKER
+            connectionString = "DefaultConnectionDocker";
+#endif
+
             services.AddDbContextPool<ApplicationDbContext<ApplicationUser>>(options =>
-                options.UseSqlServer(Configuration.GetConnectionString("DefaultConnection")));
+                options.UseSqlServer(Configuration.GetConnectionString(connectionString)));
 
             services.AddIdentityServerAndIdentityProvider(AppSettings);

src/FinkiChattery/FinkiChattery.Identity/appsettings.Development.json

@@ -17 +17 @@
         },
         "ConnectionStrings": {
-                "DefaultConnection": "data source=.;initial catalog=FinkiChattery;integrated security=True;application name=FinkiChattery Base App;Pooling=true;Min Pool Size=5;Max Pool Size=30;"
+                "DefaultConnection": "data source=.;initial catalog=FinkiChattery;integrated security=True;application name=FinkiChattery Base App;Pooling=true;Min Pool Size=5;Max Pool Size=30;",
+                "DefaultConnectionDocker": "Data Source=localhost;Initial Catalog=FinkiChattery;User ID=sa;Password=Asfa+032;Connect Timeout=60;Encrypt=False;TrustServerCertificate=True;ApplicationIntent=ReadWrite;MultiSubnetFailover=False;Pooling=true;Min Pool Size=5;Max Pool Size=30;"
         }
 }

src/FinkiChattery/FinkiChattery.Persistence/FinkiChattery.Persistence.csproj

@@ -3 +3 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+    <Configurations>Debug;Release;Debug_Docker</Configurations>
   </PropertyGroup>
 

src/FinkiChattery/FinkiChattery.Queries/FinkiChattery.Queries.csproj

@@ -3 +3 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+    <Configurations>Debug;Release;Debug_Docker</Configurations>
   </PropertyGroup>
 

src/FinkiChattery/FinkiChattery.sln

@@ -22 +22 @@
 Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "FinkiChattery.HangfireDatabase", "FinkiChattery.HangfireDatabase\FinkiChattery.HangfireDatabase.sqlproj", "{C4CB8596-3F3A-4B4E-BEC5-0720FF7CD532}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FinkiChattery.Commands", "FinkiChattery.Commands\FinkiChattery.Commands.csproj", "{7AD9C86F-46FF-442A-B134-3CE2E82CE0D0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FinkiChattery.Commands", "FinkiChattery.Commands\FinkiChattery.Commands.csproj", "{7AD9C86F-46FF-442A-B134-3CE2E82CE0D0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FinkiChattery.Queries", "FinkiChattery.Queries\FinkiChattery.Queries.csproj", "{D19820A3-E6E6-4B1C-927A-C8B8B4B16D25}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FinkiChattery.Queries", "FinkiChattery.Queries\FinkiChattery.Queries.csproj", "{D19820A3-E6E6-4B1C-927A-C8B8B4B16D25}"
 EndProject
 Global
         GlobalSection(SolutionConfigurationPlatforms) = preSolution
+                Debug_Docker|Any CPU = Debug_Docker|Any CPU
                 Debug|Any CPU = Debug|Any CPU
                 Release|Any CPU = Release|Any CPU
         EndGlobalSection
         GlobalSection(ProjectConfigurationPlatforms) = postSolution
+                {8CD7796E-5DC1-413D-8D04-3C95E89BB214}.Debug_Docker|Any CPU.ActiveCfg = Debug_Docker|Any CPU
+                {8CD7796E-5DC1-413D-8D04-3C95E89BB214}.Debug_Docker|Any CPU.Build.0 = Debug_Docker|Any CPU
                 {8CD7796E-5DC1-413D-8D04-3C95E89BB214}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                 {8CD7796E-5DC1-413D-8D04-3C95E89BB214}.Debug|Any CPU.Build.0 = Debug|Any CPU
                 {8CD7796E-5DC1-413D-8D04-3C95E89BB214}.Release|Any CPU.ActiveCfg = Release|Any CPU
                 {8CD7796E-5DC1-413D-8D04-3C95E89BB214}.Release|Any CPU.Build.0 = Release|Any CPU
+                {D2EADD50-983E-48EE-8B36-7CF088DCF8AE}.Debug_Docker|Any CPU.ActiveCfg = Debug_Docker|Any CPU
+                {D2EADD50-983E-48EE-8B36-7CF088DCF8AE}.Debug_Docker|Any CPU.Build.0 = Debug_Docker|Any CPU
                 {D2EADD50-983E-48EE-8B36-7CF088DCF8AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                 {D2EADD50-983E-48EE-8B36-7CF088DCF8AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
                 {D2EADD50-983E-48EE-8B36-7CF088DCF8AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
                 {D2EADD50-983E-48EE-8B36-7CF088DCF8AE}.Release|Any CPU.Build.0 = Release|Any CPU
+                {1BA385FA-32FC-4237-85D2-705EEBCAFD06}.Debug_Docker|Any CPU.ActiveCfg = Debug_Docker|Any CPU
+                {1BA385FA-32FC-4237-85D2-705EEBCAFD06}.Debug_Docker|Any CPU.Build.0 = Debug_Docker|Any CPU
                 {1BA385FA-32FC-4237-85D2-705EEBCAFD06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                 {1BA385FA-32FC-4237-85D2-705EEBCAFD06}.Debug|Any CPU.Build.0 = Debug|Any CPU
                 {1BA385FA-32FC-4237-85D2-705EEBCAFD06}.Release|Any CPU.ActiveCfg = Release|Any CPU
                 {1BA385FA-32FC-4237-85D2-705EEBCAFD06}.Release|Any CPU.Build.0 = Release|Any CPU
+                {4D2F08BF-44F0-427D-B5B8-079233500FA8}.Debug_Docker|Any CPU.ActiveCfg = Debug_Docker|Any CPU
+                {4D2F08BF-44F0-427D-B5B8-079233500FA8}.Debug_Docker|Any CPU.Build.0 = Debug_Docker|Any CPU
                 {4D2F08BF-44F0-427D-B5B8-079233500FA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                 {4D2F08BF-44F0-427D-B5B8-079233500FA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
                 {4D2F08BF-44F0-427D-B5B8-079233500FA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
                 {4D2F08BF-44F0-427D-B5B8-079233500FA8}.Release|Any CPU.Build.0 = Release|Any CPU
+                {E69CDEE7-B2F5-42F4-81F0-11DCDC1C8CC9}.Debug_Docker|Any CPU.ActiveCfg = Debug_Docker|Any CPU
+                {E69CDEE7-B2F5-42F4-81F0-11DCDC1C8CC9}.Debug_Docker|Any CPU.Build.0 = Debug_Docker|Any CPU
                 {E69CDEE7-B2F5-42F4-81F0-11DCDC1C8CC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                 {E69CDEE7-B2F5-42F4-81F0-11DCDC1C8CC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
                 {E69CDEE7-B2F5-42F4-81F0-11DCDC1C8CC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
                 {E69CDEE7-B2F5-42F4-81F0-11DCDC1C8CC9}.Release|Any CPU.Build.0 = Release|Any CPU
+                {5E1219F5-FC7D-4138-811D-26934E946D30}.Debug_Docker|Any CPU.ActiveCfg = Debug_Docker|Any CPU
+                {5E1219F5-FC7D-4138-811D-26934E946D30}.Debug_Docker|Any CPU.Build.0 = Debug_Docker|Any CPU
+                {5E1219F5-FC7D-4138-811D-26934E946D30}.Debug_Docker|Any CPU.Deploy.0 = Debug_Docker|Any CPU
                 {5E1219F5-FC7D-4138-811D-26934E946D30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                 {5E1219F5-FC7D-4138-811D-26934E946D30}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -58 +72 @@
                 {5E1219F5-FC7D-4138-811D-26934E946D30}.Release|Any CPU.Build.0 = Release|Any CPU
                 {5E1219F5-FC7D-4138-811D-26934E946D30}.Release|Any CPU.Deploy.0 = Release|Any CPU
+                {C4CB8596-3F3A-4B4E-BEC5-0720FF7CD532}.Debug_Docker|Any CPU.ActiveCfg = Debug_Docker|Any CPU
+                {C4CB8596-3F3A-4B4E-BEC5-0720FF7CD532}.Debug_Docker|Any CPU.Build.0 = Debug_Docker|Any CPU
+                {C4CB8596-3F3A-4B4E-BEC5-0720FF7CD532}.Debug_Docker|Any CPU.Deploy.0 = Debug_Docker|Any CPU
                 {C4CB8596-3F3A-4B4E-BEC5-0720FF7CD532}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                 {C4CB8596-3F3A-4B4E-BEC5-0720FF7CD532}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -64 +81 @@
                 {C4CB8596-3F3A-4B4E-BEC5-0720FF7CD532}.Release|Any CPU.Build.0 = Release|Any CPU
                 {C4CB8596-3F3A-4B4E-BEC5-0720FF7CD532}.Release|Any CPU.Deploy.0 = Release|Any CPU
+                {7AD9C86F-46FF-442A-B134-3CE2E82CE0D0}.Debug_Docker|Any CPU.ActiveCfg = Debug_Docker|Any CPU
+                {7AD9C86F-46FF-442A-B134-3CE2E82CE0D0}.Debug_Docker|Any CPU.Build.0 = Debug_Docker|Any CPU
                 {7AD9C86F-46FF-442A-B134-3CE2E82CE0D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                 {7AD9C86F-46FF-442A-B134-3CE2E82CE0D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
                 {7AD9C86F-46FF-442A-B134-3CE2E82CE0D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
                 {7AD9C86F-46FF-442A-B134-3CE2E82CE0D0}.Release|Any CPU.Build.0 = Release|Any CPU
+                {D19820A3-E6E6-4B1C-927A-C8B8B4B16D25}.Debug_Docker|Any CPU.ActiveCfg = Debug_Docker|Any CPU
+                {D19820A3-E6E6-4B1C-927A-C8B8B4B16D25}.Debug_Docker|Any CPU.Build.0 = Debug_Docker|Any CPU
                 {D19820A3-E6E6-4B1C-927A-C8B8B4B16D25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                 {D19820A3-E6E6-4B1C-927A-C8B8B4B16D25}.Debug|Any CPU.Build.0 = Debug|Any CPU