Skip to content

Commit f83c25a

Browse files
lars-eriklars-erik
committed
Right nuget packages and a bit touchup of readme
1 parent e890b8b commit f83c25a

File tree

7 files changed

+124
-148
lines changed

7 files changed

+124
-148
lines changed

‎Umbraco.CodeGen.Integration/ApplicationEvents.cs‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -159,17 +159,6 @@ public void OnApplicationStarted(UmbracoApplicationBase umbracoApplication, Appl
159159
}
160160
}
161161

162-
public class UmbracoDataTypeProvider : IDataTypeProvider
163-
{
164-
public IEnumerable<DataTypeDefinition> GetDataTypes()
165-
{
166-
var dataTypeDefinitions = ApplicationContext.Current.Services.DataTypeService
167-
.GetAllDataTypeDefinitions()
168-
.Select(dt => new DataTypeDefinition(dt.Name, dt.PropertyEditorAlias, dt.Name));
169-
return dataTypeDefinitions;
170-
}
171-
}
172-
173162
public class HttpContextPathResolver : IRelativePathResolver
174163
{
175164
public string Resolve(string relativePath)

‎Umbraco.CodeGen.Integration/Umbraco.CodeGen.Integration.csproj‎

Lines changed: 33 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,14 @@
4646
<Compile Include="USyncDataTypeProvider.cs" />
4747
</ItemGroup>
4848
<ItemGroup>
49+
<Reference Include="AutoMapper">
50+
<HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll</HintPath>
51+
</Reference>
52+
<Reference Include="AutoMapper.Net4">
53+
<HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll</HintPath>
54+
</Reference>
4955
<Reference Include="businesslogic">
50-
<HintPath>..\packages\UmbracoCms.Core.6.1.6\lib\businesslogic.dll</HintPath>
51-
<Private>False</Private>
56+
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\businesslogic.dll</HintPath>
5257
</Reference>
5358
<Reference Include="ClientDependency.Core">
5459
<HintPath>..\packages\ClientDependency.1.7.0.4\lib\ClientDependency.Core.dll</HintPath>
@@ -59,20 +64,17 @@
5964
<Private>False</Private>
6065
</Reference>
6166
<Reference Include="cms">
62-
<HintPath>..\packages\UmbracoCms.Core.6.1.6\lib\cms.dll</HintPath>
63-
<Private>False</Private>
67+
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\cms.dll</HintPath>
6468
</Reference>
6569
<Reference Include="controls">
66-
<HintPath>..\packages\UmbracoCms.Core.6.1.6\lib\controls.dll</HintPath>
67-
<Private>False</Private>
70+
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\controls.dll</HintPath>
6871
</Reference>
6972
<Reference Include="CookComputing.XmlRpcV2">
7073
<HintPath>..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll</HintPath>
7174
<Private>False</Private>
7275
</Reference>
7376
<Reference Include="Examine">
74-
<HintPath>..\packages\UmbracoCms.Core.6.1.6\lib\Examine.dll</HintPath>
75-
<Private>False</Private>
77+
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\Examine.dll</HintPath>
7678
</Reference>
7779
<Reference Include="HtmlAgilityPack">
7880
<HintPath>..\packages\HtmlAgilityPack.1.4.6\lib\Net40\HtmlAgilityPack.dll</HintPath>
@@ -83,28 +85,24 @@
8385
<Private>False</Private>
8486
</Reference>
8587
<Reference Include="interfaces">
86-
<HintPath>..\packages\UmbracoCms.Core.6.1.6\lib\interfaces.dll</HintPath>
87-
<Private>False</Private>
88+
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\interfaces.dll</HintPath>
8889
</Reference>
8990
<Reference Include="jumps.umbraco.usync">
9091
<HintPath>..\lib\jumps.umbraco.usync.dll</HintPath>
9192
<Private>False</Private>
9293
</Reference>
9394
<Reference Include="log4net">
94-
<HintPath>..\packages\UmbracoCms.Core.6.1.6\lib\log4net.dll</HintPath>
95-
<Private>False</Private>
95+
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\log4net.dll</HintPath>
9696
</Reference>
9797
<Reference Include="Lucene.Net">
9898
<HintPath>..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll</HintPath>
9999
<Private>False</Private>
100100
</Reference>
101101
<Reference Include="Microsoft.ApplicationBlocks.Data">
102-
<HintPath>..\packages\UmbracoCms.Core.6.1.6\lib\Microsoft.ApplicationBlocks.Data.dll</HintPath>
103-
<Private>False</Private>
102+
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\Microsoft.ApplicationBlocks.Data.dll</HintPath>
104103
</Reference>
105104
<Reference Include="Microsoft.Web.Helpers">
106-
<HintPath>..\packages\UmbracoCms.Core.6.1.6\lib\Microsoft.Web.Helpers.dll</HintPath>
107-
<Private>False</Private>
105+
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\Microsoft.Web.Helpers.dll</HintPath>
108106
</Reference>
109107
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
110108
<Private>False</Private>
@@ -127,29 +125,25 @@
127125
<Private>False</Private>
128126
</Reference>
129127
<Reference Include="Our.Umbraco.uGoLive">
130-
<HintPath>..\packages\UmbracoCms.Core.6.1.6\lib\Our.Umbraco.uGoLive.dll</HintPath>
131-
<Private>False</Private>
128+
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\Our.Umbraco.uGoLive.dll</HintPath>
132129
</Reference>
133130
<Reference Include="Our.Umbraco.uGoLive.47x">
134-
<HintPath>..\packages\UmbracoCms.Core.6.1.6\lib\Our.Umbraco.uGoLive.47x.dll</HintPath>
135-
<Private>False</Private>
131+
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\Our.Umbraco.uGoLive.47x.dll</HintPath>
136132
</Reference>
137133
<Reference Include="Our.Umbraco.uGoLive.Checks">
138-
<HintPath>..\packages\UmbracoCms.Core.6.1.6\lib\Our.Umbraco.uGoLive.Checks.dll</HintPath>
139-
<Private>False</Private>
134+
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\Our.Umbraco.uGoLive.Checks.dll</HintPath>
140135
</Reference>
141136
<Reference Include="SQLCE4Umbraco">
142-
<HintPath>..\packages\UmbracoCms.Core.6.1.6\lib\SQLCE4Umbraco.dll</HintPath>
143-
<Private>False</Private>
137+
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\SQLCE4Umbraco.dll</HintPath>
144138
</Reference>
145139
<Reference Include="System" />
146140
<Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
147-
<Private>False</Private>
148-
<HintPath>..\packages\UmbracoCms.Core.6.1.6\lib\System.Data.SqlServerCe.dll</HintPath>
141+
<Private>True</Private>
142+
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\System.Data.SqlServerCe.dll</HintPath>
149143
</Reference>
150144
<Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
151-
<Private>False</Private>
152-
<HintPath>..\packages\UmbracoCms.Core.6.1.6\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
145+
<Private>True</Private>
146+
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
153147
</Reference>
154148
<Reference Include="System.Net.Http, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
155149
<HintPath>..\packages\Microsoft.Net.Http.2.0.20710.0\lib\net40\System.Net.Http.dll</HintPath>
@@ -199,52 +193,37 @@
199193
<Reference Include="System.XML" />
200194
<Reference Include="System.Xml.Linq" />
201195
<Reference Include="TidyNet">
202-
<HintPath>..\packages\UmbracoCms.Core.6.1.6\lib\TidyNet.dll</HintPath>
203-
<Private>False</Private>
196+
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\TidyNet.dll</HintPath>
204197
</Reference>
205198
<Reference Include="umbraco">
206-
<HintPath>..\packages\UmbracoCms.Core.6.1.6\lib\umbraco.dll</HintPath>
207-
<Private>False</Private>
199+
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\umbraco.dll</HintPath>
208200
</Reference>
209201
<Reference Include="Umbraco.Core">
210-
<HintPath>..\packages\UmbracoCms.Core.6.1.6\lib\Umbraco.Core.dll</HintPath>
211-
<Private>False</Private>
202+
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\Umbraco.Core.dll</HintPath>
212203
</Reference>
213204
<Reference Include="umbraco.DataLayer">
214-
<HintPath>..\packages\UmbracoCms.Core.6.1.6\lib\umbraco.DataLayer.dll</HintPath>
215-
<Private>False</Private>
205+
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\umbraco.DataLayer.dll</HintPath>
216206
</Reference>
217207
<Reference Include="umbraco.editorControls">
218-
<HintPath>..\packages\UmbracoCms.Core.6.1.6\lib\umbraco.editorControls.dll</HintPath>
219-
<Private>False</Private>
208+
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\umbraco.editorControls.dll</HintPath>
220209
</Reference>
221210
<Reference Include="umbraco.MacroEngines">
222-
<HintPath>..\packages\UmbracoCms.Core.6.1.6\lib\umbraco.MacroEngines.dll</HintPath>
223-
<Private>False</Private>
224-
</Reference>
225-
<Reference Include="umbraco.macroRenderings">
226-
<HintPath>..\packages\UmbracoCms.Core.6.1.6\lib\umbraco.macroRenderings.dll</HintPath>
227-
<Private>False</Private>
211+
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\umbraco.MacroEngines.dll</HintPath>
228212
</Reference>
229213
<Reference Include="umbraco.providers">
230-
<HintPath>..\packages\UmbracoCms.Core.6.1.6\lib\umbraco.providers.dll</HintPath>
231-
<Private>False</Private>
214+
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\umbraco.providers.dll</HintPath>
232215
</Reference>
233216
<Reference Include="Umbraco.Web.UI">
234-
<HintPath>..\packages\UmbracoCms.Core.6.1.6\lib\Umbraco.Web.UI.dll</HintPath>
235-
<Private>False</Private>
217+
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\Umbraco.Web.UI.dll</HintPath>
236218
</Reference>
237219
<Reference Include="umbraco.XmlSerializers">
238-
<HintPath>..\packages\UmbracoCms.Core.6.1.6\lib\umbraco.XmlSerializers.dll</HintPath>
239-
<Private>False</Private>
220+
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\umbraco.XmlSerializers.dll</HintPath>
240221
</Reference>
241222
<Reference Include="UmbracoExamine">
242-
<HintPath>..\packages\UmbracoCms.Core.6.1.6\lib\UmbracoExamine.dll</HintPath>
243-
<Private>False</Private>
223+
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\UmbracoExamine.dll</HintPath>
244224
</Reference>
245225
<Reference Include="UrlRewritingNet.UrlRewriter">
246-
<HintPath>..\packages\UmbracoCms.Core.6.1.6\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
247-
<Private>False</Private>
226+
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
248227
</Reference>
249228
</ItemGroup>
250229
<ItemGroup>

‎Umbraco.CodeGen.Integration/packages.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="AutoMapper" version="3.0.0" targetFramework="net45" />
34
<package id="ClientDependency" version="1.7.0.4" targetFramework="net40" developmentDependency="true" />
45
<package id="ClientDependency-Mvc" version="1.7.0.4" targetFramework="net40" developmentDependency="true" />
56
<package id="HtmlAgilityPack" version="1.4.6" targetFramework="net40" developmentDependency="true" requireReinstallation="True" />
@@ -20,6 +21,6 @@
2021
<package id="MySql.Data" version="6.6.5" targetFramework="net40" developmentDependency="true" />
2122
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net40" developmentDependency="true" />
2223
<package id="SharpZipLib" version="0.86.0" targetFramework="net40" developmentDependency="true" />
23-
<package id="UmbracoCms.Core" version="6.1.6" targetFramework="net40" developmentDependency="true" />
24+
<package id="UmbracoCms.Core" version="7.0.0" targetFramework="net45" developmentDependency="true" />
2425
<package id="xmlrpcnet" version="2.5.0" targetFramework="net40" developmentDependency="true" />
2526
</packages>

‎Umbraco.CodeGen.Packager/App.config‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
44
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
55
</startup>
6+
<runtime>
7+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8+
<dependentAssembly>
9+
<assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
10+
<bindingRedirect oldVersion="0.0.0.0-0.85.4.369" newVersion="0.85.4.369" />
11+
</dependentAssembly>
12+
</assemblyBinding>
13+
</runtime>
614
</configuration>

0 commit comments

Comments
 (0)