Merge conflicts are resolved

Aspose.Words.Cloud.Sdk.Tests/Api/Report/BuildReportTests.cs

@@ -82,7 +82,7 @@ public async Task TestBuildReport()
                 File.ReadAllBytes(LocalTestDataFolder + reportingFolder + "/" + localDocumentFile)
             );
 
-            var requestReportEngineSettingsReportBuildOptions = new List<ReportBuildOptions>()
+            var requestReportEngineSettingsReportBuildOptions = new List<ReportBuildOptions?>()
             {
                 ReportBuildOptions.AllowMissingMembers,
                 ReportBuildOptions.RemoveEmptyParagraphs

Aspose.Words.Cloud.Sdk.Tests/BaseApiTest.cs

@@ -28,6 +28,7 @@ namespace Aspose.Words.Cloud.Sdk.Tests
     using System;
     using System.IO;
     using System.Linq;
+    using System.Reflection;
     using System.Text;
     using System.Threading.Tasks;
 
@@ -88,7 +89,9 @@ public async Task TestHandleErrors()
         public void TestApiCoverage()
         {
             var methods = typeof(WordsApi).GetMethods()
-                .Where(p => p.IsPublic && p.DeclaringType != typeof(object) && !(p.IsSpecialName && p.Name.StartsWith("get_")))
+                .Where(p => p.IsPublic && p.DeclaringType != typeof(object))
+                .Where(p => !(p.IsSpecialName && p.Name.StartsWith("get_")))
+                .Where(p => !p.GetCustomAttributes<ObsoleteAttribute>(true).Any())
                 .Select(p => p.Name)
                 .ToList();
             var unitTestFolder = Path.Combine(DirectoryHelper.GetRootSdkFolder(), "Aspose.Words.Cloud.Sdk.Tests");

Aspose.Words.Cloud.Sdk/Api/WordsApi.cs

@@ -224,6 +224,7 @@ public async Task<CompareDocumentOnlineResponse> CompareDocumentOnline(CompareDo
         }
 
         /// <summary>
+        /// Compress and resize images inside the document.
         /// The default settings allows to reduce the size of the document without any visible degradation of images quality.
         /// </summary>
         /// <param name="request">Request. <see cref="CompressDocumentRequest" /></param>
@@ -235,6 +236,7 @@ public async Task<CompressResponse> CompressDocument(CompressDocumentRequest req
 
         /// <summary>
         /// Compress and resize images inside the document.
+        /// The default settings allows to reduce the size of the document without any visible degradation of images quality.
         /// </summary>
         /// <param name="request">Request. <see cref="CompressDocumentOnlineRequest" /></param>
         /// <returns><see cref="CompressDocumentOnlineResponse" /></returns>
@@ -302,6 +304,7 @@ public async Task<WordsResponse> CopyStylesFromTemplate(CopyStylesFromTemplateRe
         }
 
         /// <summary>
+        /// Creates a new document in cloud storage in the format, determined by the file extension.
         /// Supported all save format extensions.
         /// </summary>
         /// <param name="request">Request. <see cref="CreateDocumentRequest" /></param>
@@ -399,6 +402,7 @@ public async Task DeleteBookmarks(DeleteBookmarksRequest request)
         }
 
         /// <summary>
+        /// Removes a border from the document node.
         /// The 'nodePath' parameter should refer to a paragraph, a cell or a row.
         /// </summary>
         /// <param name="request">Request. <see cref="DeleteBorderRequest" /></param>
@@ -410,6 +414,7 @@ public async Task<BorderResponse> DeleteBorder(DeleteBorderRequest request)
 
         /// <summary>
         /// Removes a border from the document node.
+        /// The 'nodePath' parameter should refer to a paragraph, a cell or a row.
         /// </summary>
         /// <param name="request">Request. <see cref="DeleteBorderOnlineRequest" /></param>
         /// <returns><see cref="DeleteBorderOnlineResponse" /></returns>
@@ -419,6 +424,7 @@ public async Task<DeleteBorderOnlineResponse> DeleteBorderOnline(DeleteBorderOnl
         }
 
         /// <summary>
+        /// Removes borders from the document node.
         /// The 'nodePath' parameter should refer to a paragraph, a cell or a row.
         /// </summary>
         /// <param name="request">Request. <see cref="DeleteBordersRequest" /></param>
@@ -430,6 +436,7 @@ public async Task<BordersResponse> DeleteBorders(DeleteBordersRequest request)
 
         /// <summary>
         /// Removes borders from the document node.
+        /// The 'nodePath' parameter should refer to a paragraph, a cell or a row.
         /// </summary>
         /// <param name="request">Request. <see cref="DeleteBordersOnlineRequest" /></param>
         /// <returns><see cref="DeleteBordersOnlineResponse" /></returns>
@@ -996,6 +1003,7 @@ public async Task<BookmarksResponse> GetBookmarksOnline(GetBookmarksOnlineReques
         }
 
         /// <summary>
+        /// Reads a border from the document node.
         /// The 'nodePath' parameter should refer to a paragraph, a cell or a row.
         /// </summary>
         /// <param name="request">Request. <see cref="GetBorderRequest" /></param>
@@ -1007,6 +1015,7 @@ public async Task<BorderResponse> GetBorder(GetBorderRequest request)
 
         /// <summary>
         /// Reads a border from the document node.
+        /// The 'nodePath' parameter should refer to a paragraph, a cell or a row.
         /// </summary>
         /// <param name="request">Request. <see cref="GetBorderOnlineRequest" /></param>
         /// <returns><see cref="BorderResponse" /></returns>
@@ -2820,7 +2829,7 @@ public async Task<SaveResponse> SaveAs(SaveAsRequest request)
         }
 
         /// <summary>
-        /// Converts a document to the specified format.
+        /// Converts a document in cloud storage to the specified format.
         /// </summary>
         /// <param name="request">Request. <see cref="SaveAsOnlineRequest" /></param>
         /// <returns><see cref="SaveAsOnlineResponse" /></returns>
@@ -2854,16 +2863,18 @@ public async Task<SaveAsRangeOnlineResponse> SaveAsRangeOnline(SaveAsRangeOnline
         /// </summary>
         /// <param name="request">Request. <see cref="SaveAsTiffRequest" /></param>
         /// <returns><see cref="SaveResponse" /></returns>
+        [System.Obsolete("This operation will be removed in the future.")]
         public async Task<SaveResponse> SaveAsTiff(SaveAsTiffRequest request)
         {
             return (SaveResponse)await request.DeserializeResponse(await this.apiInvoker.InvokeApi(async () => request.CreateHttpRequest(this.configuration, this)));
         }
 
         /// <summary>
-        /// Converts a document to TIFF format using detailed conversion settings.
+        /// Converts a document in cloud storage to TIFF format using detailed conversion settings.
         /// </summary>
         /// <param name="request">Request. <see cref="SaveAsTiffOnlineRequest" /></param>
         /// <returns><see cref="SaveAsTiffOnlineResponse" /></returns>
+        [System.Obsolete("This operation will be removed in the future.")]
         public async Task<SaveAsTiffOnlineResponse> SaveAsTiffOnline(SaveAsTiffOnlineRequest request)
         {
             return (SaveAsTiffOnlineResponse)await request.DeserializeResponse(await this.apiInvoker.InvokeApi(async () => request.CreateHttpRequest(this.configuration, this)));
@@ -2950,6 +2961,7 @@ public async Task<UpdateBookmarkOnlineResponse> UpdateBookmarkOnline(UpdateBookm
         }
 
         /// <summary>
+        /// Updates a border in the document node.
         /// The 'nodePath' parameter should refer to a paragraph, a cell or a row.
         /// </summary>
         /// <param name="request">Request. <see cref="UpdateBorderRequest" /></param>
@@ -2961,6 +2973,7 @@ public async Task<BorderResponse> UpdateBorder(UpdateBorderRequest request)
 
         /// <summary>
         /// Updates a border in the document node.
+        /// The 'nodePath' parameter should refer to a paragraph, a cell or a row.
         /// </summary>
         /// <param name="request">Request. <see cref="UpdateBorderOnlineRequest" /></param>
         /// <returns><see cref="UpdateBorderOnlineResponse" /></returns>

Aspose.Words.Cloud.Sdk/Aspose.Words.Cloud.Sdk.csproj

@@ -2,9 +2,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <AssemblyVersion>23.9.0.0</AssemblyVersion>
-    <FileVersion>23.9.0.0</FileVersion>
-    <Version>23.9.0.0</Version>
+    <AssemblyVersion>23.10.0.0</AssemblyVersion>
+    <FileVersion>23.10.0.0</FileVersion>
+    <Version>23.10.0.0</Version>
     <StyleCopTreatErrorsAsWarnings>false</StyleCopTreatErrorsAsWarnings>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>

Aspose.Words.Cloud.Sdk/Internal/ApiInvoker.cs

@@ -58,7 +58,7 @@ internal class ApiInvoker
         public ApiInvoker(List<IRequestHandler> requestHandlers, int timeout)
         {
             this.AddDefaultHeader(AsposeClientHeaderName, ".net sdk");
-            this.AddDefaultHeader(AsposeClientVersionHeaderName, "23.9");
+            this.AddDefaultHeader(AsposeClientVersionHeaderName, "23.10");
             this.requestHandlers = requestHandlers;
             this.HttpClient = new HttpClient { Timeout = TimeSpan.FromSeconds(timeout), };
         }

Aspose.Words.Cloud.Sdk/Internal/SerializationHelper.cs

@@ -104,6 +104,7 @@ internal class SerializationHelper
             { "DrawingObjectsResponse, _", typeof(DrawingObjectsResponse) },
             { "DrawingObjectUpdate, _", typeof(DrawingObjectUpdate) },
             { "EmfSaveOptionsData, _", typeof(EmfSaveOptionsData) },
+            { "EpsSaveOptionsData, _", typeof(EpsSaveOptionsData) },
             { "EpubSaveOptionsData, _", typeof(EpubSaveOptionsData) },
             { "Error, _", typeof(Error) },
             { "ErrorDetails, _", typeof(ErrorDetails) },
@@ -125,7 +126,6 @@ internal class SerializationHelper
             { "FlatOpcTemplateMacroSaveOptionsData, _", typeof(FlatOpcTemplateMacroSaveOptionsData) },
             { "FlatOpcTemplateSaveOptionsData, _", typeof(FlatOpcTemplateSaveOptionsData) },
             { "Font, _", typeof(Font) },
-            { "FontDto, _", typeof(FontDto) },
             { "FontInfo, _", typeof(FontInfo) },
             { "FontResponse, _", typeof(FontResponse) },
             { "Footnote, _", typeof(Footnote) },
@@ -216,10 +216,8 @@ internal class SerializationHelper
             { "PsSaveOptionsData, _", typeof(PsSaveOptionsData) },
             { "PublicKeyResponse, _", typeof(PublicKeyResponse) },
             { "RangeDocument, _", typeof(RangeDocument) },
-            { "RangeDocumentDto, _", typeof(RangeDocumentDto) },
             { "RangeTextResponse, _", typeof(RangeTextResponse) },
             { "ReplaceRange, _", typeof(ReplaceRange) },
-            { "ReplaceRangeDto, _", typeof(ReplaceRangeDto) },
             { "ReplaceTextParameters, _", typeof(ReplaceTextParameters) },
             { "ReplaceTextResponse, _", typeof(ReplaceTextResponse) },
             { "ReportBuildOptions, _", typeof(ReportBuildOptions) },
@@ -268,26 +266,20 @@ internal class SerializationHelper
             { "Table, _", typeof(Table) },
             { "TableCell, _", typeof(TableCell) },
             { "TableCellFormat, _", typeof(TableCellFormat) },
-            { "TableCellFormatDto, _", typeof(TableCellFormatDto) },
             { "TableCellFormatResponse, _", typeof(TableCellFormatResponse) },
             { "TableCellInsert, _", typeof(TableCellInsert) },
-            { "TableCellInsertDto, _", typeof(TableCellInsertDto) },
             { "TableCellResponse, _", typeof(TableCellResponse) },
             { "TableInsert, _", typeof(TableInsert) },
-            { "TableInsertDto, _", typeof(TableInsertDto) },
             { "TableLink, _", typeof(TableLink) },
             { "TableLinkCollection, _", typeof(TableLinkCollection) },
             { "TableLinkCollectionResponse, _", typeof(TableLinkCollectionResponse) },
             { "TableProperties, _", typeof(TableProperties) },
-            { "TablePropertiesDto, _", typeof(TablePropertiesDto) },
             { "TablePropertiesResponse, _", typeof(TablePropertiesResponse) },
             { "TableResponse, _", typeof(TableResponse) },
             { "TableRow, _", typeof(TableRow) },
             { "TableRowFormat, _", typeof(TableRowFormat) },
-            { "TableRowFormatDto, _", typeof(TableRowFormatDto) },
             { "TableRowFormatResponse, _", typeof(TableRowFormatResponse) },
             { "TableRowInsert, _", typeof(TableRowInsert) },
-            { "TableRowInsertDto, _", typeof(TableRowInsertDto) },
             { "TableRowResponse, _", typeof(TableRowResponse) },
             { "TabStop, _", typeof(TabStop) },
             { "TabStopInsert, _", typeof(TabStopInsert) },

Aspose.Words.Cloud.Sdk/Model/BmpSaveOptionsData.cs

@@ -81,6 +81,8 @@ public override string ToString()
             sb.Append("  UseAntiAliasing: ").Append(this.UseAntiAliasing).Append("\n");
             sb.Append("  UseHighQualityRendering: ").Append(this.UseHighQualityRendering).Append("\n");
             sb.Append("  VerticalResolution: ").Append(this.VerticalResolution).Append("\n");
+            sb.Append("  ImageHeight: ").Append(this.ImageHeight).Append("\n");
+            sb.Append("  ImageWidth: ").Append(this.ImageWidth).Append("\n");
             sb.Append("  UseGdiEmfRenderer: ").Append(this.UseGdiEmfRenderer).Append("\n");
             sb.Append("  SaveFormat: ").Append(this.SaveFormat).Append("\n");
             sb.Append("}\n");

Aspose.Words.Cloud.Sdk/Model/BookmarkInsert.cs

@@ -39,14 +39,14 @@ namespace Aspose.Words.Cloud.Sdk.Model
     public class BookmarkInsert : BookmarkData, IModel
     {
         /// <summary>
-        /// Gets or sets the link to end bookmark node.
+        /// Gets or sets the link to start bookmark node.
         /// </summary>
-        public virtual NewDocumentPosition EndRange { get; set; }
+        public virtual NewDocumentPosition StartRange { get; set; }
 
         /// <summary>
-        /// Gets or sets the link to start bookmark node.
+        /// Gets or sets the link to end bookmark node.
         /// </summary>
-        public virtual NewDocumentPosition StartRange { get; set; }
+        public virtual NewDocumentPosition EndRange { get; set; }
 
         /// <summary>
         /// Get the string presentation of the object.
@@ -58,8 +58,8 @@ public override string ToString()
             sb.Append("class BookmarkInsert {\n");
             sb.Append("  Name: ").Append(this.Name).Append("\n");
             sb.Append("  Text: ").Append(this.Text).Append("\n");
-            sb.Append("  EndRange: ").Append(this.EndRange).Append("\n");
             sb.Append("  StartRange: ").Append(this.StartRange).Append("\n");
+            sb.Append("  EndRange: ").Append(this.EndRange).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }

Aspose.Words.Cloud.Sdk/Model/BookmarkResponse.cs

@@ -35,6 +35,7 @@ namespace Aspose.Words.Cloud.Sdk.Model
 
     /// <summary>
     /// The REST response with a bookmark.
+    /// This response should be returned by the service when handling: GET bookmarks/{bookmarkName}.
     /// </summary>
     public class BookmarkResponse : WordsResponse, IModel
     {

Aspose.Words.Cloud.Sdk/Model/BookmarksOutlineLevelData.cs

@@ -41,7 +41,7 @@ public class BookmarksOutlineLevelData : IModel
         /// <summary>
         /// Gets or sets the bookmark's level.
         /// </summary>
-        public virtual int BookmarksOutlineLevel { get; set; }
+        public virtual int? BookmarksOutlineLevel { get; set; }
 
         /// <summary>
         /// Gets or sets the bookmark's name.

Aspose.Words.Cloud.Sdk/Model/BookmarksResponse.cs

@@ -35,6 +35,7 @@ namespace Aspose.Words.Cloud.Sdk.Model
 
     /// <summary>
     /// The REST response with a collection of bookmarks.
+    /// This response should be returned by the service when handling: GET bookmarks.
     /// </summary>
     public class BookmarksResponse : WordsResponse, IModel
     {

Aspose.Words.Cloud.Sdk/Model/Border.cs

@@ -35,6 +35,7 @@ namespace Aspose.Words.Cloud.Sdk.Model
 
     /// <summary>
     /// Represents a border of an object.
+    /// Borders can be applied to various document elements including paragraph, run of text inside a paragraph or a table cell.
     /// </summary>
     public class Border : LinkElement, IModel
     {
@@ -92,6 +93,7 @@ public enum BorderTypeEnum
 
         /// <summary>
         /// Gets or sets the border style.
+        /// If you set line style to none, then line width is automatically changed to zero.
         /// </summary>
         [JsonConverter(typeof(StringEnumConverter))]
         public enum LineStyleEnum
@@ -244,21 +246,25 @@ public enum LineStyleEnum
 
         /// <summary>
         /// Gets or sets the distance of the border from text or from the page edge in points.
+        /// Has no effect and will be automatically reset to zero for borders of table cells.
         /// </summary>
         public virtual double? DistanceFromText { get; set; }
 
         /// <summary>
         /// Gets or sets the border style.
+        /// If you set line style to none, then line width is automatically changed to zero.
         /// </summary>
         public virtual LineStyleEnum? LineStyle { get; set; }
 
         /// <summary>
         /// Gets or sets the border width in points.
+        /// If you set line width greater than zero when line style is none, the line style is automatically changed to single line.
         /// </summary>
         public virtual double? LineWidth { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether the border has a shadow.
+        /// In Microsoft Word, for a border to have a shadow, the borders on all four sides (left, top, right and bottom) should be of the same type, width, color and all should have the Shadow property set to true.
         /// </summary>
         public virtual bool? Shadow { get; set; }
 

Aspose.Words.Cloud.Sdk/Model/BorderResponse.cs

@@ -35,6 +35,7 @@ namespace Aspose.Words.Cloud.Sdk.Model
 
     /// <summary>
     /// The REST response with a border.
+    /// This response is returned by the Service when handling "GET {nodeWithBorders}/borders" REST API requests.
     /// </summary>
     public class BorderResponse : WordsResponse, IModel
     {

Aspose.Words.Cloud.Sdk/Model/BordersResponse.cs

@@ -35,6 +35,7 @@ namespace Aspose.Words.Cloud.Sdk.Model
 
     /// <summary>
     /// The REST response with a collection of borders.
+    /// This response is returned by the Service when handling "GET {nodeWithBorders}/borders" REST API requests.
     /// </summary>
     public class BordersResponse : WordsResponse, IModel
     {

Aspose.Words.Cloud.Sdk/Model/ClassificationResponse.cs

@@ -35,6 +35,7 @@ namespace Aspose.Words.Cloud.Sdk.Model
 
     /// <summary>
     /// The REST response with data on multi-class text classification.
+    /// This response is returned by the Service when handling "PUT https://api.aspose.cloud/v4.0/words/classify" REST API requests.
     /// </summary>
     public class ClassificationResponse : WordsResponse, IModel
     {
@@ -46,7 +47,7 @@ public class ClassificationResponse : WordsResponse, IModel
         /// <summary>
         /// Gets or sets the best class probability.
         /// </summary>
-        public virtual double BestClassProbability { get; set; }
+        public virtual double? BestClassProbability { get; set; }
 
         /// <summary>
         /// Gets or sets the array of best classes results.

Aspose.Words.Cloud.Sdk/Model/ClassificationResult.cs

@@ -46,7 +46,7 @@ public class ClassificationResult : IModel
         /// <summary>
         /// Gets or sets the probability of class.
         /// </summary>
-        public virtual double ClassProbability { get; set; }
+        public virtual double? ClassProbability { get; set; }
 
         /// <summary>
         /// Get the string presentation of the object.

Aspose.Words.Cloud.Sdk/Model/Comment.cs

@@ -50,11 +50,13 @@ public class Comment : CommentLink, IModel
 
         /// <summary>
         /// Gets or sets the author name for a comment.
+        /// Cannot be null.Default is empty string.
         /// </summary>
         public virtual string Author { get; set; }
 
         /// <summary>
         /// Gets or sets the initials of the user associated with a specific comment.
+        /// Cannot be null.Default is empty string.
         /// </summary>
         public virtual string Initial { get; set; }
 
@@ -65,6 +67,7 @@ public class Comment : CommentLink, IModel
 
         /// <summary>
         /// Gets or sets text of the comment.
+        /// This method allows to quickly set text of a comment from a string. The string can contain paragraph breaks, this will create paragraphs of text in the comment accordingly.
         /// </summary>
         public virtual string Text { get; set; }