Skip to content

Commit df6a95b

Browse files
rojiroji
committed
[EF7] Correct dependency issues
1 parent 97e286b commit df6a95b

File tree

7 files changed

+32
-39
lines changed

7 files changed

+32
-39
lines changed

‎NuGet.Config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
<add key="automatic" value="False" />
55
</packageRestore>
66
<packageSources>
7-
<add key="AspNetVNext" value="https://www.myget.org/F/aspnetcidev/api/v3/index.json" />
7+
<add key="AspNetCIDev" value="https://www.myget.org/F/aspnetcidev/api/v3/index.json" />
8+
<add key="AspNetVNext" value="https://www.myget.org/F/aspnetvnext/api/v3/index.json" />
89
<add key="AspNetRelease" value="https://www.myget.org/F/aspnetrelease/api/v3/index.json" />
910
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
1011
</packageSources>

‎src/EntityFramework7.Npgsql/EntityFramework7.Npgsql.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@
6363
<Private>True</Private>
6464
</Reference>
6565
<Reference Include="Microsoft.Extensions.DependencyInjection, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
66-
<HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.1.0.0-rc1-15736\lib\net45\Microsoft.Extensions.DependencyInjection.dll</HintPath>
66+
<HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.1.0.0-rc1-15672\lib\net45\Microsoft.Extensions.DependencyInjection.dll</HintPath>
6767
<Private>True</Private>
6868
</Reference>
6969
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
70-
<HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0-rc1-15736\lib\net45\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
70+
<HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0-rc1-15672\lib\net45\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
7171
<Private>True</Private>
7272
</Reference>
7373
<Reference Include="Microsoft.Extensions.Logging, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -229,4 +229,4 @@
229229
<Target Name="AfterBuild">
230230
</Target>
231231
-->
232-
</Project>
232+
</Project>

‎src/EntityFramework7.Npgsql/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<package id="Microsoft.Extensions.Configuration" version="1.0.0-rc1-15730" targetFramework="net45" />
99
<package id="Microsoft.Extensions.Configuration.Abstractions" version="1.0.0-rc1-15730" targetFramework="net45" />
1010
<package id="Microsoft.Extensions.Configuration.Binder" version="1.0.0-rc1-15730" targetFramework="net45" />
11-
<package id="Microsoft.Extensions.DependencyInjection" version="1.0.0-rc1-15736" targetFramework="net45" />
12-
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.0.0-rc1-15736" targetFramework="net45" />
11+
<package id="Microsoft.Extensions.DependencyInjection" version="1.0.0-rc1-15672" targetFramework="net45" />
12+
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.0.0-rc1-15672" targetFramework="net45" />
1313
<package id="Microsoft.Extensions.Logging" version="1.0.0-rc1-15741" targetFramework="net45" />
1414
<package id="Microsoft.Extensions.Logging.Abstractions" version="1.0.0-rc1-15741" targetFramework="net45" />
1515
<package id="Microsoft.Extensions.OptionsModel" version="1.0.0-rc1-15701" targetFramework="net45" />

‎test/EntityFramework7.Npgsql.FunctionalTests/EntityFramework7.Npgsql.FunctionalTests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@
7272
<Private>True</Private>
7373
</Reference>
7474
<Reference Include="Microsoft.Extensions.DependencyInjection, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
75-
<HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.1.0.0-rc1-15736\lib\net451\Microsoft.Extensions.DependencyInjection.dll</HintPath>
75+
<HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.1.0.0-rc1-15672\lib\net45\Microsoft.Extensions.DependencyInjection.dll</HintPath>
7676
<Private>True</Private>
7777
</Reference>
7878
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
79-
<HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0-rc1-15736\lib\net451\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
79+
<HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0-rc1-15672\lib\net45\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
8080
<Private>True</Private>
8181
</Reference>
8282
<Reference Include="Microsoft.Extensions.Logging, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -257,4 +257,4 @@
257257
<Target Name="AfterBuild">
258258
</Target>
259259
-->
260-
</Project>
260+
</Project>

‎test/EntityFramework7.Npgsql.FunctionalTests/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<package id="Microsoft.Extensions.Configuration" version="1.0.0-rc1-15730" targetFramework="net46" />
1212
<package id="Microsoft.Extensions.Configuration.Abstractions" version="1.0.0-rc1-15730" targetFramework="net46" />
1313
<package id="Microsoft.Extensions.Configuration.Binder" version="1.0.0-rc1-15730" targetFramework="net46" />
14-
<package id="Microsoft.Extensions.DependencyInjection" version="1.0.0-rc1-15736" targetFramework="net46" />
15-
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.0.0-rc1-15736" targetFramework="net46" />
14+
<package id="Microsoft.Extensions.DependencyInjection" version="1.0.0-rc1-15672" targetFramework="net46" />
15+
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.0.0-rc1-15672" targetFramework="net46" />
1616
<package id="Microsoft.Extensions.Logging" version="1.0.0-rc1-15741" targetFramework="net46" />
1717
<package id="Microsoft.Extensions.Logging.Abstractions" version="1.0.0-rc1-15741" targetFramework="net46" />
1818
<package id="Microsoft.Extensions.OptionsModel" version="1.0.0-rc1-15701" targetFramework="net46" />

‎test/EntityFramework7.Npgsql.Tests/EntityFramework7.Npgsql.Tests.csproj‎

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -58,6 +58,14 @@
5858
<HintPath>..\..\packages\Microsoft.Extensions.Configuration.Binder.1.0.0-rc1-15730\lib\net45\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
5959
<Private>True</Private>
6060
</Reference>
61+
<Reference Include="Microsoft.Extensions.DependencyInjection, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
62+
<HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.1.0.0-rc1-15672\lib\net45\Microsoft.Extensions.DependencyInjection.dll</HintPath>
63+
<Private>True</Private>
64+
</Reference>
65+
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
66+
<HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0-rc1-15672\lib\net45\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
67+
<Private>True</Private>
68+
</Reference>
6169
<Reference Include="Microsoft.Extensions.Logging, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
6270
<HintPath>..\..\packages\Microsoft.Extensions.Logging.1.0.0-rc1-15741\lib\net451\Microsoft.Extensions.Logging.dll</HintPath>
6371
<Private>True</Private>
@@ -94,22 +102,6 @@
94102
<HintPath>..\..\packages\Microsoft.Framework.Configuration.Binder.1.0.0-beta8-15706\lib\net45\Microsoft.Framework.Configuration.Binder.dll</HintPath>
95103
<Private>True</Private>
96104
</Reference>
97-
<Reference Include="Microsoft.Framework.DependencyInjection, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
98-
<HintPath>..\..\packages\Microsoft.Framework.DependencyInjection.1.0.0-beta8-15681\lib\net451\Microsoft.Framework.DependencyInjection.dll</HintPath>
99-
<Private>True</Private>
100-
</Reference>
101-
<Reference Include="Microsoft.Framework.DependencyInjection.Abstractions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
102-
<HintPath>..\..\packages\Microsoft.Framework.DependencyInjection.Abstractions.1.0.0-beta8-15681\lib\net451\Microsoft.Framework.DependencyInjection.Abstractions.dll</HintPath>
103-
<Private>True</Private>
104-
</Reference>
105-
<Reference Include="Microsoft.Framework.Logging, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
106-
<HintPath>..\..\packages\Microsoft.Framework.Logging.1.0.0-beta8-15682\lib\net45\Microsoft.Framework.Logging.dll</HintPath>
107-
<Private>True</Private>
108-
</Reference>
109-
<Reference Include="Microsoft.Framework.Logging.Abstractions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
110-
<HintPath>..\..\packages\Microsoft.Framework.Logging.Abstractions.1.0.0-beta8-15682\lib\net45\Microsoft.Framework.Logging.Abstractions.dll</HintPath>
111-
<Private>True</Private>
112-
</Reference>
113105
<Reference Include="Microsoft.Framework.OptionsModel, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
114106
<HintPath>..\..\packages\Microsoft.Framework.OptionsModel.1.0.0-beta8-15680\lib\net45\Microsoft.Framework.OptionsModel.dll</HintPath>
115107
<Private>True</Private>
@@ -152,16 +144,16 @@
152144
<HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
153145
<Private>True</Private>
154146
</Reference>
155-
<Reference Include="xunit.assert, Version=2.1.0.3110, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
156-
<HintPath>..\..\packages\xunit.assert.2.1.0-rc1-build3110\lib\dotnet\xunit.assert.dll</HintPath>
147+
<Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
148+
<HintPath>..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
157149
<Private>True</Private>
158150
</Reference>
159-
<Reference Include="xunit.core, Version=2.1.0.3110, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
160-
<HintPath>..\..\packages\xunit.extensibility.core.2.1.0-rc1-build3110\lib\dotnet\xunit.core.dll</HintPath>
151+
<Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
152+
<HintPath>..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
161153
<Private>True</Private>
162154
</Reference>
163-
<Reference Include="xunit.execution.desktop, Version=2.1.0.3110, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
164-
<HintPath>..\..\packages\xunit.extensibility.execution.2.1.0-rc1-build3110\lib\net45\xunit.execution.desktop.dll</HintPath>
155+
<Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
156+
<HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
165157
<Private>True</Private>
166158
</Reference>
167159
</ItemGroup>

‎test/EntityFramework7.Npgsql.Tests/packages.config‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<package id="Microsoft.Extensions.Configuration" version="1.0.0-rc1-15730" targetFramework="net46" />
99
<package id="Microsoft.Extensions.Configuration.Abstractions" version="1.0.0-rc1-15730" targetFramework="net46" />
1010
<package id="Microsoft.Extensions.Configuration.Binder" version="1.0.0-rc1-15730" targetFramework="net46" />
11-
<package id="Microsoft.Extensions.DependencyInjection" version="1.0.0-rc1-15704" targetFramework="net46" />
12-
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.0.0-rc1-15704" targetFramework="net46" />
11+
<package id="Microsoft.Extensions.DependencyInjection" version="1.0.0-rc1-15672" targetFramework="net46" />
12+
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.0.0-rc1-15672" targetFramework="net46" />
1313
<package id="Microsoft.Extensions.Logging" version="1.0.0-rc1-15741" targetFramework="net46" />
1414
<package id="Microsoft.Extensions.Logging.Abstractions" version="1.0.0-rc1-15741" targetFramework="net46" />
1515
<package id="Microsoft.Extensions.OptionsModel" version="1.0.0-rc1-15701" targetFramework="net46" />
@@ -28,7 +28,7 @@
2828
<package id="System.Runtime" version="4.0.0" targetFramework="net46" />
2929
<package id="System.Threading" version="4.0.0" targetFramework="net46" />
3030
<package id="xunit.abstractions" version="2.0.0" targetFramework="net46" />
31-
<package id="xunit.assert" version="2.1.0-rc1-build3110" targetFramework="net46" />
32-
<package id="xunit.extensibility.core" version="2.1.0-rc1-build3110" targetFramework="net46" />
33-
<package id="xunit.extensibility.execution" version="2.1.0-rc1-build3110" targetFramework="net46" />
31+
<package id="xunit.assert" version="2.1.0" targetFramework="net46" />
32+
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net46" />
33+
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net46" />
3434
</packages>

0 commit comments

Comments
 (0)