Skip to content

Commit 31f7771

Browse files
ShazwazzaShazwazza
committed
update to latest umb... start fixing up tests but haven't had time to get them implemented.
1 parent 8843fa7 commit 31f7771

File tree

8 files changed

+157
-100
lines changed

8 files changed

+157
-100
lines changed

‎src/UmbracoExamine.PDF.Tests/IndexInitializer.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
// /// </summary>
2222
// internal static class IndexInitializer
2323
// {
24-
24+
2525
// public static LuceneSearcher GetLuceneSearcher(Lucene.Net.Store.Directory luceneDir)
2626
// {
2727
// return new LuceneSearcher(luceneDir, new StandardAnalyzer(Lucene.Net.Util.Version.LUCENE_29));
@@ -38,7 +38,7 @@
3838

3939
// return i;
4040
// }
41-
41+
4242
// internal static void IndexingError(object sender, IndexingErrorEventArgs e)
4343
// {
4444
// throw new ApplicationException(e.Message, e.InnerException);

‎src/UmbracoExamine.PDF.Tests/PdfIndexerTests.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
//namespace UmbracoExamine.PDF.Tests
1212
//{
13-
13+
1414
// [TestFixture]
15-
// public class PdfIndexerTests
15+
// public class PdfIndexerTests
1616
// {
1717

1818
// private readonly TestMediaService _mediaService = new TestMediaService();
@@ -53,8 +53,9 @@
5353
// [TearDown]
5454
// public void TestTearDown()
5555
// {
56-
// UmbracoExamineSearcher.DisableInitializationCheck = null;
57-
// BaseUmbracoIndexer.DisableInitializationCheck = null;
56+
// typeof(UmbracoExamineSearcher).SetStaticProperty("DisableInitializationCheck", null);
57+
// typeof(BaseUmbracoIndexer).SetStaticProperty("DisableInitializationCheck", null);
58+
5859
// _luceneDir.Dispose();
5960
// }
6061

‎src/UmbracoExamine.PDF.Tests/UmbracoExamine.PDF.Tests.csproj‎

Lines changed: 64 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -36,26 +36,31 @@
3636
<Reference Include="AutoMapper.Net4">
3737
<HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll</HintPath>
3838
</Reference>
39-
<Reference Include="businesslogic">
40-
<HintPath>..\packages\UmbracoCms.Core.7.2.4\lib\businesslogic.dll</HintPath>
39+
<Reference Include="businesslogic, Version=1.0.5675.23468, Culture=neutral, processorArchitecture=MSIL">
40+
<HintPath>..\packages\UmbracoCms.Core.7.2.8\lib\businesslogic.dll</HintPath>
41+
<Private>True</Private>
4142
</Reference>
42-
<Reference Include="ClientDependency.Core">
43-
<HintPath>..\packages\ClientDependency.1.8.3.1\lib\net45\ClientDependency.Core.dll</HintPath>
43+
<Reference Include="ClientDependency.Core, Version=1.8.4.0, Culture=neutral, processorArchitecture=MSIL">
44+
<HintPath>..\packages\ClientDependency.1.8.4\lib\net45\ClientDependency.Core.dll</HintPath>
45+
<Private>True</Private>
4446
</Reference>
4547
<Reference Include="ClientDependency.Core.Mvc">
4648
<HintPath>..\packages\ClientDependency-Mvc.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
4749
</Reference>
48-
<Reference Include="cms">
49-
<HintPath>..\packages\UmbracoCms.Core.7.2.4\lib\cms.dll</HintPath>
50+
<Reference Include="cms, Version=1.0.5675.23468, Culture=neutral, processorArchitecture=MSIL">
51+
<HintPath>..\packages\UmbracoCms.Core.7.2.8\lib\cms.dll</HintPath>
52+
<Private>True</Private>
5053
</Reference>
51-
<Reference Include="controls">
52-
<HintPath>..\packages\UmbracoCms.Core.7.2.4\lib\controls.dll</HintPath>
54+
<Reference Include="controls, Version=1.0.5675.23470, Culture=neutral, processorArchitecture=MSIL">
55+
<HintPath>..\packages\UmbracoCms.Core.7.2.8\lib\controls.dll</HintPath>
56+
<Private>True</Private>
5357
</Reference>
5458
<Reference Include="CookComputing.XmlRpcV2">
5559
<HintPath>..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll</HintPath>
5660
</Reference>
57-
<Reference Include="Examine">
58-
<HintPath>..\packages\Examine.0.1.60.2941\lib\Examine.dll</HintPath>
61+
<Reference Include="Examine, Version=0.1.65.0, Culture=neutral, processorArchitecture=MSIL">
62+
<HintPath>..\packages\Examine.0.1.65.0\lib\Examine.dll</HintPath>
63+
<Private>True</Private>
5964
</Reference>
6065
<Reference Include="HtmlAgilityPack">
6166
<HintPath>..\packages\HtmlAgilityPack.1.4.6\lib\Net45\HtmlAgilityPack.dll</HintPath>
@@ -69,17 +74,20 @@
6974
<Reference Include="ImageProcessor.Web">
7075
<HintPath>..\packages\ImageProcessor.Web.3.3.1.0\lib\net45\ImageProcessor.Web.dll</HintPath>
7176
</Reference>
72-
<Reference Include="interfaces">
73-
<HintPath>..\packages\UmbracoCms.Core.7.2.4\lib\interfaces.dll</HintPath>
77+
<Reference Include="interfaces, Version=1.0.5675.23466, Culture=neutral, processorArchitecture=MSIL">
78+
<HintPath>..\packages\UmbracoCms.Core.7.2.8\lib\interfaces.dll</HintPath>
79+
<Private>True</Private>
7480
</Reference>
75-
<Reference Include="log4net">
76-
<HintPath>..\packages\UmbracoCms.Core.7.2.4\lib\log4net.dll</HintPath>
81+
<Reference Include="log4net, Version=1.2.11.0, Culture=neutral, processorArchitecture=MSIL">
82+
<HintPath>..\packages\UmbracoCms.Core.7.2.8\lib\log4net.dll</HintPath>
83+
<Private>True</Private>
7784
</Reference>
7885
<Reference Include="Lucene.Net">
7986
<HintPath>..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll</HintPath>
8087
</Reference>
81-
<Reference Include="Microsoft.ApplicationBlocks.Data">
82-
<HintPath>..\packages\UmbracoCms.Core.7.2.4\lib\Microsoft.ApplicationBlocks.Data.dll</HintPath>
88+
<Reference Include="Microsoft.ApplicationBlocks.Data, Version=1.0.1559.20655, Culture=neutral">
89+
<HintPath>..\packages\UmbracoCms.Core.7.2.8\lib\Microsoft.ApplicationBlocks.Data.dll</HintPath>
90+
<Private>True</Private>
8391
</Reference>
8492
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8593
<Private>True</Private>
@@ -94,33 +102,37 @@
94102
<Reference Include="Moq">
95103
<HintPath>..\packages\Moq.4.2.1502.0911\lib\net40\Moq.dll</HintPath>
96104
</Reference>
97-
<Reference Include="MySql.Data">
98-
<HintPath>..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll</HintPath>
105+
<Reference Include="MySql.Data, Version=6.9.7.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
106+
<HintPath>..\packages\MySql.Data.6.9.7\lib\net45\MySql.Data.dll</HintPath>
107+
<Private>True</Private>
99108
</Reference>
100109
<Reference Include="Newtonsoft.Json">
101110
<HintPath>..\packages\Newtonsoft.Json.6.0.5\lib\net45\Newtonsoft.Json.dll</HintPath>
102111
</Reference>
103112
<Reference Include="nunit.framework">
104113
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
105114
</Reference>
106-
<Reference Include="SQLCE4Umbraco">
107-
<HintPath>..\packages\UmbracoCms.Core.7.2.4\lib\SQLCE4Umbraco.dll</HintPath>
115+
<Reference Include="SQLCE4Umbraco, Version=1.0.5675.23469, Culture=neutral, processorArchitecture=MSIL">
116+
<HintPath>..\packages\UmbracoCms.Core.7.2.8\lib\SQLCE4Umbraco.dll</HintPath>
117+
<Private>True</Private>
108118
</Reference>
109119
<Reference Include="System" />
110120
<Reference Include="System.Configuration" />
111121
<Reference Include="System.Core" />
112122
<Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
123+
<HintPath>..\packages\UmbracoCms.Core.7.2.8\lib\System.Data.SqlServerCe.dll</HintPath>
113124
<Private>True</Private>
114-
<HintPath>..\packages\UmbracoCms.Core.7.2.4\lib\System.Data.SqlServerCe.dll</HintPath>
115125
</Reference>
116126
<Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
127+
<HintPath>..\packages\UmbracoCms.Core.7.2.8\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
117128
<Private>True</Private>
118-
<HintPath>..\packages\UmbracoCms.Core.7.2.4\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
119129
</Reference>
130+
<Reference Include="System.Net.Http" />
120131
<Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
121132
<Private>True</Private>
122133
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll</HintPath>
123134
</Reference>
135+
<Reference Include="System.Net.Http.WebRequest" />
124136
<Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
125137
<Private>True</Private>
126138
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll</HintPath>
@@ -158,35 +170,45 @@
158170
<Reference Include="Microsoft.CSharp" />
159171
<Reference Include="System.Data" />
160172
<Reference Include="System.Xml" />
161-
<Reference Include="TidyNet">
162-
<HintPath>..\packages\UmbracoCms.Core.7.2.4\lib\TidyNet.dll</HintPath>
173+
<Reference Include="TidyNet, Version=1.0.0.0, Culture=neutral">
174+
<HintPath>..\packages\UmbracoCms.Core.7.2.8\lib\TidyNet.dll</HintPath>
175+
<Private>True</Private>
163176
</Reference>
164-
<Reference Include="umbraco">
165-
<HintPath>..\packages\UmbracoCms.Core.7.2.4\lib\umbraco.dll</HintPath>
177+
<Reference Include="umbraco, Version=1.0.5675.23471, Culture=neutral, processorArchitecture=MSIL">
178+
<HintPath>..\packages\UmbracoCms.Core.7.2.8\lib\umbraco.dll</HintPath>
179+
<Private>True</Private>
166180
</Reference>
167-
<Reference Include="Umbraco.Core">
168-
<HintPath>..\packages\UmbracoCms.Core.7.2.4\lib\Umbraco.Core.dll</HintPath>
181+
<Reference Include="Umbraco.Core, Version=1.0.5675.23466, Culture=neutral, processorArchitecture=MSIL">
182+
<HintPath>..\packages\UmbracoCms.Core.7.2.8\lib\Umbraco.Core.dll</HintPath>
183+
<Private>True</Private>
169184
</Reference>
170-
<Reference Include="umbraco.DataLayer">
171-
<HintPath>..\packages\UmbracoCms.Core.7.2.4\lib\umbraco.DataLayer.dll</HintPath>
185+
<Reference Include="umbraco.DataLayer, Version=1.0.5675.23468, Culture=neutral, processorArchitecture=MSIL">
186+
<HintPath>..\packages\UmbracoCms.Core.7.2.8\lib\umbraco.DataLayer.dll</HintPath>
187+
<Private>True</Private>
172188
</Reference>
173-
<Reference Include="umbraco.editorControls">
174-
<HintPath>..\packages\UmbracoCms.Core.7.2.4\lib\umbraco.editorControls.dll</HintPath>
189+
<Reference Include="umbraco.editorControls, Version=1.0.5675.23472, Culture=neutral, processorArchitecture=MSIL">
190+
<HintPath>..\packages\UmbracoCms.Core.7.2.8\lib\umbraco.editorControls.dll</HintPath>
191+
<Private>True</Private>
175192
</Reference>
176-
<Reference Include="umbraco.MacroEngines">
177-
<HintPath>..\packages\UmbracoCms.Core.7.2.4\lib\umbraco.MacroEngines.dll</HintPath>
193+
<Reference Include="umbraco.MacroEngines, Version=1.0.5675.23472, Culture=neutral, processorArchitecture=MSIL">
194+
<HintPath>..\packages\UmbracoCms.Core.7.2.8\lib\umbraco.MacroEngines.dll</HintPath>
195+
<Private>True</Private>
178196
</Reference>
179-
<Reference Include="umbraco.providers">
180-
<HintPath>..\packages\UmbracoCms.Core.7.2.4\lib\umbraco.providers.dll</HintPath>
197+
<Reference Include="umbraco.providers, Version=1.0.5675.23470, Culture=neutral, processorArchitecture=MSIL">
198+
<HintPath>..\packages\UmbracoCms.Core.7.2.8\lib\umbraco.providers.dll</HintPath>
199+
<Private>True</Private>
181200
</Reference>
182-
<Reference Include="Umbraco.Web.UI">
183-
<HintPath>..\packages\UmbracoCms.Core.7.2.4\lib\Umbraco.Web.UI.dll</HintPath>
201+
<Reference Include="Umbraco.Web.UI, Version=1.0.5675.23473, Culture=neutral, processorArchitecture=MSIL">
202+
<HintPath>..\packages\UmbracoCms.Core.7.2.8\lib\Umbraco.Web.UI.dll</HintPath>
203+
<Private>True</Private>
184204
</Reference>
185-
<Reference Include="UmbracoExamine">
186-
<HintPath>..\packages\UmbracoCms.Core.7.2.4\lib\UmbracoExamine.dll</HintPath>
205+
<Reference Include="UmbracoExamine, Version=0.7.0.23469, Culture=neutral, processorArchitecture=MSIL">
206+
<HintPath>..\packages\UmbracoCms.Core.7.2.8\lib\UmbracoExamine.dll</HintPath>
207+
<Private>True</Private>
187208
</Reference>
188-
<Reference Include="UrlRewritingNet.UrlRewriter">
189-
<HintPath>..\packages\UmbracoCms.Core.7.2.4\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
209+
<Reference Include="UrlRewritingNet.UrlRewriter, Version=2.0.60829.1, Culture=neutral, processorArchitecture=MSIL">
210+
<HintPath>..\packages\UmbracoCms.Core.7.2.8\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
211+
<Private>True</Private>
190212
</Reference>
191213
</ItemGroup>
192214
<ItemGroup>

‎src/UmbracoExamine.PDF.Tests/app.config‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,9 @@
1616
</dependentAssembly>
1717
</assemblyBinding>
1818
</runtime>
19-
</configuration>
19+
<system.data>
20+
<DbProviderFactories>
21+
<remove invariant="MySql.Data.MySqlClient" />
22+
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.7.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
23+
</DbProviderFactories>
24+
</system.data></configuration>

‎src/UmbracoExamine.PDF.Tests/packages.config‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="AutoMapper" version="3.0.0" targetFramework="net45" />
4-
<package id="ClientDependency" version="1.8.3.1" targetFramework="net45" />
4+
<package id="ClientDependency" version="1.8.4" targetFramework="net45" />
55
<package id="ClientDependency-Mvc" version="1.8.0.0" targetFramework="net45" />
6-
<package id="Examine" version="0.1.60.2941" targetFramework="net45" />
6+
<package id="Examine" version="0.1.65.0" targetFramework="net45" />
77
<package id="HtmlAgilityPack" version="1.4.6" targetFramework="net45" />
88
<package id="ImageProcessor" version="1.9.5.0" targetFramework="net45" />
99
<package id="ImageProcessor.Web" version="3.3.1.0" targetFramework="net45" />
@@ -16,13 +16,14 @@
1616
<package id="Microsoft.AspNet.WebApi.Core" version="4.0.30506.0" targetFramework="net45" />
1717
<package id="Microsoft.AspNet.WebApi.WebHost" version="4.0.30506.0" targetFramework="net45" />
1818
<package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net45" />
19+
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" />
1920
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
2021
<package id="MiniProfiler" version="2.1.0" targetFramework="net45" />
2122
<package id="Moq" version="4.2.1502.0911" targetFramework="net45" />
22-
<package id="MySql.Data" version="6.6.5" targetFramework="net45" />
23+
<package id="MySql.Data" version="6.9.7" targetFramework="net45" />
2324
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
2425
<package id="NUnit" version="2.6.4" targetFramework="net45" />
2526
<package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
26-
<package id="UmbracoCms.Core" version="7.2.4" targetFramework="net45" />
27+
<package id="UmbracoCms.Core" version="7.2.8" targetFramework="net45" />
2728
<package id="xmlrpcnet" version="2.5.0" targetFramework="net45" />
2829
</packages>

0 commit comments

Comments
 (0)