From b242455a88a89f1c7f7af65f1d0a3bd3eb621d78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20G=C3=B3rzy=C5=84ski?= Date: Sat, 5 Dec 2020 12:34:23 +0100 Subject: [PATCH] Fix some weird bug with Visualstudio --- Jenkinsfile | 42 +++--- .../Repositories/CharismaRepository.cs | 26 ++-- .../Repositories/ConstitutionRepository.cs | 28 ++-- .../Repositories/DexterityRepository.cs | 28 ++-- .../Repositories/IntelligenceRepository.cs | 28 ++-- .../Repositories/StrengthRepository.cs | 28 ++-- .../Repositories/WisdomRepository.cs | 28 ++-- .../SessionCompanion/ClientApp/package.json | 122 +++++++++--------- .../SessionCompanion/appsettings.json | 26 ++-- 9 files changed, 178 insertions(+), 178 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e8bae64..edc5f50 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,21 +1,21 @@ -pipeline { - agent any - stages { - stage('Build image') { - steps { - echo "Building docker image" - script { - dir('SessionCompanion/SessionCompanion'){ - def customImage = docker.build("session-companion:${env.BUILD_ID}") - //customImage.withRun('-p 5050:5050') - } - } - } - } - stage('Delete image') { - steps { - sh "docker rmi session-companion:${env.BUILD_ID}" - } - } - } -} +pipeline { + agent any + stages { + stage('Build image') { + steps { + echo "Building docker image" + script { + dir('SessionCompanion/SessionCompanion'){ + def customImage = docker.build("session-companion:${env.BUILD_ID}") + //customImage.withRun('-p 5050:5050') + } + } + } + } + stage('Delete image') { + steps { + sh "docker rmi session-companion:${env.BUILD_ID}" + } + } + } +} diff --git a/SessionCompanion/SessionCompanion.Database/Repositories/CharismaRepository.cs b/SessionCompanion/SessionCompanion.Database/Repositories/CharismaRepository.cs index b7ef0cb..71c416b 100644 --- a/SessionCompanion/SessionCompanion.Database/Repositories/CharismaRepository.cs +++ b/SessionCompanion/SessionCompanion.Database/Repositories/CharismaRepository.cs @@ -1,14 +1,14 @@ -using SessionCompanion.Database.Repositories.Base; -using SessionCompanion.Database.Tables; -using System; -using System.Collections.Generic; -using System.Text; - -namespace SessionCompanion.Database.Repositories -{ - public class CharismaRepository : Repository, IRepository - { - public CharismaRepository(ApplicationDbContext _dbContext) : base(_dbContext) - { } - } +using SessionCompanion.Database.Repositories.Base; +using SessionCompanion.Database.Tables; +using System; +using System.Collections.Generic; +using System.Text; + +namespace SessionCompanion.Database.Repositories +{ + public class CharismaRepository : Repository, IRepository + { + public CharismaRepository(ApplicationDbContext _dbContext) : base(_dbContext) + { } + } } \ No newline at end of file diff --git a/SessionCompanion/SessionCompanion.Database/Repositories/ConstitutionRepository.cs b/SessionCompanion/SessionCompanion.Database/Repositories/ConstitutionRepository.cs index 57bf367..f6a483c 100644 --- a/SessionCompanion/SessionCompanion.Database/Repositories/ConstitutionRepository.cs +++ b/SessionCompanion/SessionCompanion.Database/Repositories/ConstitutionRepository.cs @@ -1,14 +1,14 @@ -using SessionCompanion.Database.Repositories.Base; -using SessionCompanion.Database.Tables; -using System; -using System.Collections.Generic; -using System.Text; - -namespace SessionCompanion.Database.Repositories -{ - public class ConstitutionRepository : Repository, IRepository - { - public ConstitutionRepository(ApplicationDbContext _dbContext) : base(_dbContext) - { } - } -} +using SessionCompanion.Database.Repositories.Base; +using SessionCompanion.Database.Tables; +using System; +using System.Collections.Generic; +using System.Text; + +namespace SessionCompanion.Database.Repositories +{ + public class ConstitutionRepository : Repository, IRepository + { + public ConstitutionRepository(ApplicationDbContext _dbContext) : base(_dbContext) + { } + } +} diff --git a/SessionCompanion/SessionCompanion.Database/Repositories/DexterityRepository.cs b/SessionCompanion/SessionCompanion.Database/Repositories/DexterityRepository.cs index 3e4fa68..84ac403 100644 --- a/SessionCompanion/SessionCompanion.Database/Repositories/DexterityRepository.cs +++ b/SessionCompanion/SessionCompanion.Database/Repositories/DexterityRepository.cs @@ -1,14 +1,14 @@ -using SessionCompanion.Database.Repositories.Base; -using SessionCompanion.Database.Tables; -using System; -using System.Collections.Generic; -using System.Text; - -namespace SessionCompanion.Database.Repositories -{ - public class DexterityRepository : Repository, IRepository - { - public DexterityRepository(ApplicationDbContext _dbContext) : base(_dbContext) - { } - } -} +using SessionCompanion.Database.Repositories.Base; +using SessionCompanion.Database.Tables; +using System; +using System.Collections.Generic; +using System.Text; + +namespace SessionCompanion.Database.Repositories +{ + public class DexterityRepository : Repository, IRepository + { + public DexterityRepository(ApplicationDbContext _dbContext) : base(_dbContext) + { } + } +} diff --git a/SessionCompanion/SessionCompanion.Database/Repositories/IntelligenceRepository.cs b/SessionCompanion/SessionCompanion.Database/Repositories/IntelligenceRepository.cs index f995914..f382111 100644 --- a/SessionCompanion/SessionCompanion.Database/Repositories/IntelligenceRepository.cs +++ b/SessionCompanion/SessionCompanion.Database/Repositories/IntelligenceRepository.cs @@ -1,14 +1,14 @@ -using SessionCompanion.Database.Repositories.Base; -using SessionCompanion.Database.Tables; -using System; -using System.Collections.Generic; -using System.Text; - -namespace SessionCompanion.Database.Repositories -{ - public class IntelligenceRepository : Repository, IRepository - { - public IntelligenceRepository(ApplicationDbContext _dbContext) : base(_dbContext) - { } - } -} +using SessionCompanion.Database.Repositories.Base; +using SessionCompanion.Database.Tables; +using System; +using System.Collections.Generic; +using System.Text; + +namespace SessionCompanion.Database.Repositories +{ + public class IntelligenceRepository : Repository, IRepository + { + public IntelligenceRepository(ApplicationDbContext _dbContext) : base(_dbContext) + { } + } +} diff --git a/SessionCompanion/SessionCompanion.Database/Repositories/StrengthRepository.cs b/SessionCompanion/SessionCompanion.Database/Repositories/StrengthRepository.cs index 6a70520..171ffce 100644 --- a/SessionCompanion/SessionCompanion.Database/Repositories/StrengthRepository.cs +++ b/SessionCompanion/SessionCompanion.Database/Repositories/StrengthRepository.cs @@ -1,14 +1,14 @@ -using SessionCompanion.Database.Repositories.Base; -using SessionCompanion.Database.Tables; -using System; -using System.Collections.Generic; -using System.Text; - -namespace SessionCompanion.Database.Repositories -{ - public class StrengthRepository : Repository, IRepository - { - public StrengthRepository(ApplicationDbContext _dbContext) : base(_dbContext) - { } - } -} +using SessionCompanion.Database.Repositories.Base; +using SessionCompanion.Database.Tables; +using System; +using System.Collections.Generic; +using System.Text; + +namespace SessionCompanion.Database.Repositories +{ + public class StrengthRepository : Repository, IRepository + { + public StrengthRepository(ApplicationDbContext _dbContext) : base(_dbContext) + { } + } +} diff --git a/SessionCompanion/SessionCompanion.Database/Repositories/WisdomRepository.cs b/SessionCompanion/SessionCompanion.Database/Repositories/WisdomRepository.cs index a26a310..32336d2 100644 --- a/SessionCompanion/SessionCompanion.Database/Repositories/WisdomRepository.cs +++ b/SessionCompanion/SessionCompanion.Database/Repositories/WisdomRepository.cs @@ -1,14 +1,14 @@ -using SessionCompanion.Database.Repositories.Base; -using SessionCompanion.Database.Tables; -using System; -using System.Collections.Generic; -using System.Text; - -namespace SessionCompanion.Database.Repositories -{ - public class WisdomRepository : Repository, IRepository - { - public WisdomRepository(ApplicationDbContext _dbContext) : base(_dbContext) - { } - } -} +using SessionCompanion.Database.Repositories.Base; +using SessionCompanion.Database.Tables; +using System; +using System.Collections.Generic; +using System.Text; + +namespace SessionCompanion.Database.Repositories +{ + public class WisdomRepository : Repository, IRepository + { + public WisdomRepository(ApplicationDbContext _dbContext) : base(_dbContext) + { } + } +} diff --git a/SessionCompanion/SessionCompanion/ClientApp/package.json b/SessionCompanion/SessionCompanion/ClientApp/package.json index 456f2cc..337a8e8 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/package.json +++ b/SessionCompanion/SessionCompanion/ClientApp/package.json @@ -1,61 +1,61 @@ -{ - "name": "sessioncompanion", - "version": "0.0.0", - "scripts": { - "ng": "ng", - "start": "ng serve", - "build": "ng build", - "build:ssr": "ng run SessionCompanion:server:dev", - "test": "ng test", - "lint": "ng lint", - "e2e": "ng e2e" - }, - "private": true, - "dependencies": { - "@angular/animations": "8.2.12", - "@angular/cdk": "~8.2.3", - "@angular/common": "8.2.12", - "@angular/compiler": "8.2.12", - "@angular/core": "8.2.12", - "@angular/forms": "8.2.12", - "@angular/material": "^8.2.3", - "@angular/platform-browser": "8.2.12", - "@angular/platform-browser-dynamic": "8.2.12", - "@angular/platform-server": "8.2.12", - "@angular/router": "8.2.12", - "@nguniversal/module-map-ngfactory-loader": "8.1.1", - "aspnet-prerendering": "^3.0.1", - "bootstrap": "^4.3.1", - "core-js": "^3.3.3", - "hammerjs": "^2.0.8", - "jquery": "3.4.1", - "oidc-client": "^1.9.1", - "popper.js": "^1.16.0", - "rxjs": "^6.5.3", - "zone.js": "0.9.1" - }, - "devDependencies": { - "@angular-devkit/build-angular": "^0.803.26", - "@angular/cli": "^8.3.26", - "@angular/compiler-cli": "^8.2.14", - "@angular/language-service": "^8.2.12", - "@types/jasmine": "~3.4.4", - "@types/jasminewd2": "~2.0.8", - "@types/node": "~12.11.6", - "codelyzer": "^5.2.0", - "jasmine-core": "~3.5.0", - "jasmine-spec-reporter": "~4.2.1", - "karma": "^5.0.2", - "karma-chrome-launcher": "~3.1.0", - "karma-coverage-istanbul-reporter": "~2.1.0", - "karma-jasmine": "~2.0.1", - "karma-jasmine-html-reporter": "^1.4.2", - "typescript": "3.5.3" - }, - "optionalDependencies": { - "node-sass": "^4.12.0", - "protractor": "~5.4.2", - "ts-node": "~8.4.1", - "tslint": "~5.20.0" - } -} +{ + "name": "sessioncompanion", + "version": "0.0.0", + "scripts": { + "ng": "ng", + "start": "ng serve", + "build": "ng build", + "build:ssr": "ng run SessionCompanion:server:dev", + "test": "ng test", + "lint": "ng lint", + "e2e": "ng e2e" + }, + "private": true, + "dependencies": { + "@angular/animations": "8.2.12", + "@angular/cdk": "~8.2.3", + "@angular/common": "8.2.12", + "@angular/compiler": "8.2.12", + "@angular/core": "8.2.12", + "@angular/forms": "8.2.12", + "@angular/material": "^8.2.3", + "@angular/platform-browser": "8.2.12", + "@angular/platform-browser-dynamic": "8.2.12", + "@angular/platform-server": "8.2.12", + "@angular/router": "8.2.12", + "@nguniversal/module-map-ngfactory-loader": "8.1.1", + "aspnet-prerendering": "^3.0.1", + "bootstrap": "^4.3.1", + "core-js": "^3.3.3", + "hammerjs": "^2.0.8", + "jquery": "3.4.1", + "oidc-client": "^1.9.1", + "popper.js": "^1.16.0", + "rxjs": "^6.5.3", + "zone.js": "0.9.1" + }, + "devDependencies": { + "@angular-devkit/build-angular": "^0.803.26", + "@angular/cli": "^8.3.26", + "@angular/compiler-cli": "^8.2.14", + "@angular/language-service": "^8.2.12", + "@types/jasmine": "~3.4.4", + "@types/jasminewd2": "~2.0.8", + "@types/node": "~12.11.6", + "codelyzer": "^5.2.0", + "jasmine-core": "~3.5.0", + "jasmine-spec-reporter": "~4.2.1", + "karma": "^5.0.2", + "karma-chrome-launcher": "~3.1.0", + "karma-coverage-istanbul-reporter": "~2.1.0", + "karma-jasmine": "~2.0.1", + "karma-jasmine-html-reporter": "^1.4.2", + "typescript": "3.5.3" + }, + "optionalDependencies": { + "node-sass": "^4.12.0", + "protractor": "~5.4.2", + "ts-node": "~8.4.1", + "tslint": "~5.20.0" + } +} diff --git a/SessionCompanion/SessionCompanion/appsettings.json b/SessionCompanion/SessionCompanion/appsettings.json index cb23b68..d9cfdc6 100644 --- a/SessionCompanion/SessionCompanion/appsettings.json +++ b/SessionCompanion/SessionCompanion/appsettings.json @@ -1,13 +1,13 @@ -{ - "ConnectionStrings": { - "DefaultConnection": "Server=(localdb)\\mssqllocaldb;Database=SessionCompanion;Trusted_Connection=True;MultipleActiveResultSets=true" - }, - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" - } - }, - "AllowedHosts": "*" -} +{ + "ConnectionStrings": { + "DefaultConnection": "Server=(localdb)\\mssqllocaldb;Database=SessionCompanion;Trusted_Connection=True;MultipleActiveResultSets=true" + }, + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + }, + "AllowedHosts": "*" +}