Browse Source

Merge pull request #14695 from abpframework/auto-merge/rel-7-0/1460

Merge branch dev with rel-7.0
pull/14698/head
maliming 4 years ago
committed by GitHub
parent
commit
21902da124
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      templates/app-nolayers/angular/package.json
  2. 2
      templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json
  3. 4
      templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json
  4. 2
      templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json
  5. 2
      templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json
  6. 2
      templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json
  7. 2
      templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json
  8. 2
      templates/app/angular/package.json
  9. 2
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json
  10. 4
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json
  11. 4
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json
  12. 12871
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/global.css
  13. 4
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/global.js
  14. 4
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/index.html
  15. 2
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json
  16. 2
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json
  17. 2
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json
  18. 4
      templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/wwwroot/global.css
  19. 4
      templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/wwwroot/index.html

2
templates/app-nolayers/angular/package.json

@ -19,7 +19,7 @@
"@abp/ng.setting-management": "~7.0.0-rc.1",
"@abp/ng.tenant-management": "~7.0.0-rc.1",
"@abp/ng.theme.shared": "~7.0.0-rc.1",
"@abp/ng.theme.lepton-x": "~2.0.0-preview20221014",
"@abp/ng.theme.lepton-x": "~2.0.0-rc.1",
"@angular/animations": "^14.2.1",
"@angular/common": "^14.2.1",
"@angular/compiler": "^14.2.1",

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

@ -3,6 +3,6 @@
"name": "my-app",
"private": true,
"dependencies": {
"@abp/aspnetcore.components.server.leptonxlitetheme": "~2.0.0-preview20221014"
"@abp/aspnetcore.components.server.leptonxlitetheme": "~2.0.0-rc.1"
}
}

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": "~2.0.0-preview20221014",
"@abp/aspnetcore.components.server.leptonxlitetheme": "~2.0.0-preview20221014"
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.0.0-rc.1",
"@abp/aspnetcore.components.server.leptonxlitetheme": "~2.0.0-rc.1"
}
}

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": "~2.0.0-preview20221014"
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.0.0-rc.1"
}
}

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": "~2.0.0-preview20221014"
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.0.0-rc.1"
}
}

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": "~2.0.0-preview20221014"
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.0.0-rc.1"
}
}

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": "~2.0.0-preview20221014"
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.0.0-rc.1"
}
}

2
templates/app/angular/package.json

@ -19,7 +19,7 @@
"@abp/ng.setting-management": "~7.0.0-rc.1",
"@abp/ng.tenant-management": "~7.0.0-rc.1",
"@abp/ng.theme.shared": "~7.0.0-rc.1",
"@abp/ng.theme.lepton-x": "~2.0.0-preview20221014",
"@abp/ng.theme.lepton-x": "~2.0.0-rc.1",
"@angular/animations": "^14.2.1",
"@angular/common": "^14.2.1",
"@angular/compiler": "^14.2.1",

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": "~2.0.0-preview20221014"
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.0.0-rc.1"
}
}

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": "~2.0.0-preview20221014",
"@abp/aspnetcore.components.server.leptonxlitetheme": "~2.0.0-preview20221014"
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.0.0-rc.1",
"@abp/aspnetcore.components.server.leptonxlitetheme": "~2.0.0-rc.1"
}
}

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": "~2.0.0-preview20221014",
"@abp/aspnetcore.components.server.leptonxlitetheme": "~2.0.0-preview20221014"
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.0.0-rc.1",
"@abp/aspnetcore.components.server.leptonxlitetheme": "~2.0.0-rc.1"
}
}

12871
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/global.css

File diff suppressed because one or more lines are too long

4
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/global.js

File diff suppressed because one or more lines are too long

4
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/index.html

@ -8,7 +8,7 @@
<base href="/" />
<!--ABP:Styles-->
<link href="global.css?_v=638036140263987806" rel="stylesheet"/>
<link href="global.css?_v=638042184565255290" rel="stylesheet"/>
<link href="main.css" rel="stylesheet"/>
<!--/ABP:Styles-->
<link href="MyCompanyName.MyProjectName.Blazor.styles.css" rel="stylesheet"/>
@ -29,7 +29,7 @@
</div>
<!--ABP:Scripts-->
<script src="global.js?_v=638036140265768416"></script>
<script src="global.js?_v=638042184568471262"></script>
<!--/ABP:Scripts-->
<!-- <TEMPLATE-REMOVE IF-NOT='PWA'> -->

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": "~2.0.0-preview20221014"
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.0.0-rc.1"
}
}

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": "~2.0.0-preview20221014"
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.0.0-rc.1"
}
}

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": "~2.0.0-preview20221014"
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.0.0-rc.1"
}
}

4
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/wwwroot/global.css

File diff suppressed because one or more lines are too long

4
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/wwwroot/index.html

@ -8,7 +8,7 @@
<base href="/" />
<!--ABP:Styles-->
<link href="global.css?_v=638036140548899053" rel="stylesheet"/>
<link href="global.css?_v=638042184864919740" rel="stylesheet"/>
<link href="main.css" rel="stylesheet"/>
<!--/ABP:Styles-->
</head>
@ -22,7 +22,7 @@
</div>
<!--ABP:Scripts-->
<script src="global.js?_v=638036140549851619"></script>
<script src="global.js?_v=638042184865781315"></script>
<!--/ABP:Scripts-->
</body>
</html>

Loading…
Cancel
Save