Skip to content

Commit dad0288

Browse files
roywangasposeroywangaspose
committed
Release Aspose.Cells.Cloud SDK 19.3.
Full list of issues covering all changes in this release: CELLSCLOUD-10212 Conflict of Aspose.Cells Cloud SDK for .NET with Aspose.PDF Cloud SDK for .NET
1 parent 5310401 commit dad0288

File tree

11 files changed

+100
-79
lines changed

11 files changed

+100
-79
lines changed

‎Aspose.Cells-Cloud.nuspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>Aspose.Cells-Cloud</id>
5-
<version>19.2</version>
5+
<version>19.3</version>
66
<title>Aspose.Cells Cloud SDK for .NET</title>
77
<authors>Naeem</authors>
88
<owners>asposecloud</owners>
@@ -12,11 +12,11 @@
1212
<copyright>Aspose 2002-2019. All Rights Reserved.</copyright>
1313
<tags>Excel Spreadsheet Aspose.Cells XLS XLSX TXT ODS</tags>
1414
<dependencies>
15-
<dependency id="Newtonsoft.Json" version="9.0.0.0" />
16-
<dependency id="RestSharp" version="105.1.0.0" />
15+
<dependency id="Newtonsoft.Json" version="11.0.2.0" />
16+
<dependency id="RestSharp" version="106.2.2.0" />
1717
</dependencies>
1818
</metadata>
1919
<files>
20-
<file src="Aspose.Cells.Cloud.SDK\bin\Release\Aspose.Cells.Cloud.SDK.dll" target="lib\net4.5" />
20+
<file src="Aspose.Cells.Cloud.SDK\bin\Release\Aspose.Cells.Cloud.SDK.dll" target="lib\net4.5.2" />
2121
</files>
2222
</package>

‎Aspose.Cells.Cloud.SDK.Test/Api/CellsBaseTest.cs

Lines changed: 42 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11

22
namespace Aspose.Cells.Cloud.SDK.Test
33
{
4-
using NUnit.Framework;
5-
64
using Aspose.Cells.Cloud.SDK.Client;
75
using Aspose.Cells.Cloud.SDK.Api;
8-
using Aspose.Cells.Cloud.SDK.Model;
9-
using Com.Aspose.Storage.Api;
6+
using Aspose.Storage.Cloud.Sdk.Api;
7+
using Aspose.Storage.Cloud.Sdk.Model;
8+
using Aspose.Storage.Cloud.Sdk.Model.Requests;
109
using System.IO;
1110
using System.Collections.Generic;
1211
public class CellsBaseTest
1312
{
1413
protected ApiClient client;
15-
protected Configuration config;
14+
protected Client.Configuration config;
1615
protected static OAuthApi oauth2 =null;
1716
protected string grantType = "client_credentials";
18-
protected string clientId = "xxxxx-xxxx-xxxx-xxxx-xxxxxxx";
19-
protected string clientSecret = "xxxxxxxxxxxxxxxxxxx";
17+
protected string clientId = "your app sid";
18+
protected string clientSecret = "your app key";
2019
protected static string accesstoken;
2120
protected string refreshtoken;
2221
protected string BOOK1 = "Book1.xlsx";
@@ -35,38 +34,50 @@ public class CellsBaseTest
3534
protected string RANGE = "A1:C10";
3635
protected string CELLAREA = "A1:C10";
3736
protected StorageApi storageApi;
38-
private string TestDataFolder = @"xxxxxxxxx";
37+
private string TestDataFolder = @"D:\Projects\Aspose\Aspose.Cloud\Aspose.Cells.Cloud.SDK\src\TestData\";
3938
protected void UpdateDataFile( string folder, string filename)
4039
{
41-
this.storageApi = new StorageApi( clientSecret, clientId, "https://api.aspose.cloud/v1.1");
42-
if(string.IsNullOrEmpty(folder))
40+
this.storageApi = new StorageApi( clientSecret, clientId);
41+
DeleteFileRequest file = new DeleteFileRequest();
42+
PutCreateRequest newfile = new PutCreateRequest();
43+
if (string.IsNullOrEmpty(folder))
4344
{
44-
this.storageApi.DeleteFile( filename, null, null);
45-
this.storageApi.PutCreate(filename, null, null, File.ReadAllBytes(TestDataFolder + filename));
46-
45+
file.Path = filename;
46+
newfile.Path = filename;
47+
newfile.File = File.Open(TestDataFolder + filename, FileMode.Open);
4748
}
4849
else
4950
{
50-
this.storageApi.DeleteFile(folder + "/" + filename, null, null);
51-
this.storageApi.PutCreate(folder + "/" + filename, null, null, File.ReadAllBytes(TestDataFolder + filename));
52-
51+
file.Path = folder + "/" + filename;
52+
newfile.Path = folder + "/" + filename;
53+
newfile.File = File.Open(TestDataFolder + filename, FileMode.Open);
5354
}
55+
storageApi.DeleteFile(file);
56+
storageApi.PutCreate(newfile);
57+
newfile.File.Close();
5458
}
5559
protected void UpdateDataFileForDropBox(string folder, string filename)
5660
{
57-
this.storageApi = new StorageApi(clientSecret, clientId, "https://api.aspose.cloud/v1.1");
61+
this.storageApi = new StorageApi(clientSecret, clientId);
62+
DeleteFileRequest file = new DeleteFileRequest();
63+
PutCreateRequest newfile = new PutCreateRequest();
64+
file.Storage = "DropBox";
65+
newfile.Storage = "DropBox";
5866
if (string.IsNullOrEmpty(folder))
5967
{
60-
this.storageApi.DeleteFile(filename, null, "DropBox");
61-
this.storageApi.PutCreate(filename, null, "DropBox", File.ReadAllBytes(TestDataFolder + filename));
62-
68+
file.Path = filename;
69+
newfile.Path = filename;
70+
newfile.File = File.Open(TestDataFolder + filename, FileMode.Open);
6371
}
6472
else
6573
{
66-
this.storageApi.DeleteFile(folder + "/" + filename, null, "DropBox");
67-
this.storageApi.PutCreate(folder + "/" + filename, null, "DropBox", File.ReadAllBytes(TestDataFolder + filename));
68-
74+
file.Path = folder + "/" + filename;
75+
newfile.Path = folder + "/" + filename;
76+
newfile.File = File.Open(TestDataFolder + filename, FileMode.Open);
6977
}
78+
this.storageApi.DeleteFile(file);
79+
this.storageApi.PutCreate(newfile);
80+
newfile.File.Close();
7081
}
7182
protected Stream GetTestDataStream( string filename)
7283
{
@@ -81,7 +92,13 @@ protected byte[] GetTestDataByteArray(string filename)
8192
{
8293
return File.ReadAllBytes(TestDataFolder + filename);
8394
}
84-
protected Configuration GetConfiguration()
95+
protected void WriteResponseStream(string filename, Stream stream)
96+
{
97+
FileStream fs = File.Create(TestDataFolder + filename);
98+
stream.CopyTo(fs);
99+
fs.Close();
100+
}
101+
protected Client.Configuration GetConfiguration()
85102
{
86103
if (oauth2 == null)
87104
{
@@ -93,7 +110,7 @@ protected Configuration GetConfiguration()
93110
Dictionary<string, string> headerParameters = new Dictionary<string, string>();
94111
headerParameters.Add("Authorization", "Bearer " + accesstoken);
95112
client = new ApiClient();
96-
config = new Configuration(client, headerParameters);
113+
config = new Client.Configuration(client, headerParameters);
97114
return config;
98115
}
99116
}

‎Aspose.Cells.Cloud.SDK.Test/Aspose.Cells.Cloud.SDK.Test.csproj

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<!--
33
Web API Swagger specification
44
@@ -16,7 +16,7 @@ OpenAPI spec version: 1.0
1616
<AppDesignerFolder>Properties</AppDesignerFolder>
1717
<RootNamespace>Aspose.Cells.Cloud.SDK.Test</RootNamespace>
1818
<AssemblyName>Aspose.Cells.Cloud.SDK.Test</AssemblyName>
19-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
19+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
2020
<FileAlignment>512</FileAlignment>
2121
</PropertyGroup>
2222
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,6 +37,9 @@ OpenAPI spec version: 1.0
3737
<WarningLevel>4</WarningLevel>
3838
</PropertyGroup>
3939
<ItemGroup>
40+
<Reference Include="Aspose.Storage.Cloud.Sdk, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
41+
<HintPath>..\packages\Aspose.Storage-Cloud.18.3.0\lib\net20\Aspose.Storage.Cloud.Sdk.dll</HintPath>
42+
</Reference>
4043
<Reference Include="System" />
4144
<Reference Include="System.Core" />
4245
<Reference Include="System.Xml.Linq" />
@@ -47,35 +50,32 @@ OpenAPI spec version: 1.0
4750
<Reference Include="System.Runtime.Serialization" />
4851
<Reference Include="System.Xml" />
4952
<Reference Include="Newtonsoft.Json">
50-
<HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
51-
<HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
53+
<HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
54+
<HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
5255
</Reference>
5356
<Reference Include="RestSharp">
54-
<HintPath Condition="Exists('..\packages')">..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
55-
<HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
57+
<HintPath Condition="Exists('..\packages')">..\packages\RestSharp.106.2.2\lib\net452\RestSharp.dll</HintPath>
58+
<HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.106.2.2\lib\net452\RestSharp.dll</HintPath>
5659
</Reference>
5760
<Reference Include="nunit.framework">
5861
<HintPath Condition="Exists('..\packages')">..\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll</HintPath>
5962
<HintPath Condition="Exists('..\..\packages')">..\..\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll</HintPath>
6063
</Reference>
61-
<Reference Include="Aspose.Storage-Cloud">
62-
<HintPath Condition="Exists('..\packages')">..\packages\Aspose.Storage-Cloud.1.0.10\lib\Aspose.Storage-Cloud.dll</HintPath>
63-
<HintPath Condition="Exists('..\..\packages')">..\..\packages\Aspose.Storage-Cloud.1.0.10\lib\Aspose.Storage-Cloud.dll</HintPath>
64-
</Reference>
6564
</ItemGroup>
6665
<ItemGroup>
67-
<Compile Include="**\*.cs"
68-
Exclude="obj\**"/>
66+
<Compile Include="**\*.cs" Exclude="obj\**" />
6967
</ItemGroup>
7068
<ItemGroup>
71-
<None Include="packages.config" />
69+
<None Include="app.config" />
70+
<None Include="packages.config">
71+
<SubType>Designer</SubType>
72+
</None>
7273
</ItemGroup>
7374
<Import Project="$(MsBuildToolsPath)\Microsoft.CSharp.targets" />
7475
<ItemGroup>
75-
<ProjectReference Include="..\Aspose.Cells.Cloud.SDK\Aspose.Cells.Cloud.SDK.csproj">
76-
<Project>{01EAB971-83A4-45CC-90A9-D216AA78FDAC}</Project>
77-
<Name>Aspose.Cells.Cloud.SDK</Name>
78-
</ProjectReference>
76+
<ProjectReference Include="..\Aspose.Cells.Cloud.SDK\Aspose.Cells.Cloud.SDK.csproj">
77+
<Project>{01EAB971-83A4-45CC-90A9-D216AA78FDAC}</Project>
78+
<Name>Aspose.Cells.Cloud.SDK</Name>
79+
</ProjectReference>
7980
</ItemGroup>
80-
</Project>
81-
81+
</Project>

‎Aspose.Cells.Cloud.SDK.Test/packages.config

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="Aspose.Storage-Cloud" version="18.3.0" targetFramework="net452" />
4+
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net452" developmentDependency="true" />
35
<package id="NUnit" version="3.9.0" targetFramework="net45" />
4-
<package id="RestSharp" version="105.1.0" targetFramework="net45" developmentDependency="true" />
5-
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" developmentDependency="true" />
6-
<package id="Aspose.Storage-Cloud" version="1.0.10" targetFramework="net45" />
7-
</packages>
6+
<package id="RestSharp" version="106.2.2" targetFramework="net452" developmentDependency="true" />
7+
</packages>

‎Aspose.Cells.Cloud.SDK/Aspose.Cells.Cloud.SDK.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ OpenAPI spec version: 1.0
1212

1313
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
1414
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
15-
<ProjectGuid>{01EAB971-83A4-45CC-90A9-D216AA78FDAC}</ProjectGuid>
15+
<ProjectGuid>{6E3FFD87-CDA6-4BB7-9AD9-1124042FE776}</ProjectGuid>
1616
<OutputType>Library</OutputType>
1717
<AppDesignerFolder>Properties</AppDesignerFolder>
1818
<RootNamespace>Aspose.Cells.Cloud.SDK</RootNamespace>
1919
<AssemblyName>Aspose.Cells.Cloud.SDK</AssemblyName>
20-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
20+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
2121
<FileAlignment>512</FileAlignment>
2222
</PropertyGroup>
2323
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -48,12 +48,12 @@ OpenAPI spec version: 1.0
4848
<Reference Include="System.Runtime.Serialization" />
4949
<Reference Include="System.Xml" />
5050
<Reference Include="Newtonsoft.Json">
51-
<HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
52-
<HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
51+
<HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
52+
<HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
5353
</Reference>
5454
<Reference Include="RestSharp">
55-
<HintPath Condition="Exists('..\packages')">..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
56-
<HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
55+
<HintPath Condition="Exists('..\packages')">..\packages\RestSharp.106.2.2\lib\net452\RestSharp.dll</HintPath>
56+
<HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.106.2.2\lib\net452\RestSharp.dll</HintPath>
5757
</Reference>
5858
</ItemGroup>
5959
<ItemGroup>

‎Aspose.Cells.Cloud.SDK/Aspose.Cells.Cloud.SDK.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
<!-- Dependencies are automatically installed when the package is installed -->
2525
<dependencies>
2626

27-
<dependency id="NewtonSoft.Json" version="10.0.3" />
28-
<dependency id="RestSharp" version="105.1.0" />
27+
<dependency id="NewtonSoft.Json" version="11.0.2" />
28+
<dependency id="RestSharp" version="106.1.0" />
2929

3030
</dependencies>
3131
</metadata>

‎Aspose.Cells.Cloud.SDK/Client/ApiClient.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,13 @@ private RestRequest PrepareRequest(
135135
#if NETCOREAPP2_0
136136
request.AddFile(param.Value.Name, param.Value.Writer, param.Value.FileName, param.Value.ContentLength, param.Value.ContentType);
137137
#else
138-
request.AddFile(param.Value.Name, param.Value.Writer, param.Value.FileName, param.Value.ContentType);
138+
//request.AddFile(param.Value.Name, param.Value.Writer, param.Value.FileName, param.Value.ContentType);
139+
using (MemoryStream stream = new MemoryStream())
140+
{
141+
param.Value.Writer(stream);
142+
request.AddParameter(param.Value.ContentType, stream.ToArray(), ParameterType.RequestBody);
143+
}
144+
139145
#endif
140146
}
141147

‎Aspose.Cells.Cloud.SDK/Client/Configuration.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public Configuration(ApiClient apiClient = null,
4646
string tempFolderPath = null,
4747
string dateTimeFormat = null,
4848
int timeout = 100000,
49-
string userAgent = "Swagger-Codegen/19.2.1/csharp"
49+
string userAgent = "Swagger-Codegen/19.3/csharp"
5050
)
5151
{
5252
setApiClientUsingDefault(apiClient);
@@ -81,7 +81,7 @@ public Configuration(ApiClient apiClient)
8181
/// Version of the package.
8282
/// </summary>
8383
/// <value>Version of the package.</value>
84-
public const string Version = "19.2.1";
84+
public const string Version = "19.3";
8585

8686
/// <summary>
8787
/// Gets or sets the default Configuration.
@@ -326,7 +326,7 @@ public static String ToDebugReport()
326326
.GetReferencedAssemblies()
327327
.Where(x => x.Name == "System.Core").First().Version.ToString() + "\n";
328328
report += " Version of the API: 1.0\n";
329-
report += " SDK Package Version: 19.2.1\n";
329+
report += " SDK Package Version: 19.3\n";
330330

331331
return report;
332332
}

‎Aspose.Cells.Cloud.SDK/Properties/AssemblyInfo.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
// General Information about an assembly is controlled through the following
55
// set of attributes. Change these attribute values to modify the information
66
// associated with an assembly.
7-
[assembly: AssemblyTitle("Swagger Library")]
8-
[assembly: AssemblyDescription("A library generated from a Swagger doc")]
7+
[assembly: AssemblyTitle("Aspose.Cells-Cloud")]
8+
[assembly: AssemblyDescription("Aspose.Cells Cloud for .NET is a spreadsheet programming SDK that allows software developers to manipulate and convert spreadsheet files from within their own applications. A Wrapper of RESTfull APIs, Aspose.Cells Cloud for .NET speeds up Microsoft Excel programming and conversion.")]
99
[assembly: AssemblyConfiguration("")]
10-
[assembly: AssemblyCompany("Swagger")]
11-
[assembly: AssemblyProduct("SwaggerLibrary")]
12-
[assembly: AssemblyCopyright("No Copyright")]
10+
[assembly: AssemblyCompany("Aspose Pty Ltd")]
11+
[assembly: AssemblyProduct("Aspose.Cells Cloud")]
12+
[assembly: AssemblyCopyright("Copyright (c) 2019 Aspose.Cells Cloud")]
1313
[assembly: AssemblyTrademark("")]
1414
[assembly: AssemblyCulture("")]
1515

@@ -28,5 +28,5 @@
2828
// You can specify all the values or you can default the Build and Revision Numbers
2929
// by using the '*' as shown below:
3030
// [assembly: AssemblyVersion("1.0.*")]
31-
[assembly: AssemblyVersion("19.2.1")]
32-
[assembly: AssemblyFileVersion("19.2.1")]
31+
[assembly: AssemblyVersion("19.3")]
32+
[assembly: AssemblyFileVersion("19.3")]

‎Aspose.Cells.Cloud.SDK/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="RestSharp" version="105.1.0" targetFramework="net45" developmentDependency="true" />
4-
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" developmentDependency="true" />
3+
<package id="RestSharp" version="106.2.2" targetFramework="net45" developmentDependency="true" />
4+
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" developmentDependency="true" />
55
</packages>

0 commit comments

Comments
 (0)