Skip to content
This repository was archived by the owner on Feb 16, 2019. It is now read-only.

Commit 2cabfd9

Browse files
jagealljageall
committed
Updating to netstandard2.0
1 parent eccbc2d commit 2cabfd9

4 files changed

Lines changed: 71 additions & 70 deletions

File tree

‎global.json‎

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

‎src/EventStore.ClientAPI.NetCore/EventStore.ClientAPI.NetCore.csproj‎

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,41 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<Description>The client API for the Event Store. Get the open source or commercial versions of the Event Store server from http://geteventstore.com</Description>
5-
<VersionPrefix>4.0.0-alpha</VersionPrefix>
6-
<Authors>Event Store LLP</Authors>
7-
<TargetFramework>netstandard1.3</TargetFramework>
8-
<DebugType>portable</DebugType>
9-
<AssemblyName>EventStore.ClientAPI.NetCore</AssemblyName>
10-
<PackageId>EventStore.ClientAPI.NetCore</PackageId>
11-
<PackageTags>eventstore;client;netstandard1.3;netcore</PackageTags>
12-
<PackageIconUrl>http://geteventstore.com/assets/ouro-200.png</PackageIconUrl>
13-
<PackageLicenseUrl>https://github.com/EventStore/netcore-client/blob/master/LICENSE.md</PackageLicenseUrl>
14-
<RepositoryType>git</RepositoryType>
15-
<RepositoryUrl>https://github.com/EventStore/ClientAPI.NetCore</RepositoryUrl>
16-
<PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
17-
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
18-
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
19-
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
20-
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
21-
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
22-
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
23-
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
24-
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
25-
</PropertyGroup>
3+
<PropertyGroup>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
</PropertyGroup>
266

27-
<ItemGroup>
28-
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
29-
<PackageReference Include="protobuf-net" Version="2.1.0" />
30-
<PackageReference Include="System.Data.Common" Version="4.1.0" />
31-
<PackageReference Include="System.Net.NameResolution" Version="4.0.0" />
32-
<PackageReference Include="System.Net.Security" Version="4.0.0" />
33-
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.1.1" />
34-
<PackageReference Include="System.Threading.Thread" Version="4.0.0" />
35-
<PackageReference Include="System.Threading.ThreadPool" Version="4.0.10" />
36-
<PackageReference Include="System.Xml.XmlDocument" Version="4.0.1" />
37-
</ItemGroup>
7+
<PropertyGroup>
8+
<Description>The client API for the Event Store. Get the open source or commercial versions of the Event Store server from http://geteventstore.com</Description>
9+
<VersionPrefix>4.0.0-alpha</VersionPrefix>
10+
<Authors>Event Store LLP</Authors>
11+
<DebugType>portable</DebugType>
12+
<AssemblyName>EventStore.ClientAPI.NetCore</AssemblyName>
13+
<PackageId>EventStore.ClientAPI.NetCore</PackageId>
14+
<PackageTags>eventstore;client;netstandard2.0;netcore</PackageTags>
15+
<PackageIconUrl>http://geteventstore.com/assets/ouro-200.png</PackageIconUrl>
16+
<PackageLicenseUrl>https://github.com/EventStore/netcore-client/blob/master/LICENSE.md</PackageLicenseUrl>
17+
<RepositoryType>git</RepositoryType>
18+
<RepositoryUrl>https://github.com/EventStore/ClientAPI.NetCore</RepositoryUrl>
19+
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
20+
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
21+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
22+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
23+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
24+
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
25+
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
26+
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
27+
</PropertyGroup>
28+
29+
<ItemGroup>
30+
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
31+
<PackageReference Include="protobuf-net" Version="2.3.2" />
32+
<PackageReference Include="System.Data.Common" Version="4.3.0" />
33+
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
34+
<PackageReference Include="System.Net.Security" Version="4.3.1" />
35+
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
36+
<PackageReference Include="System.Threading.Thread" Version="4.3.0" />
37+
<PackageReference Include="System.Threading.ThreadPool" Version="4.3.0" />
38+
<PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
39+
</ItemGroup>
3840

3941
</Project>

‎test/EventStore.ClientAPI.NetCore.Tests/EventStore.ClientAPI.NetCore.Tests.csproj‎

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

3-
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
4-
<OutputType>Library</OutputType>
5-
</PropertyGroup>
3+
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
4+
<OutputType>Library</OutputType>
5+
</PropertyGroup>
66

7-
<PropertyGroup>
8-
<TargetFramework>netcoreapp1.1</TargetFramework>
9-
<AssemblyName>EventStore.Core.Tests.ClientAPI</AssemblyName>
10-
<PackageId>EventStore.ClientAPI.NetCore.Tests</PackageId>
11-
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
12-
<PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8</PackageTargetFallback>
13-
<ApplicationIcon />
14-
<OutputTypeEx>library</OutputTypeEx>
15-
<StartupObject />
16-
<RootNamespace>EventStore.Core.Tests.ClientAPI</RootNamespace>
17-
</PropertyGroup>
7+
<PropertyGroup>
8+
<TargetFramework>netcoreapp2.0</TargetFramework>
9+
<AssemblyName>EventStore.Core.Tests.ClientAPI</AssemblyName>
10+
<PackageId>EventStore.ClientAPI.NetCore.Tests</PackageId>
11+
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
12+
<ApplicationIcon />
13+
<OutputTypeEx>library</OutputTypeEx>
14+
<StartupObject />
15+
<RootNamespace>EventStore.Core.Tests.ClientAPI</RootNamespace>
16+
<IsPackable>False</IsPackable>
17+
</PropertyGroup>
1818

19-
<ItemGroup>
20-
<ProjectReference Include="../../src/EventStore.ClientAPI.NetCore/EventStore.ClientAPI.NetCore.csproj" />
21-
</ItemGroup>
19+
<ItemGroup>
20+
<ProjectReference Include="../../src/EventStore.ClientAPI.NetCore/EventStore.ClientAPI.NetCore.csproj" />
21+
</ItemGroup>
2222

23-
<ItemGroup>
24-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
25-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.0.2" />
26-
<packagereference Include="NUnit" Version="3.6.1"></packagereference>
27-
<packagereference Include="NUnit3TestAdapter" Version="3.8.0-alpha1"></packagereference>
28-
29-
</ItemGroup>
23+
<ItemGroup>
24+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170810-02" />
25+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.0" />
26+
<packagereference Include="NUnit" Version="3.7.1"></packagereference>
27+
<packagereference Include="NUnit3TestAdapter" Version="3.8.0"></packagereference>
3028

31-
<ItemGroup>
32-
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
33-
</ItemGroup>
29+
</ItemGroup>
30+
31+
<ItemGroup>
32+
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
33+
</ItemGroup>
3434

3535
</Project>

‎wercker.yml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ build:
66
code: |
77
apt-get update
88
apt-get install apt-transport-https -y
9-
sh -c 'echo "deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet-release/ xenial main" > /etc/apt/sources.list.d/dotnetdev.list'
10-
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 417A0893
9+
apt-get install curl
10+
curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg
11+
mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg
12+
sudo sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-xenial-prod xenial main" > /etc/apt/sources.list.d/dotnetdev.list'
1113
apt-get update
12-
apt-get install dotnet-dev-1.0.1 -y
14+
apt-get install dotnet-sdk-2.0.0 -y
1315
1416
- script:
1517
name: install and run eventstore
@@ -32,14 +34,14 @@ build:
3234
name: Run tests
3335
code: |
3436
dotnet restore
35-
dotnet test test/EventStore.ClientAPI.NetCore.Tests/EventStore.ClientAPI.NetCore.Tests.csproj
37+
dotnet test test/EventStore.ClientAPI.NetCore.Tests/EventStore.ClientAPI.NetCore.Tests.csproj --no-build --logger trx;LogFileName=~/TestResults.xml
3638
3739
after-steps:
3840
- script:
3941
name: copy log files
4042
code: |
41-
echo "contents of ~"
42-
ls ~
43+
echo "copying test results"
44+
cp ./test/EventStore.ClientAPI.NetCore.Tests/TestResults/*.trx $WERCKER_REPORT_ARTIFACTS_DIR
4345
echo "copying server logs"
4446
cp -R ~/logs $WERCKER_REPORT_ARTIFACTS_DIR
4547
# TODO: copy test output

0 commit comments

Comments
 (0)