diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0cee56ca1..1737b6ce4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,3 +1,6 @@ + + + # ASP.NET Core # Build and test ASP.NET Core projects targeting .NET Core. # Add steps that run tests, create a NuGet package, deploy, and more: @@ -23,64 +26,21 @@ pool: steps: -- task: CmdLine@2 - displayName: Run Build Script - inputs: - script: './build.sh' -- task: CmdLine@2 - inputs: - script: | - cd src/Ombi/bin/Release/netcoreapp3.0 - - ls - workingDirectory: '$(Build.SourcesDirectory)' -- task: CopyFiles@2 - displayName: Upload Windows Build - inputs: - SourceFolder: '$(publishLocation)/windows.zip' - TargetFolder: '$(Build.ArtifactStagingDirectory)' - OverWrite: true - -- task: CopyFiles@2 - displayName: Upload OSX Build - inputs: - SourceFolder: '**/osx.tar.gz' - TargetFolder: '$(Build.ArtifactStagingDirectory)' - OverWrite: true - -- task: CopyFiles@2 - displayName: Upload Linux Build - inputs: - SourceFolder: '$(publishLocation)/linux.tar.gz' - TargetFolder: '$(Build.ArtifactStagingDirectory)' - OverWrite: true - -- task: CopyFiles@2 - displayName: Upload Linux-ARM Build - inputs: - SourceFolder: '$(publishLocation)/linux-arm.tar.gz' - TargetFolder: '$(Build.ArtifactStagingDirectory)' - OverWrite: true - -- task: CopyFiles@2 - displayName: Upload Windows 32Bit Build +- task: Yarn@3 + displayName: Install UI Dependancies inputs: - SourceFolder: '$(publishLocation)/windows-32bit.zip' - TargetFolder: '$(Build.ArtifactStagingDirectory)' - OverWrite: true + projectDirectory: '$(Build.SourcesDirectory)/src/Ombi/ClientApp/' + arguments: 'install' -- task: CopyFiles@2 - displayName: Upload Linux-ARM64 Build +- task: DotNetCoreCLI@2 + displayName: Run Unit Tests inputs: - SourceFolder: '$(publishLocation)/linux-arm64.tar.gz' - TargetFolder: '$(Build.ArtifactStagingDirectory)' - OverWrite: true + command: 'test' + projects: '**/*Tests.csproj' -- task: PublishTestResults@2 - displayName: Upload Test Results +- task: DotNetCoreCLI@2 + displayName: Publish Win10-x64 inputs: - testResultsFormat: 'VSTest' - testResultsFiles: '**/Test.trx' - mergeTestResults: true - failTaskOnFailedTests: true - testRunTitle: 'Unit Tests' \ No newline at end of file + command: 'publish' + publishWebProjects: true + arguments: '-c $(buildConfiguration) -r "win10-x64"' \ No newline at end of file diff --git a/src/Ombi/ClientApp/package.json b/src/Ombi/ClientApp/package.json index eed99bd2d..c5583bc37 100644 --- a/src/Ombi/ClientApp/package.json +++ b/src/Ombi/ClientApp/package.json @@ -35,7 +35,6 @@ "angular-bootstrap-md": "^7.5.4", "angular-router-loader": "^0.8.5", "angular2-template-loader": "^0.6.2", - "angularx-qrcode": "^1.7.0-beta.5", "aspnet-prerendering": "^3.0.1", "awesome-typescript-loader": "^5.2.0", "bootstrap": "^4.2.1", diff --git a/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.ts b/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.ts index 9d6bd9b9b..c18279f1a 100644 --- a/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.ts +++ b/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.ts @@ -14,8 +14,8 @@ export class UserPreferenceComponent implements OnInit { public username: string; public selectedLang: string; public availableLanguages = AvailableLanguages; - public qrCode: string; - public qrCodeEnabled: boolean; + //public qrCode: string; + //public qrCodeEnabled: boolean; constructor(private authService: AuthService, private readonly translate: TranslateService, @@ -31,13 +31,13 @@ export class UserPreferenceComponent implements OnInit { const customization = await this.settingsService.getCustomization().toPromise(); const accessToken = await this.identityService.getAccessToken().toPromise(); - this.qrCode = `${customization.applicationUrl}|${accessToken}`; + //this.qrCode = `${customization.applicationUrl}|${accessToken}`; - if(!customization.applicationUrl) { - this.qrCodeEnabled = false; - } else { - this.qrCodeEnabled = true; - } + //if(!customization.applicationUrl) { + // this.qrCodeEnabled = false; + //} else { + // this.qrCodeEnabled = true; + //} const selectedLang = this.storage.get("Language"); if (selectedLang) { @@ -50,4 +50,4 @@ export class UserPreferenceComponent implements OnInit { this.translate.use(this.selectedLang); } -} \ No newline at end of file +} diff --git a/src/Ombi/ClientApp/src/app/user-preferences/user-preferences.module.ts b/src/Ombi/ClientApp/src/app/user-preferences/user-preferences.module.ts index 4a3adb104..be461437b 100644 --- a/src/Ombi/ClientApp/src/app/user-preferences/user-preferences.module.ts +++ b/src/Ombi/ClientApp/src/app/user-preferences/user-preferences.module.ts @@ -1,6 +1,5 @@ -import { NgModule } from "@angular/core"; +import { NgModule } from "@angular/core"; import { RouterModule } from "@angular/router" -import { QRCodeModule } from 'angularx-qrcode'; import { MatCheckboxModule } from '@angular/material'; @@ -13,7 +12,6 @@ import * as fromComponents from './components'; imports: [ RouterModule.forChild(fromComponents.routes), SharedModule, - QRCodeModule, MatCheckboxModule, ], declarations: [