Skip to content

Commit 164a5c9

Browse files
committed
2 parents 38a908c + f4b3d49 commit 164a5c9

File tree

11 files changed

+26
-52
lines changed

11 files changed

+26
-52
lines changed

angular/Web.config

Lines changed: 0 additions & 25 deletions
This file was deleted.

angular/web.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<remove fileExtension=".json" />
66
<mimeMap fileExtension=".json" mimeType="application/json" />
77
<mimeMap fileExtension="woff" mimeType="application/font-woff" />
8-
<mimeMap fileExtension="woff2" mimeType="application/font-woff" />
8+
<mimeMap fileExtension="woff2" mimeType="application/font-woff" />
99
</staticContent>
1010
<!-- IIS URL Rewrite for Angular routes -->
1111
<rewrite>
@@ -22,4 +22,4 @@
2222
</rules>
2323
</rewrite>
2424
</system.webServer>
25-
</configuration>
25+
</configuration>

aspnet-core/build/build-with-ng.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dotnet publish --output (Join-Path $outputFolder "Host")
2525

2626
Set-Location $ngFolder
2727
& yarn
28-
& ng build -prod
28+
& ng build --prod
2929
Copy-Item (Join-Path $ngFolder "dist") (Join-Path $outputFolder "ng") -Recurse
3030
Copy-Item (Join-Path $ngFolder "Dockerfile") (Join-Path $outputFolder "ng")
3131

@@ -54,4 +54,4 @@ Copy-Item (Join-Path $slnFolder "docker/ng/*.*") $outputFolder
5454

5555
## FINALIZE ###################################################################
5656

57-
Set-Location $outputFolder
57+
Set-Location $outputFolder

aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Abp.AutoMapper" Version="4.4.0" />
22-
<PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="4.4.0" />
23-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.2.0" />
21+
<PackageReference Include="Abp.AutoMapper" Version="4.5.0" />
22+
<PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="4.5.0" />
23+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.2.4" />
2424
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
2525
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.2.0" />
2626
<PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="3.3.1" />

aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.1" />
20-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.1">
19+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.4" />
20+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.4">
2121
<PrivateAssets>all</PrivateAssets>
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2323
</PackageReference>
24-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.1" />
24+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.4" />
2525
</ItemGroup>
2626

2727
<ItemGroup>

aspnet-core/src/AbpCompanyName.AbpProjectName.Migrator/AbpCompanyName.AbpProjectName.Migrator.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Abp.Castle.Log4Net" Version="4.4.0" />
21+
<PackageReference Include="Abp.Castle.Log4Net" Version="4.5.0" />
2222
</ItemGroup>
2323

2424
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpCompanyName.AbpProjectName.Web.Core.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
<ItemGroup>
2626
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
2727
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.2.0" />
28-
<PackageReference Include="Swashbuckle.AspNetCore" Version="3.0.0" />
29-
<PackageReference Include="Abp.AspNetCore" Version="4.4.0" />
30-
<PackageReference Include="Abp.ZeroCore" Version="4.4.0" />
28+
<PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
29+
<PackageReference Include="Abp.AspNetCore" Version="4.5.0" />
30+
<PackageReference Include="Abp.ZeroCore" Version="4.5.0" />
3131
<PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
32-
<PackageReference Include="Abp.AspNetCore.SignalR" Version="4.4.0" />
32+
<PackageReference Include="Abp.AspNetCore.SignalR" Version="4.5.0" />
3333
</ItemGroup>
3434

3535
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/AbpCompanyName.AbpProjectName.Web.Host.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
</ItemGroup>
3434

3535
<ItemGroup>
36-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.1">
36+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.3">
3737
<PrivateAssets>All</PrivateAssets>
3838
</PackageReference>
3939
<PackageReference Include="Castle.LoggingFacility.MsLogging" Version="3.1.0" />
@@ -45,7 +45,7 @@
4545
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
4646
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.2.0" />
4747
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
48-
<PackageReference Include="Abp.Castle.Log4Net" Version="4.4.0" />
48+
<PackageReference Include="Abp.Castle.Log4Net" Version="4.5.0" />
4949
</ItemGroup>
5050

5151
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
<ItemGroup>
3333
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.0" />
34-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.1">
34+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.3">
3535
<PrivateAssets>All</PrivateAssets>
3636
</PackageReference>
3737
<PackageReference Include="AspNet.Security.OpenIdConnect.Server" Version="2.0.0" />
@@ -47,9 +47,9 @@
4747
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
4848
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.2.0" />
4949
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
50-
<PackageReference Include="Abp.HangFire" Version="4.4.0" />
51-
<PackageReference Include="Abp.RedisCache" Version="4.4.0" />
52-
<PackageReference Include="Abp.Castle.Log4Net" Version="4.4.0" />
50+
<PackageReference Include="Abp.HangFire" Version="4.5.0" />
51+
<PackageReference Include="Abp.RedisCache" Version="4.5.0" />
52+
<PackageReference Include="Abp.Castle.Log4Net" Version="4.5.0" />
5353
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Version="2.2.0" PrivateAssets="All" />
5454
</ItemGroup>
5555

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/_Layout.cshtml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
@inject IAbpAntiForgeryManager AbpAntiForgeryManager
1515
@inject IMultiTenancyConfig MultiTenancyConfig
1616
@inject IWebResourceManager WebResourceManager
17-
@inject ISettingManager SettingManager
1817
@inject IAlertManager AlertManager
1918
@{
2019
Layout = null;

0 commit comments

Comments
 (0)