Skip to content

Commit f5d8705

Browse files
gencebaygencebay
committed
package updates, netstandard
1 parent 07643f6 commit f5d8705

File tree

10 files changed

+44
-159
lines changed

10 files changed

+44
-159
lines changed

‎src/NetCoreStack.Proxy/Extensions/ObjectExtensions.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,7 @@ public static IDictionary<string, object> ToDictionary(this object value)
2222
Dictionary<string, object> dictionary = new Dictionary<string, object>(StringComparer.CurrentCultureIgnoreCase);
2323
if (value != null)
2424
{
25-
#if NET46
2625
PropertyInfo[] properties = value.GetType().GetProperties();
27-
#endif
28-
29-
#if NETCOREAPP1_1 || NETSTANDARD1_6
30-
PropertyInfo[] properties = TypeExtensions.GetProperties(value.GetType());
31-
#endif
3226

3327
for (int i = 0; i < properties.Length; i++)
3428
{

‎src/NetCoreStack.Proxy/NetCoreStack.Proxy.csproj‎

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard1.6;net46</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
55
<AssemblyName>NetCoreStack.Proxy</AssemblyName>
66
<PackageId>NetCoreStack.Proxy</PackageId>
7-
<Version>1.1.0</Version>
8-
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
9-
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
10-
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
117
</PropertyGroup>
128

139
<ItemGroup>
14-
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="1.1.2" />
15-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" />
16-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="1.1.2" />
17-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.2" />
18-
<PackageReference Include="NetCoreStack.Contracts" Version="1.1.4" />
19-
<PackageReference Include="NetCoreStack.DispatchProxyAsync" Version="1.1.0" />
20-
</ItemGroup>
21-
22-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
23-
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
24-
</ItemGroup>
25-
26-
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
27-
<Reference Include="System" />
28-
<Reference Include="Microsoft.CSharp" />
10+
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.0.0" />
11+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
12+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
13+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
14+
<PackageReference Include="NetCoreStack.Contracts" Version="2.0.0" />
15+
<PackageReference Include="NetCoreStack.DispatchProxyAsync" Version="2.0.0" />
2916
</ItemGroup>
3017

3118
</Project>

‎test/NetCoreStack.Api.Hosting/NetCoreStack.Api.Hosting.csproj‎

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp1.1</TargetFramework>
4+
<TargetFramework>netcoreapp2.0</TargetFramework>
55
</PropertyGroup>
6-
7-
<ItemGroup>
8-
<Folder Include="wwwroot\" />
9-
</ItemGroup>
6+
107
<ItemGroup>
11-
<PackageReference Include="Microsoft.AspNetCore" Version="1.1.2" />
12-
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="1.1.2" />
13-
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="1.1.2" />
14-
<PackageReference Include="Microsoft.AspNetCore.Http" Version="1.1.2" />
15-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" />
16-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.2" />
17-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="1.1.2" />
18-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="1.1.2" />
19-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="1.1.2" />
20-
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="1.1.2" />
21-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.2" />
22-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.2" />
8+
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
239
<PackageReference Include="NetCoreStack.Data" Version="1.0.0-preview-306" />
2410
<PackageReference Include="NetCoreStack.Mvc" Version="1.0.0-preview-306" />
2511
<PackageReference Include="Swashbuckle" Version="6.0.0-beta902" />
2612
</ItemGroup>
13+
2714
<ItemGroup>
28-
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="1.0.0" />
15+
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
2916
</ItemGroup>
3017
<ItemGroup>
3118
<ProjectReference Include="..\NetCoreStack.Domain.Contracts\NetCoreStack.Domain.Contracts.csproj" />

‎test/NetCoreStack.Domain.Contracts/NetCoreStack.Domain.Contracts.csproj‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard1.6</TargetFramework>
4+
<TargetFramework>netstandard2.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" />
9-
<PackageReference Include="NetCoreStack.Contracts" Version="1.1.4" />
10-
<PackageReference Include="NetCoreStack.Data.Contracts" Version="1.1.4" />
11-
<PackageReference Include="System.ComponentModel.Annotations" Version="4.3.0" />
8+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
9+
<PackageReference Include="NetCoreStack.Contracts" Version="2.0.0" />
10+
<PackageReference Include="NetCoreStack.Data.Contracts" Version="2.0.0" />
1211
</ItemGroup>
1312

1413
</Project>

‎test/NetCoreStack.Proxy.ServerApp/NetCoreStack.Proxy.ServerApp.csproj‎

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,22 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp1.1</TargetFramework>
4+
<TargetFramework>netcoreapp2.0</TargetFramework>
55
<PreserveCompilationContext>true</PreserveCompilationContext>
6-
<AssemblyName>NetCoreStack.Proxy.ServerApp</AssemblyName>
7-
<OutputType>Exe</OutputType>
8-
<PackageId>NetCoreStack.Proxy.ServerApp</PackageId>
9-
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
10-
<PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
11-
<RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
6+
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
127
</PropertyGroup>
138

149
<ItemGroup>
1510
<ProjectReference Include="..\NetCoreStack.Proxy.Test.Contracts\NetCoreStack.Proxy.Test.Contracts.csproj" />
1611
</ItemGroup>
1712

1813
<ItemGroup>
19-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" />
20-
<PackageReference Include="Microsoft.AspNetCore.Routing" Version="1.1.2" />
21-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.2" />
22-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.2" />
23-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.2" />
24-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="1.1.2" />
25-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.2" />
26-
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
27-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.2" />
28-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.2" />
29-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.1.2" />
30-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.2" />
31-
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="1.1.2" />
32-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.2" />
14+
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0" />
3315
<PackageReference Include="Swashbuckle" Version="6.0.0-beta902" />
3416
</ItemGroup>
3517

3618
<ItemGroup>
37-
<DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="1.0.0" />
19+
<DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="2.0.0" />
3820
</ItemGroup>
3921

4022
</Project>

‎test/NetCoreStack.Proxy.Test.Contracts/NetCoreStack.Proxy.Test.Contracts.csproj‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard1.6</TargetFramework>
5-
<AssemblyName>NetCoreStack.Proxy.Test.Contracts</AssemblyName>
6-
<PackageId>NetCoreStack.Proxy.Test.Contracts</PackageId>
7-
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
8-
<PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
9-
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
10-
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
11-
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
4+
<TargetFramework>netstandard2.0</TargetFramework>
125
</PropertyGroup>
136

147
<ItemGroup>
15-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="1.1.3" />
16-
<PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
17-
<PackageReference Include="NetCoreStack.Contracts" Version="1.1.4" />
8+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
9+
<PackageReference Include="NetCoreStack.Contracts" Version="2.0.0" />
1810
</ItemGroup>
1911

2012
</Project>

‎test/NetCoreStack.Proxy.Test.Contracts/SolutionPathUtility.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using Microsoft.Extensions.PlatformAbstractions;
2-
using System;
1+
using System;
32
using System.IO;
43
using System.Reflection;
54

@@ -21,7 +20,7 @@ public static class SolutionPathUtility
2120
public static string GetProjectPath(string solutionRelativePath, Assembly assembly)
2221
{
2322
var projectName = assembly.GetName().Name;
24-
var applicationBasePath = PlatformServices.Default.Application.ApplicationBasePath;
23+
var applicationBasePath = AppDomain.CurrentDomain.BaseDirectory;
2524

2625
var directoryInfo = new DirectoryInfo(applicationBasePath);
2726
do

‎test/NetCoreStack.Proxy.Tests/NetCoreStack.Proxy.Tests.csproj‎

Lines changed: 10 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp1.1</TargetFramework>
5-
<AssemblyName>NetCoreStack.Proxy.Tests</AssemblyName>
6-
<PackageId>NetCoreStack.Proxy.Tests</PackageId>
7-
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
8-
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
9-
<RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
10-
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
11-
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
12-
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
4+
<TargetFramework>netcoreapp2.0</TargetFramework>
5+
6+
<IsPackable>false</IsPackable>
137
</PropertyGroup>
148

159
<ItemGroup>
16-
<None Update="appsettings.json">
17-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
18-
</None>
10+
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
11+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
12+
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.0.0" />
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
14+
<PackageReference Include="Moq" Version="4.7.99" />
15+
<PackageReference Include="xunit" Version="2.2.0" />
16+
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
1917
</ItemGroup>
2018

2119
<ItemGroup>
@@ -24,27 +22,4 @@
2422
<ProjectReference Include="..\NetCoreStack.Proxy.Test.Contracts\NetCoreStack.Proxy.Test.Contracts.csproj" />
2523
</ItemGroup>
2624

27-
<ItemGroup>
28-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
29-
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
30-
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.500-preview2-1-003177" />
31-
<PackageReference Include="Moq" Version="4.7.10" />
32-
<PackageReference Include="xunit" Version="2.2.0" />
33-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" />
34-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.2" />
35-
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
36-
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="1.1.2" />
37-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="1.1.2" />
38-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.2" />
39-
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="1.1.2" />
40-
</ItemGroup>
41-
42-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
43-
<PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />
44-
</ItemGroup>
45-
46-
<ItemGroup>
47-
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
48-
</ItemGroup>
49-
5025
</Project>

‎test/NetCoreStack.Proxy.WebClient/NetCoreStack.Proxy.WebClient.csproj‎

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp1.1</TargetFramework>
5-
<PreserveCompilationContext>true</PreserveCompilationContext>
6-
<AssemblyName>NetCoreStack.Proxy.WebClient</AssemblyName>
7-
<OutputType>Exe</OutputType>
8-
<PackageId>NetCoreStack.Proxy.WebClient</PackageId>
9-
<RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
10-
<PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
4+
<TargetFramework>netcoreapp2.0</TargetFramework>
5+
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
6+
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
117
</PropertyGroup>
128

13-
<ItemGroup>
14-
<None Update="wwwroot\**\*">
15-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
16-
</None>
17-
</ItemGroup>
18-
199
<ItemGroup>
2010
<ProjectReference Include="..\..\src\NetCoreStack.Proxy\NetCoreStack.Proxy.csproj" />
2111
<ProjectReference Include="..\NetCoreStack.Proxy.Test.Contracts\NetCoreStack.Proxy.Test.Contracts.csproj" />
2212
</ItemGroup>
2313

2414
<ItemGroup>
25-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.1.2" />
26-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" />
27-
<PackageReference Include="Microsoft.AspNetCore.Routing" Version="1.1.2" />
28-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.2" />
29-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.2" />
30-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.2" />
31-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.2" />
32-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.2" />
33-
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
34-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.2" />
35-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.2" />
36-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.2" />
37-
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="1.1.2" />
15+
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
3816
<PackageReference Include="Swashbuckle" Version="6.0.0-beta902" />
3917
</ItemGroup>
4018

‎test/NetCoreStack.WebClient.Hosting/NetCoreStack.WebClient.Hosting.csproj‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp1.1</TargetFramework>
4+
<TargetFramework>netcoreapp2.0</TargetFramework>
5+
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
56
</PropertyGroup>
67

78
<PropertyGroup>
8-
<PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81;</PackageTargetFallback>
9+
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
910
</PropertyGroup>
1011
<ItemGroup>
11-
<PackageReference Include="Microsoft.AspNetCore" Version="1.1.2" />
12-
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="1.1.2" />
13-
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="1.1.2" />
14-
<PackageReference Include="Microsoft.AspNetCore.Http" Version="1.1.2" />
15-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" />
16-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.2" />
17-
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="1.1.2" />
18-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.2" />
19-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.2" />
20-
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.1.2" />
12+
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
2113
<PackageReference Include="NetCoreStack.Mvc" Version="1.0.0-preview-306" />
2214
</ItemGroup>
2315
<ItemGroup>
24-
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="1.0.0" />
16+
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
2517
</ItemGroup>
2618
<ItemGroup>
2719
<ProjectReference Include="..\..\src\NetCoreStack.Proxy\NetCoreStack.Proxy.csproj" />

0 commit comments

Comments
 (0)