Browse Source

Merge pull request #18622 from abpframework/auto-merge/rel-7-4/2399

Merge branch rel-8.0 with rel-7.4
pull/18623/head
Masum ULU 2 years ago
committed by GitHub
parent
commit
39fb53fdcd
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      npm/scripts/change-package-version.ts
  2. 2
      npm/scripts/package.json
  3. 4
      templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json
  4. 4
      templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json
  5. 2
      templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/package.json
  6. 2
      templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/package.json
  7. 2
      templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json
  8. 2
      templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json
  9. 2
      templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json
  10. 2
      templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json
  11. 2
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json
  12. 4
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json
  13. 4
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json
  14. 2
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json
  15. 2
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json
  16. 2
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json

1
npm/scripts/change-package-version.ts

@ -18,6 +18,7 @@ import {program} from "commander";
glob(`${workingDir}**/package.json`, options, (err, files) => {
if (err) throw err;
//Todo @masumulu28: check options value and throw error if not provided
const {packageName,targetVersion}= program.opts();
for (const file of files) {

2
npm/scripts/package.json

@ -5,7 +5,7 @@
"scripts": {
"remove-lock-files": "yarn && ts-node -r tsconfig-paths/register remove-lock-files.ts",
"validate-versions": "yarn && ts-node -r tsconfig-paths/register validate-versions.ts",
"change-package-version": "ts-node -r tsconfig-paths/register change-package-version.ts -n @abp/ng.theme.lepton-x -v 3.0.0"
"change-package-version": "ts-node -r tsconfig-paths/register change-package-version.ts"
},
"dependencies": {
"axios": "^0.24.0",

4
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json

@ -3,7 +3,7 @@
"name": "my-app",
"private": true,
"dependencies": {
"@abp/aspnetcore.components.server.leptonxlitetheme": "~3.0.0-rc.1",
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0-rc.1"
"@abp/aspnetcore.components.server.leptonxlitetheme": "~3.0.0",
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0"
}
}

4
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json

@ -3,7 +3,7 @@
"name": "my-app",
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0-rc.1",
"@abp/aspnetcore.components.server.leptonxlitetheme": "~3.0.0-rc.1"
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0",
"@abp/aspnetcore.components.server.leptonxlitetheme": "~3.0.0"
}
}

2
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/package.json

@ -3,6 +3,6 @@
"name": "my-app",
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0-rc.1"
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0"
}
}

2
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/package.json

@ -3,6 +3,6 @@
"name": "my-app",
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0-rc.1"
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0"
}
}

2
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json

@ -3,6 +3,6 @@
"name": "my-app",
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0-rc.1"
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0"
}
}

2
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json

@ -3,6 +3,6 @@
"name": "my-app",
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0-rc.1"
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0"
}
}

2
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json

@ -3,6 +3,6 @@
"name": "my-app",
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0-rc.1"
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0"
}
}

2
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json

@ -3,6 +3,6 @@
"name": "my-app",
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0-rc.1"
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0"
}
}

2
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json

@ -3,6 +3,6 @@
"name": "my-app-authserver",
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0-rc.1"
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0"
}
}

4
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json

@ -3,7 +3,7 @@
"name": "my-app",
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0-rc.1",
"@abp/aspnetcore.components.server.leptonxlitetheme": "~3.0.0-rc.1"
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0",
"@abp/aspnetcore.components.server.leptonxlitetheme": "~3.0.0"
}
}

4
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json

@ -3,7 +3,7 @@
"name": "my-app",
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0-rc.1",
"@abp/aspnetcore.components.server.leptonxlitetheme": "~3.0.0-rc.1"
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0",
"@abp/aspnetcore.components.server.leptonxlitetheme": "~3.0.0"
}
}

2
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json

@ -3,6 +3,6 @@
"name": "my-app",
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0-rc.1"
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0"
}
}

2
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json

@ -3,6 +3,6 @@
"name": "my-app",
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0-rc.1"
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0"
}
}

2
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json

@ -3,6 +3,6 @@
"name": "my-app",
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0-rc.1"
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0"
}
}

Loading…
Cancel
Save