[ACA-3914] Fix app version number and enable git commit hash to be used properly (#1650)

This commit is contained in:
Popovics András
2020-09-16 12:24:21 +02:00
committed by GitHub
parent 6612a702c0
commit 3db18f7d1d
5 changed files with 6 additions and 6 deletions

View File

@@ -3,7 +3,7 @@
"javascript.preferences.importModuleSpecifier": "relative", "javascript.preferences.importModuleSpecifier": "relative",
"typescript.preferences.quoteStyle": "single", "typescript.preferences.quoteStyle": "single",
"typescript.preferences.importModuleSpecifier": "relative", "typescript.preferences.importModuleSpecifier": "relative",
"editor.formatOnSave": true, "editor.formatOnSave": false,
"[json]": { "[json]": {
"editor.formatOnSave": false "editor.formatOnSave": false
}, },

View File

@@ -1,7 +1,7 @@
{ {
"name": "alfresco-content-app", "name": "alfresco-content-app",
"version": "2.0.1", "version": "2.0.1",
"commit": "", "commit": "<build-generated-commit>",
"license": "LGPL-3.0", "license": "LGPL-3.0",
"scripts": { "scripts": {
"postinstall": "ngcc", "postinstall": "ngcc",

View File

@@ -2,8 +2,7 @@
<aca-page-layout-content [scrollable]="true"> <aca-page-layout-content [scrollable]="true">
<div class="main-content"> <div class="main-content">
<article> <article>
<adf-about-github-link [application]="'application.name' | adfAppConfig" [url]="appRepoUrl" [version]="'application.version' | adfAppConfig"> <adf-about-github-link [application]="'application.name' | adfAppConfig" [url]="appRepoUrl" [version]="appVersion"> </adf-about-github-link>
</adf-about-github-link>
</article> </article>
<article> <article>

View File

@@ -29,7 +29,7 @@ import { RepositoryInfo } from '@alfresco/js-api';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { map } from 'rxjs/operators'; import { map } from 'rxjs/operators';
import { AppExtensionService, ContentApiService } from '@alfresco/aca-shared'; import { AppExtensionService, ContentApiService } from '@alfresco/aca-shared';
import { dependencies, version, name, commit } from '../../../../package.json'; import { dependencies, version, name, commit } from 'package.json';
@Component({ @Component({
selector: 'app-about', selector: 'app-about',
templateUrl: './about.component.html', templateUrl: './about.component.html',

View File

@@ -25,7 +25,8 @@
"@alfresco/aca-shared/rules": ["projects/aca-shared/rules/src/public-api.ts"], "@alfresco/aca-shared/rules": ["projects/aca-shared/rules/src/public-api.ts"],
"@alfresco/adf-office-services-ext": ["projects/adf-office-services-ext/src/public-api.ts"], "@alfresco/adf-office-services-ext": ["projects/adf-office-services-ext/src/public-api.ts"],
"@alfresco/aca-testing-shared": ["projects/aca-testing-shared"], "@alfresco/aca-testing-shared": ["projects/aca-testing-shared"],
"@alfresco/aca-about": ["projects/aca-about/src/public-api.ts"] "@alfresco/aca-about": ["projects/aca-about/src/public-api.ts"],
"package.json": ["package.json"]
} }
}, },
"exclude": ["node_modules"], "exclude": ["node_modules"],