Merge pull request #255 from AuthorizeNet/future

Remove CoffeeShop Sample App & update version
AuthorizeNet · Mar 2, 2019 · e23ffab · e23ffab
2 parents 292dc38 + 605b068
commit e23ffab
Show file tree

Hide file tree

Showing 42 changed files with 8 additions and 1,583 deletions.
diff --git a/Authorize.NET/AuthorizeNET.csproj b/Authorize.NET/AuthorizeNET.csproj
@@ -55,7 +55,9 @@
     <Reference Include="System.Security" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="*.cs" />
+    <Compile Include="Environment.cs" />
+    <Compile Include="MarketType.cs" />
+    <Compile Include="TestFriends.cs" />
     <Compile Include="Api\Contracts\V1\*.cs" />
     <Compile Include="Api\Controllers\ARBCancelSubscriptionController.cs" />
     <Compile Include="Api\Controllers\ARBCreateSubscriptionController.cs" />

diff --git a/Authorize.NET/Merchant.cs b/Authorize.NET/Merchant.cs
diff --git a/Authorize.NET/Properties/AssemblyInfo.cs b/Authorize.NET/Properties/AssemblyInfo.cs
@@ -30,7 +30,7 @@
 //      Revision
 //
 // See AssemblyFileVersion.cs for Product and Assembly Version
-//[assembly: AssemblyVersion("1.9.6.0")]
-[assembly: AssemblyFileVersion("1.9.7.0")]
-[assembly: AssemblyVersion("1.9.7.0")]
+//[assembly: AssemblyVersion("1.9.7.0")]
+[assembly: AssemblyFileVersion("1.9.8.0")]
+[assembly: AssemblyVersion("1.9.8.0")]
 
diff --git a/Authorize.NET/Util/Constants.cs b/Authorize.NET/Util/Constants.cs
@@ -26,7 +26,7 @@ public static class Constants {
         public const int HttpConnectionDefaultTimeout = 30000;
         public const int HttpReadWriteDefaultTimeout = 30000;
 
-        public const string SDKVersion = "1.9.7";
+        public const string SDKVersion = "1.9.8";
 
     }
 #pragma warning restore 1591

diff --git a/AuthorizeNETtest/Api/Controllers/Test/ApiCoreTestBase.cs b/AuthorizeNETtest/Api/Controllers/Test/ApiCoreTestBase.cs
@@ -27,7 +27,6 @@ public abstract class ApiCoreTestBase {
         protected static AuthorizeNet.Environment TestEnvironment = AuthorizeNet.Environment.SANDBOX;
         //protected static AuthorizeNet.Environment TestEnvironment = AuthorizeNet.Environment.HOSTED_VM;
 
-	    static Merchant _merchant ;
 	    static readonly String ApiLoginIdKey ;
 	    static readonly String TransactionKey ;
 	    static String _md5HashKey ;
@@ -91,15 +90,6 @@ static ApiCoreTestBase() {
                     "LoginId and/or TransactionKey have not been set. Merchant keys are required.");
 		    }
 
-	        if (null != ApiLoginIdKey && null != TransactionKey)
-	        {
-	            _merchant = Merchant.CreateMerchant(TestEnvironment, ApiLoginIdKey, TransactionKey);
-	        }
-            if (null == _merchant)
-            {
-                Assert.Fail("Merchant logins have been set");
-            }
-
 	        ErrorMessages = new Dictionary<string, string>();
 	    }
 

diff --git a/AuthorizeNet.nuspec b/AuthorizeNet.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>AuthorizeNet</id>
-        <version>1.9.7</version>
+        <version>1.9.8</version>
         <title>AuthorizeNet</title>
         <authors>Authorize.Net</authors>
         <owners>AuthorizeNet</owners>

diff --git a/CoffeeShopWebApp/Coffee.aspx b/CoffeeShopWebApp/Coffee.aspx
diff --git a/CoffeeShopWebApp/Coffee.aspx.cs b/CoffeeShopWebApp/Coffee.aspx.cs
diff --git a/CoffeeShopWebApp/Coffee.aspx.designer.cs b/CoffeeShopWebApp/Coffee.aspx.designer.cs
diff --git a/CoffeeShopWebApp/CoffeeShopWebApp.csproj b/CoffeeShopWebApp/CoffeeShopWebApp.csproj