Skip to content

Commit

Permalink
Updated wunwanted changes for NET6
Browse files Browse the repository at this point in the history
  • Loading branch information
Suriya-Murugan committed Mar 8, 2024
1 parent ae83756 commit 982b3da
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
4 changes: 3 additions & 1 deletion ASP.NET Core/src/Controllers/DocumentEditorController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,9 @@ public string MailMerge([FromBody] ExportData exportData)
document.Save(stream, Syncfusion.DocIO.FormatType.Docx);
}
catch (Exception ex)
{ }
{
return ex.Message;
}
string sfdtText = "";
Syncfusion.EJ2.DocumentEditor.WordDocument document1 = Syncfusion.EJ2.DocumentEditor.WordDocument.Load(stream, Syncfusion.EJ2.DocumentEditor.FormatType.Docx);
sfdtText = Newtonsoft.Json.JsonConvert.SerializeObject(document1);
Expand Down
1 change: 0 additions & 1 deletion ASP.NET Core/src/EJ2APIServices_NET6.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

<ItemGroup>
<PackageReference Include="BitMiracle.LibTiff.NET" Version="2.4.649" />
<PackageReference Include="Microsoft.AspNetCore.App" Version="*" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions ASP.NET Core/src/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace EJ2APIServices
{
public class Startup
{
internal static string? path;
internal static string path;

public Startup(IConfiguration configuration, IWebHostEnvironment env)
{
Expand All @@ -29,7 +29,7 @@ public Startup(IConfiguration configuration, IWebHostEnvironment env)
Configuration = builder.Build();

path = Configuration["SPELLCHECK_DICTIONARY_PATH"];
string? jsonFileName = Configuration["SPELLCHECK_JSON_FILENAME"];
string jsonFileName = Configuration["SPELLCHECK_JSON_FILENAME"];
//check the spell check dictionary path environment variable value and assign default data folder
//if it is null.
path = string.IsNullOrEmpty(path) ? Path.Combine(env.ContentRootPath, "Data") : Path.Combine(env.ContentRootPath, path);
Expand All @@ -38,9 +38,9 @@ public Startup(IConfiguration configuration, IWebHostEnvironment env)
if (File.Exists(jsonFileName))
{
string jsonImport = File.ReadAllText(jsonFileName);
List<DictionaryData>? spellChecks = JsonConvert.DeserializeObject<List<DictionaryData>>(jsonImport);
List<DictionaryData> spellChecks = JsonConvert.DeserializeObject<List<DictionaryData>>(jsonImport);
List<DictionaryData> spellDictCollection = new List<DictionaryData>();
string? personalDictPath = null;
string personalDictPath = null;
//construct the dictionary file path using customer provided path and dictionary name
if (spellChecks != null)
{
Expand Down

0 comments on commit 982b3da

Please sign in to comment.