Skip to content

Commit ae61e86

Browse files
authored
Merge pull request #169 from digipost/dotnetstandard2.0
.NET Standard 2.0
2 parents e6e7942 + 9c0a0df commit ae61e86

File tree

16 files changed

+95
-74
lines changed

16 files changed

+95
-74
lines changed

.github/workflows/build.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Build
2+
3+
on: [push]
4+
5+
jobs:
6+
build:
7+
8+
runs-on: ubuntu-latest
9+
10+
steps:
11+
- uses: actions/checkout@v2
12+
- name: Setup .NET Core
13+
uses: actions/setup-dotnet@v1
14+
with:
15+
dotnet-version: 3.1.101
16+
- name: Install dependencies
17+
run: dotnet restore
18+
- name: Build
19+
run: dotnet build --configuration Release --no-restore
20+
- name: Test
21+
run: dotnet test --no-restore --verbosity normal

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ git:
88

99
matrix:
1010
include:
11-
- dotnet: 2.2.104
11+
- dotnet: 3.1.101
1212
mono: none
13-
env: DOTNETCORE=2
13+
env: DOTNETCORE=3
1414

1515
before_install:
1616
- sed -i 's/[email protected]:/https:\/\/github.com\//' .gitmodules

Digipost.Api.Client.Common.Tests/Digipost.Api.Client.Common.Tests.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.2</TargetFramework>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
55
<RootNamespace>Digipost.Api.Client.Common.Tests</RootNamespace>
66
<AssemblyName>Digipost.Api.Client.Common.Tests</AssemblyName>
77
<ProjectGuid>{BC85F48B-9584-41F7-BBE8-EBBEC1EEC7E8}</ProjectGuid>
@@ -32,10 +32,10 @@
3232
</PropertyGroup>
3333

3434
<ItemGroup>
35-
<PackageReference Include="BouncyCastle" Version="1.8.5" />
36-
<PackageReference Include="Difi.Felles.Utility" Version="3.0.2" />
37-
<PackageReference Include="Digipost.Api.Client.Shared" Version="5.0.0" />
38-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
35+
<PackageReference Include="BouncyCastle" Version="1.8.6.1" />
36+
<PackageReference Include="Difi.Felles.Utility" Version="4.0.0" />
37+
<PackageReference Include="Digipost.Api.Client.Shared" Version="6.0.0" />
38+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
3939
<PackageReference Include="xunit.abstractions" Version="2.0.3" />
4040
<PackageReference Include="xunit.assert" Version="2.4.1" />
4141
<PackageReference Include="xunit.core" Version="2.4.1" />

Digipost.Api.Client.Common/Digipost.Api.Client.Common.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<PropertyGroup>
9-
<TargetFramework>netcoreapp2.2</TargetFramework>
9+
<TargetFramework>netstandard2.0</TargetFramework>
1010
<RootNamespace>Digipost.Api.Client.Common</RootNamespace>
1111
<AssemblyName>Digipost.Api.Client.Common</AssemblyName>
1212
<ProjectGuid>{CD338E5A-1ED0-4331-B34E-8292FA8E387B}</ProjectGuid>
@@ -37,12 +37,12 @@
3737
</PropertyGroup>
3838

3939
<ItemGroup>
40-
<PackageReference Include="BouncyCastle" Version="1.8.5" />
41-
<PackageReference Include="Difi.Felles.Utility" Version="3.0.2" />
42-
<PackageReference Include="Digipost.Api.Client.Shared" Version="5.0.0" />
43-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
44-
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0" />
45-
<PackageReference Include="NLog.Extensions.Logging" Version="1.5.2" />
40+
<PackageReference Include="BouncyCastle" Version="1.8.6.1" />
41+
<PackageReference Include="Difi.Felles.Utility" Version="4.0.0" />
42+
<PackageReference Include="Digipost.Api.Client.Shared" Version="6.0.0" />
43+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.3" />
44+
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.3" />
45+
<PackageReference Include="NLog.Extensions.Logging" Version="1.6.2" />
4646
<ProjectReference Include="..\Digipost.Api.Client.Resources\Digipost.Api.Client.Resources.csproj">
4747
<Project>{18CBB05A-B0AE-42FF-870F-1C213A238751}</Project>
4848
<Name>Digipost.Api.Client.Resources</Name>

Digipost.Api.Client.ConcurrencyTest/Digipost.Api.Client.ConcurrencyTest.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.2</TargetFramework>
4+
<TargetFramework>netstandard2.0</TargetFramework>
55
<RootNamespace>Digipost.Api.Client.ConcurrencyTest</RootNamespace>
66
<ProjectGuid>{7B5E5062-98E5-4312-9A82-28DF530BF5FB}</ProjectGuid>
77
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -31,10 +31,10 @@
3131
</PropertyGroup>
3232

3333
<ItemGroup>
34-
<PackageReference Include="BouncyCastle" Version="1.8.5" />
35-
<PackageReference Include="Difi.Felles.Utility" Version="3.0.2" />
36-
<PackageReference Include="Digipost.Api.Client.Shared" Version="5.0.0" />
37-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
34+
<PackageReference Include="BouncyCastle" Version="1.8.6.1" />
35+
<PackageReference Include="Difi.Felles.Utility" Version="4.0.0" />
36+
<PackageReference Include="Digipost.Api.Client.Shared" Version="6.0.0" />
37+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
3838
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
3939
<ProjectReference Include="..\Digipost.Api.Client.Common\Digipost.Api.Client.Common.csproj">
4040
<Project>{CD338E5A-1ED0-4331-B34E-8292FA8E387B}</Project>

Digipost.Api.Client.Docs/Digipost.Api.Client.Docs.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<PropertyGroup>
9-
<TargetFramework>netcoreapp2.2</TargetFramework>
9+
<TargetFramework>netcoreapp3.1</TargetFramework>
1010
<RootNamespace>Digipost.Api.Client.Docs</RootNamespace>
1111
<AssemblyName>Digipost.Api.Client.Docs</AssemblyName>
1212
<ProjectGuid>{1B5DB6E1-7363-4B6D-8565-CBF7E5C958DE}</ProjectGuid>
@@ -37,10 +37,10 @@
3737
</PropertyGroup>
3838

3939
<ItemGroup>
40-
<PackageReference Include="BouncyCastle" Version="1.8.5" />
41-
<PackageReference Include="Difi.Felles.Utility" Version="3.0.2" />
42-
<PackageReference Include="Digipost.Api.Client.DataTypes.Core" Version="1.0.0" />
43-
<PackageReference Include="Digipost.Api.Client.Shared" Version="5.0.0" />
40+
<PackageReference Include="BouncyCastle" Version="1.8.6.1" />
41+
<PackageReference Include="Difi.Felles.Utility" Version="4.0.0" />
42+
<PackageReference Include="Digipost.Api.Client.DataTypes.Core" Version="2.0.0" />
43+
<PackageReference Include="Digipost.Api.Client.Shared" Version="6.0.0" />
4444
<ProjectReference Include="..\Digipost.Api.Client.Common\Digipost.Api.Client.Common.csproj">
4545
<Project>{CD338E5A-1ED0-4331-B34E-8292FA8E387B}</Project>
4646
<Name>Digipost.Api.Client.Common</Name>

Digipost.Api.Client.Inbox.Tests/Digipost.Api.Client.Inbox.Tests.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.2</TargetFramework>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
55
<RootNamespace>Digipost.Api.Client.Inbox.Tests</RootNamespace>
66
<AssemblyName>Digipost.Api.Client.Inbox.Tests</AssemblyName>
77
<ProjectGuid>{37678527-9988-46E8-A5D6-8F9533058F67}</ProjectGuid>
@@ -32,10 +32,10 @@
3232
</PropertyGroup>
3333

3434
<ItemGroup>
35-
<PackageReference Include="BouncyCastle" Version="1.8.5" />
36-
<PackageReference Include="Difi.Felles.Utility" Version="3.0.2" />
37-
<PackageReference Include="Digipost.Api.Client.Shared" Version="5.0.0" />
38-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
35+
<PackageReference Include="BouncyCastle" Version="1.8.6.1" />
36+
<PackageReference Include="Difi.Felles.Utility" Version="4.0.0" />
37+
<PackageReference Include="Digipost.Api.Client.Shared" Version="6.0.0" />
38+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
3939
<PackageReference Include="xunit.abstractions" Version="2.0.3" />
4040
<PackageReference Include="xunit.assert" Version="2.4.1" />
4141
<PackageReference Include="xunit.core" Version="2.4.1" />

Digipost.Api.Client.Inbox/Digipost.Api.Client.Inbox.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<PropertyGroup>
9-
<TargetFramework>netcoreapp2.2</TargetFramework>
9+
<TargetFramework>netstandard2.0</TargetFramework>
1010
<RootNamespace>Digipost.Api.Client.Inbox</RootNamespace>
1111
<AssemblyName>Digipost.Api.Client.Inbox</AssemblyName>
1212
<ProjectGuid>{F23C5F66-E398-4234-8FB1-443D958FDF1A}</ProjectGuid>
@@ -37,9 +37,9 @@
3737
</PropertyGroup>
3838

3939
<ItemGroup>
40-
<PackageReference Include="BouncyCastle" Version="1.8.5" />
41-
<PackageReference Include="Difi.Felles.Utility" Version="3.0.2" />
42-
<PackageReference Include="Digipost.Api.Client.Shared" Version="5.0.0" />
40+
<PackageReference Include="BouncyCastle" Version="1.8.6.1" />
41+
<PackageReference Include="Difi.Felles.Utility" Version="4.0.0" />
42+
<PackageReference Include="Digipost.Api.Client.Shared" Version="6.0.0" />
4343
<ProjectReference Include="..\Digipost.Api.Client.Common\Digipost.Api.Client.Common.csproj">
4444
<Project>{CD338E5A-1ED0-4331-B34E-8292FA8E387B}</Project>
4545
<Name>Digipost.Api.Client.Common</Name>

Digipost.Api.Client.Resources/Digipost.Api.Client.Resources.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<PropertyGroup>
9-
<TargetFramework>netcoreapp2.2</TargetFramework>
9+
<TargetFramework>netstandard2.0</TargetFramework>
1010
<RootNamespace>Digipost.Api.Client.Resources</RootNamespace>
1111
<AssemblyName>Digipost.Api.Client.Resources</AssemblyName>
1212
<ProjectGuid>{18CBB05A-B0AE-42FF-870F-1C213A238751}</ProjectGuid>
@@ -37,9 +37,9 @@
3737
</PropertyGroup>
3838

3939
<ItemGroup>
40-
<PackageReference Include="BouncyCastle" Version="1.8.5" />
41-
<PackageReference Include="Difi.Felles.Utility" Version="3.0.2" />
42-
<PackageReference Include="Digipost.Api.Client.Shared" Version="5.0.0" />
40+
<PackageReference Include="BouncyCastle" Version="1.8.6.1" />
41+
<PackageReference Include="Difi.Felles.Utility" Version="4.0.0" />
42+
<PackageReference Include="Digipost.Api.Client.Shared" Version="6.0.0" />
4343
</ItemGroup>
4444

4545
<ItemGroup>

Digipost.Api.Client.Scripts/Digipost.Api.Client.Scripts.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<PropertyGroup>
9-
<TargetFramework>netcoreapp2.2</TargetFramework>
9+
<TargetFramework>netstandard2.0</TargetFramework>
1010
<RootNamespace>Digipost.Api.Client.Scripts</RootNamespace>
1111
<AssemblyName>Digipost.Api.Client.Scripts</AssemblyName>
1212
<ProjectGuid>{A0F4D5F2-F2C7-4DDA-8B94-0057A96DA5A0}</ProjectGuid>
@@ -47,8 +47,8 @@
4747
</None>
4848
</ItemGroup>
4949
<ItemGroup>
50-
<PackageReference Include="BouncyCastle" Version="1.8.5" />
51-
<PackageReference Include="Difi.Felles.Utility" Version="3.0.2" />
52-
<PackageReference Include="Digipost.Api.Client.Shared" Version="5.0.0" />
50+
<PackageReference Include="BouncyCastle" Version="1.8.6.1" />
51+
<PackageReference Include="Difi.Felles.Utility" Version="4.0.0" />
52+
<PackageReference Include="Digipost.Api.Client.Shared" Version="6.0.0" />
5353
</ItemGroup>
5454
</Project>

0 commit comments

Comments
 (0)