Skip to content

Commit

Permalink
Updating the to Net8
Browse files Browse the repository at this point in the history
Removing support for old versions (Net3, Net4, netstandard1.3)
Updating depencies to the latest version
  • Loading branch information
karen-avetisyan-mc committed Feb 27, 2024
1 parent c34c166 commit c315104
Show file tree
Hide file tree
Showing 22 changed files with 140 additions and 352 deletions.
40 changes: 12 additions & 28 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,45 +12,29 @@ name: Build & Test
jobs:
build:
env:
NETCORE2_TEST_PROJECT: >-
Mastercard.Developer.OAuth1Signer.Tests/NetCore2/Mastercard.Developer.OAuth1Signer.Tests.NetCore2.csproj
NETCORE3_TEST_PROJECT: >-
Mastercard.Developer.OAuth1Signer.Tests/NetCore3/Mastercard.Developer.OAuth1Signer.Tests.NetCore3.csproj
NET_TEST_PROJECT: >-
Mastercard.Developer.OAuth1Signer.Tests/Mastercard.Developer.OAuth1Signer.Tests.csproj
runs-on: ubuntu-latest
strategy:
matrix:
dotnet:
- 2.1.700
- 2.1
- 2.2
- 3.1
- 8.0.201
include:
- dotnet: 2.1.700
- dotnet: 8.0.201
mono: none
TEST_PROJECT: $NETCORE2_TEST_PROJECT
- dotnet: 2.1
mono: none
TEST_PROJECT: $NETCORE2_TEST_PROJECT
- dotnet: 2.2
mono: none
TEST_PROJECT: $NETCORE2_TEST_PROJECT
- dotnet: 3.1
mono: none
TEST_PROJECT: $NETCORE3_TEST_PROJECT
TEST_PROJECT: $NETCORE_TEST_PROJECT
steps:
- name: Checkout code
uses: actions/checkout@v2
- name: Setup .NET 6
- name: Setup .NET 8
uses: actions/[email protected]
with:
dotnet-version: 6.0.x
- name: Build using .NET 6
dotnet-version: 8.0.201
- name: Build using .NET 8
run: >
export PATH="$PATH:$HOME/.dotnet/tools"
dotnet build ${{ env.NETCORE2_TEST_PROJECT }} -c Release
dotnet build ${{ env.NETCORE3_TEST_PROJECT }} -c Release
dotnet build ${{ env.NETCORE_TEST_PROJECT }} -c Release
- name: Setup .NET [Core] ${{ matrix.dotnet }}
uses: actions/[email protected]
with:
Expand All @@ -61,11 +45,11 @@ jobs:
- name: Run tests using .NET [Core] ${{ matrix.dotnet }}
run: >
export PATH="$PATH:$HOME/.dotnet/tools"
dotnet test ${{ matrix.TEST_PROJECT }} -c Release
dotnet test ${{ matrix.TEST_PROJECT }} -c Debug
-l:"trx;LogFileName=tests.trx" -r:"bin/" /p:CollectCoverage=true
/p:CoverletOutputFormat="opencover"
/p:CoverletOutput="bin/coverage.xml"
- name: Local publish
run: >
dotnet publish ${{ matrix.TEST_PROJECT }} -c Release
dotnet publish ${{ matrix.TEST_PROJECT }} -c Debug
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.3</TargetFramework>
<TargetFramework>netstandard2.1</TargetFramework>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Version>1.4.0</Version>
<Version>1.5.0</Version>
<Product>Mastercard.Developer.OAuth1Signer.Core</Product>
<Authors>Mastercard</Authors>
<Company>Mastercard</Company>
Expand All @@ -16,7 +16,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../Identity.snk</AssemblyOriginatorKeyFile>
<AssemblyVersion>1.0.0.0</AssemblyVersion> <!-- Frozen -->
<FileVersion>1.4.0.0</FileVersion> <!-- Same version as the package version -->
<FileVersion>1.5.0.0</FileVersion> <!-- Same version as the package version -->
<DocumentationFile>Mastercard.Developer.OAuth1Signer.Core.xml</DocumentationFile>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
Expand All @@ -35,20 +35,7 @@

<ItemGroup>
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
<_Parameter1>Mastercard.Developer.OAuth1Signer.Tests.NetCore2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b50e085c4583209974a6a902505c534b21b205b9e627c583beea690b541d67fdfe8dc53e50c6a0653f0e3e7828d75432a50df4c4b5348ca4e662e42af603cc97636fb2393ef995babf19bc51644c30296a3edf0afd0182cfc21d0c836da5af922e3631a52a2dc5ed2edc8c568f41ff3d41c82fbe27e6bf4fe4df3e50568b65c8</_Parameter1>
<_Parameter1>Mastercard.Developer.OAuth1Signer.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b50e085c4583209974a6a902505c534b21b205b9e627c583beea690b541d67fdfe8dc53e50c6a0653f0e3e7828d75432a50df4c4b5348ca4e662e42af603cc97636fb2393ef995babf19bc51644c30296a3edf0afd0182cfc21d0c836da5af922e3631a52a2dc5ed2edc8c568f41ff3d41c82fbe27e6bf4fe4df3e50568b65c8</_Parameter1>
</AssemblyAttribute>
</ItemGroup>

<ItemGroup>
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
<_Parameter1>Mastercard.Developer.OAuth1Signer.Tests.NetCore3, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b50e085c4583209974a6a902505c534b21b205b9e627c583beea690b541d67fdfe8dc53e50c6a0653f0e3e7828d75432a50df4c4b5348ca4e662e42af603cc97636fb2393ef995babf19bc51644c30296a3edf0afd0182cfc21d0c836da5af922e3631a52a2dc5ed2edc8c568f41ff3d41c82fbe27e6bf4fe4df3e50568b65c8</_Parameter1>
</AssemblyAttribute>
</ItemGroup>

<ItemGroup>
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
<_Parameter1>Mastercard.Developer.OAuth1Signer.Tests.Net4x, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b50e085c4583209974a6a902505c534b21b205b9e627c583beea690b541d67fdfe8dc53e50c6a0653f0e3e7828d75432a50df4c4b5348ca4e662e42af603cc97636fb2393ef995babf19bc51644c30296a3edf0afd0182cfc21d0c836da5af922e3631a52a2dc5ed2edc8c568f41ff3d41c82fbe27e6bf4fe4df3e50568b65c8</_Parameter1>
</AssemblyAttribute>
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.3</TargetFramework>
<TargetFramework>netstandard2.1</TargetFramework>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Version>1.4.0</Version>
<Version>1.5.0</Version>
<Product>Mastercard.Developer.OAuth1Signer.RestSharp</Product>
<Authors>Mastercard</Authors>
<Company>Mastercard</Company>
Expand All @@ -16,7 +16,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../Identity.snk</AssemblyOriginatorKeyFile>
<AssemblyVersion>1.0.0.0</AssemblyVersion> <!-- Frozen -->
<FileVersion>1.4.0.0</FileVersion> <!-- Same version as the package version -->
<FileVersion>1.5.0.0</FileVersion> <!-- Same version as the package version -->
<DocumentationFile>Mastercard.Developer.OAuth1Signer.RestSharp.xml</DocumentationFile>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
Expand All @@ -34,7 +34,7 @@
</ItemGroup>

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

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public RestSharpOAuth1Authenticator(string consumerKey, RSA signingKey, Uri base

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

ValueTask IAuthenticator.Authenticate(RestClient client, RestRequest request)
ValueTask IAuthenticator.Authenticate(IRestClient client, RestRequest request)
{
throw new NotImplementedException();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>netstandard2.1</TargetFramework>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Version>1.4.0</Version>
<Product>Mastercard.Developer.OAuth1Signer.RestSharpV2</Product>
Expand Down Expand Up @@ -34,7 +34,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="RestSharp" Version="108.0.3" /> <!-- Minimum version, inclusive -->
<PackageReference Include="RestSharp" Version="110.2.0" /> <!-- Minimum version, inclusive -->
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{879DAE6D-71CA-4860-8253-1889597F584F}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Mastercard.Developer.OAuth1Signer.Tests</RootNamespace>
<AssemblyName>Mastercard.Developer.OAuth1Signer.Tests</AssemblyName>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<IsCodedUITest>False</IsCodedUITest>
<TestProjectType>UnitTest</TestProjectType>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>../Identity.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Mastercard.Developer.OAuth1Signer.Core\Mastercard.Developer.OAuth1Signer.Core.csproj">
<Project>{de48b59f-51d0-401d-afb8-9fc53e6ded37}</Project>
<Name>Mastercard.Developer.OAuth1Signer.Core</Name>
</ProjectReference>
<ProjectReference Include="..\Mastercard.Developer.OAuth1Signer.RestSharpV2\Mastercard.Developer.OAuth1Signer.RestSharpV2.csproj">
<Project>{344c0659-8994-4ca8-9792-e003a511a971}</Project>
<Name>Mastercard.Developer.OAuth1Signer.RestSharpV2</Name>
</ProjectReference>
<ProjectReference Include="..\Mastercard.Developer.OAuth1Signer.RestSharp\Mastercard.Developer.OAuth1Signer.RestSharp.csproj">
<Project>{ef0c28d2-674a-4e1b-9a9c-a7241e50ddd7}</Project>
<Name>Mastercard.Developer.OAuth1Signer.RestSharp</Name>
</ProjectReference>
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include=".\Tests\_Resources\test_key_container.p12">
<Link>_Resources\test_key_container.p12</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
<PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
<PackageReference Include="coverlet.collector" Version="6.0.1" />
</ItemGroup>
</Project>

This file was deleted.

This file was deleted.

Loading

0 comments on commit c315104

Please sign in to comment.