Skip to content

Commit cf2971c

Browse files
karen-avetisyan-mckaren-avetisyan-mc
authored
Merge pull request #19 from Mastercard/update-the-version
Updating dependencies to the netstandard2.1
2 parents c34c166 + 0a04572 commit cf2971c

22 files changed

+143
-353
lines changed

‎.github/workflows/test.yml‎

Lines changed: 12 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,45 +12,29 @@ name: Build & Test
1212
jobs:
1313
build:
1414
env:
15-
NETCORE2_TEST_PROJECT: >-
16-
Mastercard.Developer.OAuth1Signer.Tests/NetCore2/Mastercard.Developer.OAuth1Signer.Tests.NetCore2.csproj
17-
NETCORE3_TEST_PROJECT: >-
18-
Mastercard.Developer.OAuth1Signer.Tests/NetCore3/Mastercard.Developer.OAuth1Signer.Tests.NetCore3.csproj
15+
NET_TEST_PROJECT: >-
16+
Mastercard.Developer.OAuth1Signer.Tests/Mastercard.Developer.OAuth1Signer.Tests.csproj
1917
runs-on: ubuntu-latest
2018
strategy:
2119
matrix:
2220
dotnet:
23-
- 2.1.700
24-
- 2.1
25-
- 2.2
26-
- 3.1
21+
- 8.0.201
2722
include:
28-
- dotnet: 2.1.700
23+
- dotnet: 8.0.201
2924
mono: none
30-
TEST_PROJECT: $NETCORE2_TEST_PROJECT
31-
- dotnet: 2.1
32-
mono: none
33-
TEST_PROJECT: $NETCORE2_TEST_PROJECT
34-
- dotnet: 2.2
35-
mono: none
36-
TEST_PROJECT: $NETCORE2_TEST_PROJECT
37-
- dotnet: 3.1
38-
mono: none
39-
TEST_PROJECT: $NETCORE3_TEST_PROJECT
25+
TEST_PROJECT: $NETCORE_TEST_PROJECT
4026
steps:
4127
- name: Checkout code
4228
uses: actions/checkout@v2
43-
- name: Setup .NET 6
29+
- name: Setup .NET 8
4430
uses: actions/[email protected]
4531
with:
46-
dotnet-version: 6.0.x
47-
- name: Build using .NET 6
32+
dotnet-version: 8.0.201
33+
- name: Build using .NET 8
4834
run: >
4935
export PATH="$PATH:$HOME/.dotnet/tools"
5036
51-
dotnet build ${{ env.NETCORE2_TEST_PROJECT }} -c Release
52-
53-
dotnet build ${{ env.NETCORE3_TEST_PROJECT }} -c Release
37+
dotnet build ${{ env.NETCORE_TEST_PROJECT }} -c Release
5438
- name: Setup .NET [Core] ${{ matrix.dotnet }}
5539
uses: actions/[email protected]
5640
with:
@@ -61,11 +45,11 @@ jobs:
6145
- name: Run tests using .NET [Core] ${{ matrix.dotnet }}
6246
run: >
6347
export PATH="$PATH:$HOME/.dotnet/tools"
64-
65-
dotnet test ${{ matrix.TEST_PROJECT }} -c Release
48+
49+
dotnet test ${{ matrix.TEST_PROJECT }} -c Debug
6650
-l:"trx;LogFileName=tests.trx" -r:"bin/" /p:CollectCoverage=true
6751
/p:CoverletOutputFormat="opencover"
6852
/p:CoverletOutput="bin/coverage.xml"
6953
- name: Local publish
7054
run: >
71-
dotnet publish ${{ matrix.TEST_PROJECT }} -c Release
55+
dotnet publish ${{ matrix.TEST_PROJECT }} -c Debug

‎Mastercard.Developer.OAuth1Signer.Core/Mastercard.Developer.OAuth1Signer.Core.csproj‎

Lines changed: 4 additions & 17 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.4.0</Version>
6+
<Version>1.5.0</Version>
77
<Product>Mastercard.Developer.OAuth1Signer.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.4.0.0</FileVersion> <!-- Same version as the package version -->
19+
<FileVersion>1.5.0.0</FileVersion> <!-- Same version as the package version -->
2020
<DocumentationFile>Mastercard.Developer.OAuth1Signer.Core.xml</DocumentationFile>
2121
<IncludeSymbols>true</IncludeSymbols>
2222
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -35,20 +35,7 @@
3535

3636
<ItemGroup>
3737
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
38-
<_Parameter1>Mastercard.Developer.OAuth1Signer.Tests.NetCore2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b50e085c4583209974a6a902505c534b21b205b9e627c583beea690b541d67fdfe8dc53e50c6a0653f0e3e7828d75432a50df4c4b5348ca4e662e42af603cc97636fb2393ef995babf19bc51644c30296a3edf0afd0182cfc21d0c836da5af922e3631a52a2dc5ed2edc8c568f41ff3d41c82fbe27e6bf4fe4df3e50568b65c8</_Parameter1>
38+
<_Parameter1>Mastercard.Developer.OAuth1Signer.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b50e085c4583209974a6a902505c534b21b205b9e627c583beea690b541d67fdfe8dc53e50c6a0653f0e3e7828d75432a50df4c4b5348ca4e662e42af603cc97636fb2393ef995babf19bc51644c30296a3edf0afd0182cfc21d0c836da5af922e3631a52a2dc5ed2edc8c568f41ff3d41c82fbe27e6bf4fe4df3e50568b65c8</_Parameter1>
3939
</AssemblyAttribute>
4040
</ItemGroup>
41-
42-
<ItemGroup>
43-
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
44-
<_Parameter1>Mastercard.Developer.OAuth1Signer.Tests.NetCore3, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b50e085c4583209974a6a902505c534b21b205b9e627c583beea690b541d67fdfe8dc53e50c6a0653f0e3e7828d75432a50df4c4b5348ca4e662e42af603cc97636fb2393ef995babf19bc51644c30296a3edf0afd0182cfc21d0c836da5af922e3631a52a2dc5ed2edc8c568f41ff3d41c82fbe27e6bf4fe4df3e50568b65c8</_Parameter1>
45-
</AssemblyAttribute>
46-
</ItemGroup>
47-
48-
<ItemGroup>
49-
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
50-
<_Parameter1>Mastercard.Developer.OAuth1Signer.Tests.Net4x, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b50e085c4583209974a6a902505c534b21b205b9e627c583beea690b541d67fdfe8dc53e50c6a0653f0e3e7828d75432a50df4c4b5348ca4e662e42af603cc97636fb2393ef995babf19bc51644c30296a3edf0afd0182cfc21d0c836da5af922e3631a52a2dc5ed2edc8c568f41ff3d41c82fbe27e6bf4fe4df3e50568b65c8</_Parameter1>
51-
</AssemblyAttribute>
52-
</ItemGroup>
53-
5441
</Project>

‎Mastercard.Developer.OAuth1Signer.RestSharp/Mastercard.Developer.OAuth1Signer.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.4.0</Version>
6+
<Version>1.5.0</Version>
77
<Product>Mastercard.Developer.OAuth1Signer.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.4.0.0</FileVersion> <!-- Same version as the package version -->
19+
<FileVersion>1.5.0.0</FileVersion> <!-- Same version as the package version -->
2020
<DocumentationFile>Mastercard.Developer.OAuth1Signer.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.OAuth1Signer.RestSharpV2/Authenticators/RestSharpOAuth1Authenticator.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public RestSharpOAuth1Authenticator(string consumerKey, RSA signingKey, Uri base
3838

3939
public Task HandleChallenge(HttpClient client, HttpRequestMessage request, ICredentials credentials, HttpResponseMessage response) => throw new NotImplementedException();
4040

41-
ValueTask IAuthenticator.Authenticate(RestClient client, RestRequest request)
41+
ValueTask IAuthenticator.Authenticate(IRestClient client, RestRequest request)
4242
{
4343
throw new NotImplementedException();
4444
}

‎Mastercard.Developer.OAuth1Signer.RestSharpV2/Mastercard.Developer.OAuth1Signer.RestSharpV2.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFramework>netstandard2.1</TargetFramework>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<Version>1.4.0</Version>
77
<Product>Mastercard.Developer.OAuth1Signer.RestSharpV2</Product>
@@ -34,7 +34,7 @@
3434
</ItemGroup>
3535

3636
<ItemGroup>
37-
<PackageReference Include="RestSharp" Version="108.0.3" /> <!-- Minimum version, inclusive -->
37+
<PackageReference Include="RestSharp" Version="110.2.0" /> <!-- Minimum version, inclusive -->
3838
</ItemGroup>
3939

4040
<ItemGroup>

‎Mastercard.Developer.OAuth1Signer.Tests/Mastercard.Developer.OAuth1Signer.Tests.csproj‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFramework>net8.0</TargetFramework>
4+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6+
<ProjectGuid>{879DAE6D-71CA-4860-8253-1889597F584F}</ProjectGuid>
7+
<OutputType>Library</OutputType>
8+
<AppDesignerFolder>Properties</AppDesignerFolder>
9+
<RootNamespace>Mastercard.Developer.OAuth1Signer.Tests</RootNamespace>
10+
<AssemblyName>Mastercard.Developer.OAuth1Signer.Tests</AssemblyName>
11+
<FileAlignment>512</FileAlignment>
12+
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
13+
<IsCodedUITest>False</IsCodedUITest>
14+
<TestProjectType>UnitTest</TestProjectType>
15+
<NuGetPackageImportStamp>
16+
</NuGetPackageImportStamp>
17+
<TargetFrameworkProfile />
18+
</PropertyGroup>
19+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
20+
<DebugSymbols>true</DebugSymbols>
21+
<DebugType>full</DebugType>
22+
<Optimize>false</Optimize>
23+
<OutputPath>bin\Debug\</OutputPath>
24+
<DefineConstants>DEBUG;TRACE</DefineConstants>
25+
<ErrorReport>prompt</ErrorReport>
26+
<WarningLevel>4</WarningLevel>
27+
</PropertyGroup>
28+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29+
<DebugType>pdbonly</DebugType>
30+
<Optimize>true</Optimize>
31+
<OutputPath>bin\Release\</OutputPath>
32+
<DefineConstants>TRACE</DefineConstants>
33+
<ErrorReport>prompt</ErrorReport>
34+
<WarningLevel>4</WarningLevel>
35+
</PropertyGroup>
36+
<PropertyGroup>
37+
<SignAssembly>true</SignAssembly>
38+
</PropertyGroup>
39+
<PropertyGroup>
40+
<AssemblyOriginatorKeyFile>../Identity.snk</AssemblyOriginatorKeyFile>
41+
</PropertyGroup>
42+
<ItemGroup>
43+
<Reference Include="System" />
44+
</ItemGroup>
45+
<ItemGroup>
46+
<ProjectReference Include="..\Mastercard.Developer.OAuth1Signer.Core\Mastercard.Developer.OAuth1Signer.Core.csproj">
47+
<Project>{de48b59f-51d0-401d-afb8-9fc53e6ded37}</Project>
48+
<Name>Mastercard.Developer.OAuth1Signer.Core</Name>
49+
</ProjectReference>
50+
<ProjectReference Include="..\Mastercard.Developer.OAuth1Signer.RestSharpV2\Mastercard.Developer.OAuth1Signer.RestSharpV2.csproj">
51+
<Project>{344c0659-8994-4ca8-9792-e003a511a971}</Project>
52+
<Name>Mastercard.Developer.OAuth1Signer.RestSharpV2</Name>
53+
</ProjectReference>
54+
<ProjectReference Include="..\Mastercard.Developer.OAuth1Signer.RestSharp\Mastercard.Developer.OAuth1Signer.RestSharp.csproj">
55+
<Project>{ef0c28d2-674a-4e1b-9a9c-a7241e50ddd7}</Project>
56+
<Name>Mastercard.Developer.OAuth1Signer.RestSharp</Name>
57+
</ProjectReference>
58+
</ItemGroup>
59+
60+
<ItemGroup>
61+
<EmbeddedResource Include=".\Tests\_Resources\test_key_container.p12">
62+
<Link>_Resources\test_key_container.p12</Link>
63+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
64+
</EmbeddedResource>
65+
</ItemGroup>
66+
<ItemGroup>
67+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
68+
<PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
69+
<PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
70+
<PackageReference Include="coverlet.collector" Version="6.0.1" />
71+
</ItemGroup>
72+
</Project>

‎Mastercard.Developer.OAuth1Signer.Tests/Net4x/Mastercard.Developer.OAuth1Signer.Tests.Net4x.csproj‎

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

‎Mastercard.Developer.OAuth1Signer.Tests/Net4x/Properties/AssemblyInfo.cs‎

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

0 commit comments

Comments
 (0)