imhven
/
abp
mirror of https://github.com/abpframework/abp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rel-7.0' into Password-Show-Hiden-Feature-10076

Browse Source
pull/14648/head
malik masis 3 years ago
parent 0c71423dec 275da62bdb
commit 3c54a90ea6
26 changed files with 36 additions and 12899 deletions
Show Stats Download Patch File Download Diff File

2
common.props
Unescape View File

@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<LangVersion>latest</LangVersion>
<Version>7.0.0-rc.1</Version>
<Version>7.0.0-rc.2</Version>
<NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
<PackageIconUrl>https://abp.io/assets/abp_nupkg.png</PackageIconUrl>
<PackageProjectUrl>https://abp.io/</PackageProjectUrl>

2
templates/app-nolayers/angular/package.json
Unescape View File

@ -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/Program.cs
Unescape View File

@ -55,7 +55,7 @@ public class Program
}
catch (Exception ex)
{
if (ex.GetType().Name.Equals("StopTheHostException", StringComparison.Ordinal))
if (ex is HostAbortedException)
{
throw;
}

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

@ -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"
}
}

2
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Program.cs
Unescape View File

@ -60,7 +60,7 @@ public class Program
}
catch (Exception ex)
{
if (ex.GetType().Name.Equals("StopTheHostException", StringComparison.Ordinal))
if (ex is HostAbortedException)
{
throw;
}

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

@ -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/Program.cs
Unescape View File

@ -55,7 +55,7 @@ public class Program
}
catch (Exception ex)
{
if (ex.GetType().Name.Equals("StopTheHostException", StringComparison.Ordinal))
if (ex is HostAbortedException)
{
throw;
}

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

@ -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/Program.cs
Unescape View File

@ -60,7 +60,7 @@ public class Program
}
catch (Exception ex)
{
if (ex.GetType().Name.Equals("StopTheHostException", StringComparison.Ordinal))
if (ex is HostAbortedException)
{
throw;
}

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

@ -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/Program.cs
Unescape View File

@ -55,7 +55,7 @@ public class Program
}
catch (Exception ex)
{
if (ex.GetType().Name.Equals("StopTheHostException", StringComparison.Ordinal))
if (ex is HostAbortedException)
{
throw;
}

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

@ -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/Program.cs
Unescape View File

@ -60,7 +60,7 @@ public class Program
}
catch (Exception ex)
{
if (ex.GetType().Name.Equals("StopTheHostException", StringComparison.Ordinal))
if (ex is HostAbortedException)
{
throw;
}

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

@ -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
Unescape View File

@ -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
Unescape View File

@ -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
Unescape View File

@ -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
Unescape View File

@ -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
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

@ -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
Unescape View File

@ -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
Unescape View File

@ -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
Unescape View File

@ -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
View File

File diff suppressed because one or more lines are too long

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

@ -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>

Write Preview
Loading…
Cancel
Save