Skip to content

Commit 65abd98

Browse files
authored
Cleanup (#115)
* chore: fix compiler warnings * chore: remove support for .net 5 (end of life) * Add support for .net 7.0 * chore: removed support for .net 7 (CI issues to fix)
1 parent 7d2b5d6 commit 65abd98

File tree

4 files changed

+19
-14
lines changed

4 files changed

+19
-14
lines changed

src/Utils/StreamJsonConverter.cs

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,16 @@ public static class StreamJsonConverter
1313
NamingStrategy = new SnakeCaseNamingStrategy(), // this handles ForeignId => foreign_id etc. conversion for us
1414
},
1515
NullValueHandling = NullValueHandling.Ignore,
16-
DateTimeZoneHandling = DateTimeZoneHandling.Utc // always convert time to UTC
16+
DateTimeZoneHandling = DateTimeZoneHandling.Utc, // always convert time to UTC
1717
};
1818

1919
public static JsonSerializer Serializer { get; } = JsonSerializer.Create(Settings);
20-
public static string SerializeObject(object obj) => JsonConvert.SerializeObject(obj, Settings);
21-
public static T DeserializeObject<T>(string json) => JsonConvert.DeserializeObject<T>(json, Settings);
20+
21+
public static string SerializeObject(object obj) =>
22+
JsonConvert.SerializeObject(obj, Settings);
23+
24+
public static T DeserializeObject<T>(string json) =>
25+
JsonConvert.DeserializeObject<T>(json, Settings);
2226
}
2327

2428
public static class StreamJsonConverterUTC
@@ -31,11 +35,15 @@ public static class StreamJsonConverterUTC
3135
NamingStrategy = new SnakeCaseNamingStrategy(), // this handles ForeignId => foreign_id etc. conversion for us
3236
},
3337
NullValueHandling = NullValueHandling.Ignore,
34-
DateTimeZoneHandling = DateTimeZoneHandling.Utc // always convert time to UTC
38+
DateTimeZoneHandling = DateTimeZoneHandling.Utc, // always convert time to UTC
3539
};
3640

3741
public static JsonSerializer Serializer { get; } = JsonSerializer.Create(Settings);
38-
public static string SerializeObject(object obj) => JsonConvert.SerializeObject(obj, Settings);
39-
public static T DeserializeObject<T>(string json) => JsonConvert.DeserializeObject<T>(json, Settings);
42+
43+
public static string SerializeObject(object obj) =>
44+
JsonConvert.SerializeObject(obj, Settings);
45+
46+
public static T DeserializeObject<T>(string json) =>
47+
JsonConvert.DeserializeObject<T>(json, Settings);
4048
}
4149
}

src/stream-net.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<DefineConstants>TRACE;DEBUG;NETCORE</DefineConstants>
44
</PropertyGroup>
55
<PropertyGroup>
6-
<TargetFrameworks>net45;net46;net47;net48;netstandard1.6;netstandard2.0;netstandard2.1;net5.0;net6.0</TargetFrameworks>
6+
<TargetFrameworks>netstandard1.6;netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
77
</PropertyGroup>
88
<PropertyGroup>
99
<PackageId>stream-net</PackageId>

tests/ReactionTests.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,7 @@ public async Task TestReactionPagination()
112112
Guid.NewGuid().ToString(),
113113
"upvote",
114114
"mary",
115-
data
116-
);
115+
data);
117116

118117
// activity id
119118
var filter = ReactionFiltering.Default;
@@ -140,15 +139,13 @@ public async Task TestReactionPagination()
140139
// with limit
141140
reactionsByActivity = await Client.Reactions.FilterAsync(
142141
filter.WithLimit(1),
143-
pagination
144-
);
142+
pagination);
145143
Assert.AreEqual(1, reactionsByActivity.Count());
146144

147145
// with data
148146
var reactionsByActivityWithData = await Client.Reactions.FilterWithActivityAsync(
149147
filter.WithLimit(1),
150-
pagination
151-
);
148+
pagination);
152149
Assert.AreEqual(1, reactionsByActivity.Count());
153150
Assert.AreEqual(data, reactionsByActivity.FirstOrDefault().Data);
154151

tests/UtilsTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public async Task TestActivityIdSameAsBackend()
5353
}
5454

5555
[Test]
56-
public async Task TestStreamJsonConverterUTC()
56+
public void TestStreamJsonConverterUTC()
5757
{
5858
var date0 = new DateTime(2023, 5, 10, 12, 30, 15, DateTimeKind.Utc);
5959
var date0AsJsonNewtonsoft = Newtonsoft.Json.JsonConvert.SerializeObject(date0);

0 commit comments

Comments
 (0)