Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #7: Port to netstandard #30

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Issue #7: Port to netstandard #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f057de
Issue #7: Port to netstandard
IndikaUdagedara Jan 5, 2018
3f8140e
Update appveyor.yml for netcore
IndikaUdagedara Jan 5, 2018
ccc75b5
Cleanup .csproj files
IndikaUdagedara Jan 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@

before_build:
- nuget restore
- appveyor-retry dotnet restore

build_script:
- dotnet build

test_script:
- dotnet test ".\eWAY.Rapid.Tests\"

environment:
matrix:
Expand Down
9 changes: 0 additions & 9 deletions eWAY.Rapid.Tests/App.config
View file
Open in desktop

This file was deleted.

25 changes: 20 additions & 5 deletions eWAY.Rapid.Tests/IntegrationTests/SdkTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,28 @@
using System.Configuration;
using System;
using System.IO;
using Microsoft.Extensions.Configuration;

namespace eWAY.Rapid.Tests.IntegrationTests
{
public abstract class SdkTestBase
{
public static string PASSWORD = ConfigurationManager.AppSettings["PASSWORD"];
public static string APIKEY = ConfigurationManager.AppSettings["APIKEY"];
public static string ENDPOINT = ConfigurationManager.AppSettings["ENDPOINT"];
public static int APIVERSION = int.Parse(ConfigurationManager.AppSettings["APIVERSION"]);
protected SdkTestBase()
{
var configuration = new ConfigurationBuilder()
.SetBasePath(Directory.GetCurrentDirectory())
.AddJsonFile("appsettings.json")
.Build();

PASSWORD = configuration["PASSWORD"];
APIKEY = configuration["APIKEY"];
ENDPOINT = configuration["ENDPOINT"];
APIVERSION = Convert.ToInt32(configuration["APIVERSION"]);
}

public static string PASSWORD;
public static string APIKEY;
public static string ENDPOINT;
public static int APIVERSION;

protected IRapidClient CreateRapidApiClient()
{
Expand Down
6 changes: 6 additions & 0 deletions eWAY.Rapid.Tests/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"PASSWORD": "API-P4ss",
"APIKEY": "60CF3Ce97nRS1Z1Wp5m9kMmzHHEh8Rkuj31QCtVxjPWGYA9FymyqsK0Enm1P6mHJf0THbR",
"ENDPOINT": "https://api.sandbox.ewaypayments.com/",
"APIVERSION": 40
}
148 changes: 23 additions & 125 deletions eWAY.Rapid.Tests/eWAY.Rapid.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,126 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{B08D82FE-FB42-451D-AC73-454D2D85D369}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>eWAY.Rapid.Tests</RootNamespace>
<AssemblyName>eWAY.Rapid.Tests</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
<IsCodedUITest>False</IsCodedUITest>
<TestProjectType>UnitTest</TestProjectType>
</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>..\eWAY.Rapid.GitHub.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<HintPath>..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll</HintPath>
</Reference>
<Reference Include="Moq, Version=4.8.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<HintPath>..\packages\Moq.4.8.0\lib\net45\Moq.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Threading.Tasks.Extensions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.4.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.Web.Extensions" />
</ItemGroup>
<Choose>
<When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
<ItemGroup>
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
</ItemGroup>
</When>
<Otherwise>
<ItemGroup>
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
</ItemGroup>
</Otherwise>
</Choose>
<ItemGroup>
<Compile Include="IntegrationTests\CreateCustomerTests.cs" />
<Compile Include="IntegrationTests\CreateTransactionTests.cs" />
<Compile Include="IntegrationTests\DirectRefundTests.cs" />
<Compile Include="IntegrationTests\MultiThreadedTests.cs" />
<Compile Include="IntegrationTests\PreAuthTests.cs" />
<Compile Include="IntegrationTests\QueryCustomerTests.cs" />
<Compile Include="IntegrationTests\SettlementSearchTests.cs" />
<Compile Include="IntegrationTests\QueryTransactionTests.cs" />
<Compile Include="IntegrationTests\UpdateCustomerTests.cs" />
<Compile Include="MappingTests\MappingTests.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="IntegrationTests\SdkTestBase.cs" />
<Compile Include="TestUtil.cs" />
<Compile Include="UnitTests\CreateCustomerTests.cs" />
<Compile Include="UnitTests\CreateTransactionTests.cs" />
<Compile Include="UnitTests\MiscTests.cs" />
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
<None Include="eWAY.Rapid.GitHub.snk" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup />
<ItemGroup>
<ProjectReference Include="..\eWAY.Rapid\eWAY.Rapid.csproj">
<Project>{f51b5be6-79a8-44eb-83dd-3109e527f81e}</Project>
<Name>eWAY.Rapid</Name>
</ProjectReference>
</ItemGroup>
<Choose>
<When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
<ItemGroup>
<Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
</ItemGroup>
</When>
</Choose>
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<TargetFrameworks>netcoreapp2.0</TargetFrameworks>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\eWAY.Rapid.GitHub.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="Moq" Version="4.8.0" />
<PackageReference Include="MSTest.TestAdapter" Version="1.2.0" />
<PackageReference Include="MSTest.TestFramework" Version="1.2.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\eWAY.Rapid\eWAY.Rapid.csproj" />
</ItemGroup>
<ItemGroup>
<None Update="appsettings.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
</Project>
6 changes: 0 additions & 6 deletions eWAY.Rapid.Tests/packages.config
View file
Open in desktop

This file was deleted.

Loading