Skip to content

Commit c5584a3

Browse files
lars-eriklars-erik
committed
Misc polish
1 parent e6cdd30 commit c5584a3

File tree

6 files changed

+84
-32
lines changed

6 files changed

+84
-32
lines changed

‎Umbraco.CodeGen.Integration/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AutoMapper" version="3.0.0" targetFramework="net45" />
3+
<package id="AutoMapper" version="3.0.0" targetFramework="net45" developmentDependency="true" />
44
<package id="ClientDependency" version="1.7.0.4" targetFramework="net40" developmentDependency="true" />
55
<package id="ClientDependency-Mvc" version="1.7.0.4" targetFramework="net40" developmentDependency="true" />
66
<package id="HtmlAgilityPack" version="1.4.6" targetFramework="net40" developmentDependency="true" requireReinstallation="True" />
7-
<package id="ICSharpCode.NRefactory" version="5.3.0" targetFramework="net45" />
87
<package id="Lucene.Net" version="2.9.4.1" targetFramework="net40" developmentDependency="true" />
98
<package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net40" developmentDependency="true" />
109
<package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.1" targetFramework="net40" developmentDependency="true" />
@@ -17,10 +16,11 @@
1716
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net40" developmentDependency="true" requireReinstallation="True" />
1817
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" developmentDependency="true" />
1918
<package id="MiniProfiler" version="2.1.0" targetFramework="net40" developmentDependency="true" />
20-
<package id="Mono.Cecil" version="0.9.5.4" targetFramework="net45" />
2119
<package id="MySql.Data" version="6.6.5" targetFramework="net40" developmentDependency="true" />
2220
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net40" developmentDependency="true" />
2321
<package id="SharpZipLib" version="0.86.0" targetFramework="net40" developmentDependency="true" />
2422
<package id="UmbracoCms.Core" version="7.0.0" targetFramework="net45" developmentDependency="true" />
2523
<package id="xmlrpcnet" version="2.5.0" targetFramework="net40" developmentDependency="true" />
24+
<package id="Mono.Cecil" version="0.9.5.4" targetFramework="net45" />
25+
<package id="ICSharpCode.NRefactory" version="5.3.0" targetFramework="net45" />
2626
</packages>

‎Umbraco.CodeGen.Tests/Parsers/Annotated/PropertyParserTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,11 +152,11 @@ public void Parse_Type_IsTypeOfDefinition()
152152
{
153153
const string code = @"
154154
public class AClass {
155-
[GenericProperty(DataType=""Textstring"")]
155+
[GenericProperty(Definition=""RTE"")]
156156
public string AProperty {get;set;}
157157
}";
158158
ParseProperty(code);
159-
Assert.AreEqual("ec15c1e5-9d90-422a-aa52-4f7622c63bea", property.Type);
159+
Assert.AreEqual(TestDataTypeProvider.Rte.DataTypeId, property.Type);
160160
}
161161

162162
[Test]

‎Umbraco.CodeGen.WaitForSixTwo/Properties/AssemblyInfo.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
// General Information about an assembly is controlled through the following
66
// set of attributes. Change these attribute values to modify the information
77
// associated with an assembly.
8-
[assembly: AssemblyTitle("Umbraco.Tests")]
8+
[assembly: AssemblyTitle("Umbraco.CodeGen.U7")]
99
[assembly: AssemblyDescription("")]
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("")]
12-
[assembly: AssemblyProduct("Umbraco.Tests")]
12+
[assembly: AssemblyProduct("Umbraco.CodeGen.U7")]
1313
[assembly: AssemblyCopyright("Copyright © 2013")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
@@ -32,5 +32,4 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]
35+
[assembly: AssemblyVersion("1.0.*")]

‎Umbraco.CodeGen.WaitForSixTwo/Umbraco.CodeGen.WaitForSixTwo.csproj‎

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,16 @@
3737
<ItemGroup>
3838
<Reference Include="AutoMapper, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
3939
<HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll</HintPath>
40+
<Private>False</Private>
4041
</Reference>
4142
<Reference Include="AutoMapper.Net4, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
4243
<HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll</HintPath>
44+
<Private>False</Private>
4345
</Reference>
4446
<Reference Include="businesslogic, Version=1.0.5073.23295, Culture=neutral, processorArchitecture=MSIL">
4547
<SpecificVersion>False</SpecificVersion>
4648
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\businesslogic.dll</HintPath>
49+
<Private>False</Private>
4750
</Reference>
4851
<Reference Include="ClientDependency.Core">
4952
<HintPath>..\packages\ClientDependency.1.7.0.4\lib\ClientDependency.Core.dll</HintPath>
@@ -56,17 +59,20 @@
5659
<Reference Include="cms, Version=1.0.5073.23296, Culture=neutral, processorArchitecture=MSIL">
5760
<SpecificVersion>False</SpecificVersion>
5861
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\cms.dll</HintPath>
62+
<Private>False</Private>
5963
</Reference>
6064
<Reference Include="controls, Version=1.0.5073.23297, Culture=neutral, processorArchitecture=MSIL">
6165
<SpecificVersion>False</SpecificVersion>
6266
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\controls.dll</HintPath>
67+
<Private>False</Private>
6368
</Reference>
6469
<Reference Include="CookComputing.XmlRpcV2">
6570
<HintPath>..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll</HintPath>
6671
<Private>False</Private>
6772
</Reference>
6873
<Reference Include="Examine, Version=0.1.52.2941, Culture=neutral, processorArchitecture=MSIL">
6974
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\Examine.dll</HintPath>
75+
<Private>False</Private>
7076
</Reference>
7177
<Reference Include="HtmlAgilityPack">
7278
<HintPath>..\packages\HtmlAgilityPack.1.4.6\lib\Net40\HtmlAgilityPack.dll</HintPath>
@@ -79,19 +85,23 @@
7985
<Reference Include="interfaces, Version=1.0.5073.23294, Culture=neutral, processorArchitecture=MSIL">
8086
<SpecificVersion>False</SpecificVersion>
8187
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\interfaces.dll</HintPath>
88+
<Private>False</Private>
8289
</Reference>
8390
<Reference Include="log4net, Version=1.2.11.0, Culture=neutral, processorArchitecture=MSIL">
8491
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\log4net.dll</HintPath>
92+
<Private>False</Private>
8593
</Reference>
8694
<Reference Include="Lucene.Net">
8795
<HintPath>..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll</HintPath>
8896
<Private>False</Private>
8997
</Reference>
9098
<Reference Include="Microsoft.ApplicationBlocks.Data, Version=1.0.1559.20655, Culture=neutral">
9199
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\Microsoft.ApplicationBlocks.Data.dll</HintPath>
100+
<Private>False</Private>
92101
</Reference>
93102
<Reference Include="Microsoft.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
94103
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\Microsoft.Web.Helpers.dll</HintPath>
104+
<Private>False</Private>
95105
</Reference>
96106
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
97107
<Private>False</Private>
@@ -115,25 +125,29 @@
115125
</Reference>
116126
<Reference Include="Our.Umbraco.uGoLive, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
117127
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\Our.Umbraco.uGoLive.dll</HintPath>
128+
<Private>False</Private>
118129
</Reference>
119130
<Reference Include="Our.Umbraco.uGoLive.47x, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
120131
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\Our.Umbraco.uGoLive.47x.dll</HintPath>
132+
<Private>False</Private>
121133
</Reference>
122134
<Reference Include="Our.Umbraco.uGoLive.Checks, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
123135
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\Our.Umbraco.uGoLive.Checks.dll</HintPath>
136+
<Private>False</Private>
124137
</Reference>
125138
<Reference Include="SQLCE4Umbraco, Version=1.0.5073.23296, Culture=neutral, processorArchitecture=MSIL">
126139
<SpecificVersion>False</SpecificVersion>
127140
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\SQLCE4Umbraco.dll</HintPath>
141+
<Private>False</Private>
128142
</Reference>
129143
<Reference Include="System" />
130144
<Reference Include="System.Core" />
131145
<Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
132-
<Private>True</Private>
146+
<Private>False</Private>
133147
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\System.Data.SqlServerCe.dll</HintPath>
134148
</Reference>
135149
<Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
136-
<Private>True</Private>
150+
<Private>False</Private>
137151
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
138152
</Reference>
139153
<Reference Include="System.Net.Http, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -188,45 +202,56 @@
188202
<Reference Include="System.Xml" />
189203
<Reference Include="TidyNet, Version=1.0.0.0, Culture=neutral">
190204
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\TidyNet.dll</HintPath>
205+
<Private>False</Private>
191206
</Reference>
192207
<Reference Include="umbraco, Version=1.0.5073.23298, Culture=neutral, processorArchitecture=MSIL">
193208
<SpecificVersion>False</SpecificVersion>
194209
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\umbraco.dll</HintPath>
210+
<Private>False</Private>
195211
</Reference>
196212
<Reference Include="Umbraco.Core, Version=1.0.5073.23294, Culture=neutral, processorArchitecture=MSIL">
197213
<SpecificVersion>False</SpecificVersion>
198214
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\Umbraco.Core.dll</HintPath>
215+
<Private>False</Private>
199216
</Reference>
200217
<Reference Include="umbraco.DataLayer, Version=1.0.5073.23295, Culture=neutral, processorArchitecture=MSIL">
201218
<SpecificVersion>False</SpecificVersion>
202219
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\umbraco.DataLayer.dll</HintPath>
220+
<Private>False</Private>
203221
</Reference>
204222
<Reference Include="umbraco.editorControls, Version=1.0.5073.23300, Culture=neutral, processorArchitecture=MSIL">
205223
<SpecificVersion>False</SpecificVersion>
206224
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\umbraco.editorControls.dll</HintPath>
225+
<Private>False</Private>
207226
</Reference>
208227
<Reference Include="umbraco.MacroEngines, Version=1.0.5073.23301, Culture=neutral, processorArchitecture=MSIL">
209228
<SpecificVersion>False</SpecificVersion>
210229
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\umbraco.MacroEngines.dll</HintPath>
230+
<Private>False</Private>
211231
</Reference>
212232
<Reference Include="umbraco.providers, Version=1.0.5073.23297, Culture=neutral, processorArchitecture=MSIL">
213233
<SpecificVersion>False</SpecificVersion>
214234
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\umbraco.providers.dll</HintPath>
235+
<Private>False</Private>
215236
</Reference>
216237
<Reference Include="Umbraco.Web.UI, Version=1.0.5073.23301, Culture=neutral, processorArchitecture=MSIL">
217238
<SpecificVersion>False</SpecificVersion>
218239
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\Umbraco.Web.UI.dll</HintPath>
240+
<Private>False</Private>
219241
</Reference>
220242
<Reference Include="umbraco.XmlSerializers, Version=1.0.5073.23298, Culture=neutral, processorArchitecture=MSIL">
221243
<SpecificVersion>False</SpecificVersion>
222244
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\umbraco.XmlSerializers.dll</HintPath>
245+
<Private>False</Private>
223246
</Reference>
224247
<Reference Include="UmbracoExamine, Version=0.6.0.23296, Culture=neutral, processorArchitecture=MSIL">
225248
<SpecificVersion>False</SpecificVersion>
226249
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\UmbracoExamine.dll</HintPath>
250+
<Private>False</Private>
227251
</Reference>
228252
<Reference Include="UrlRewritingNet.UrlRewriter, Version=2.0.60829.1, Culture=neutral, processorArchitecture=MSIL">
229253
<HintPath>..\packages\UmbracoCms.Core.7.0.0\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
254+
<Private>False</Private>
230255
</Reference>
231256
</ItemGroup>
232257
<ItemGroup>
@@ -235,6 +260,17 @@
235260
</ItemGroup>
236261
<ItemGroup>
237262
<None Include="packages.config" />
263+
<None Include="Umbraco.CodeGen.WaitForSixTwo.nuspec" />
264+
</ItemGroup>
265+
<ItemGroup>
266+
<ProjectReference Include="..\Umbraco.CodeGen.Integration\Umbraco.CodeGen.Integration.csproj">
267+
<Project>{25a9d2a6-65ff-470f-b284-2f85b08ee2b4}</Project>
268+
<Name>Umbraco.CodeGen.Integration</Name>
269+
</ProjectReference>
270+
<ProjectReference Include="..\Umbraco.CodeGen\Umbraco.CodeGen.csproj">
271+
<Project>{132e2fc4-b509-4204-9da2-d688bea75d4a}</Project>
272+
<Name>Umbraco.CodeGen</Name>
273+
</ProjectReference>
238274
</ItemGroup>
239275
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
240276
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />

‎Umbraco.CodeGen.WaitForSixTwo/Umbraco.CodeGen.WaitForSixTwo.nuspec‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0"?>
2+
<package >
3+
<metadata>
4+
<id>Umbraco.CodeGen.U7</id>
5+
<version>$version$</version>
6+
<title>Umbraco CodeGen for Umbraco 7</title>
7+
<authors>LEA</authors>
8+
<owners>MarkedsPartner AS</owners>
9+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
10+
<description>Temp package until all features are there.</description>
11+
<releaseNotes>Should work..</releaseNotes>
12+
<copyright>Copyright 2013 MarkedsPartner AS</copyright>
13+
<tags/>
14+
</metadata>
15+
</package>

‎Umbraco.CodeGen.WaitForSixTwo/packages.config‎

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AutoMapper" version="3.0.0" targetFramework="net45" />
4-
<package id="ClientDependency" version="1.7.0.4" targetFramework="net40" />
5-
<package id="ClientDependency-Mvc" version="1.7.0.4" targetFramework="net40" />
6-
<package id="HtmlAgilityPack" version="1.4.6" targetFramework="net40" requireReinstallation="True" />
7-
<package id="Lucene.Net" version="2.9.4.1" targetFramework="net40" />
8-
<package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net40" />
9-
<package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.1" targetFramework="net40" />
10-
<package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net40" />
11-
<package id="Microsoft.AspNet.WebApi" version="4.0.30506.0" targetFramework="net40" />
12-
<package id="Microsoft.AspNet.WebApi.Client" version="4.0.30506.0" targetFramework="net40" />
13-
<package id="Microsoft.AspNet.WebApi.Core" version="4.0.30506.0" targetFramework="net40" />
14-
<package id="Microsoft.AspNet.WebApi.WebHost" version="4.0.30506.0" targetFramework="net40" />
15-
<package id="Microsoft.AspNet.WebPages" version="2.0.30506.0" targetFramework="net40" />
16-
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net40" requireReinstallation="True" />
17-
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
18-
<package id="MiniProfiler" version="2.1.0" targetFramework="net40" />
19-
<package id="MySql.Data" version="6.6.5" targetFramework="net40" />
20-
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net40" />
21-
<package id="SharpZipLib" version="0.86.0" targetFramework="net40" />
22-
<package id="UmbracoCms.Core" version="7.0.0" targetFramework="net45" />
23-
<package id="xmlrpcnet" version="2.5.0" targetFramework="net40" />
3+
<package id="AutoMapper" version="3.0.0" targetFramework="net45" developmentDependency="true" />
4+
<package id="ClientDependency" version="1.7.0.4" targetFramework="net40" developmentDependency="true" />
5+
<package id="ClientDependency-Mvc" version="1.7.0.4" targetFramework="net40" developmentDependency="true" />
6+
<package id="HtmlAgilityPack" version="1.4.6" targetFramework="net40" requireReinstallation="True" developmentDependency="true" />
7+
<package id="Lucene.Net" version="2.9.4.1" targetFramework="net40" developmentDependency="true" />
8+
<package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net40" developmentDependency="true" />
9+
<package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.1" targetFramework="net40" developmentDependency="true" />
10+
<package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net40" developmentDependency="true" />
11+
<package id="Microsoft.AspNet.WebApi" version="4.0.30506.0" targetFramework="net40" developmentDependency="true" />
12+
<package id="Microsoft.AspNet.WebApi.Client" version="4.0.30506.0" targetFramework="net40" developmentDependency="true" />
13+
<package id="Microsoft.AspNet.WebApi.Core" version="4.0.30506.0" targetFramework="net40" developmentDependency="true" />
14+
<package id="Microsoft.AspNet.WebApi.WebHost" version="4.0.30506.0" targetFramework="net40" developmentDependency="true" />
15+
<package id="Microsoft.AspNet.WebPages" version="2.0.30506.0" targetFramework="net40" developmentDependency="true" />
16+
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net40" requireReinstallation="True" developmentDependency="true" />
17+
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" developmentDependency="true" />
18+
<package id="MiniProfiler" version="2.1.0" targetFramework="net40" developmentDependency="true" />
19+
<package id="MySql.Data" version="6.6.5" targetFramework="net40" developmentDependency="true" />
20+
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net40" developmentDependency="true" />
21+
<package id="SharpZipLib" version="0.86.0" targetFramework="net40" developmentDependency="true" />
22+
<package id="UmbracoCms.Core" version="7.0.0" targetFramework="net45" developmentDependency="true" />
23+
<package id="xmlrpcnet" version="2.5.0" targetFramework="net40" developmentDependency="true" />
24+
<package id="Mono.Cecil" version="0.9.5.4" targetFramework="net45" />
25+
<package id="ICSharpCode.NRefactory" version="5.3.0" targetFramework="net45" />
2426
</packages>

0 commit comments

Comments
 (0)