Skip to content

Commit 66b9ff1

Browse files
committed
minor fix 02.00.01 errors in dnn-search
1 parent 1263b37 commit 66b9ff1

File tree

4 files changed

+12
-20
lines changed

4 files changed

+12
-20
lines changed

Connect.Dnn.Koi/Connect.Dnn.Koi.csproj.user

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<IISExpressUseClassicPipelineMode />
1010
<UseGlobalApplicationHostFile />
1111
<ProjectView>ProjectFiles</ProjectView>
12-
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
12+
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
1313
</PropertyGroup>
1414
<ProjectExtensions>
1515
<VisualStudio>

Connect.Dnn.Koi/Connect_Dnn_Koi.dnn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<dotnetnuke type="Package" version="5.0">
22
<packages>
3-
<package name="Connect.Dnn.Koi" type="Library" version="02.00.00">
3+
<package name="Connect.Dnn.Koi" type="Library" version="02.00.01">
44
<friendlyName>DnnConnect Koi</friendlyName>
55
<description>Koi</description>
66
<iconFile>icon.png</iconFile>

Connect.Dnn.Koi/Koi/Context/HttpContextState.cs

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
using System;
2-
using System.Linq;
3-
using Connect.Koi.Detectors;
1+
using System.Collections;
2+
using System.Web;
43
using Connect.Koi.Dnn;
54
using Connect.Koi.Internals;
65

@@ -16,28 +15,21 @@ public override string CssFramework
1615
{
1716
get
1817
{
19-
var items = System.Web.HttpContext.Current.Items;
18+
if (HttpContext.Current?.Items == null) return null;
19+
20+
var items = HttpContext.Current.Items;
2021

2122
if (items[Keys.CssFramework] == null)
22-
TryToDetectTheCssFramework();
23+
TryToDetectTheCssFramework(items);
2324

2425
return items[Keys.CssFramework]?.ToString();
2526
}
2627
}
2728

28-
private static void TryToDetectTheCssFramework()
29+
private static void TryToDetectTheCssFramework(IDictionary items)
2930
{
30-
var items = System.Web.HttpContext.Current.Items;
31-
32-
//var framework = CssFrameworks.Unknown;
3331
var resolver = new DetectKoiOfCurrentDnnTheme();
3432
var framework = resolver.AutoDetect() ?? CssFrameworks.Unknown;
35-
//var type = AssemblyHandling.FindInherited(typeof(ICssFrameworkDetector)).FirstOrDefault();
36-
//if (type != null)
37-
//{
38-
// var resolver = (ICssFrameworkDetector) Activator.CreateInstance(type);
39-
// framework = resolver.AutoDetect();
40-
//}
4133
items.Add(Keys.CssFramework, framework ?? CssFrameworks.Unknown);
4234
}
4335
}

Connect.Koi/Connect.Koi.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<TargetFrameworks>net451;netstandard2.0</TargetFrameworks>
55
<RootNamespace>Connect.Koi</RootNamespace>
66
<AssemblyName>Connect.Koi</AssemblyName>
7-
<AssemblyVersion>2.0.0.*</AssemblyVersion>
8-
<FileVersion>2.0.0.0</FileVersion>
9-
<Version>2.0.0</Version>
7+
<AssemblyVersion>02.00.01</AssemblyVersion>
8+
<FileVersion>02.00.1.0</FileVersion>
9+
<Version>02.00.01</Version>
1010
<!-- Deterministic=False is necessary, so the version-number can contain an *-->
1111
<Deterministic>False</Deterministic>
1212
<Copyright>Copyright (MIT) 2021 2sic</Copyright>

0 commit comments

Comments
 (0)