Skip to content

Commit 531d7d9

Browse files
karen-avetisyan-mckaren-avetisyan-mc
authored
Merge pull request #27 from Mastercard/use-net5
Moving to the netstandard2.1 Building tests using .Net5
2 parents b03b86f + 8eb9739 commit 531d7d9

File tree

3 files changed

+239
-7
lines changed

3 files changed

+239
-7
lines changed

‎.github/workflows/test.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@ jobs:
1818
strategy:
1919
matrix:
2020
dotnet:
21-
- 8.0.201
21+
- 5.0.x
2222
include:
23-
- dotnet: 8.0.201
23+
- dotnet: 5.0.x
2424
mono: none
2525
TEST_PROJECT: $NETCORE_TEST_PROJECT
2626
steps:
2727
- name: Checkout code
2828
uses: actions/checkout@v2
29-
- name: Setup .NET 8
29+
- name: Setup .NET 5
3030
uses: actions/[email protected]
3131
with:
32-
dotnet-version: 8.0.201
33-
- name: Build using .NET 8
32+
dotnet-version: 5.0.x
33+
- name: Build using .NET 5
3434
run: >
3535
export PATH="$PATH:$HOME/.dotnet/tools"
3636

‎Mastercard.Developer.ClientEncryption.Tests/Mastercard.Developer.ClientEncryption.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net5</TargetFramework>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
66
<ProjectGuid>{DE07F478-E087-4FAA-80E2-220671C70418}</ProjectGuid>
@@ -140,4 +140,4 @@
140140
<PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
141141
<PackageReference Include="coverlet.collector" Version="6.0.1" />
142142
</ItemGroup>
143-
</Project>
143+
</Project>

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

Lines changed: 232 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,232 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{DE07F478-E087-4FAA-80E2-220671C70418}</ProjectGuid>
8+
<OutputType>Library</OutputType>
9+
<AppDesignerFolder>Properties</AppDesignerFolder>
10+
<RootNamespace>Mastercard.Developer.ClientEncryption.Tests.Net4x</RootNamespace>
11+
<AssemblyName>Mastercard.Developer.ClientEncryption.Tests.Net4x</AssemblyName>
12+
<TargetFrameworkVersion>v6</TargetFrameworkVersion>
13+
<FileAlignment>512</FileAlignment>
14+
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
15+
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
16+
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
17+
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
18+
<IsCodedUITest>False</IsCodedUITest>
19+
<TestProjectType>UnitTest</TestProjectType>
20+
<NuGetPackageImportStamp>
21+
</NuGetPackageImportStamp>
22+
<TargetFrameworkProfile />
23+
</PropertyGroup>
24+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
25+
<DebugSymbols>true</DebugSymbols>
26+
<DebugType>full</DebugType>
27+
<Optimize>false</Optimize>
28+
<OutputPath>bin\Debug\</OutputPath>
29+
<DefineConstants>DEBUG;TRACE</DefineConstants>
30+
<ErrorReport>prompt</ErrorReport>
31+
<WarningLevel>4</WarningLevel>
32+
</PropertyGroup>
33+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
34+
<DebugType>pdbonly</DebugType>
35+
<Optimize>true</Optimize>
36+
<OutputPath>bin\Release\</OutputPath>
37+
<DefineConstants>TRACE</DefineConstants>
38+
<ErrorReport>prompt</ErrorReport>
39+
<WarningLevel>4</WarningLevel>
40+
</PropertyGroup>
41+
<PropertyGroup>
42+
<SignAssembly>true</SignAssembly>
43+
</PropertyGroup>
44+
<PropertyGroup>
45+
<AssemblyOriginatorKeyFile>../../Identity.snk</AssemblyOriginatorKeyFile>
46+
</PropertyGroup>
47+
<ItemGroup>
48+
<Compile Include="..\Tests\Encryption\AES\AesEncryptionTest.cs">
49+
<Link>Encryption\AES\AesEncryptionTest.cs</Link>
50+
</Compile>
51+
<Compile Include="..\Tests\Encryption\EncryptionExceptionTest.cs">
52+
<Link>Encryption\EncryptionExceptionTest.cs</Link>
53+
</Compile>
54+
<Compile Include="..\Tests\Encryption\FieldLevelEncryptionConfigBuilderTest.cs">
55+
<Link>Encryption\FieldLevelEncryptionConfigBuilderTest.cs</Link>
56+
</Compile>
57+
<Compile Include="..\Tests\Encryption\FieldLevelEncryptionParamsTest.cs">
58+
<Link>Encryption\FieldLevelEncryptionParamsTest.cs</Link>
59+
</Compile>
60+
<Compile Include="..\Tests\Encryption\FieldLevelEncryptionTest.cs">
61+
<Link>Encryption\FieldLevelEncryptionTest.cs</Link>
62+
</Compile>
63+
<Compile Include="..\Tests\Encryption\JweConfigBuilderTest.cs">
64+
<Link>Encryption\JweConfigBuilderTest.cs</Link>
65+
</Compile>
66+
<Compile Include="..\Tests\Encryption\JWE\JweEncryptionTest.cs">
67+
<Link>Encryption\JWE\JweEncryptionTest.cs</Link>
68+
</Compile>
69+
<Compile Include="..\Tests\Interceptors\RestResponseDouble.cs">
70+
<Link>Interceptors\RestResponseDouble.cs</Link>
71+
</Compile>
72+
<Compile Include="..\Tests\Interceptors\RestSharpFieldLevelEncryptionInterceptorTest.cs">
73+
<Link>Interceptors\RestSharpFieldLevelEncryptionInterceptorTest.cs</Link>
74+
</Compile>
75+
<Compile Include="..\Tests\Interceptors\RestSharpV2FieldLevelEncryptionInterceptorTest.cs">
76+
<Link>Interceptors\RestSharpV2FieldLevelEncryptionInterceptorTest.cs</Link>
77+
</Compile>
78+
<Compile Include="..\Tests\Interceptors\RestSharpV2CbcJweEncryptionInterceptorTest.cs">
79+
<Link>Interceptors\RestSharpV2CbcJweEncryptionInterceptorTest.cs</Link>
80+
</Compile>
81+
<Compile Include="..\Tests\Interceptors\RestSharpV2GcmJweEncryptionInterceptorTest.cs">
82+
<Link>Interceptors\RestSharpV2GcmJweEncryptionInterceptorTest.cs</Link>
83+
</Compile>
84+
<Compile Include="..\Tests\Encryption\JWE\GcmJweObjectTest.cs">
85+
<Link>Encryption\JWE\GcmJweObjectTest.cs</Link>
86+
</Compile>
87+
<Compile Include="..\Tests\Encryption\JWE\JweHeaderTest.cs">
88+
<Link>Encryption\JWE\JweHeaderTest.cs</Link>
89+
</Compile>
90+
<Compile Include="..\Tests\Encryption\JWE\CbcJweObjectTest.cs">
91+
<Link>Encryption\JWE\CbcJweObjectTest.cs</Link>
92+
</Compile>
93+
<Compile Include="..\Tests\Encryption\RSA\RsaEncryptionTest.cs">
94+
<Link>Encryption\RSA\RsaEncryptionTest.cs</Link>
95+
</Compile>
96+
<Compile Include="..\Tests\Test\TestUtils.cs">
97+
<Link>Test\TestUtils.cs</Link>
98+
</Compile>
99+
<Compile Include="..\Tests\Utils\Base64UtilsTest.cs">
100+
<Link>Utils\Base64UtilsTest.cs</Link>
101+
</Compile>
102+
<Compile Include="..\Tests\Utils\ByteUtilsTest.cs">
103+
<Link>Utils\ByteUtilsTest.cs</Link>
104+
</Compile>
105+
<Compile Include="..\Tests\Utils\EncodingUtilsTest.cs">
106+
<Link>Utils\EncodingUtilsTest.cs</Link>
107+
</Compile>
108+
<Compile Include="..\Tests\Utils\EncryptionUtilsTest.cs">
109+
<Link>Utils\EncryptionUtilsTest.cs</Link>
110+
</Compile>
111+
<Compile Include="..\Tests\Utils\JsonUtilsTest.cs">
112+
<Link>Utils\JsonUtilsTest.cs</Link>
113+
</Compile>
114+
<Compile Include="..\Tests\Utils\RsaKeyUtilsTest.cs">
115+
<Link>Utils\RsaKeyUtilsTest.cs</Link>
116+
</Compile>
117+
</ItemGroup>
118+
<ItemGroup>
119+
<EmbeddedResource Include="..\Tests\_Resources\Certificates\test_certificate-1024.pem">
120+
<Link>_Resources\Certificates\test_certificate-1024.pem</Link>
121+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
122+
</EmbeddedResource>
123+
<EmbeddedResource Include="..\Tests\_Resources\Certificates\test_certificate-2048.der">
124+
<Link>_Resources\Certificates\test_certificate-2048.der</Link>
125+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
126+
</EmbeddedResource>
127+
<EmbeddedResource Include="..\Tests\_Resources\Certificates\test_certificate-2048.pem">
128+
<Link>_Resources\Certificates\test_certificate-2048.pem</Link>
129+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
130+
</EmbeddedResource>
131+
<EmbeddedResource Include="..\Tests\_Resources\Certificates\test_certificate-4096.pem">
132+
<Link>_Resources\Certificates\test_certificate-4096.pem</Link>
133+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
134+
</EmbeddedResource>
135+
<EmbeddedResource Include="..\Tests\_Resources\Certificates\test_certificate-512.pem">
136+
<Link>_Resources\Certificates\test_certificate-512.pem</Link>
137+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
138+
</EmbeddedResource>
139+
<EmbeddedResource Include="..\Tests\_Resources\Keys\Pkcs1\test_key_pkcs1-1024.pem">
140+
<Link>_Resources\Keys\Pkcs1\test_key_pkcs1-1024.pem</Link>
141+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
142+
</EmbeddedResource>
143+
<EmbeddedResource Include="..\Tests\_Resources\Keys\Pkcs1\test_key_pkcs1-2048.pem">
144+
<Link>_Resources\Keys\Pkcs1\test_key_pkcs1-2048.pem</Link>
145+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
146+
</EmbeddedResource>
147+
<EmbeddedResource Include="..\Tests\_Resources\Keys\Pkcs1\test_key_pkcs1-4096.pem">
148+
<Link>_Resources\Keys\Pkcs1\test_key_pkcs1-4096.pem</Link>
149+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
150+
</EmbeddedResource>
151+
<EmbeddedResource Include="..\Tests\_Resources\Keys\Pkcs1\test_key_pkcs1-512.pem">
152+
<Link>_Resources\Keys\Pkcs1\test_key_pkcs1-512.pem</Link>
153+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
154+
</EmbeddedResource>
155+
<EmbeddedResource Include="..\Tests\_Resources\Keys\Pkcs12\test_key.p12">
156+
<Link>_Resources\Keys\Pkcs12\test_key.p12</Link>
157+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
158+
</EmbeddedResource>
159+
<EmbeddedResource Include="..\Tests\_Resources\Keys\Pkcs8\test_invalid_key.der">
160+
<Link>_Resources\Keys\Pkcs8\test_invalid_key.der</Link>
161+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
162+
</EmbeddedResource>
163+
<EmbeddedResource Include="..\Tests\_Resources\Keys\Pkcs8\test_key_pkcs8-1024.der">
164+
<Link>_Resources\Keys\Pkcs8\test_key_pkcs8-1024.der</Link>
165+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
166+
</EmbeddedResource>
167+
<EmbeddedResource Include="..\Tests\_Resources\Keys\Pkcs8\test_key_pkcs8-1024.pem">
168+
<Link>_Resources\Keys\Pkcs8\test_key_pkcs8-1024.pem</Link>
169+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
170+
</EmbeddedResource>
171+
<EmbeddedResource Include="..\Tests\_Resources\Keys\Pkcs8\test_key_pkcs8-2048.der">
172+
<Link>_Resources\Keys\Pkcs8\test_key_pkcs8-2048.der</Link>
173+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
174+
</EmbeddedResource>
175+
<EmbeddedResource Include="..\Tests\_Resources\Keys\Pkcs8\test_key_pkcs8-2048.pem">
176+
<Link>_Resources\Keys\Pkcs8\test_key_pkcs8-2048.pem</Link>
177+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
178+
</EmbeddedResource>
179+
<EmbeddedResource Include="..\Tests\_Resources\Keys\Pkcs8\test_key_pkcs8-4096.der">
180+
<Link>_Resources\Keys\Pkcs8\test_key_pkcs8-4096.der</Link>
181+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
182+
</EmbeddedResource>
183+
<EmbeddedResource Include="..\Tests\_Resources\Keys\Pkcs8\test_key_pkcs8-4096.pem">
184+
<Link>_Resources\Keys\Pkcs8\test_key_pkcs8-4096.pem</Link>
185+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
186+
</EmbeddedResource>
187+
<EmbeddedResource Include="..\Tests\_Resources\Keys\Pkcs8\test_key_pkcs8-512.der">
188+
<Link>_Resources\Keys\Pkcs8\test_key_pkcs8-512.der</Link>
189+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
190+
</EmbeddedResource>
191+
<EmbeddedResource Include="..\Tests\_Resources\Keys\Pkcs8\test_key_pkcs8-512.pem">
192+
<Link>_Resources\Keys\Pkcs8\test_key_pkcs8-512.pem</Link>
193+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
194+
</EmbeddedResource>
195+
</ItemGroup>
196+
<ItemGroup>
197+
<ProjectReference Include="..\..\Mastercard.Developer.ClientEncryption.Core\Mastercard.Developer.ClientEncryption.Core.csproj">
198+
<Project>{8ffa4f79-9d2c-4807-bad7-8e2f0a15e099}</Project>
199+
<Name>Mastercard.Developer.ClientEncryption.Core</Name>
200+
</ProjectReference>
201+
<ProjectReference Include="..\..\Mastercard.Developer.ClientEncryption.RestSharpV2\Mastercard.Developer.ClientEncryption.RestSharpV2.csproj">
202+
<Project>{bc6f2c72-16a3-44cb-ad68-3acd8a465640}</Project>
203+
<Name>Mastercard.Developer.ClientEncryption.RestSharpV2</Name>
204+
</ProjectReference>
205+
<ProjectReference Include="..\..\Mastercard.Developer.ClientEncryption.RestSharp\Mastercard.Developer.ClientEncryption.RestSharp.csproj">
206+
<Project>{4abdad88-8dc4-4463-91ec-74a711d6acfb}</Project>
207+
<Name>Mastercard.Developer.ClientEncryption.RestSharp</Name>
208+
</ProjectReference>
209+
</ItemGroup>
210+
<ItemGroup>
211+
<Reference Include="System" />
212+
</ItemGroup>
213+
<ItemGroup>
214+
<PackageReference Include="FubarCoder.RestSharp.Portable.Core">
215+
<Version>4.0.6</Version>
216+
</PackageReference>
217+
<PackageReference Include="MSTest.TestAdapter">
218+
<Version>2.1.2</Version>
219+
</PackageReference>
220+
<PackageReference Include="MSTest.TestFramework">
221+
<Version>2.1.2</Version>
222+
</PackageReference>
223+
<PackageReference Include="System.Security.Cryptography.Cng">
224+
<Version>4.7.0</Version>
225+
</PackageReference>
226+
<PackageReference Include="System.Security.Cryptography.X509Certificates">
227+
<Version>4.3.2</Version>
228+
</PackageReference>
229+
</ItemGroup>
230+
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
231+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
232+
</Project>

0 commit comments

Comments
 (0)