Skip to content

Commit c0de5b8

Browse files
author
kirill.novinskiy@aspose.com
committed
upgrade dependencies
1 parent 319a3d4 commit c0de5b8

13 files changed

+60
-981
lines changed

‎Aspose.Pdf.Cloud.Sdk.Core.sln

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎LICENSE.TXT renamed to ‎LICENSE.txt

File renamed without changes.

‎build.bat

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎src/Aspose.PDF.Cloud.Examples/Aspose.PDF.Cloud.Examples.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.0</TargetFramework>
5+
<TargetFrameworks>net8.0;net452</TargetFrameworks>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<ProjectReference Include="..\Aspose.Pdf.Cloud.Sdk\Aspose.Pdf.Cloud.Sdk.csproj" />
9+
<PackageReference Include="Aspose.Pdf-Cloud" Version="25.5.1" />
1010
</ItemGroup>
1111

1212
</Project>

‎src/Aspose.Pdf.Cloud.Sdk.Test/Aspose.Pdf.Cloud.Sdk.Test.Core.csproj

Lines changed: 0 additions & 73 deletions
This file was deleted.

‎src/Aspose.Pdf.Cloud.Sdk.Test/Aspose.Pdf.Cloud.Sdk.Test.csproj

Lines changed: 15 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -1,126 +1,23 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<!--
3-
Aspose.Pdf for Cloud API Reference
4-
5-
No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
6-
7-
OpenAPI spec version: 1.1
8-
9-
-->
10-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project Sdk="Microsoft.NET.Sdk">
112
<PropertyGroup>
12-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
13-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
14-
<ProjectGuid>{19F1DEBC-DE5E-4517-8062-F000CD499087}</ProjectGuid>
3+
<TargetFrameworks>net452;net8.0</TargetFrameworks>
154
<OutputType>Library</OutputType>
16-
<AppDesignerFolder>Properties</AppDesignerFolder>
17-
<RootNamespace>Aspose.Pdf.Cloud.Sdk.Test</RootNamespace>
18-
<AssemblyName>Aspose.Pdf.Cloud.Sdk.Test</AssemblyName>
19-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
20-
<FileAlignment>512</FileAlignment>
21-
<TargetFrameworkProfile />
5+
<AssemblyName>Aspose.Pdf.Cloud.Sdk.Test</AssemblyName>
6+
<RootNamespace>Aspose.Pdf.Cloud.Sdk.Test</RootNamespace>
227
</PropertyGroup>
23-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
24-
<DebugSymbols>true</DebugSymbols>
25-
<DebugType>full</DebugType>
26-
<Optimize>false</Optimize>
27-
<OutputPath>bin\Debug\</OutputPath>
28-
<DefineConstants>DEBUG;TRACE</DefineConstants>
29-
<ErrorReport>prompt</ErrorReport>
30-
<WarningLevel>4</WarningLevel>
31-
</PropertyGroup>
32-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
33-
<DebugType>pdbonly</DebugType>
34-
<Optimize>true</Optimize>
35-
<OutputPath>bin\Release\</OutputPath>
36-
<DefineConstants>TRACE</DefineConstants>
37-
<ErrorReport>prompt</ErrorReport>
38-
<WarningLevel>4</WarningLevel>
39-
</PropertyGroup>
40-
<ItemGroup>
41-
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
42-
<HintPath>..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
43-
</Reference>
44-
<Reference Include="System" />
45-
<Reference Include="System.Core" />
46-
<Reference Include="System.Net.Http" />
47-
<Reference Include="System.Xml.Linq" />
48-
<Reference Include="System.Data.DataSetExtensions" />
49-
<Reference Include="System.ComponentModel.DataAnnotations" />
50-
<Reference Include="Microsoft.CSharp" />
51-
<Reference Include="System.Data" />
52-
<Reference Include="System.Runtime.Serialization" />
53-
<Reference Include="System.Xml" />
54-
<Reference Include="nunit.framework">
55-
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
56-
<HintPath Condition="Exists('..\packages')">..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
57-
<HintPath Condition="Exists('..\..\packages')">..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
58-
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
59-
</Reference>
60-
</ItemGroup>
61-
<ItemGroup>
62-
<Compile Include="AnnotationsTests.cs" />
63-
<Compile Include="AppendTests.cs" />
64-
<Compile Include="AttachmentsTests.cs" />
65-
<Compile Include="BookmarksTests.cs" />
66-
<Compile Include="CaretAnnotationsTests.cs" />
67-
<Compile Include="CircleAnnotationsTests.cs" />
68-
<Compile Include="ConvertTests.cs" />
69-
<Compile Include="ConvertToPdfTests.cs" />
70-
<Compile Include="DocumentTests.cs" />
71-
<Compile Include="EncryptDecryptTests.cs" />
72-
<Compile Include="FieldsTests.cs" />
73-
<Compile Include="FileAttachmentAnnotationsTests.cs" />
74-
<Compile Include="FreeTextAnnotationsTests.cs" />
75-
<Compile Include="HeaderFooterTests.cs" />
76-
<Compile Include="HighlightAnnotationsTests.cs" />
77-
<Compile Include="ImagesTests.cs" />
78-
<Compile Include="ImportExportTests.cs" />
79-
<Compile Include="InkAnnotationsTests.cs" />
80-
<Compile Include="LayersTests.cs" />
81-
<Compile Include="LineAnnotationsTests.cs" />
82-
<Compile Include="LinkAnnotationsTests.cs" />
83-
<Compile Include="MergeTests.cs" />
84-
<Compile Include="MovieAnnotationsTests.cs" />
85-
<Compile Include="OrganizeTests.cs" />
86-
<Compile Include="PageConvertToImageTests.cs" />
87-
<Compile Include="PolygonAnnotationsTests.cs" />
88-
<Compile Include="PolyLineAnnotationsTests.cs" />
89-
<Compile Include="PopupAnnotationsTests.cs" />
90-
<Compile Include="PrivilegesTests.cs" />
91-
<Compile Include="RedactionAnnotationsTests.cs" />
92-
<Compile Include="ScreenAnnotationsTests.cs" />
93-
<Compile Include="SoundAnnotationsTests.cs" />
94-
<Compile Include="SquareAnnotationsTests.cs" />
95-
<Compile Include="SquigglyAnnotationsTests.cs" />
96-
<Compile Include="StampAnnotationsTests.cs" />
97-
<Compile Include="StampsTests.cs" />
98-
<Compile Include="StrikeOutAnnotationsTests.cs" />
99-
<Compile Include="TablesTests.cs" />
100-
<Compile Include="TextAnnotationsTests.cs" />
101-
<Compile Include="TextTests.cs" />
102-
<Compile Include="OcrTests.cs" />
103-
<Compile Include="PagesTests.cs" />
104-
<Compile Include="TextReplaceTests.cs" />
105-
<Compile Include="PropertiesTests.cs" />
106-
<Compile Include="SignTests.cs" />
107-
<Compile Include="TestBase.cs" />
108-
<Compile Include="UnderlineAnnotationsTests.cs" />
109-
<Compile Include="XmpMetadataTests.cs" />
110-
<Compile Include="StorageTests.cs" />
111-
</ItemGroup>
112-
<ItemGroup>
113-
<None Include="app.config" />
114-
<None Include="packages.config" />
115-
</ItemGroup>
1168
<ItemGroup>
117-
<ProjectReference Include="..\Aspose.Pdf.Cloud.Sdk\Aspose.Pdf.Cloud.Sdk.csproj">
118-
<Project>{ef4ce7ef-dd3c-4654-8b0a-4bf813184ee4}</Project>
119-
<Name>Aspose.Pdf.Cloud.Sdk</Name>
120-
</ProjectReference>
9+
<ProjectReference Include="..\Aspose.Pdf.Cloud.Sdk\Aspose.Pdf.Cloud.Sdk.csproj" />
12110
</ItemGroup>
12211
<ItemGroup>
123-
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.3" />
13+
<PackageReference Include="NUnit" Version="3.14.0" />
14+
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
15+
<PackageReference Include="NUnit.ConsoleRunner" Version="3.20.1" />
12416
</ItemGroup>
125-
<Import Project="$(MsBuildToolsPath)\Microsoft.CSharp.targets" />
17+
<Target Name="CopyNUnitConsole" AfterTargets="Build">
18+
<ItemGroup>
19+
<NUnitConsoleFiles Include="$(NuGetPackageRoot)\nunit.consolerunner\3.20.1\tools\**\*" />
20+
</ItemGroup>
21+
<Copy SourceFiles="@(NUnitConsoleFiles)" DestinationFiles="@(NUnitConsoleFiles->'$(OutDir)\nunit\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
22+
</Target>
12623
</Project>

‎src/Aspose.Pdf.Cloud.Sdk.Test/TestBase.cs

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
using System;
2727
using System.IO;
28+
using System.Net;
2829
using Aspose.Pdf.Cloud.Sdk.Api;
2930
using Aspose.Pdf.Cloud.Sdk.Client;
3031
using Newtonsoft.Json;
@@ -35,9 +36,28 @@ namespace Aspose.Pdf.Cloud.Sdk.Test {
3536
public abstract class TestsBase {
3637

3738
private const string BaseProductUri = @"https://api.aspose.cloud";
38-
protected const string TestDataFolder = @"../../../../../testData";
3939
private const string ServerCredsFile = @"Settings/servercreds.json";
4040
protected const string TempFolder = "TempPdfCloud";
41+
42+
protected string TestDataFolder
43+
{
44+
get
45+
{
46+
string path = Directory.GetCurrentDirectory();
47+
while(Directory.GetParent(path) != null)
48+
{
49+
string testdataPath = Path.Combine(path, "testData");
50+
if (Directory.Exists(testdataPath))
51+
{
52+
return testdataPath;
53+
}
54+
55+
path = Directory.GetParent(path).FullName;
56+
}
57+
58+
throw new DirectoryNotFoundException();
59+
}
60+
}
4161

4262
private class Creds {
4363
public string AppSID { get; set; }
@@ -66,6 +86,7 @@ private Creds _GetCreds() {
6686

6787
[SetUp]
6888
public virtual void SetUp() {
89+
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
6990
Console.WriteLine(TestContext.CurrentContext.Test.Name);
7091
// To run tests with your own credentials please uncomment following line of code
7192
// this._creds = new Creds { AppKey = "your app key", AppSID = "your app sid" };

‎src/Aspose.Pdf.Cloud.Sdk.Test/packages.config

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)