Skip to content

Commit

Permalink
Update packages
Browse files Browse the repository at this point in the history
  • Loading branch information
nh43de committed Mar 23, 2023
1 parent d33f5a3 commit 33d972e
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 25 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@
<None Remove="NewFolder\**" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.1" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="ExcelDataReader" Version="3.6.0" />
<PackageReference Include="ExcelDataReader.DataSet" Version="3.6.0" />
<PackageReference Include="MinVer" Version="2.3.0">
<PackageReference Include="MinVer" Version="4.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="System.Text.Json" Version="4.7.2" />
<PackageReference Include="System.Text.Json" Version="7.0.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DataPowerTools\DataPowerTools.csproj" />
Expand Down
6 changes: 3 additions & 3 deletions src/DataPowerTools/DataPowerTools.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="2.0.1" />
<PackageReference Include="MinVer" Version="2.3.0">
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.0" />
<PackageReference Include="MinVer" Version="4.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
*
*/
using System;
using Newtonsoft.Json.Linq;

namespace DataPowerTools.Extensions.DataConversionExtensions
{
Expand Down
31 changes: 14 additions & 17 deletions src/DataPowerTools/Extensions/StringExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
using System;
using System.Data;
using System.Security;
using System.Text;
using System.Data;
using System.Text.RegularExpressions;
using DataPowerTools.Strings;
using Newtonsoft.Json.Linq;


namespace DataPowerTools.Extensions
{
Expand Down Expand Up @@ -69,17 +66,17 @@ public static string Indent(this string str, string indentionStr)
return IndentRegex.Replace(str, indentionStr);
}

public static bool IsValidJson(this string obj)
{
try
{
JObject.Parse(obj);
return true;
}
catch (Exception)
{
return false;
}
}
//public static bool IsValidJson(this string obj)
//{
// try
// {
// JObject.Parse(obj);
// return true;
// }
// catch (Exception)
// {
// return false;
// }
//}
}
}

0 comments on commit 33d972e

Please sign in to comment.