Skip to content

Commit 32718a1

Browse files
committed
Apply **OnTopic-WebForms** hotfix
Previously, in #d008f01, we had to introduce a local `WebFormsTopicLookupService` to work around a bug in the **OnTopic-WebForms** library. That bug has been resolved via a hotfix. Given that, we may now get rid of that local workaround, and apply the original version from the `OnTopic.Web` library.
1 parent b175f18 commit 32718a1

6 files changed

Lines changed: 7 additions & 50 deletions

File tree

OnTopic.Editor.Web.Host/Global.asax.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ protected void Application_Start(object sender, EventArgs e) {
3636
| strongly typed class, which is necessary to provide access to members which parse and query the DefaultConfiguration
3737
| property.
3838
\-----------------------------------------------------------------------------------------------------------------------*/
39-
TopicFactory.TypeLookupService = new OnTopic.Editor.Web.WebFormsTopicLookupService();
39+
TopicFactory.TypeLookupService = new WebFormsTopicLookupService();
4040

4141
/*------------------------------------------------------------------------------------------------------------------------
4242
| CONFIGURE REPOSITORY

OnTopic.Editor.Web.Host/OnTopic.Editor.Web.Host.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
<Reference Include="OnTopic.Data.Sql, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
5454
<HintPath>..\packages\OnTopic.Data.Sql.4.0.0\lib\netstandard2.0\OnTopic.Data.Sql.dll</HintPath>
5555
</Reference>
56-
<Reference Include="OnTopic.Web, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
57-
<HintPath>..\packages\OnTopic.Web.4.0.0-alpha.2\lib\net48\OnTopic.Web.dll</HintPath>
56+
<Reference Include="OnTopic.Web, Version=4.0.1.0, Culture=neutral, processorArchitecture=MSIL">
57+
<HintPath>..\packages\OnTopic.Web.4.0.1\lib\net48\OnTopic.Web.dll</HintPath>
5858
</Reference>
5959
<Reference Include="System.Data.SqlClient, Version=4.6.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
6060
<HintPath>..\packages\System.Data.SqlClient.4.7.0\lib\net461\System.Data.SqlClient.dll</HintPath>

OnTopic.Editor.Web.Host/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
<package id="OnTopic" version="4.0.0" targetFramework="net48" />
55
<package id="OnTopic.Data.Caching" version="4.0.0" targetFramework="net48" />
66
<package id="OnTopic.Data.Sql" version="4.0.0" targetFramework="net48" />
7-
<package id="OnTopic.Web" version="4.0.0-alpha.2" targetFramework="net48" />
7+
<package id="OnTopic.Web" version="4.0.1" targetFramework="net48" />
88
<package id="System.Data.SqlClient" version="4.7.0" targetFramework="net48" />
99
</packages>

OnTopic.Editor.Web/Infrastructure/WebFormsTopicLookupService.cs

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

OnTopic.Editor.Web/OnTopic.Editor.Web.csproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
<Reference Include="OnTopic, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
5151
<HintPath>..\packages\OnTopic.4.0.0\lib\netstandard2.0\OnTopic.dll</HintPath>
5252
</Reference>
53-
<Reference Include="OnTopic.Web, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
54-
<HintPath>..\packages\OnTopic.Web.4.0.0-alpha.2\lib\net48\OnTopic.Web.dll</HintPath>
53+
<Reference Include="OnTopic.Web, Version=4.0.1.0, Culture=neutral, processorArchitecture=MSIL">
54+
<HintPath>..\packages\OnTopic.Web.4.0.1\lib\net48\OnTopic.Web.dll</HintPath>
5555
</Reference>
5656
</ItemGroup>
5757
<ItemGroup>
@@ -982,7 +982,6 @@
982982
<DependentUpon>Default.aspx</DependentUpon>
983983
<SubType>ASPXCodeBehind</SubType>
984984
</Content>
985-
<Compile Include="Infrastructure\WebFormsTopicLookupService.cs" />
986985
<Compile Include="Properties\AssemblyInfo.cs" />
987986
</ItemGroup>
988987
<ItemGroup>

OnTopic.Editor.Web/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="OnTopic" version="4.0.0" targetFramework="net48" />
4-
<package id="OnTopic.Web" version="4.0.0-alpha.2" targetFramework="net48" />
4+
<package id="OnTopic.Web" version="4.0.1" targetFramework="net48" />
55
</packages>

0 commit comments

Comments
 (0)