Merge branch 'master' of https://github.com/Acumatica/AcumaticaRESTAP…

…IClientForCSharp
dianecawley · Jan 20, 2022 · 9bf2892 · 9bf2892
2 parents 48b49fb + 3722e70
commit 9bf2892
Show file tree

Hide file tree

Showing 24 changed files with 197 additions and 374 deletions.
diff --git a/Acumatica REST API Client.sln b/Acumatica REST API Client.sln
@@ -1,14 +1,10 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29503.13
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Acumatica REST API Example Console Application", "Acumatica REST API Console Application\Acumatica REST API Example Console Application.csproj", "{201508E8-B057-4EFB-AD9D-74C777339C42}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Acumatica.RESTClient", "Acumatica.RESTClient\Acumatica.RESTClient.csproj", "{25008D3F-3D78-4BB9-B14B-0A792AE97892}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SOAPLikeWrapperForREST", "SOAPLikeWrapperForREST\SOAPLikeWrapperForREST.csproj", "{99541823-473A-46E8-AEC0-CE6250F00FE8}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Endpoints", "Endpoints", "{F0B2BD45-79AE-43AF-B737-3018CD95C6E3}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Acumatica.DeviceHub_19.200.001", "Acumatica.DeviceHub_19.200.001\Acumatica.DeviceHub_19.200.001.csproj", "{638D4F3F-4496-44DC-8BAA-6C0F05516A22}"
@@ -33,18 +29,10 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{201508E8-B057-4EFB-AD9D-74C777339C42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{201508E8-B057-4EFB-AD9D-74C777339C42}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{201508E8-B057-4EFB-AD9D-74C777339C42}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{201508E8-B057-4EFB-AD9D-74C777339C42}.Release|Any CPU.Build.0 = Release|Any CPU
 		{25008D3F-3D78-4BB9-B14B-0A792AE97892}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{25008D3F-3D78-4BB9-B14B-0A792AE97892}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{25008D3F-3D78-4BB9-B14B-0A792AE97892}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{25008D3F-3D78-4BB9-B14B-0A792AE97892}.Release|Any CPU.Build.0 = Release|Any CPU
-		{99541823-473A-46E8-AEC0-CE6250F00FE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{99541823-473A-46E8-AEC0-CE6250F00FE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{99541823-473A-46E8-AEC0-CE6250F00FE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{99541823-473A-46E8-AEC0-CE6250F00FE8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{638D4F3F-4496-44DC-8BAA-6C0F05516A22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{638D4F3F-4496-44DC-8BAA-6C0F05516A22}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{638D4F3F-4496-44DC-8BAA-6C0F05516A22}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/Acumatica REST API Console Application/Acumatica REST API Example Console Application.csproj b/Acumatica REST API Console Application/Acumatica REST API Example Console Application.csproj
@@ -33,10 +33,51 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="RestSharp, Version=107.1.1.0, Culture=neutral, PublicKeyToken=598062e77f915f75" />
+    <Reference Include="Acumatica.RESTClient, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Acumatica.RESTClient.1.1.0\lib\net48\Acumatica.RESTClient.dll</HintPath>
+    </Reference>
+    <Reference Include="DefaultEndpoint_20.200.001, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\DefaultEndpoint_20.200.001.1.0.0\lib\net48\DefaultEndpoint_20.200.001.dll</HintPath>
+    </Reference>
+    <Reference Include="JsonSubTypes, Version=1.8.0.0, Culture=neutral, PublicKeyToken=ee75fc290dbc1176, processorArchitecture=MSIL">
+      <HintPath>..\packages\JsonSubTypes.1.8.0\lib\net47\JsonSubTypes.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="RestSharp, Version=107.1.1.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
+      <HintPath>..\packages\RestSharp.107.1.1\lib\netstandard2.0\RestSharp.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
     <Reference Include="System.Core" />
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
+    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Text.Encodings.Web, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Encodings.Web.5.0.0\lib\net461\System.Text.Encodings.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Text.Json, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Json.5.0.0\lib\net461\System.Text.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
+    </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -53,20 +94,9 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Acumatica.Default_18.200.001\Acumatica.Default_18.200.001.csproj">
-      <Project>{b26a386b-f5da-4679-acba-1541251b696b}</Project>
-      <Name>Acumatica.Default_18.200.001</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Acumatica.Default_20.200.001\Acumatica.Default_20.200.001.csproj">
-      <Project>{cf6f7377-7a11-4d88-ad4d-6440e6994826}</Project>
-      <Name>Acumatica.Default_20.200.001</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Acumatica.RESTClient\Acumatica.RESTClient.csproj">
-      <Project>{25008d3f-3d78-4bb9-b14b-0a792ae97892}</Project>
-      <Name>Acumatica.RESTClient</Name>
-    </ProjectReference>
     <ProjectReference Include="..\SOAPLikeWrapperForREST\SOAPLikeWrapperForREST.csproj">
       <Project>{99541823-473a-46e8-aec0-ce6250f00fe8}</Project>
       <Name>SOAPLikeWrapperForREST</Name>

diff --git a/Acumatica REST API Console Application/App.config b/Acumatica REST API Console Application/App.config
@@ -9,6 +9,10 @@
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
diff --git a/Acumatica REST API Console Application/Program.cs b/Acumatica REST API Console Application/Program.cs
@@ -1,6 +1,6 @@
 using Acumatica.Auth.Api;
 using Acumatica.Auth.Model;
-using Acumatica.Default_18_200_001.Api;
+using Acumatica.Default_20_200_001.Api;
 using Acumatica.RESTClient.Client;
 using System;
 using System.Collections.Generic;

diff --git a/Acumatica REST API Console Application/RESTExample.cs b/Acumatica REST API Console Application/RESTExample.cs
@@ -1,7 +1,7 @@
 using Acumatica.Auth.Api;
 using Acumatica.Auth.Model;
-using Acumatica.Default_18_200_001.Api;
-using Acumatica.Default_18_200_001.Model;
+using Acumatica.Default_20_200_001.Api;
+using Acumatica.Default_20_200_001.Model;
 using Acumatica.RESTClient.Client;
 using RestSharp;
 using System;

diff --git a/Acumatica REST API Console Application/SOAPLikeExample.cs b/Acumatica REST API Console Application/SOAPLikeExample.cs
@@ -1,4 +1,4 @@
-using Acumatica.Default_18_200_001.Model;
+using Acumatica.Default_20_200_001.Model;
 using SOAPLikeWrapperForREST;
 using System;
 
@@ -8,7 +8,7 @@ public class SOAPLikeExample
     {
         public static void ExampleMethod(string siteURL, string username, string password, string tenant = null, string branch = null, string locale = null)
         {
-            var restClient = new SOAPLikeClient(siteURL, "/Default/18.200.001");
+            var restClient = new SOAPLikeClient(siteURL, "/Default/20.200.001");
 
             try
             {

diff --git a/Acumatica.RESTClient/packages.config → ...T API Console Application/packages.config b/Acumatica.RESTClient/packages.config → ...T API Console Application/packages.config
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="JsonSubTypes" version="1.8.0" targetFramework="net472" />
+  <package id="Acumatica.RESTClient" version="1.1.0" targetFramework="net48" />
+  <package id="DefaultEndpoint_20.200.001" version="1.0.0" targetFramework="net48" />
+  <package id="JsonSubTypes" version="1.8.0" targetFramework="net48" />
   <package id="Microsoft.Bcl.AsyncInterfaces" version="5.0.0" targetFramework="net48" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" developmentDependency="true" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
   <package id="RestSharp" version="107.1.1" targetFramework="net48" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
   <package id="System.Memory" version="4.5.4" targetFramework="net48" />