Skip to content

Commit 80bfc0b

Browse files
SphtKrSphtKr
committed
Merge pull request #53 from SphtKr/todomvc-build-errors
NuGet package version mismatches, EF was too high, Json.NET was too low....
2 parents 6042d0e + 8d4e094 commit 80bfc0b

File tree

11 files changed

+34
-28
lines changed

11 files changed

+34
-28
lines changed

‎JSONAPI.EntityFramework.Tests/App.Config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
4-
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
4+
55
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
6-
</configSections>
6+
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --></configSections>
77
<connectionStrings>
88
<add name="TestEntities" providerName="System.Data.SqlClient" connectionString="data source=(localdb)\v11.0;initial catalog=JSONAPITestEntities;integrated security=True;multipleactiveresultsets=True;App=EntityFramework" />
99
</connectionStrings>

‎JSONAPI.EntityFramework.Tests/JSONAPI.EntityFramework.Tests.csproj‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,11 @@
4040
<ItemGroup>
4141
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
4242
<SpecificVersion>False</SpecificVersion>
43-
<HintPath>..\packages\EntityFramework.6.1.1\lib\net45\EntityFramework.dll</HintPath>
43+
<HintPath>..\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.dll</HintPath>
4444
</Reference>
45-
<Reference Include="EntityFramework.SqlServer">
46-
<HintPath>..\packages\EntityFramework.6.1.1\lib\net45\EntityFramework.SqlServer.dll</HintPath>
45+
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
46+
<SpecificVersion>False</SpecificVersion>
47+
<HintPath>..\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.SqlServer.dll</HintPath>
4748
</Reference>
4849
<Reference Include="FluentAssertions, Version=3.2.2.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
4950
<SpecificVersion>False</SpecificVersion>
@@ -54,13 +55,13 @@
5455
<HintPath>..\packages\FluentAssertions.3.2.2\lib\net45\FluentAssertions.Core.dll</HintPath>
5556
</Reference>
5657
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
57-
<Reference Include="Moq, Version=4.2.1409.1722, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
58+
<Reference Include="Moq, Version=4.2.1502.911, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
5859
<SpecificVersion>False</SpecificVersion>
59-
<HintPath>..\packages\Moq.4.2.1409.1722\lib\net40\Moq.dll</HintPath>
60+
<HintPath>..\packages\Moq.4.2.1502.0911\lib\net40\Moq.dll</HintPath>
6061
</Reference>
6162
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
6263
<SpecificVersion>False</SpecificVersion>
63-
<HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
64+
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
6465
</Reference>
6566
<Reference Include="System" />
6667
<Reference Include="System.ComponentModel.DataAnnotations" />
@@ -101,7 +102,9 @@
101102
<Compile Include="Properties\AssemblyInfo.cs" />
102103
</ItemGroup>
103104
<ItemGroup>
104-
<None Include="App.Config" />
105+
<None Include="App.Config">
106+
<SubType>Designer</SubType>
107+
</None>
105108
<EmbeddedResource Include="Data\Comment.json">
106109
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
107110
</EmbeddedResource>

‎JSONAPI.EntityFramework.Tests/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="EntityFramework" version="6.1.1" targetFramework="net45" />
3+
<package id="EntityFramework" version="6.1.2" targetFramework="net45" />
44
<package id="FluentAssertions" version="3.2.2" targetFramework="net45" />
55
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.2" targetFramework="net45" />
66
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.2" targetFramework="net45" />
7-
<package id="Moq" version="4.2.1409.1722" targetFramework="net45" />
8-
<package id="Newtonsoft.Json" version="6.0.6" targetFramework="net45" />
7+
<package id="Moq" version="4.2.1502.0911" targetFramework="net45" />
8+
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
99
</packages>

‎JSONAPI.EntityFramework/JSONAPI.EntityFramework.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@
4040
<ItemGroup>
4141
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
4242
<SpecificVersion>False</SpecificVersion>
43-
<HintPath>..\packages\EntityFramework.6.1.1\lib\net45\EntityFramework.dll</HintPath>
43+
<HintPath>..\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.dll</HintPath>
4444
</Reference>
4545
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
4646
<SpecificVersion>False</SpecificVersion>
47-
<HintPath>..\packages\EntityFramework.6.1.1\lib\net45\EntityFramework.SqlServer.dll</HintPath>
47+
<HintPath>..\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.SqlServer.dll</HintPath>
4848
</Reference>
4949
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
5050
<SpecificVersion>False</SpecificVersion>
51-
<HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
51+
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
5252
</Reference>
5353
<Reference Include="System" />
5454
<Reference Include="System.ComponentModel.DataAnnotations" />

‎JSONAPI.EntityFramework/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="EntityFramework" version="6.1.1" targetFramework="net45" />
3+
<package id="EntityFramework" version="6.1.2" targetFramework="net45" />
44
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.2" targetFramework="net45" />
55
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.2" targetFramework="net45" />
6-
<package id="Newtonsoft.Json" version="6.0.6" targetFramework="net45" />
6+
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
77
</packages>

‎JSONAPI.Tests/JSONAPI.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
4848
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
4949
<SpecificVersion>False</SpecificVersion>
50-
<HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
50+
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
5151
</Reference>
5252
<Reference Include="System" />
5353
<Reference Include="System.Core">

‎JSONAPI.Tests/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.2" targetFramework="net45" />
55
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.2" targetFramework="net45" />
66
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.2" targetFramework="net45" />
7-
<package id="Newtonsoft.Json" version="6.0.6" targetFramework="net45" />
7+
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
88
</packages>

‎JSONAPI.TodoMVC.API/JSONAPI.TodoMVC.API.csproj‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,13 @@
4040
<WarningLevel>4</WarningLevel>
4141
</PropertyGroup>
4242
<ItemGroup>
43-
<Reference Include="EntityFramework">
44-
<HintPath>..\..\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.dll</HintPath>
43+
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
44+
<SpecificVersion>False</SpecificVersion>
45+
<HintPath>..\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.dll</HintPath>
4546
</Reference>
46-
<Reference Include="EntityFramework.SqlServer">
47-
<HintPath>..\..\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.SqlServer.dll</HintPath>
47+
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
48+
<SpecificVersion>False</SpecificVersion>
49+
<HintPath>..\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.SqlServer.dll</HintPath>
4850
</Reference>
4951
<Reference Include="Microsoft.CSharp" />
5052
<Reference Include="Microsoft.Owin">
@@ -55,7 +57,7 @@
5557
</Reference>
5658
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
5759
<SpecificVersion>False</SpecificVersion>
58-
<HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
60+
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
5961
</Reference>
6062
<Reference Include="Owin">
6163
<HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>

‎JSONAPI.TodoMVC.API/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
<package id="Microsoft.AspNet.WebApi.Owin" version="5.2.2" targetFramework="net45" />
77
<package id="Microsoft.Owin" version="3.0.0" targetFramework="net45" />
88
<package id="Microsoft.Owin.Host.SystemWeb" version="3.0.0" targetFramework="net45" />
9-
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
9+
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
1010
<package id="Owin" version="1.0" targetFramework="net45" />
1111
</packages>

‎JSONAPI/JSONAPI.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,9 @@
3838
<DocumentationFile>bin\Release\JSONAPI.XML</DocumentationFile>
3939
</PropertyGroup>
4040
<ItemGroup>
41-
<Reference Include="Newtonsoft.Json">
42-
<HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
41+
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
42+
<SpecificVersion>False</SpecificVersion>
43+
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
4344
</Reference>
4445
<Reference Include="System" />
4546
<Reference Include="System.ComponentModel.DataAnnotations" />

0 commit comments

Comments
 (0)