Skip to content

Commit a17317a

Browse files
nul800sebastiaannul800sebastiaan
authored
Merge pull request #162 from zpqrtbnk/temp-u4-10822
Temp u4 10822
2 parents 8f3dec1 + faf37bd commit a17317a

File tree

16 files changed

+437
-373
lines changed

16 files changed

+437
-373
lines changed

‎NuGet.Config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
<packageSources>
44
<add key="nuget.org" value="https://www.nuget.org/api/v2/" />
55
<add key="umbracocore" value="http://www.myget.org/f/umbracocore/" />
6+
<add key="umbraconightly" value="https://www.myget.org/F/umbraconightly/api/v3/index.json" />
67
</packageSources>
78
</configuration>

‎SolutionInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
// Also need to
2929

3030
// Assembly
31-
[assembly: AssemblyVersion("3.0.8.100")]
32-
[assembly: AssemblyFileVersion("3.0.8.100")]
31+
[assembly: AssemblyVersion("3.0.9.0")]
32+
[assembly: AssemblyFileVersion("3.0.9.0")]
3333

3434
// NuGet Package
3535
// Note: could not release "1.8.0" because it was depending on pre-release NuGet packages
3636
// for Roslyn, so had to release 1.8.0-final... starting with 2.1.3 Roslyn has a released
3737
// 1.0 version, so now we can release "2.1.3" without the "-final" extension.
38-
[assembly: AssemblyInformationalVersion("3.0.8.100")]
38+
[assembly: AssemblyInformationalVersion("3.0.9.0")]
3939
// Do not remove this line.

‎Umbraco.ModelsBuilder.Api/Umbraco.ModelsBuilder.Api.csproj

Lines changed: 75 additions & 95 deletions
Large diffs are not rendered by default.

‎Umbraco.ModelsBuilder.Api/app.config

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<system.data>
4-
<DbProviderFactories>
5-
<remove invariant="MySql.Data.MySqlClient" />
6-
<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.8.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
7-
</DbProviderFactories>
8-
</system.data>
3+
94
<runtime>
105
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
116
<dependentAssembly>
@@ -18,24 +13,41 @@
1813
</dependentAssembly>
1914
<dependentAssembly>
2015
<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
21-
<bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
16+
<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
2217
</dependentAssembly>
2318
<dependentAssembly>
2419
<assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
25-
<bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
20+
<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
2621
</dependentAssembly>
2722
<dependentAssembly>
2823
<assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
29-
<bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
24+
<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
3025
</dependentAssembly>
3126
<dependentAssembly>
3227
<assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
33-
<bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
28+
<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
3429
</dependentAssembly>
3530
<dependentAssembly>
3631
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
3732
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
3833
</dependentAssembly>
34+
<dependentAssembly>
35+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
36+
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
37+
</dependentAssembly>
38+
<dependentAssembly>
39+
<assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
40+
<bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0" />
41+
</dependentAssembly>
42+
<dependentAssembly>
43+
<assemblyIdentity name="MySql.Data" publicKeyToken="c5687fc88969c44d" culture="neutral" />
44+
<bindingRedirect oldVersion="0.0.0.0-6.9.10.0" newVersion="6.9.10.0" />
45+
</dependentAssembly>
3946
</assemblyBinding>
4047
</runtime>
41-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup></configuration>
48+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup><system.data>
49+
<DbProviderFactories>
50+
<remove invariant="MySql.Data.MySqlClient" />
51+
<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.10.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
52+
</DbProviderFactories>
53+
</system.data></configuration>

‎Umbraco.ModelsBuilder.Api/packages.config

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,44 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AutoMapper" version="3.0.0" targetFramework="net452" />
4-
<package id="ClientDependency" version="1.8.4" targetFramework="net452" />
3+
<package id="AutoMapper" version="3.3.1" targetFramework="net45" />
4+
<package id="ClientDependency" version="1.9.6" targetFramework="net45" />
55
<package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net452" />
6-
<package id="Examine" version="0.1.68.0" targetFramework="net452" />
7-
<package id="HtmlAgilityPack" version="1.4.9" targetFramework="net452" />
8-
<package id="ImageProcessor" version="2.3.3.0" targetFramework="net45" />
9-
<package id="ImageProcessor.Web" version="4.5.3.0" targetFramework="net45" />
6+
<package id="Examine" version="0.1.89" targetFramework="net45" />
7+
<package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net45" />
8+
<package id="ImageProcessor" version="2.5.6" targetFramework="net45" />
9+
<package id="ImageProcessor.Web" version="4.8.7" targetFramework="net45" />
10+
<package id="log4net" version="2.0.8" targetFramework="net45" />
11+
<package id="Log4Net.Async" version="2.0.4" targetFramework="net45" />
1012
<package id="Lucene.Net" version="2.9.4.1" targetFramework="net452" />
11-
<package id="Markdown" version="1.14.4" targetFramework="net45" />
13+
<package id="Markdown" version="1.14.7" targetFramework="net45" />
1214
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net452" />
1315
<package id="Microsoft.AspNet.Identity.Owin" version="2.2.1" targetFramework="net452" />
1416
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net452" />
1517
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net452" />
18+
<package id="Microsoft.AspNet.SignalR.Core" version="2.2.1" targetFramework="net45" />
1619
<package id="Microsoft.AspNet.WebApi" version="5.2.3" targetFramework="net452" />
1720
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net452" />
1821
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net452" />
1922
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.3" targetFramework="net452" />
2023
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net452" />
2124
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
2225
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net45" />
26+
<package id="Microsoft.IO.RecyclableMemoryStream" version="1.2.2" targetFramework="net45" />
2327
<package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net452" />
24-
<package id="Microsoft.Owin" version="3.0.1" targetFramework="net452" />
25-
<package id="Microsoft.Owin.Host.SystemWeb" version="3.0.1" targetFramework="net452" />
26-
<package id="Microsoft.Owin.Security" version="3.0.1" targetFramework="net452" />
27-
<package id="Microsoft.Owin.Security.Cookies" version="3.0.1" targetFramework="net452" />
28-
<package id="Microsoft.Owin.Security.OAuth" version="3.0.1" targetFramework="net452" />
28+
<package id="Microsoft.Owin" version="3.1.0" targetFramework="net45" />
29+
<package id="Microsoft.Owin.Host.SystemWeb" version="3.1.0" targetFramework="net45" />
30+
<package id="Microsoft.Owin.Security" version="3.1.0" targetFramework="net45" />
31+
<package id="Microsoft.Owin.Security.Cookies" version="3.1.0" targetFramework="net45" />
32+
<package id="Microsoft.Owin.Security.OAuth" version="3.1.0" targetFramework="net45" />
2933
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net452" />
3034
<package id="MiniProfiler" version="2.1.0" targetFramework="net452" />
31-
<package id="MySql.Data" version="6.9.8" targetFramework="net452" />
32-
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net452" />
35+
<package id="MySql.Data" version="6.9.10" targetFramework="net45" />
36+
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
3337
<package id="Owin" version="1.0" targetFramework="net452" />
3438
<package id="semver" version="1.1.2" targetFramework="net45" />
3539
<package id="SharpZipLib" version="0.86.0" targetFramework="net452" />
36-
<package id="UmbracoCms.Core" version="7.4.3" targetFramework="net45" />
40+
<package id="System.Threading.Tasks.Dataflow" version="4.7.0" targetFramework="net45" />
41+
<package id="UmbracoCms.Core" version="7.8.0-beta010" targetFramework="net45" />
3742
<package id="UrlRewritingNet" version="2.0.7" targetFramework="net452" />
3843
<package id="xmlrpcnet" version="2.5.0" targetFramework="net452" />
3944
</packages>

‎Umbraco.ModelsBuilder.Console/App.config

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
88
<dependentAssembly>
99
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
10-
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
10+
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
1111
</dependentAssembly>
1212
<dependentAssembly>
1313
<assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
@@ -39,19 +39,27 @@
3939
</dependentAssembly>
4040
<dependentAssembly>
4141
<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
42-
<bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
42+
<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
4343
</dependentAssembly>
4444
<dependentAssembly>
4545
<assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
46-
<bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
46+
<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
4747
</dependentAssembly>
4848
<dependentAssembly>
4949
<assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
50-
<bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
50+
<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
5151
</dependentAssembly>
5252
<dependentAssembly>
5353
<assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
54-
<bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
54+
<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
55+
</dependentAssembly>
56+
<dependentAssembly>
57+
<assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
58+
<bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0" />
59+
</dependentAssembly>
60+
<dependentAssembly>
61+
<assemblyIdentity name="MySql.Data" publicKeyToken="c5687fc88969c44d" culture="neutral" />
62+
<bindingRedirect oldVersion="0.0.0.0-6.9.10.0" newVersion="6.9.10.0" />
5563
</dependentAssembly>
5664
</assemblyBinding>
5765
</runtime>

‎Umbraco.ModelsBuilder.CustomTool/app.config

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</dependentAssembly>
4141
<dependentAssembly>
4242
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
43-
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
43+
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
4444
</dependentAssembly>
4545
<dependentAssembly>
4646
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -68,19 +68,27 @@
6868
</dependentAssembly>
6969
<dependentAssembly>
7070
<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
71-
<bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
71+
<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
7272
</dependentAssembly>
7373
<dependentAssembly>
7474
<assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
75-
<bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
75+
<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
7676
</dependentAssembly>
7777
<dependentAssembly>
7878
<assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
79-
<bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
79+
<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
8080
</dependentAssembly>
8181
<dependentAssembly>
8282
<assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
83-
<bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
83+
<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
84+
</dependentAssembly>
85+
<dependentAssembly>
86+
<assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
87+
<bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0" />
88+
</dependentAssembly>
89+
<dependentAssembly>
90+
<assemblyIdentity name="MySql.Data" publicKeyToken="c5687fc88969c44d" culture="neutral" />
91+
<bindingRedirect oldVersion="0.0.0.0-6.9.10.0" newVersion="6.9.10.0" />
8492
</dependentAssembly>
8593
</assemblyBinding>
8694
</runtime>

‎Umbraco.ModelsBuilder.CustomTool/source.extension.vsixmanifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
33
<Metadata>
4-
<Identity Id="F5C32FC3-6672-4665-803D-6C5D2CAC556A" Version="3.0.8.100" Language="en-US" Publisher="Umbraco HQ" />
4+
<Identity Id="F5C32FC3-6672-4665-803D-6C5D2CAC556A" Version="3.0.9.0" Language="en-US" Publisher="Umbraco HQ" />
55
<DisplayName>Umbraco ModelsBuilder Custom Tool</DisplayName>
66
<Description xml:space="preserve">Umbraco Visual Studio Custom Tool for generating strongly typed IPublishedContent models.</Description>
77
<MoreInfo>https://github.com/zpqrtbnk/Zbu.ModelsBuilder</MoreInfo>

‎Umbraco.ModelsBuilder.Tests/App.config

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</dependentAssembly>
2020
<dependentAssembly>
2121
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
22-
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
22+
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
2323
</dependentAssembly>
2424
<dependentAssembly>
2525
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -51,25 +51,33 @@
5151
</dependentAssembly>
5252
<dependentAssembly>
5353
<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
54-
<bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
54+
<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
5555
</dependentAssembly>
5656
<dependentAssembly>
5757
<assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
58-
<bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
58+
<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
5959
</dependentAssembly>
6060
<dependentAssembly>
6161
<assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
62-
<bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
62+
<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
6363
</dependentAssembly>
6464
<dependentAssembly>
6565
<assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
66-
<bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
66+
<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
67+
</dependentAssembly>
68+
<dependentAssembly>
69+
<assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
70+
<bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0" />
71+
</dependentAssembly>
72+
<dependentAssembly>
73+
<assemblyIdentity name="MySql.Data" publicKeyToken="c5687fc88969c44d" culture="neutral" />
74+
<bindingRedirect oldVersion="0.0.0.0-6.9.10.0" newVersion="6.9.10.0" />
6775
</dependentAssembly>
6876
</assemblyBinding>
6977
</runtime>
7078
<system.data>
7179
<DbProviderFactories>
7280
<remove invariant="MySql.Data.MySqlClient" />
73-
<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.8.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
81+
<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.10.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
7482
</DbProviderFactories>
7583
</system.data></configuration>

0 commit comments

Comments
 (0)