Skip to content

Commit 6435d48

Browse files
committed
Bug fixes, package updates, CDN urls
1 parent d3ff8db commit 6435d48

File tree

668 files changed

+67
-90462
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

668 files changed

+67
-90462
lines changed

NetCoreStack.Hisar.sln

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Admin.Hosting", "test\Admin
3737
EndProject
3838
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hisar.Component.CoreManagement", "test\components\Hisar.Component.CoreManagement\Hisar.Component.CoreManagement.csproj", "{15504075-7E8E-4E84-8F40-0655CAA539DD}"
3939
EndProject
40-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hisar.Component.FileManager", "test\components\Hisar.Component.FileManager\Hisar.Component.FileManager.csproj", "{A0ECFFAA-5E38-40FA-BAB5-90707BBEE449}"
41-
EndProject
4240
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shared", "shared", "{78342CF0-FAFF-4FC8-A126-10B5610E441A}"
4341
EndProject
4442
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shared.Library", "test\shared\Shared.Library\Shared.Library.csproj", "{F975485D-47C8-47B6-AC21-E0A494F5559F}"
@@ -91,10 +89,6 @@ Global
9189
{15504075-7E8E-4E84-8F40-0655CAA539DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
9290
{15504075-7E8E-4E84-8F40-0655CAA539DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
9391
{15504075-7E8E-4E84-8F40-0655CAA539DD}.Release|Any CPU.Build.0 = Release|Any CPU
94-
{A0ECFFAA-5E38-40FA-BAB5-90707BBEE449}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
95-
{A0ECFFAA-5E38-40FA-BAB5-90707BBEE449}.Debug|Any CPU.Build.0 = Debug|Any CPU
96-
{A0ECFFAA-5E38-40FA-BAB5-90707BBEE449}.Release|Any CPU.ActiveCfg = Release|Any CPU
97-
{A0ECFFAA-5E38-40FA-BAB5-90707BBEE449}.Release|Any CPU.Build.0 = Release|Any CPU
9892
{F975485D-47C8-47B6-AC21-E0A494F5559F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
9993
{F975485D-47C8-47B6-AC21-E0A494F5559F}.Debug|Any CPU.Build.0 = Debug|Any CPU
10094
{F975485D-47C8-47B6-AC21-E0A494F5559F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -119,7 +113,6 @@ Global
119113
{FF724659-E79D-465F-9E77-EAF3C1D59B6D} = {5CA075E2-B2E1-4D94-B0EF-4CB1BBB0D45A}
120114
{4F58F7DE-D21E-4688-9D36-C026D9F75B1C} = {5CA075E2-B2E1-4D94-B0EF-4CB1BBB0D45A}
121115
{15504075-7E8E-4E84-8F40-0655CAA539DD} = {181B8C0C-9FAD-40C0-AE0A-257843CFF03C}
122-
{A0ECFFAA-5E38-40FA-BAB5-90707BBEE449} = {181B8C0C-9FAD-40C0-AE0A-257843CFF03C}
123116
{78342CF0-FAFF-4FC8-A126-10B5610E441A} = {5CA075E2-B2E1-4D94-B0EF-4CB1BBB0D45A}
124117
{F975485D-47C8-47B6-AC21-E0A494F5559F} = {78342CF0-FAFF-4FC8-A126-10B5610E441A}
125118
{41B9F8F9-A41B-4B34-BE5B-9C80955B92B0} = {181B8C0C-9FAD-40C0-AE0A-257843CFF03C}

src/NetCoreStack.Hisar.Server/ServiceCollectionExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace NetCoreStack.Hisar.Server
88
public static class ServiceCollectionExtensions
99
{
1010
public static void AddHisarMongoDbContext<TContext>(this IServiceCollection services,
11-
IConfigurationRoot configuration) where TContext : MongoDbContext
11+
IConfiguration configuration) where TContext : MongoDbContext
1212
{
1313
services.AddSingleton<ICollectionNameSelector, HisarCollectionNameSelector>();
1414
services.AddNetCoreStackMongoDb<TContext>(configuration);

src/NetCoreStack.Hisar/Extensions/ServiceCollectionExtensions.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,12 @@ private static HisarAssemblyComponentsLoader CreateAssemblyLoader<TStartup>(ISer
4242
internal static RunningComponentHelperOfT<TStartup> CreateComponentHelper<TStartup>(this IServiceCollection services)
4343
{
4444
var serviceDescriptor = services.FirstOrDefault(x => x.ServiceType == typeof(IComponentTypeResolver));
45+
if (serviceDescriptor == null)
46+
{
47+
throw new InvalidOperationException("Please make sure to startup configuration as fallow. UseStartup<Startup> to " +
48+
"UseStartup<DefaultHisarStartup<Startup>>");
49+
}
50+
4551
return new RunningComponentHelperOfT<TStartup>(serviceDescriptor.CreateInstance<IComponentTypeResolver>());
4652
}
4753

test/Admin.Hosting/Views/Shared/_Layout.cshtml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -174,14 +174,6 @@
174174
@RenderBody()
175175
</div>
176176
<!-- /page content -->
177-
<!-- footer content -->
178-
<footer>
179-
<div class="pull-right">
180-
Bootstrap Admin Template by <a href="https://colorlib.com">Colorlib</a>
181-
</div>
182-
<div class="clearfix"></div>
183-
</footer>
184-
<!-- /footer content -->
185177
</div>
186178
</div>
187179
<!-- Skycons -->

test/Admin.Hosting/appsettings.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
2-
"DbSettings": {
3-
"SqlConnectionString": "Server=.;Database=HisarDb;Trusted_Connection=True;MultipleActiveResultSets=true",
4-
"MongoDbConnectionString": "mongodb://localhost:27017/hisardb"
5-
},
62
"AppSettings": {
73
"UploadRootPath": "hisar-upload",
84
"Name": "Hisar Admin Hosting"
95
},
6+
"DbSettings": {
7+
"SqlConnectionString": "Server=.;Database=HisarDb;Trusted_Connection=True;MultipleActiveResultSets=true",
8+
"MongoDbConnectionString": "mongodb://localhost:27017/hisardb"
9+
},
1010
"Logging": {
1111
"IncludeScopes": false,
1212
"LogLevel": {

test/Landing.Hosting/appsettings.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2+
"AppSettings": {
3+
"Name": "Hisar Development Environment"
4+
},
25
"DbSettings": {
36
"SqlConnectionString": "Server=.;Database=HisarDb;Trusted_Connection=True;MultipleActiveResultSets=true",
47
"MongoDbConnectionString": "mongodb://localhost:27017/hisardb"
58
},
6-
"AppSettings": {
7-
"Name": "Hisar Development Environment"
8-
},
99
"Logging": {
1010
"IncludeScopes": false,
1111
"LogLevel": {

test/NetCoreStack.Hisar.Tests/NetCoreStack.Hisar.Tests.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515

1616
<ItemGroup>
1717
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
19-
<PackageReference Include="Moq" Version="4.8.3" />
20-
<PackageReference Include="xunit" Version="2.3.1" />
21-
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
19+
<PackageReference Include="Moq" Version="4.9.0" />
20+
<PackageReference Include="xunit" Version="2.4.0" />
21+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

test/NetCoreStack.Hisar.Tests/appsettings.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
{
22
"AppSettings": {
3-
"Name": "Hisar Development Environment",
4-
"ConnectionString": "Server=.;Database=HisarDb;Trusted_Connection=True;MultipleActiveResultSets=true"
3+
"Name": "Hisar Development Environment"
4+
},
5+
"DbSettings": {
6+
"SqlConnectionString": "Server=.;Database=HisarDb;Trusted_Connection=True;MultipleActiveResultSets=true",
7+
"MongoDbConnectionString": "mongodb://localhost:27017/hisardb"
58
},
69
"Logging": {
710
"IncludeScopes": false,

test/components/Hisar.Component.ContentManagement/appsettings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
{
22
"AppSettings": {
3+
"Name": "Content Management"
4+
},
5+
"DbSettings": {
36
"SqlConnectionString": "Data Source=hisardb.sqlite",
47
"MongoDbConnectionString": "mongodb://localhost:27017/hisardb"
58
},

test/components/Hisar.Component.CoreManagement/Hisar.Component.CoreManagement.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
<ProjectReference Include="..\..\..\src\NetCoreStack.Hisar\NetCoreStack.Hisar.csproj" />
2828
</ItemGroup>
2929

30-
<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
31-
<Exec Command="cd $(ProjectDir) &amp; dotnet hisar --build &quot;$(ProjectDir)&quot;" />
32-
</Target>
33-
3430
<ItemGroup>
3531
<EmbeddedResource Include="Views\**\*.cshtml" />
3632
<EmbeddedResource Include="wwwroot\**\*.*" />

0 commit comments

Comments
 (0)