Skip to content

Commit bd462e3

Browse files
jaredcnancejaredcnance
committed
fix build issues and consolidate props definitions
1 parent 72388aa commit bd462e3

File tree

14 files changed

+54
-70
lines changed

14 files changed

+54
-70
lines changed

‎Directory.Build.props‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,32 @@
11
<Project>
22

33
<PropertyGroup>
4+
<NetCoreAppVersion>netcoreapp2.0</NetCoreAppVersion>
45
<NetStandardVersion>netstandard2.0</NetStandardVersion>
6+
57
<AspNetCoreVersion>2.0.1</AspNetCoreVersion>
6-
<EFCoreVersion>2.0.1</EFCoreVersion>
8+
79
<MicrosoftLoggingVersion>2.0.0</MicrosoftLoggingVersion>
810
<MicrosoftConfigurationVersion>2.0.0</MicrosoftConfigurationVersion>
11+
<MicrosoftOptionsVersion>2.0.0</MicrosoftOptionsVersion>
12+
13+
14+
<EFCoreVersion>2.0.1</EFCoreVersion>
15+
<EFCoreToolsVersion>2.0.1</EFCoreToolsVersion>
16+
17+
<NpgsqlVersion>3.2.6</NpgsqlVersion>
18+
<NpgsqlPostgreSQLVersion>2.0.0</NpgsqlPostgreSQLVersion>
19+
920
<TuplesVersion>4.4.0</TuplesVersion>
1021
</PropertyGroup>
1122

1223
<!-- Test Project Dependencies -->
1324
<PropertyGroup>
14-
<NetCoreAppVersion>netcoreapp2.0</NetCoreAppVersion>
15-
<MicrosoftOptionsVersion>2.0.0</MicrosoftOptionsVersion>
16-
<NpgsqlPostgreSQLVersion>2.0.0</NpgsqlPostgreSQLVersion>
17-
<NpgsqlVersion>3.2.6</NpgsqlVersion>
18-
<EFCoreToolsVersion>2.0.1</EFCoreToolsVersion>
1925
<TestSdkVersion>15.3.0-preview-20170427-09</TestSdkVersion>
2026
<TestHostVersion>1.1.2</TestHostVersion>
2127
<XUnitVersion>2.3.0-beta3-build3705</XUnitVersion>
2228
<BogusVersion>15.0.3</BogusVersion>
2329
<MoqVersion>4.7.99</MoqVersion>
2430
</PropertyGroup>
2531

26-
</Project>
32+
</Project>

‎benchmarks/Benchmarks.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<Import Project="..\build\dependencies.props" />
32
<PropertyGroup>
43
<OutputType>Exe</OutputType>
54
<TargetFramework>$(NetCoreAppVersion)</TargetFramework>

‎build/dependencies.props‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
2-
<Import Project="..\..\..\build\dependencies.props" />
32
<PropertyGroup>
43
<TargetFramework>$(NetCoreAppVersion)</TargetFramework>
54
<PreserveCompilationContext>true</PreserveCompilationContext>

‎src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
2-
<Import Project="..\..\..\build\dependencies.props" />
32
<PropertyGroup>
43
<TargetFramework>$(NetCoreAppVersion)</TargetFramework>
54
</PropertyGroup>

‎src/Examples/OperationsExample/OperationsExample.csproj‎

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,32 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
2-
3-
<PropertyGroup>
4-
<TargetFramework>netcoreapp1.0</TargetFramework>
5-
<PreserveCompilationContext>true</PreserveCompilationContext>
6-
<AssemblyName>OperationsExample</AssemblyName>
7-
<OutputType>Exe</OutputType>
8-
</PropertyGroup>
9-
10-
<ItemGroup>
11-
<ProjectReference Include="../../JsonApiDotNetCore/JsonApiDotNetCore.csproj" />
12-
</ItemGroup>
13-
14-
<ItemGroup>
15-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.2" />
16-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.2" />
17-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="1.1.2" />
18-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.2" />
19-
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="1.1.2" />
20-
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
21-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.2" />
22-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.2" />
23-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.2" />
24-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="1.1.1" />
25-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="1.1.2" />
26-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="1.1.0" />
27-
</ItemGroup>
28-
29-
<ItemGroup>
30-
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="1.0.0" />
31-
</ItemGroup>
32-
33-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
2+
<PropertyGroup>
3+
<TargetFramework>$(NetCoreAppVersion)</TargetFramework>
4+
<PreserveCompilationContext>true</PreserveCompilationContext>
5+
<AssemblyName>OperationsExample</AssemblyName>
6+
<OutputType>Exe</OutputType>
7+
</PropertyGroup>
8+
9+
<ItemGroup>
10+
<ProjectReference Include="../../JsonApiDotNetCore/JsonApiDotNetCore.csproj" />
11+
</ItemGroup>
12+
13+
<ItemGroup>
14+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(AspNetCoreVersion)" />
15+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftConfigurationVersion)" />
16+
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="$(MicrosoftConfigurationVersion)" />
17+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftConfigurationVersion)" />
18+
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftConfigurationVersion)" />
19+
<PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftLoggingVersion)" />
20+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftLoggingVersion)" />
21+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftLoggingVersion)" />
22+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftOptionsVersion)" />
23+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="$(EFCoreToolsVersion)" />
24+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="$(EFCoreToolsVersion)" />
25+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlPostgreSQLVersion)" />
26+
</ItemGroup>
27+
28+
<ItemGroup>
29+
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="$(EFCoreToolsVersion)" />
30+
</ItemGroup>
31+
32+
</Project>

‎src/Examples/ReportsExample/ReportsExample.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
2-
<Import Project="..\..\..\build\dependencies.props" />
32
<PropertyGroup>
43
<TargetFramework>$(NetCoreAppVersion)</TargetFramework>
54
</PropertyGroup>

‎src/JsonApiDotNetCore/Extensions/IServiceCollectionExtensions.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,6 @@ public static void AddJsonApiInternals(
9898
if (jsonApiOptions.EnabledExtensions.Contains(JsonApiExtension.Operations))
9999
AddOperationServices(services);
100100

101-
services.AddScoped<IDbContextResolver, DbContextResolver>();
102-
103101
services.AddScoped(typeof(IEntityRepository<>), typeof(DefaultEntityRepository<>));
104102
services.AddScoped(typeof(IEntityRepository<,>), typeof(DefaultEntityRepository<,>));
105103

‎src/JsonApiDotNetCore/Internal/Generics/GenericProcessor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public interface IGenericProcessor
1616

1717
public class GenericProcessor<T> : GenericProcessor<T, int> where T : class, IIdentifiable<int>
1818
{
19-
public GenericProcessor(DbContext context) : base(context) { }
19+
public GenericProcessor(IDbContextResolver contextResolver) : base(contextResolver) { }
2020
}
2121

2222
public class GenericProcessor<T, TId> : IGenericProcessor where T : class, IIdentifiable<TId>

‎src/JsonApiDotNetCore/JsonApiDotNetCore.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<Import Project="..\..\build\dependencies.props" />
32
<PropertyGroup>
43
<VersionPrefix>2.2.0</VersionPrefix>
54
<TargetFrameworks>$(NetStandardVersion)</TargetFrameworks>
@@ -23,4 +22,4 @@
2322
<PackageReference Include="System.ValueTuple" Version="$(TuplesVersion)" />
2423
</ItemGroup>
2524

26-
</Project>
25+
</Project>

0 commit comments

Comments
 (0)