Skip to content

Commit b03b86f

Browse files
karen-avetisyan-mckaren-avetisyan-mc
authored
Merge pull request #25 from Mastercard/restsharp-upgrade
Moving to the netstandard2.1
2 parents aa83123 + eaddfe8 commit b03b86f

File tree

55 files changed

+180
-824
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+180
-824
lines changed

‎.github/workflows/test.yml‎

Lines changed: 11 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -12,51 +12,29 @@ name: Build & Test
1212
jobs:
1313
build:
1414
env:
15-
NETCORE2_TEST_PROJECT: >-
16-
Mastercard.Developer.ClientEncryption.Tests/NetCore2/Mastercard.Developer.ClientEncryption.Tests.NetCore2.csproj
17-
NETCORE3_TEST_PROJECT: >-
18-
Mastercard.Developer.ClientEncryption.Tests/NetCore3/Mastercard.Developer.ClientEncryption.Tests.NetCore3.csproj
19-
NET5_TEST_PROJECT: >-
20-
Mastercard.Developer.ClientEncryption.Tests/Net5/Mastercard.Developer.ClientEncryption.Tests.Net5.csproj
15+
NET_TEST_PROJECT: >-
16+
Mastercard.Developer.ClientEncryption.Tests/Mastercard.Developer.ClientEncryption.Tests.csproj
2117
runs-on: ubuntu-latest
2218
strategy:
2319
matrix:
2420
dotnet:
25-
- 2.1.700
26-
- 2.1
27-
- 2.2
28-
- 3.1.x
29-
- 5.0.x
21+
- 8.0.201
3022
include:
31-
- dotnet: 2.1.700
23+
- dotnet: 8.0.201
3224
mono: none
33-
TEST_PROJECT: $NETCORE2_TEST_PROJECT
34-
- dotnet: 2.1
35-
mono: none
36-
TEST_PROJECT: $NETCORE2_TEST_PROJECT
37-
- dotnet: 2.2
38-
mono: none
39-
TEST_PROJECT: $NETCORE2_TEST_PROJECT
40-
- dotnet: 3.1.x
41-
mono: none
42-
TEST_PROJECT: $NETCORE3_TEST_PROJECT
43-
- dotnet: 5.0.x
44-
mono: none
45-
TEST_PROJECT: $NET5_TEST_PROJECT
25+
TEST_PROJECT: $NETCORE_TEST_PROJECT
4626
steps:
4727
- name: Checkout code
4828
uses: actions/checkout@v2
49-
- name: Setup .NET 6
29+
- name: Setup .NET 8
5030
uses: actions/[email protected]
5131
with:
52-
dotnet-version: 6.0.x
53-
- name: Build using .NET 6
32+
dotnet-version: 8.0.201
33+
- name: Build using .NET 8
5434
run: >
5535
export PATH="$PATH:$HOME/.dotnet/tools"
5636
57-
dotnet build ${{ env.NETCORE2_TEST_PROJECT }} -c Release
58-
59-
dotnet build ${{ env.NETCORE3_TEST_PROJECT }} -c Release
37+
dotnet build ${{ env.NETCORE_TEST_PROJECT }} -c Release
6038
- name: Setup .NET [Core] ${{ matrix.dotnet }}
6139
uses: actions/[email protected]
6240
with:
@@ -68,10 +46,10 @@ jobs:
6846
run: >
6947
export PATH="$PATH:$HOME/.dotnet/tools"
7048
71-
dotnet test ${{ matrix.TEST_PROJECT }} -c Release
49+
dotnet test ${{ matrix.TEST_PROJECT }} -c Debug
7250
-l:"trx;LogFileName=tests.trx" -r:"bin/" /p:CollectCoverage=true
7351
/p:CoverletOutputFormat="opencover"
7452
/p:CoverletOutput="bin/coverage.xml"
7553
- name: Local publish
7654
run: >
77-
dotnet publish ${{ matrix.TEST_PROJECT }} -c Release
55+
dotnet publish ${{ matrix.TEST_PROJECT }} -c Debug

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ bld/
2626

2727
# Visual Studio 2015/2017 cache/options directory
2828
.vs/
29+
.vscode/
2930
# Uncomment if you have tasks that create the project's static files in wwwroot
3031
#wwwroot/
3132

‎Mastercard.Developer.ClientEncryption.Core/Mastercard.Developer.ClientEncryption.Core.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard1.3;netstandard2.1</TargetFrameworks>
4+
<TargetFramework>netstandard2.1</TargetFramework>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
6-
<Version>1.8.0</Version>
6+
<Version>1.9.0</Version>
77
<Product>Mastercard.Developer.ClientEncryption.Core</Product>
88
<Authors>Mastercard</Authors>
99
<Company>Mastercard</Company>
@@ -16,7 +16,7 @@
1616
<SignAssembly>true</SignAssembly>
1717
<AssemblyOriginatorKeyFile>../Identity.snk</AssemblyOriginatorKeyFile>
1818
<AssemblyVersion>1.0.0.0</AssemblyVersion> <!-- Frozen -->
19-
<FileVersion>1.8.0.0</FileVersion> <!-- Same version as the package version -->
19+
<FileVersion>1.9.0.0</FileVersion> <!-- Same version as the package version -->
2020
<DocumentationFile>Mastercard.Developer.ClientEncryption.Core.xml</DocumentationFile>
2121
<IncludeSymbols>true</IncludeSymbols>
2222
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -35,30 +35,12 @@
3535

3636
<ItemGroup>
3737
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
38-
<_Parameter1>Mastercard.Developer.ClientEncryption.Tests.NetCore2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b50e085c4583209974a6a902505c534b21b205b9e627c583beea690b541d67fdfe8dc53e50c6a0653f0e3e7828d75432a50df4c4b5348ca4e662e42af603cc97636fb2393ef995babf19bc51644c30296a3edf0afd0182cfc21d0c836da5af922e3631a52a2dc5ed2edc8c568f41ff3d41c82fbe27e6bf4fe4df3e50568b65c8</_Parameter1>
38+
<_Parameter1>Mastercard.Developer.ClientEncryption.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b50e085c4583209974a6a902505c534b21b205b9e627c583beea690b541d67fdfe8dc53e50c6a0653f0e3e7828d75432a50df4c4b5348ca4e662e42af603cc97636fb2393ef995babf19bc51644c30296a3edf0afd0182cfc21d0c836da5af922e3631a52a2dc5ed2edc8c568f41ff3d41c82fbe27e6bf4fe4df3e50568b65c8</_Parameter1>
3939
</AssemblyAttribute>
4040
</ItemGroup>
4141

4242
<ItemGroup>
43-
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
44-
<_Parameter1>Mastercard.Developer.ClientEncryption.Tests.NetCore3, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b50e085c4583209974a6a902505c534b21b205b9e627c583beea690b541d67fdfe8dc53e50c6a0653f0e3e7828d75432a50df4c4b5348ca4e662e42af603cc97636fb2393ef995babf19bc51644c30296a3edf0afd0182cfc21d0c836da5af922e3631a52a2dc5ed2edc8c568f41ff3d41c82fbe27e6bf4fe4df3e50568b65c8</_Parameter1>
45-
</AssemblyAttribute>
46-
</ItemGroup>
47-
48-
<ItemGroup>
49-
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
50-
<_Parameter1>Mastercard.Developer.ClientEncryption.Tests.Net4x, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b50e085c4583209974a6a902505c534b21b205b9e627c583beea690b541d67fdfe8dc53e50c6a0653f0e3e7828d75432a50df4c4b5348ca4e662e42af603cc97636fb2393ef995babf19bc51644c30296a3edf0afd0182cfc21d0c836da5af922e3631a52a2dc5ed2edc8c568f41ff3d41c82fbe27e6bf4fe4df3e50568b65c8</_Parameter1>
51-
</AssemblyAttribute>
52-
</ItemGroup>
53-
54-
<ItemGroup>
55-
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
56-
<_Parameter1>Mastercard.Developer.ClientEncryption.Tests.Net5, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b50e085c4583209974a6a902505c534b21b205b9e627c583beea690b541d67fdfe8dc53e50c6a0653f0e3e7828d75432a50df4c4b5348ca4e662e42af603cc97636fb2393ef995babf19bc51644c30296a3edf0afd0182cfc21d0c836da5af922e3631a52a2dc5ed2edc8c568f41ff3d41c82fbe27e6bf4fe4df3e50568b65c8</_Parameter1>
57-
</AssemblyAttribute>
58-
</ItemGroup>
59-
60-
<ItemGroup>
61-
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" /> <!-- Minimum version, inclusive -->
43+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> <!-- Minimum version, inclusive -->
6244
</ItemGroup>
6345

6446
</Project>

‎Mastercard.Developer.ClientEncryption.RestSharp/Mastercard.Developer.ClientEncryption.RestSharp.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>netstandard1.3</TargetFramework>
4+
<TargetFramework>netstandard2.1</TargetFramework>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
6-
<Version>1.8.0</Version>
6+
<Version>1.9.0</Version>
77
<Product>Mastercard.Developer.ClientEncryption.RestSharp</Product>
88
<Authors>Mastercard</Authors>
99
<Company>Mastercard</Company>
@@ -16,7 +16,7 @@
1616
<SignAssembly>true</SignAssembly>
1717
<AssemblyOriginatorKeyFile>../Identity.snk</AssemblyOriginatorKeyFile>
1818
<AssemblyVersion>1.0.0.0</AssemblyVersion> <!-- Frozen -->
19-
<FileVersion>1.8.0.0</FileVersion> <!-- Same version as the package version -->
19+
<FileVersion>1.9.0.0</FileVersion> <!-- Same version as the package version -->
2020
<DocumentationFile>Mastercard.Developer.ClientEncryption.RestSharp.xml</DocumentationFile>
2121
<IncludeSymbols>true</IncludeSymbols>
2222
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -34,7 +34,7 @@
3434
</ItemGroup>
3535

3636
<ItemGroup>
37-
<PackageReference Include="FubarCoder.RestSharp.Portable.Core" Version="4.0.6" /> <!-- Minimum version, inclusive -->
37+
<PackageReference Include="FubarCoder.RestSharp.Portable.Core" Version="4.0.8" /> <!-- Minimum version, inclusive -->
3838
</ItemGroup>
3939

4040
<ItemGroup>

‎Mastercard.Developer.ClientEncryption.RestSharpV2/Mastercard.Developer.ClientEncryption.RestSharpV2.csproj‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
3+
<TargetFramework>netstandard2.1</TargetFramework>
54
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
6-
<Version>1.8.0</Version>
5+
<Version>1.9.0</Version>
76
<Product>Mastercard.Developer.ClientEncryption.RestSharpV2</Product>
87
<Authors>Mastercard</Authors>
98
<Company>Mastercard</Company>
@@ -16,7 +15,7 @@
1615
<SignAssembly>true</SignAssembly>
1716
<AssemblyOriginatorKeyFile>../Identity.snk</AssemblyOriginatorKeyFile>
1817
<AssemblyVersion>1.0.0.0</AssemblyVersion> <!-- Frozen -->
19-
<FileVersion>1.8.0.0</FileVersion> <!-- Same version as the package version -->
18+
<FileVersion>1.9.0.0</FileVersion> <!-- Same version as the package version -->
2019
<DocumentationFile>Mastercard.Developer.ClientEncryption.RestSharpV2.xml</DocumentationFile>
2120
<IncludeSymbols>true</IncludeSymbols>
2221
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -34,7 +33,7 @@
3433
</ItemGroup>
3534

3635
<ItemGroup>
37-
<PackageReference Include="RestSharp" Version="108.0.3" />
36+
<PackageReference Include="RestSharp" Version="110.2.0" />
3837
</ItemGroup>
3938

4039
<ItemGroup>
@@ -43,25 +42,20 @@
4342

4443
<ItemGroup>
4544
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
46-
<_Parameter1>Mastercard.Developer.ClientEncryption.Tests.NetCore2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b50e085c4583209974a6a902505c534b21b205b9e627c583beea690b541d67fdfe8dc53e50c6a0653f0e3e7828d75432a50df4c4b5348ca4e662e42af603cc97636fb2393ef995babf19bc51644c30296a3edf0afd0182cfc21d0c836da5af922e3631a52a2dc5ed2edc8c568f41ff3d41c82fbe27e6bf4fe4df3e50568b65c8</_Parameter1>
45+
<_Parameter1>Mastercard.Developer.ClientEncryption.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b50e085c4583209974a6a902505c534b21b205b9e627c583beea690b541d67fdfe8dc53e50c6a0653f0e3e7828d75432a50df4c4b5348ca4e662e42af603cc97636fb2393ef995babf19bc51644c30296a3edf0afd0182cfc21d0c836da5af922e3631a52a2dc5ed2edc8c568f41ff3d41c82fbe27e6bf4fe4df3e50568b65c8</_Parameter1>
4746
</AssemblyAttribute>
4847
</ItemGroup>
4948

5049
<ItemGroup>
5150
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
52-
<_Parameter1>Mastercard.Developer.ClientEncryption.Tests.NetCore3, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b50e085c4583209974a6a902505c534b21b205b9e627c583beea690b541d67fdfe8dc53e50c6a0653f0e3e7828d75432a50df4c4b5348ca4e662e42af603cc97636fb2393ef995babf19bc51644c30296a3edf0afd0182cfc21d0c836da5af922e3631a52a2dc5ed2edc8c568f41ff3d41c82fbe27e6bf4fe4df3e50568b65c8</_Parameter1>
51+
<_Parameter1>Mastercard.Developer.ClientEncryption.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b50e085c4583209974a6a902505c534b21b205b9e627c583beea690b541d67fdfe8dc53e50c6a0653f0e3e7828d75432a50df4c4b5348ca4e662e42af603cc97636fb2393ef995babf19bc51644c30296a3edf0afd0182cfc21d0c836da5af922e3631a52a2dc5ed2edc8c568f41ff3d41c82fbe27e6bf4fe4df3e50568b65c8</_Parameter1>
5352
</AssemblyAttribute>
5453
</ItemGroup>
5554

56-
<ItemGroup>
57-
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
58-
<_Parameter1>Mastercard.Developer.ClientEncryption.Tests.Net4x, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b50e085c4583209974a6a902505c534b21b205b9e627c583beea690b541d67fdfe8dc53e50c6a0653f0e3e7828d75432a50df4c4b5348ca4e662e42af603cc97636fb2393ef995babf19bc51644c30296a3edf0afd0182cfc21d0c836da5af922e3631a52a2dc5ed2edc8c568f41ff3d41c82fbe27e6bf4fe4df3e50568b65c8</_Parameter1>
59-
</AssemblyAttribute>
60-
</ItemGroup>
6155

6256
<ItemGroup>
6357
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
64-
<_Parameter1>Mastercard.Developer.ClientEncryption.Tests.Net5, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b50e085c4583209974a6a902505c534b21b205b9e627c583beea690b541d67fdfe8dc53e50c6a0653f0e3e7828d75432a50df4c4b5348ca4e662e42af603cc97636fb2393ef995babf19bc51644c30296a3edf0afd0182cfc21d0c836da5af922e3631a52a2dc5ed2edc8c568f41ff3d41c82fbe27e6bf4fe4df3e50568b65c8</_Parameter1>
58+
<_Parameter1>Mastercard.Developer.ClientEncryption.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b50e085c4583209974a6a902505c534b21b205b9e627c583beea690b541d67fdfe8dc53e50c6a0653f0e3e7828d75432a50df4c4b5348ca4e662e42af603cc97636fb2393ef995babf19bc51644c30296a3edf0afd0182cfc21d0c836da5af922e3631a52a2dc5ed2edc8c568f41ff3d41c82fbe27e6bf4fe4df3e50568b65c8</_Parameter1>
6559
</AssemblyAttribute>
6660
</ItemGroup>
6761
</Project>

0 commit comments

Comments
 (0)