Skip to content

Commit

Permalink
Updated to .NET 8 RTM (#348)
Browse files Browse the repository at this point in the history
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
  • Loading branch information
csharpfritz and github-actions[bot] authored Dec 12, 2023
1 parent 8d772c8 commit b19f45f
Show file tree
Hide file tree
Showing 23 changed files with 107 additions and 135 deletions.
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "8.0.100-rc.2.23502.2"
"version": "8.0.100"
}
}
18 changes: 9 additions & 9 deletions src/TagzApp.Common/TagzApp.Common.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@

<ItemGroup>
<PackageReference Include="Dapper" Version="2.1.24" />
<PackageReference Include="Microsoft.Data.Sqlite.Core" Version="8.0.0-rc.2.23480.1" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="Npgsql" Version="8.0.0-rc.2" />
<PackageReference Include="Microsoft.Data.Sqlite.Core" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
<PackageReference Include="Npgsql" Version="8.0.1" />
</ItemGroup>

</Project>
8 changes: 4 additions & 4 deletions src/TagzApp.Communication/TagzApp.Communication.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

<ItemGroup>
<PackageReference Include="Ensure.That" Version="11.0.0-p3" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.0-rc.2.23480.2" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
</ItemGroup>

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

<ItemGroup>
<PackageReference Include="Azure.Storage.Queues" Version="12.16.0" />
<PackageReference Include="Azure.Storage.Queues" Version="12.17.1" />
</ItemGroup>

<ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions src/TagzApp.Providers.Blazot/TagzApp.Providers.Blazot.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="System.Net.Http.Json" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
<PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
<ProjectReference Include="..\TagzApp.Common\TagzApp.Common.csproj" />
<ProjectReference Include="..\TagzApp.Communication\TagzApp.Communication.csproj" />
<InternalsVisibleTo Include="TagzApp.UnitTest" />
Expand Down
10 changes: 5 additions & 5 deletions src/TagzApp.Providers.Mastodon/TagzApp.Providers.Mastodon.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="System.Net.Http.Json" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
<PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
<InternalsVisibleTo Include="TagzApp.UnitTest" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@

<ItemGroup>
<InternalsVisibleTo Include="TagzApp.UnitTest" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="System.Net.Http.Json" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
<PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
<ProjectReference Include="..\TagzApp.Common\TagzApp.Common.csproj" />
<ProjectReference Include="..\TagzApp.Communication\TagzApp.Communication.csproj" />
</ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions src/TagzApp.Providers.Twitter/TagzApp.Providers.Twitter.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="System.Net.Http.Json" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
<PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
<ProjectReference Include="..\TagzApp.Common\TagzApp.Common.csproj" />
<ProjectReference Include="..\TagzApp.Communication\TagzApp.Communication.csproj" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Google.Apis.YouTube.v3" Version="1.63.0.3205" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="Google.Apis.YouTube.v3" Version="1.64.0.3205" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
12 changes: 6 additions & 6 deletions src/TagzApp.Providers.Youtube/TagzApp.Providers.Youtube.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="System.Net.Http.Json" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="Google.Apis" Version="1.63.0" />
<PackageReference Include="Google.Apis.YouTube.v3" Version="1.63.0.3205" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
<PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
<PackageReference Include="Google.Apis" Version="1.64.0" />
<PackageReference Include="Google.Apis.YouTube.v3" Version="1.64.0.3205" />
<InternalsVisibleTo Include="TagzApp.UnitTest" />
</ItemGroup>

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

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0-rc.2.23480.1" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0-rc.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/TagzApp.Storage.Postgres/AppExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using Microsoft.Extensions.Logging;
using TagzApp.Communication;
using TagzApp.Storage.Postgres;
using TagzApp.Storage.Postgres.SafetyModeration;
using TagzApp.Web.Services;

namespace Microsoft.Extensions.DependencyInjection;
Expand Down
1 change: 1 addition & 0 deletions src/TagzApp.Storage.Postgres/PostgresMessagingService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using TagzApp.Communication;
using TagzApp.Storage.Postgres.SafetyModeration;
using TagzApp.Web.Services;

namespace TagzApp.Storage.Postgres;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
namespace TagzApp.Storage.Postgres.SafetyModeration;

public class AzureSafetyConfiguration
{

public const string ConfigurationKey = "azuresafety";

public bool Enabled { get; set; } = false;

public string Key { get; set; } = string.Empty;

public string Endpoint { get; set; } = string.Empty;

}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
using TagzApp.Web.Services;
using Microsoft.Extensions.Caching.Memory;

namespace TagzApp.Storage.Postgres;
namespace TagzApp.Storage.Postgres.SafetyModeration;

public class AzureSafetyModeration : INotifyNewMessages
{
Expand Down Expand Up @@ -124,14 +124,15 @@ public void NotifyNewContent(string hashtag, Content content)
return;
}

if (response != null && (response.Value.SexualResult.Severity > 0 || response.Value.HateResult.Severity > 0 || response.Value.SelfHarmResult.Severity > 0 || response.Value.ViolenceResult.Severity > 0))
if (response != null && (response.Value.CategoryResult(TextCategory.Sexual) > 0 || response.Value.CategoryResult(TextCategory.Hate) > 0 || response.Value.CategoryResult(TextCategory.SelfHarm) > 0 || response.Value.CategoryResult(TextCategory.Violence) > 0))
{

string reason = "";
if (response.Value.SexualResult.Severity > 0) reason += $"Sexual: {response.Value.SexualResult.Severity}. ";
if (response.Value.HateResult.Severity > 0) reason += $"Hate: {response.Value.HateResult.Severity}. ";
if (response.Value.SelfHarmResult.Severity > 0) reason += $"SelfHarm: {response.Value.SelfHarmResult.Severity}. ";
if (response.Value.ViolenceResult.Severity > 0) reason += $"Violence: {response.Value.ViolenceResult.Severity}. ";
// CategoriesAnalysis.FirstOrDefault(a => a.Category == TextCategory.Hate)
if (response.Value.CategoryResult(TextCategory.Sexual) > 0) reason += $"Sexual: {response.Value.CategoryResult(TextCategory.Sexual)}. ";
if (response.Value.CategoryResult(TextCategory.Hate) > 0) reason += $"Hate: {response.Value.CategoryResult(TextCategory.Hate)}. ";
if (response.Value.CategoryResult(TextCategory.SelfHarm) > 0) reason += $"SelfHarm: {response.Value.CategoryResult(TextCategory.SelfHarm)}. ";
if (response.Value.CategoryResult(TextCategory.Violence) > 0) reason += $"Violence: {response.Value.CategoryResult(TextCategory.Violence)}. ";

// Add moderation from Azure Content Safety
using var scope = _ServiceProvider.CreateScope();
Expand Down Expand Up @@ -189,7 +190,7 @@ private class HtmlCleaner
//add characters that are should not be removed to this regex
private static readonly Regex _notOkCharacter_ = new(@"[^\w;&#@.:/\\?=|%!() -]", RegexOptions.Compiled);

public static String UnHtml(String html)
public static string UnHtml(string html)
{
html = HttpUtility.UrlDecode(html);
html = HttpUtility.HtmlDecode(html);
Expand All @@ -206,16 +207,16 @@ public static String UnHtml(String html)
return html;
}

private static String RemoveTag(String html, String startTag, String endTag)
private static string RemoveTag(string html, string startTag, string endTag)
{
Boolean bAgain;
bool bAgain;
do
{
bAgain = false;
Int32 startTagPos = html.IndexOf(startTag, 0, StringComparison.CurrentCultureIgnoreCase);
int startTagPos = html.IndexOf(startTag, 0, StringComparison.CurrentCultureIgnoreCase);
if (startTagPos < 0)
continue;
Int32 endTagPos = html.IndexOf(endTag, startTagPos + 1, StringComparison.CurrentCultureIgnoreCase);
int endTagPos = html.IndexOf(endTag, startTagPos + 1, StringComparison.CurrentCultureIgnoreCase);
if (endTagPos <= startTagPos)
continue;
html = html.Remove(startTagPos, endTagPos - startTagPos + endTag.Length);
Expand All @@ -224,11 +225,11 @@ private static String RemoveTag(String html, String startTag, String endTag)
return html;
}

private static String SingleSpacedTrim(String inString)
private static string SingleSpacedTrim(string inString)
{
StringBuilder sb = new();
Boolean inBlanks = false;
foreach (Char c in inString)
bool inBlanks = false;
foreach (char c in inString)
{
switch (c)
{
Expand All @@ -253,17 +254,3 @@ private static String SingleSpacedTrim(String inString)
}

}


public class AzureSafetyConfiguration
{

public const string ConfigurationKey = "azuresafety";

public bool Enabled { get; set; } = false;

public string Key { get; set; } = string.Empty;

public string Endpoint { get; set; } = string.Empty;

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
using Azure.AI.ContentSafety;

namespace TagzApp.Storage.Postgres.SafetyModeration;

public static class ContentSafetyExtensions
{

public static int? CategoryResult(this AnalyzeTextResult result, TextCategory category)
{

return result.CategoriesAnalysis.FirstOrDefault(a => a.Category == category)?.Severity ?? null;


}


}
6 changes: 3 additions & 3 deletions src/TagzApp.Storage.Postgres/TagzApp.Storage.Postgres.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Azure.AI.ContentSafety" Version="1.0.0-beta.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0-rc.2.23480.1" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0-rc.2" />
<PackageReference Include="Azure.AI.ContentSafety" Version="1.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions src/TagzApp.UnitTest/TagzApp.UnitTest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0-preview-23503-02" />
<PackageReference Include="xunit" Version="2.6.1" />
<PackageReference Include="xunit.analyzers" Version="1.4.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
<PackageReference Include="xunit" Version="2.6.3" />
<PackageReference Include="xunit.analyzers" Version="1.7.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
36 changes: 0 additions & 36 deletions src/TagzApp.Web/Areas/Identity/Data/SecurityContext.cs

This file was deleted.

12 changes: 0 additions & 12 deletions src/TagzApp.Web/Areas/Identity/Data/TagzAppUser.cs

This file was deleted.

Loading

0 comments on commit b19f45f

Please sign in to comment.