Skip to content

Commit

Permalink
upgrade deps
Browse files Browse the repository at this point in the history
  • Loading branch information
@mythz
mythz committed Dec 6, 2022
1 parent 8169399 commit 6f61915
Show file tree
Hide file tree
Showing 87 changed files with 156 additions and 174 deletions.
2 changes: 1 addition & 1 deletion ServiceStack.Aws/src/ServiceStack.Aws/ServiceStack.Aws.Core.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<ItemGroup>
<ProjectReference Include="..\..\..\ServiceStack\src\ServiceStack\ServiceStack.Core.csproj" />
<PackageReference Include="AWSSDK.Core" Version="3.7.11.2" />
<PackageReference Include="AWSSDK.Core" Version="3.7.101.1" />
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.0.94" />
<PackageReference Include="AWSSDK.S3" Version="3.7.4" />
<PackageReference Include="AWSSDK.SQS" Version="3.7.1.36" />
Expand Down
8 changes: 4 additions & 4 deletions ServiceStack.Aws/src/ServiceStack.Aws/ServiceStack.Aws.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="AWSSDK.Core" Version="3.7.11.2" />
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.3.34" />
<PackageReference Include="AWSSDK.S3" Version="3.7.9.2" />
<PackageReference Include="AWSSDK.SQS" Version="3.7.2.55" />
<PackageReference Include="AWSSDK.Core" Version="3.7.101.1" />
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.100.29" />
<PackageReference Include="AWSSDK.S3" Version="3.7.101.29" />
<PackageReference Include="AWSSDK.SQS" Version="3.7.100.29" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
Expand Down
2 changes: 1 addition & 1 deletion ServiceStack.Aws/tests/ServiceStack.Aws.DynamoDbTests/DynamoDbCustomCacheClientTestsAsync.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public class DynamoDbCustomCacheClientTestsAsync : DynamoTestBase
private ICacheClientAsync cache;

[OneTimeSetUp]
public async Task OnOneTimeSetUp()
public void OnOneTimeSetUp()
{
cache = (ICacheClientAsync)CreateCacheClient();
}
Expand Down
2 changes: 1 addition & 1 deletion ServiceStack.Aws/tests/ServiceStack.Aws.DynamoDbTests/PocoDynamoDbTestsAsync.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace ServiceStack.Aws.DynamoDbTests
public class PocoDynamoDbTestsAsync : DynamoTestBase
{
[OneTimeSetUp]
public async Task OneTimeSetUp()
public void OneTimeSetUp()
{
var db = CreatePocoDynamo();
db.DeleteAllTables(TimeSpan.FromMinutes(1));
Expand Down
2 changes: 1 addition & 1 deletion ServiceStack.Aws/tests/ServiceStack.Aws.DynamoDbTests/RangeKeyTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public override int GetHashCode()
{
unchecked
{
return (Id.GetHashCode() * 397) ^ (CreatedDate != null ? CreatedDate.GetHashCode() : 0);
return (Id.GetHashCode() * 397) ^ (CreatedDate != default ? CreatedDate.GetHashCode() : 0);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ServiceStack.Aws/tests/ServiceStack.Aws.DynamoDbTests/ServiceStack.Aws.DynamoDbTests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="System.Linq.Async" Version="5.0.0" />
<PackageReference Include="System.Memory" Version="4.5.5" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
<Reference Include="System.Configuration" />
Expand All @@ -32,7 +33,6 @@
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Web" />
<Reference Include="Microsoft.CSharp" />
<PackageReference Include="System.Memory" Version="4.5.4" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ServiceStack.Aws/tests/ServiceStack.Aws.Tests/ServiceStack.Aws.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="System.Memory" Version="4.5.5" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
<Reference Include="System.Threading" />
Expand All @@ -30,7 +31,6 @@
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Web" />
<Reference Include="Microsoft.CSharp" />
<PackageReference Include="System.Memory" Version="4.5.4" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
</ItemGroup>
Expand Down
7 changes: 7 additions & 0 deletions ServiceStack.Azure/src/ServiceStack.Azure.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack.Common", "..\.
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack", "..\..\ServiceStack\src\ServiceStack\ServiceStack.csproj", "{B2917A3A-6A60-4438-A3E8-31305FB100AD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack.Kestrel", "..\..\ServiceStack\src\ServiceStack.Kestrel\ServiceStack.Kestrel.csproj", "{085C64CA-8E90-45D0-87BB-12AE919EB7D8}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -63,6 +65,10 @@ Global
{B2917A3A-6A60-4438-A3E8-31305FB100AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B2917A3A-6A60-4438-A3E8-31305FB100AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B2917A3A-6A60-4438-A3E8-31305FB100AD}.Release|Any CPU.Build.0 = Release|Any CPU
{085C64CA-8E90-45D0-87BB-12AE919EB7D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{085C64CA-8E90-45D0-87BB-12AE919EB7D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{085C64CA-8E90-45D0-87BB-12AE919EB7D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{085C64CA-8E90-45D0-87BB-12AE919EB7D8}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -76,5 +82,6 @@ Global
{9F1DA3D4-89FC-4B2C-BABB-1C4FCA7CF6A2} = {AB0D6C2B-CF78-45F2-9BD0-5565ACB345D4}
{E21E106A-0C68-4E02-81F5-762090CEF06D} = {AB0D6C2B-CF78-45F2-9BD0-5565ACB345D4}
{B2917A3A-6A60-4438-A3E8-31305FB100AD} = {AB0D6C2B-CF78-45F2-9BD0-5565ACB345D4}
{085C64CA-8E90-45D0-87BB-12AE919EB7D8} = {AB0D6C2B-CF78-45F2-9BD0-5565ACB345D4}
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion ServiceStack.Azure/src/ServiceStack.Azure/ServiceStack.Azure.Core.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<ItemGroup>
<ProjectReference Include="..\..\..\ServiceStack\src\ServiceStack\ServiceStack.Core.csproj" />
<PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
<PackageReference Include="System.Linq.Async" Version="5.0.0" />
<PackageReference Include="System.Linq.Async" Version="5.1.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'net6.0'">
Expand Down
4 changes: 2 additions & 2 deletions ServiceStack.Azure/src/ServiceStack.Azure/ServiceStack.Azure.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<ItemGroup>
<PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
<PackageReference Include="System.Linq.Async" Version="5.0.0" />
<PackageReference Include="System.Linq.Async" Version="5.1.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
Expand All @@ -39,7 +39,7 @@

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'net6.0'">
<PackageReference Include="Microsoft.Azure.ServiceBus" Version="5.2.0" />
<PackageReference Include="Microsoft.Azure.Management.ServiceBus" Version="3.0.0" />
<PackageReference Include="Microsoft.Azure.Management.ServiceBus" Version="5.0.0" />
</ItemGroup>

</Project>
5 changes: 3 additions & 2 deletions ServiceStack.Azure/tests/ServiceStack.Azure.Tests/ServiceStack.Azure.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@
<PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="System.Memory" Version="4.5.4" />
<PackageReference Include="System.Linq.Async" Version="5.0.0" />
<PackageReference Include="System.Memory" Version="4.5.5" />
<PackageReference Include="System.Linq.Async" Version="5.1.0" />
<PackageReference Include="Microsoft.Azure.KeyVault.Core" Version="3.0.5" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
Expand Down
2 changes: 1 addition & 1 deletion ServiceStack.OrmLite/src/ServiceStack.OrmLite.Firebird/ServiceStack.OrmLite.Firebird.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="9.0.1" />
<PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="9.1.0" />
</ItemGroup>

<ItemGroup>
Expand Down
14 changes: 8 additions & 6 deletions ...ceStack.OrmLite/src/ServiceStack.OrmLite.MySql/Converters/MySqlDateTimeOffsetConverter.cs
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
using ServiceStack.OrmLite.Converters;
using System;
using System.Data;
using ServiceStack.OrmLite.Converters;

namespace ServiceStack.OrmLite.MySql.Converters
namespace ServiceStack.OrmLite.MySql.Converters;

public class MySqlDateTimeOffsetConverter : DateTimeOffsetConverter
{
public class MySqlDateTimeOffsetConverter : DateTimeOffsetConverter
{
public override string ColumnDefinition => "VARCHAR(255)";
}
public override string ColumnDefinition => "VARCHAR(255)";
public override DbType DbType => DbType.String;
}
2 changes: 1 addition & 1 deletion ServiceStack.OrmLite/src/ServiceStack.OrmLite.MySql/ServiceStack.OrmLite.MySql.Core.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<ProjectReference Include="..\ServiceStack.OrmLite\ServiceStack.OrmLite.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Mysql.Data" Version="8.0.29" />
<PackageReference Include="Mysql.Data" Version="8.0.31" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion ServiceStack.OrmLite/src/ServiceStack.OrmLite.MySql/ServiceStack.OrmLite.MySql.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Mysql.Data" Version="8.0.29" />
<PackageReference Include="Mysql.Data" Version="8.0.31" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
Expand Down
2 changes: 1 addition & 1 deletion ServiceStack.OrmLite/src/ServiceStack.OrmLite.MySql/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup><system.data>
<DbProviderFactories>
<remove invariant="MySql.Data.MySqlClient" />
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=8.0.29.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=8.0.31.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
</DbProviderFactories>
</system.data></configuration>
2 changes: 1 addition & 1 deletion ...e/src/ServiceStack.OrmLite.MySqlConnector/ServiceStack.OrmLite.MySqlConnector.Core.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<ProjectReference Include="..\ServiceStack.OrmLite\ServiceStack.OrmLite.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MySqlConnector" Version="2.1.8" />
<PackageReference Include="MySqlConnector" Version="2.2.1" />
</ItemGroup>
<ItemGroup>
<Folder Include="DataAnnotations\" />
Expand Down
2 changes: 1 addition & 1 deletion ...rmLite/src/ServiceStack.OrmLite.MySqlConnector/ServiceStack.OrmLite.MySqlConnector.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<ProjectReference Include="..\ServiceStack.OrmLite\ServiceStack.OrmLite.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MySqlConnector" Version="2.1.8" />
<PackageReference Include="MySqlConnector" Version="2.2.1" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
<Reference Include="System.Net" />
Expand Down
2 changes: 1 addition & 1 deletion ...k.OrmLite/src/ServiceStack.OrmLite.PostgreSQL/ServiceStack.OrmLite.PostgreSQL.Core.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<ProjectReference Include="..\ServiceStack.OrmLite\ServiceStack.OrmLite.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Npgsql" Version="5.0.13" />
<PackageReference Include="Npgsql" Version="5.0.15" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions ...eStack.OrmLite/src/ServiceStack.OrmLite.PostgreSQL/ServiceStack.OrmLite.PostgreSQL.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
<PackageReference Include="Npgsql" Version="4.1.11" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<PackageReference Include="Npgsql" Version="5.0.13" />
<PackageReference Include="Npgsql" Version="5.0.15" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
<PackageReference Include="Npgsql" Version="5.0.13" />
<PackageReference Include="Npgsql" Version="5.0.15" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion ...erviceStack.OrmLite.SqlServer.Converters/ServiceStack.OrmLite.SqlServer.Converters.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<ProjectReference Include="..\ServiceStack.OrmLite.SqlServer\ServiceStack.OrmLite.SqlServer.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SqlServer.Types" Version="14.0.1016.290" />
<PackageReference Include="Microsoft.SqlServer.Types" Version="160.1000.6" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion ...e/src/ServiceStack.OrmLite.SqlServer.Data/ServiceStack.OrmLite.SqlServer.Data.Core.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<ProjectReference Include="..\ServiceStack.OrmLite\ServiceStack.OrmLite.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Data.SqlClient" Version="4.1.0" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...rmLite/src/ServiceStack.OrmLite.SqlServer.Data/ServiceStack.OrmLite.SqlServer.Data.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<ProjectReference Include="..\ServiceStack.OrmLite\ServiceStack.OrmLite.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Data.SqlClient" Version="4.1.0" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions ...iceStack.OrmLite/src/ServiceStack.OrmLite.SqlServer/ServiceStack.OrmLite.SqlServer.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
<PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion ...eStack.OrmLite/src/ServiceStack.OrmLite.Sqlite.Cil/ServiceStack.OrmLite.Sqlite.Cil.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<ProjectReference Include="..\ServiceStack.OrmLite\ServiceStack.OrmLite.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Data.Sqlite.Core" Version="6.0.5" />
<PackageReference Include="Microsoft.Data.Sqlite.Core" Version="6.0.11" />
<PackageReference Include="SQLitePCLRaw.bundle_cil" Version="2.0.5-pre20210119130047" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion ...tack.OrmLite/src/ServiceStack.OrmLite.Sqlite.Data/ServiceStack.OrmLite.Sqlite.Data.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<ProjectReference Include="..\ServiceStack.OrmLite\ServiceStack.OrmLite.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.5" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.11" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...rmLite/src/ServiceStack.OrmLite.Sqlite.Windows/ServiceStack.OrmLite.Sqlite.Windows.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<ProjectReference Include="..\ServiceStack.OrmLite\ServiceStack.OrmLite.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.115.5" />
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.117" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ServiceStack.OrmLite/src/ServiceStack.OrmLite.Sqlite/ServiceStack.OrmLite.Sqlite.Core.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<ProjectReference Include="..\ServiceStack.OrmLite\ServiceStack.OrmLite.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.115.5" />
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.117" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion ServiceStack.OrmLite/src/ServiceStack.OrmLite.Sqlite/ServiceStack.OrmLite.Sqlite.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.115.5" />
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.117" />
</ItemGroup>

</Project>
8 changes: 0 additions & 8 deletions ServiceStack.OrmLite/src/ServiceStack.OrmLite.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{6CEB3EDE
ProjectSection(SolutionItems) = preProject
..\build\build.bat = ..\build\build.bat
..\build\build.proj = ..\build\build.proj
..\build\build.tasks = ..\build\build.tasks
..\README.md = ..\README.md
Directory.Build.props = Directory.Build.props
ServiceStack.OrmLite\ServiceStack.OrmLite.Core.csproj = ServiceStack.OrmLite\ServiceStack.OrmLite.Core.csproj
ServiceStack.OrmLite.Firebird\ServiceStack.OrmLite.Firebird.Core.csproj = ServiceStack.OrmLite.Firebird\ServiceStack.OrmLite.Firebird.Core.csproj
Expand All @@ -17,16 +15,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{6CEB3EDE
ServiceStack.OrmLite.PostgreSQL\ServiceStack.OrmLite.PostgreSQL.Core.csproj = ServiceStack.OrmLite.PostgreSQL\ServiceStack.OrmLite.PostgreSQL.Core.csproj
ServiceStack.OrmLite.Sqlite\ServiceStack.OrmLite.Sqlite.Core.csproj = ServiceStack.OrmLite.Sqlite\ServiceStack.OrmLite.Sqlite.Core.csproj
ServiceStack.OrmLite.SqlServer\ServiceStack.OrmLite.SqlServer.Core.csproj = ServiceStack.OrmLite.SqlServer\ServiceStack.OrmLite.SqlServer.Core.csproj
..\build\build-core.proj = ..\build\build-core.proj
ServiceStack.OrmLite.Sqlite.Data\ServiceStack.OrmLite.Sqlite.Data.csproj = ServiceStack.OrmLite.Sqlite.Data\ServiceStack.OrmLite.Sqlite.Data.csproj
ServiceStack.OrmLite.SqlServer.Data\ServiceStack.OrmLite.SqlServer.Data.csproj = ServiceStack.OrmLite.SqlServer.Data\ServiceStack.OrmLite.SqlServer.Data.csproj
ServiceStack.OrmLite.SqlServer.Data\ServiceStack.OrmLite.SqlServer.Data.Core.csproj = ServiceStack.OrmLite.SqlServer.Data\ServiceStack.OrmLite.SqlServer.Data.Core.csproj
..\build\build-core-data.proj = ..\build\build-core-data.proj
..\tests\Directory.Build.props = ..\tests\Directory.Build.props
ServiceStack.OrmLite.PostgreSQL\ServiceStack.OrmLite.PostgreSQL.Source.csproj = ServiceStack.OrmLite.PostgreSQL\ServiceStack.OrmLite.PostgreSQL.Source.csproj
ServiceStack.OrmLite.MySql\ServiceStack.OrmLite.MySql.Source.csproj = ServiceStack.OrmLite.MySql\ServiceStack.OrmLite.MySql.Source.csproj
ServiceStack.OrmLite.Sqlite\ServiceStack.OrmLite.Sqlite.Source.csproj = ServiceStack.OrmLite.Sqlite\ServiceStack.OrmLite.Sqlite.Source.csproj
ServiceStack.OrmLite.SqlServer\ServiceStack.OrmLite.SqlServer.Source.csproj = ServiceStack.OrmLite.SqlServer\ServiceStack.OrmLite.SqlServer.Source.csproj
ServiceStack.OrmLite.Oracle\ServiceStack.OrmLite.Oracle.csproj = ServiceStack.OrmLite.Oracle\ServiceStack.OrmLite.Oracle.csproj
EndProjectSection
EndProject
Expand Down
12 changes: 4 additions & 8 deletions ServiceStack.OrmLite/src/ServiceStack.OrmLite/Converters/DateTimeOffsetConverter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,16 @@ public class DateTimeOffsetConverter : OrmLiteConverter
//From OrmLiteDialectProviderBase:
public override object FromDbValue(Type fieldType, object value)
{
var strValue = value as string;
if (strValue != null)
if (value is string strValue)
{
var moment = DateTimeOffset.Parse(strValue, null, DateTimeStyles.RoundtripKind);
return moment;
}
if (value.GetType() == fieldType)
{
return value;
}
if (value is DateTime)
{
return new DateTimeOffset((DateTime)value);
}
if (value is DateTime dateTime)
return new DateTimeOffset(dateTime);

var convertedValue = DialectProvider.StringSerializer.DeserializeFromString(value.ToString(), fieldType);
return convertedValue;
}
Expand Down
2 changes: 2 additions & 0 deletions ServiceStack.OrmLite/src/ServiceStack.OrmLite/Migrator.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ public class Migration : IMeta
public string? Log { get; set; }
public string? ErrorCode { get; set; }
public string? ErrorMessage { get; set; }
[StringLength(StringLengthAttribute.MaxText)]
public string? ErrorStackTrace { get; set; }
[StringLength(StringLengthAttribute.MaxText)]
public Dictionary<string, string> Meta { get; set; }
}

Expand Down
2 changes: 1 addition & 1 deletion ServiceStack.OrmLite/src/ServiceStack.OrmLite/ServiceStack.OrmLite.Core.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Memory" Version="4.5.4" />
<PackageReference Include="System.Memory" Version="4.5.5" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
Expand Down
Loading

0 comments on commit 6f61915

Please sign in to comment.