Release 2.10.2

Author: square-sdk-deployer

.gitignore

@@ -9,6 +9,18 @@
 
 # Build results
 
+[Dd]ebug/
+[Rr]elease/# Ref: https://gist.github.com/kmorcinek/2710267
+# Download this file using PowerShell v3 under Windows with the following comand
+# Invoke-WebRequest https://gist.githubusercontent.com/kmorcinek/2710267/raw/ -OutFile .gitignore
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+
 [Dd]ebug/
 [Rr]elease/
 x64/
@@ -156,6 +168,183 @@ UpgradeLog*.htm
 **/App_Data/*.sdf
 
 
+#LightSwitch generated files
+GeneratedArtifacts/
+_Pvt_Extensions/
+ModelManifest.xml
+
+# =========================
+# Windows detritus
+# =========================
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Mac desktop service store files
+.DS_Store
+
+# SASS Compiler cache
+.sass-cache
+
+# Visual Studio 2014 CTP
+**/*.sln.ide
+
+travis-ci/accounts.json
+.vs/Square.Connect/xs/UserPrefs.xml
+.vs/Square.Connect/xs/sqlite3/db.lock
+
+x64/
+build/
+[Bb]in/
+[Oo]bj/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.log
+*.scc
+
+# OS generated files #
+.DS_Store*
+ehthumbs.db
+Icon?
+Thumbs.db
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+*.ncrunch*
+.*crunch*.local.xml
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.Publish.xml
+
+# Windows Azure Build Output
+csx
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Others
+sql/
+*.Cache
+ClientBin/
+[Ss]tyle[Cc]op.*
+~$*
+*~
+*.dbmdl
+*.[Pp]ublish.xml
+*.pfx
+*.publishsettings
+modulesbin/
+tempbin/
+
+# EPiServer Site file (VPP)
+AppData/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# vim
+*.txt~
+*.swp
+*.swo
+
+# svn
+.svn
+
+# SQL Server files
+**/App_Data/*.mdf
+**/App_Data/*.ldf
+**/App_Data/*.sdf
+
+
 #LightSwitch generated files
 GeneratedArtifacts/
 _Pvt_Extensions/

.travis.yml

@@ -1,19 +1,16 @@
-#
-# Generated by: https://github.com/swagger-api/swagger-codegen.git
-#
 language: csharp
-mono:
-  - latest
-solution: Square.Connect.sln
+dist: trusty
+mono: none
+dotnet: 2.0.0
 
 install:
   - wget -nc https://dist.nuget.org/win-x86-commandline/latest/nuget.exe;
   - openssl aes-256-cbc -K $encrypted_1ab91df4dffb_key -iv $encrypted_1ab91df4dffb_iv -in ./travis-ci/accounts.enc -out ./travis-ci/accounts.json -d
 
 script:
-  - export frameworkVersion=net45
-  - export releaseVersion="2.10.1"
-  - /bin/sh ./mono_nunit_test.sh
+  - export frameworkVersion=netstandard2.0
+  - export releaseVersion="2.10.2"
+  - /bin/sh ./nunit_test.sh
 
 after_success:
   - /bin/bash ./travis-ci/build_and_publish.sh

CHANGES.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## Version 2.10.2 (2018-08-21)
+
+Updated the SDK target to be .net standard 2.0.
+
 ## Version 2.10.1 (2018-08-02)
 
 We have added MobileAuthorization API.

README.md

@@ -8,7 +8,7 @@ specification repository](https://github.com/square/connect-api-specification)
 for the specification and template files we used to generate this.
 
 ## Frameworks supported
-- .NET 4.5 or later
+- .NET Standard
 
 ## Usage
 ### **Obtain from [NuGet package manager](https://www.nuget.org/packages/Square.Connect/) (Recommended)**
@@ -19,14 +19,8 @@ PM> Install-Package Square.Connect
 ### **Generating DLLs from source**
 
 #### Dependencies
-- [RestSharp] (https://www.nuget.org/packages/RestSharp) - 106.2.2 or later
-- [Json.NET] (https://www.nuget.org/packages/Newtonsoft.Json/) - 7.0.0 or later
-
-The DLLs included in the package may not be the latest version. We recommned using [NuGet](https://docs.nuget.org/consume/installing-nuget) to obtain the latest version of the packages:
-```
-PM> Install-Package RestSharp
-PM> Install-Package Newtonsoft.Json
-```
+- [RestSharp] (https://www.nuget.org/packages/RestSharp) - 106.3.1 or later
+- [Json.NET] (https://www.nuget.org/packages/Newtonsoft.Json/) - 10.0.0 or later
 
 Option 1: Run the following command to generate the DLL
 
@@ -37,8 +31,6 @@ Option 2: Import the `Square.Connect/Square.Connect.csproj` to your solution and
 
 Then include the DLLs (under the `bin` folder) in the C# project,
 
-- RestSharp.dll
-- Newtonsoft.Json.dll
 - Square.Connect.dll
 
 ## Getting Started

build.bat

@@ -1,16 +1,2 @@
-:: Generated by: https://github.com/swagger-api/swagger-codegen.git
-::
-
 @echo off
-
-SET CSCPATH=%SYSTEMROOT%\Microsoft.NET\Framework\v4.0.30319
-
-if not exist ".\nuget.exe" powershell -Command "(new-object System.Net.WebClient).DownloadFile('https://dist.nuget.org/win-x86-commandline/latest/nuget.exe', '.\nuget.exe')"
-.\nuget.exe install src\Square.Connect\packages.config -o packages
-
-if not exist ".\bin" mkdir bin
-
-copy packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll bin\Newtonsoft.Json.dll
-copy packages\RestSharp.106.2.2\lib\net452\RestSharp.dll bin\RestSharp.dll
-%CSCPATH%\csc  /reference:bin\Newtonsoft.Json.dll;bin\RestSharp.dll;System.ComponentModel.DataAnnotations.dll;System.Web.dll  /target:library /out:bin\IO.Swagger.dll /recurse:src\IO.Swagger\*.cs /doc:bin\IO.Swagger.xml
-
+dotnet build

build.sh

@@ -1,51 +1,12 @@
 #!/usr/bin/env bash
-#
-# Generated by: https://github.com/swagger-api/swagger-codegen.git
-
-frameworkVersion=net45
-netfx=${frameworkVersion#net}
 
+frameworkVersion=netstandard2.0
 echo "[INFO] Target framework: ${frameworkVersion}"
 
-echo "[INFO] Download nuget and packages"
-if ! which wget
-then
-    echo "wget is either not installed on thie system or is"\
-    "unavailable through the \$PATH."
-	while true; do
-	    printf "Install it by [ curl -sSL https://dist.nuget.org/win-x86-commandline/latest/nuget.exe ]? [y/N] "
-	    read -r  yn
-	    case "$yn" in
-	        [Yy]* ) break;;
-	        [Nn]* ) exit;;
-	        '' ) exit;;
-	    esac
-	done
-	curl -sSL https://dist.nuget.org/win-x86-commandline/latest/nuget.exe -o nuget.exe;
-else
-	wget -nc https://dist.nuget.org/win-x86-commandline/latest/nuget.exe;
-fi
-
-mozroots --import --sync
-mono nuget.exe install src/Square.Connect/packages.config -o packages;
-
-echo "[INFO] Copy DLLs to the 'bin' folder"
-mkdir -p bin;
-cp packages/Newtonsoft.Json.8.0.3/lib/net45/Newtonsoft.Json.dll bin/Newtonsoft.Json.dll;
-cp packages/RestSharp.106.2.2/lib/net452/RestSharp.dll bin/RestSharp.dll;
-
-echo "[INFO] Run 'mcs' to build bin/Square.Connect.dll"
-
-mcs -sdk:${netfx} -r:bin/Newtonsoft.Json.dll,\
-bin/RestSharp.dll,\
-System.ComponentModel.DataAnnotations.dll,\
-System.Runtime.Serialization.dll,\
-System.Web.dll \
--target:library \
--out:bin/Square.Connect.dll \
--recurse:"src/Square.Connect/*.cs" \
--doc:bin/Square.Connect.xml \
--platform:anycpu
+echo "[INFO] Run 'dotnet' to build bin/Square.Connect.dll"
+dotnet build src/Square.Connect/Square.Connect.csproj \
+-o ../../bin \
+-f $frameworkVersion
 
 if [ $? -ne 0 ]
 then

nunit_test.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+echo "[INFO] Build the solution and run the unit test"
+dotnet test src/Square.Connect.Test/Square.Connect.Test.csproj -v n

src/Square.Connect.Test/Api/CatalogApiTests.cs

@@ -405,7 +405,8 @@ public void TestRetrieveItemCatalogObject()
             Assert.IsNotNull(resp);
             Assert.AreEqual(coffee.Type, resp._Object.Type);
             Assert.AreEqual(idMap[COFFEE_ID], resp._Object.Id);
-            Assert.IsNotNullOrEmpty(resp._Object.UpdatedAt);
+            Assert.IsNotNull(resp._Object.UpdatedAt);
+            Assert.IsNotEmpty(resp._Object.UpdatedAt);
             Assert.AreNotEqual(0, resp._Object.Version);
             Assert.IsFalse(resp._Object.IsDeleted.Value);
             Assert.AreEqual(coffee.ItemData.Name, resp._Object.ItemData.Name);
@@ -426,7 +427,8 @@ public void TestRetrieveTaxCatalogObject()
             Assert.IsNotNull(resp);
             Assert.AreEqual(salesTax.Type, resp._Object.Type);
             Assert.AreEqual(idMap[SALES_TAX_ID], resp._Object.Id);
-            Assert.IsNotNullOrEmpty(resp._Object.UpdatedAt);
+            Assert.IsNotNull(resp._Object.UpdatedAt);
+            Assert.IsNotEmpty(resp._Object.UpdatedAt);
             Assert.AreNotEqual(0, resp._Object.Version);
             Assert.IsFalse(resp._Object.IsDeleted.Value);
             Assert.AreEqual(salesTax.TaxData.Name, resp._Object.TaxData.Name);

src/Square.Connect.Test/Configuration/TestAccounts.cs

@@ -8,7 +8,7 @@ namespace Square.Connect.Test
 {
     public class TestAccounts
     {
-        private static readonly string jsonFilePath = @"../../../../travis-ci/accounts.json";
+        private static readonly string jsonFilePath = @"../../../../../travis-ci/accounts.json";
         private static Dictionary<String, AccountInfo> accounts;
 
         public AccountInfo this[String name]