From 099ea561de0a5eacab12d8e7e16293f42e60d7a9 Mon Sep 17 00:00:00 2001 From: esofar Date: Fri, 6 Dec 2019 12:12:42 +0800 Subject: [PATCH 1/4] Update Entities.md --- docs/zh-Hans/Entities.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/zh-Hans/Entities.md b/docs/zh-Hans/Entities.md index ba567b2584..9c3066fef4 100644 --- a/docs/zh-Hans/Entities.md +++ b/docs/zh-Hans/Entities.md @@ -41,7 +41,7 @@ public class UserRole : Entity public DateTime CreationTime { get; set; } - public Phone() + public UserRole() { } From 896a65d69090cad494ee82b8d65f00e37d86e1dc Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Fri, 6 Dec 2019 09:52:38 +0300 Subject: [PATCH 2/4] build: improve build script add prepare:workspace script --- npm/ng-packs/package.json | 3 ++- npm/ng-packs/scripts/build.js | 4 ++-- npm/ng-packs/scripts/package-lock.json | 3 ++- npm/ng-packs/scripts/package.json | 7 ++++--- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index eada7a3cee..98871a1fc9 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -8,7 +8,8 @@ "commit": "git-cz", "lint": "ng lint", "scripts:build": "cd scripts && npm install && yarn build", - "ci": "yarn scripts:build --noCommit && yarn ci:test && yarn ng lint", + "prepare:workspace": "yarn scripts:build --noCommit", + "ci": "yarn prepare:workspace && yarn ci:test && yarn ng lint", "ci:test": "ng test --coverage=false" }, "devDependencies": { diff --git a/npm/ng-packs/scripts/build.js b/npm/ng-packs/scripts/build.js index 8258d85ff5..dca954af42 100644 --- a/npm/ng-packs/scripts/build.js +++ b/npm/ng-packs/scripts/build.js @@ -31,9 +31,9 @@ import program from 'commander'; await fse.writeJSON('../package.json', packageJson, { spaces: 2 }); try { - await execa('yarn', { + await execa('yarn', ['install', '--ignore-scripts'], { stdout: 'inherit', - cwd: '..', + cwd: '../', }); execa.sync( diff --git a/npm/ng-packs/scripts/package-lock.json b/npm/ng-packs/scripts/package-lock.json index 36bf73d5b9..fcce2fbb08 100644 --- a/npm/ng-packs/scripts/package-lock.json +++ b/npm/ng-packs/scripts/package-lock.json @@ -507,7 +507,8 @@ "esm": { "version": "3.2.25", "resolved": "https://registry.npmjs.org/esm/-/esm-3.2.25.tgz", - "integrity": "sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==" + "integrity": "sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==", + "dev": true }, "esutils": { "version": "2.0.2", diff --git a/npm/ng-packs/scripts/package.json b/npm/ng-packs/scripts/package.json index 5e070a2c2c..26dcb1d4a6 100644 --- a/npm/ng-packs/scripts/package.json +++ b/npm/ng-packs/scripts/package.json @@ -1,7 +1,7 @@ { "name": "scripts", "version": "1.0.0", - "description": "Abp publish helper scripts", + "description": "ABP helper scripts", "main": "index.js", "modules": "[build.js, sync.js]", "scripts": { @@ -10,13 +10,14 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "author": "", - "license": "ISC", "dependencies": { "babel-preset-node6": "^11.0.0", "commander": "^4.0.1", - "esm": "^3.2.25", "execa": "^2.0.3", "fs-extra": "^8.1.0", "prompt-confirm": "^2.0.4" + }, + "devDependencies": { + "esm": "^3.2.25" } } From adc8997596222692dde0a8a0cc2c6fbaf5d527a8 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Fri, 6 Dec 2019 09:52:44 +0300 Subject: [PATCH 3/4] docs: update readme --- npm/ng-packs/README.md | 24 ++++++++++++++++++- .../Logs/logs.txt | 8 +++++++ .../tempkey.rsa | 1 + 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/Logs/logs.txt create mode 100644 templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/tempkey.rsa diff --git a/npm/ng-packs/README.md b/npm/ng-packs/README.md index 5f73c2589e..b5347a18df 100644 --- a/npm/ng-packs/README.md +++ b/npm/ng-packs/README.md @@ -1,2 +1,24 @@

Abp Ng Packages

-[docs.abp.io](https://docs.abp.io) + + +## Getting started + +Run `yarn` to install all dependencies, then run `yarn prepare:workspace` to prepare the ABP packages (might take 2 minutes). + +Run `yarn start` to start the `dev-app`. Navigate to http://localhost:4200/. + +## Development + +### Package +[Symlink Manager](https://github.com/mehmet-erim/symlink-manager) is used to manage symbolic link processes. Run `yarn symlink copy` to select the packages to develop. + +> Ignore the changes in the dist folder. The changes should be discarded. + +### Application +The `dev-app` project is the same as the Angular UI template project. `dev-app` is used to see changes instantly. + +If you will only develop the `dev-app`, you don't need to run `symlink-manager`. + +> Reminder! If you have developed the `dev-app` template, you should do the same for the application and module templates. + +For more information, see the [docs.abp.io](https://docs.abp.io) diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/Logs/logs.txt b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/Logs/logs.txt new file mode 100644 index 0000000000..a244040364 --- /dev/null +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/Logs/logs.txt @@ -0,0 +1,8 @@ +2019-12-05 11:46:34.037 +03:00 [INF] Started database migrations... +2019-12-05 11:46:34.074 +03:00 [INF] Migrating database schema... +2019-12-05 11:46:36.917 +03:00 [INF] Executing database seed... +2019-12-05 11:46:39.199 +03:00 [INF] Successfully completed database migrations. +2019-12-06 09:26:40.351 +03:00 [INF] Started database migrations... +2019-12-06 09:26:40.388 +03:00 [INF] Migrating database schema... +2019-12-06 09:26:43.132 +03:00 [INF] Executing database seed... +2019-12-06 09:26:45.321 +03:00 [INF] Successfully completed database migrations. diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/tempkey.rsa b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/tempkey.rsa new file mode 100644 index 0000000000..ae822ab8e4 --- /dev/null +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/tempkey.rsa @@ -0,0 +1 @@ +{"KeyId":"0EgYLW-IDBQG6Q98VxwfnQ","Parameters":{"D":"gUUASGZNkQfvUm+Bz+M8W3bn1/MTJp4bkaDR16hUMznp7K0gFEfiMqI76VmM5fp2s0Spr3XEQiQwUkUCm4mv5oGbOQ/JDH07KSvlpGrJzcW23xO9cf3Xvfa6WbAzghykGsbVxrOOlt5jH3VD4KUzVUbo8lzv1dRDiLi7dqi8UfOCxCxU/ATwOAfNt9b7ETKraDzQaBqfh+p5cIjgHHtOT0DseS8FzTK7BySBEwOKs3FT2/2OgfLA9G0/Fn4L2sNN0av/T4lJKkgGSnV6BTAonwrgs/wRBApQPFs8+wV+8o/XkiItpSDKUlJL4adXZo5JoUIsROXEkxBy9xK9fhSuIQ==","DP":"Sv/q6kl8F/2cr8kqsstToNpqow+F/AObK5QZUp/sckOfV+zXVPzfu13xbxE7ejxm4P5Op7KvDHvsHxRuLBk7UPcn0EfkP/aRjHajdsLpjsaLBNAZd72cpfl+W/3UK4yGw2V0oRpVQvYtG+jROfxLmyUQF0MRxp1yoAyAQjK0emU=","DQ":"iJ+Id/4pwTwarVGMmFF6CFLtmnfHMEgKYJLBzfIBxevgMpnN6p5zvrHlgVMW4PJHS3lmIqgr6kT85dEzja4itorM26wCvU7Njeq88vkknNkADG1kdjNmpXHzAUsTeJiJXfYj7ghm8Rt4DolkATAPeHFOYZ6LEBPtA+0tOl54dwk=","Exponent":"AQAB","InverseQ":"5kSeWfOLVoYApCR8xzsZgHln/zsbcwAGLooRXMobWCgilGOSqohssQjSUS/8y/WgElDZFHWK6QUzhrPWLoerr7mNWR/tg0/8p6SojnO3uFninTLPgjIpXkTrSpKvzJDzA0zkTvVu3cisVXKUjNB9zp42mM/6MGiQ8d4zASgAoCw=","Modulus":"uCUAJZt2d6GV8fXL28VJP2m8YvNkRhiHXliXzHa4eooJQyxhS5d+Ho0BElTkNA6EAfSCYpBwOMJST4tl3rcv5MPl0Vqa8m4YPZp892TxyUFKU+RQiYZn6HFtBmhcYaT31XXF4hUNN75lYcjrj8LylkL5WLZND0ZV7jTlXCcUFe3nx1UVyXlPBx/GerDFXqgce8ZPpEQNa081btuftXuvdbCUi+TuSFQCROpNFxdbXx1d/GzR0QiQF/dNK+BttBc0GyVytiHShNz9hfOv40NYYvTgPoQS/dpqkOVyVv00XwdnKaSu9FWbbYxONsILuyiJmnPt4Cdq8fPYHVA9HuNCxQ==","P":"5tE5EaofTEYFnm5Q56gUPx0rmJeUtrMKOHf8hb5HXMuqTfltYesdd8RuOedvNJfSepxM9lzdI64FG/T0hpYw27A76KyvRfCCo53CM6Y5/Qs8241LEq66BGz3wk6yAiXxpTEDKxvoEYt2pGgSmFT84TJZa6rZ+M0/aGvQPAwmYt0=","Q":"zDwynLTpQ5+4rPX8MSfO9eXW70RPz8lQKM/AkO4N4qlRCNW4hJnAHP7rwCseUtfDThfAfgZzLTUIiTBOAZwdkvdQQIR47XUlmnTiVzFVbD2TGw/S5R74fWJydQsF78dM44TZUNXLI9OO5KPFjVoWIkH9G+9HwDqn+NGdF3Fl3Qk="}} \ No newline at end of file From 48014c080614f471f44b9f325a3a625369f12100 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Fri, 6 Dec 2019 09:54:11 +0300 Subject: [PATCH 4/4] Revert "docs: update readme" This reverts commit adc8997596222692dde0a8a0cc2c6fbaf5d527a8. --- .../MyCompanyName.MyProjectName.DbMigrator/Logs/logs.txt | 8 -------- .../MyCompanyName.MyProjectName.DbMigrator/tempkey.rsa | 1 - 2 files changed, 9 deletions(-) delete mode 100644 templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/Logs/logs.txt delete mode 100644 templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/tempkey.rsa diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/Logs/logs.txt b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/Logs/logs.txt deleted file mode 100644 index a244040364..0000000000 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/Logs/logs.txt +++ /dev/null @@ -1,8 +0,0 @@ -2019-12-05 11:46:34.037 +03:00 [INF] Started database migrations... -2019-12-05 11:46:34.074 +03:00 [INF] Migrating database schema... -2019-12-05 11:46:36.917 +03:00 [INF] Executing database seed... -2019-12-05 11:46:39.199 +03:00 [INF] Successfully completed database migrations. -2019-12-06 09:26:40.351 +03:00 [INF] Started database migrations... -2019-12-06 09:26:40.388 +03:00 [INF] Migrating database schema... -2019-12-06 09:26:43.132 +03:00 [INF] Executing database seed... -2019-12-06 09:26:45.321 +03:00 [INF] Successfully completed database migrations. diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/tempkey.rsa b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/tempkey.rsa deleted file mode 100644 index ae822ab8e4..0000000000 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/tempkey.rsa +++ /dev/null @@ -1 +0,0 @@ -{"KeyId":"0EgYLW-IDBQG6Q98VxwfnQ","Parameters":{"D":"gUUASGZNkQfvUm+Bz+M8W3bn1/MTJp4bkaDR16hUMznp7K0gFEfiMqI76VmM5fp2s0Spr3XEQiQwUkUCm4mv5oGbOQ/JDH07KSvlpGrJzcW23xO9cf3Xvfa6WbAzghykGsbVxrOOlt5jH3VD4KUzVUbo8lzv1dRDiLi7dqi8UfOCxCxU/ATwOAfNt9b7ETKraDzQaBqfh+p5cIjgHHtOT0DseS8FzTK7BySBEwOKs3FT2/2OgfLA9G0/Fn4L2sNN0av/T4lJKkgGSnV6BTAonwrgs/wRBApQPFs8+wV+8o/XkiItpSDKUlJL4adXZo5JoUIsROXEkxBy9xK9fhSuIQ==","DP":"Sv/q6kl8F/2cr8kqsstToNpqow+F/AObK5QZUp/sckOfV+zXVPzfu13xbxE7ejxm4P5Op7KvDHvsHxRuLBk7UPcn0EfkP/aRjHajdsLpjsaLBNAZd72cpfl+W/3UK4yGw2V0oRpVQvYtG+jROfxLmyUQF0MRxp1yoAyAQjK0emU=","DQ":"iJ+Id/4pwTwarVGMmFF6CFLtmnfHMEgKYJLBzfIBxevgMpnN6p5zvrHlgVMW4PJHS3lmIqgr6kT85dEzja4itorM26wCvU7Njeq88vkknNkADG1kdjNmpXHzAUsTeJiJXfYj7ghm8Rt4DolkATAPeHFOYZ6LEBPtA+0tOl54dwk=","Exponent":"AQAB","InverseQ":"5kSeWfOLVoYApCR8xzsZgHln/zsbcwAGLooRXMobWCgilGOSqohssQjSUS/8y/WgElDZFHWK6QUzhrPWLoerr7mNWR/tg0/8p6SojnO3uFninTLPgjIpXkTrSpKvzJDzA0zkTvVu3cisVXKUjNB9zp42mM/6MGiQ8d4zASgAoCw=","Modulus":"uCUAJZt2d6GV8fXL28VJP2m8YvNkRhiHXliXzHa4eooJQyxhS5d+Ho0BElTkNA6EAfSCYpBwOMJST4tl3rcv5MPl0Vqa8m4YPZp892TxyUFKU+RQiYZn6HFtBmhcYaT31XXF4hUNN75lYcjrj8LylkL5WLZND0ZV7jTlXCcUFe3nx1UVyXlPBx/GerDFXqgce8ZPpEQNa081btuftXuvdbCUi+TuSFQCROpNFxdbXx1d/GzR0QiQF/dNK+BttBc0GyVytiHShNz9hfOv40NYYvTgPoQS/dpqkOVyVv00XwdnKaSu9FWbbYxONsILuyiJmnPt4Cdq8fPYHVA9HuNCxQ==","P":"5tE5EaofTEYFnm5Q56gUPx0rmJeUtrMKOHf8hb5HXMuqTfltYesdd8RuOedvNJfSepxM9lzdI64FG/T0hpYw27A76KyvRfCCo53CM6Y5/Qs8241LEq66BGz3wk6yAiXxpTEDKxvoEYt2pGgSmFT84TJZa6rZ+M0/aGvQPAwmYt0=","Q":"zDwynLTpQ5+4rPX8MSfO9eXW70RPz8lQKM/AkO4N4qlRCNW4hJnAHP7rwCseUtfDThfAfgZzLTUIiTBOAZwdkvdQQIR47XUlmnTiVzFVbD2TGw/S5R74fWJydQsF78dM44TZUNXLI9OO5KPFjVoWIkH9G+9HwDqn+NGdF3Fl3Qk="}} \ No newline at end of file