Skip to content

Commit

Permalink
Updated Dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
RobK410 committed Sep 24, 2024
1 parent 3f06553 commit edff844
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 22 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ namespace Talegen.Storage.Net.AzureBlobs
using Azure;
using Azure.Storage.Files.Shares;
using Azure.Storage.Files.Shares.Models;
using Newtonsoft.Json;
using Talegen.Common.Core.Extensions;
using Talegen.Storage.Net.AzureBlobs.Properties;
using Talegen.Storage.Net.Core;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,22 @@
<RepositoryUrl>https://github.com/Talegen/Talegen.Storage.Net</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageTags>storage azure</PackageTags>
<PackageReleaseNotes>Updated packages to latest versions, added temp file and path generation methods.</PackageReleaseNotes>
<PackageReleaseNotes>Updated Dependencies.</PackageReleaseNotes>
<NeutralLanguage>en</NeutralLanguage>
<ApplicationIcon />
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<Version>1.0.6</Version>
<AssemblyVersion>1.0.6.0</AssemblyVersion>
<FileVersion>1.0.6.0</FileVersion>
<Version>1.0.7</Version>
<AssemblyVersion>1.0.7.0</AssemblyVersion>
<FileVersion>1.0.7.0</FileVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DocumentationFile>.\Talegen.Storage.Net.AzureBlobs.xml</DocumentationFile>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Azure.Storage.Blobs" Version="12.20.0" />
<PackageReference Include="Azure.Storage.Files.Shares" Version="12.18.0" />
<PackageReference Include="Azure.Storage.Blobs" Version="12.22.0" />
<PackageReference Include="Azure.Storage.Files.Shares" Version="12.20.0" />
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions src/Talegen.Storage.Net.Core/Disk/LocalStorageService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@ namespace Talegen.Storage.Net.Core.Disk
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Text.Json;
using System.Threading.Tasks;
using Newtonsoft.Json;
using Talegen.Common.Core.Extensions;
using Talegen.Common.Core.Storage;
using Talegen.Common.Core.Threading;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ namespace Talegen.Storage.Net.Core.Memory
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using Newtonsoft.Json;
using Talegen.Common.Core.Extensions;
using Talegen.Common.Core.Storage;
using Talegen.Storage.Net.Core.Properties;
Expand Down
7 changes: 3 additions & 4 deletions src/Talegen.Storage.Net.Core/StorageExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ namespace Talegen.Storage.Net.Core
using System;
using System.IO;
using System.Text;
using Newtonsoft.Json;
using Talegen.Storage.Net.Core.Properties;

/// <summary>
Expand All @@ -42,7 +41,7 @@ public static bool SerializeToFile<T>(this IStorageService storageService, strin
throw new ArgumentNullException(nameof(storageService));
}

string contents = JsonConvert.SerializeObject(obj);
string contents = System.Text.Json.JsonSerializer.Serialize(obj);
return storageService.WriteTextFile(filePath, contents, encoding);
}

Expand All @@ -68,9 +67,9 @@ public static T DeserializeFromFile<T>(this IStorageService storageService, stri
{
try
{
result = JsonConvert.DeserializeObject<T>(contents);
result = System.Text.Json.JsonSerializer.Deserialize<T>(contents);
}
catch (JsonReaderException readEx)
catch (System.Text.Json.JsonException readEx)
{
throw new StorageException(string.Format(Resources.FileContentsCannotBeDeserializedErrorText, filePath, nameof(T)), readEx);
}
Expand Down
11 changes: 6 additions & 5 deletions src/Talegen.Storage.Net.Core/Talegen.Storage.Net.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
<RepositoryType>git</RepositoryType>
<PackageProjectUrl>https://github.com/Talegen/Talegen.Storage.Net</PackageProjectUrl>
<PackageTags>storage</PackageTags>
<PackageReleaseNotes>Updated packages to latest versions, added temp file and path generation methods.</PackageReleaseNotes>
<PackageReleaseNotes>Updated Dependencies.</PackageReleaseNotes>
<NeutralLanguage>en</NeutralLanguage>
<Version>1.0.6</Version>
<AssemblyVersion>1.0.6.0</AssemblyVersion>
<FileVersion>1.0.6.0</FileVersion>
<Version>1.0.7</Version>
<AssemblyVersion>1.0.7.0</AssemblyVersion>
<FileVersion>1.0.7.0</FileVersion>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<ApplicationIcon />
<PackageIcon>logo.png</PackageIcon>
Expand All @@ -28,7 +28,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Talegen.Common.Core" Version="1.0.15" />
<PackageReference Include="System.Text.Json" Version="8.0.4" />
<PackageReference Include="Talegen.Common.Core" Version="1.1.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="xunit" Version="2.8.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="xunit" Version="2.9.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down

0 comments on commit edff844

Please sign in to comment.