Merge ModelsBuilder in, NuGet dies on circ dependencies now

This commit is contained in:
Stephan
2018-05-21 10:05:52 +02:00
parent 21dbd1e402
commit 373fad6efe
56 changed files with 5671 additions and 1 deletions

View File

@@ -109,7 +109,6 @@
<PackageReference Include="MySql.Data" Version="6.10.7" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Umbraco.SqlServerCE" Version="4.0.0.1" />
<PackageReference Include="Umbraco.ModelsBuilder" Version="8.0.0-alpha.18" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj">
@@ -120,6 +119,10 @@
<Name>Umbraco.Examine</Name>
<Project>{07FBC26B-2927-4A22-8D96-D644C667FECC}</Project>
</ProjectReference>
<ProjectReference Include="..\Umbraco.ModelsBuilder\Umbraco.ModelsBuilder.csproj">
<Project>{7020a059-c0d1-43a0-8efd-23591a0c9af6}</Project>
<Name>Umbraco.ModelsBuilder</Name>
</ProjectReference>
<ProjectReference Include="..\Umbraco.Web\Umbraco.Web.csproj">
<Project>{651e1350-91b6-44b7-bd60-7207006d7003}</Project>
<Name>Umbraco.Web</Name>