Merge pull request #67 from Ashampoo/develop

release
Ashampoo · Feb 28, 2024 · 4128e5d · 4128e5d
2 parents 21ef44f + 03b1d02
commit 4128e5d
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 23 deletions.
diff --git a/...Systems.Formats.Abstractions/src/Ashampoo.Translation.Systems.Formats.Abstractions.csproj b/...Systems.Formats.Abstractions/src/Ashampoo.Translation.Systems.Formats.Abstractions.csproj
@@ -32,6 +32,6 @@
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="StronglyTypedId" Version="1.0.0-beta07" />
+        <PackageReference Include="Strongly" Version="1.5.1" />
     </ItemGroup>
 </Project>
diff --git a/src/Ashampoo.Translation.Systems.Formats.Abstractions/src/IFormatProvider.cs b/src/Ashampoo.Translation.Systems.Formats.Abstractions/src/IFormatProvider.cs
@@ -27,7 +27,7 @@ public interface IFormatProvider<out T> where T : class, IFormat
     /// <summary>
     /// Returns the supported file extensions of the format provider.
     /// </summary>
-    string[] SupportedFileExtensions { get; }
+    IEnumerable<string> SupportedFileExtensions { get; }
 
     /// <summary>
     /// Creates a new instance of the format builder.

diff --git a/src/Ashampoo.Translation.Systems.Formats.Abstractions/src/Models/Language.cs b/src/Ashampoo.Translation.Systems.Formats.Abstractions/src/Models/Language.cs
@@ -1,11 +1,11 @@
-using StronglyTypedIds;
+using Strongly;
 
 namespace Ashampoo.Translation.Systems.Formats.Abstractions.Models;
 
 /// <summary>
 /// Represents a strongly typed identifier for a language.
 /// </summary>
-[StronglyTypedId(Template.String)]
+[Strongly(StronglyType.String, StronglyConverter.SystemTextJson, StronglyImplementations.IEquatable |StronglyImplementations.Parsable)]
 public readonly partial struct Language;
 
 /// <summary>

diff --git a/src/Ashampoo.Translation.Systems.Formats/src/AshLang/AshLangFormatProvider.cs b/src/Ashampoo.Translation.Systems.Formats/src/AshLang/AshLangFormatProvider.cs
@@ -8,7 +8,7 @@ namespace Ashampoo.Translation.Systems.Formats.AshLang;
 public sealed class AshLangFormatProvider : IFormatProvider<AshLangFormat>
 {
     /// <inheritdoc />
-    public string Id { get; } = "ashlang";
+    public string Id => "ashlang";
 
     /// <inheritdoc />
     public AshLangFormat Create() => new();
@@ -20,7 +20,7 @@ public bool SupportsFileName(string fileName)
     }
 
     /// <inheritdoc />
-    public string[] SupportedFileExtensions => [".ashlang"];
+    public IEnumerable<string> SupportedFileExtensions => [".ashlang"];
 
     /// <inheritdoc />
     public IFormatBuilder<AshLangFormat> GetFormatBuilder() => new AshLangFormatBuilder();

diff --git a/src/Ashampoo.Translation.Systems.Formats/src/Gengo/GengoFormatProvider.cs b/src/Ashampoo.Translation.Systems.Formats/src/Gengo/GengoFormatProvider.cs
@@ -8,7 +8,7 @@ namespace Ashampoo.Translation.Systems.Formats.Gengo;
 public sealed class GengoFormatProvider : IFormatProvider<GengoFormat>
 {
     /// <inheritdoc />
-    public string Id { get; } = "gengo";
+    public string Id => "gengo";
 
     /// <inheritdoc />
     public GengoFormat Create() => new();
@@ -20,7 +20,7 @@ public bool SupportsFileName(string fileName)
     }
 
     /// <inheritdoc />
-    public string[] SupportedFileExtensions { get; } = [".xlsx", ".xls"];
+    public IEnumerable<string> SupportedFileExtensions { get; } = [".xlsx", ".xls"];
 
     /// <inheritdoc />
     public IFormatBuilder<GengoFormat> GetFormatBuilder() => new GengoFormatBuilder();

diff --git a/src/Ashampoo.Translation.Systems.Formats/src/JavaProperties/JavaPropertiesFormat.cs b/src/Ashampoo.Translation.Systems.Formats/src/JavaProperties/JavaPropertiesFormat.cs
@@ -71,7 +71,7 @@ private async Task<bool> ConfigureOptionsAsync(FormatReadOptions? options)
         }
         else
         {
-            Header.TargetLanguage = (Language)options.TargetLanguage!;
+            Header.TargetLanguage = options.TargetLanguage!;
         }
 
         return true;

diff --git a/src/Ashampoo.Translation.Systems.Formats/src/JavaProperties/JavaPropertiesFormatProvider.cs b/src/Ashampoo.Translation.Systems.Formats/src/JavaProperties/JavaPropertiesFormatProvider.cs
@@ -8,7 +8,8 @@ namespace Ashampoo.Translation.Systems.Formats.JavaProperties;
 public sealed class JavaPropertiesFormatProvider : IFormatProvider<JavaPropertiesFormat>
 {
     /// <inheritdoc />
-    public string Id { get; } = "javaProperties";
+    public string Id => "javaProperties";
+
     /// <inheritdoc />
     public JavaPropertiesFormat Create() => new();
 
@@ -19,7 +20,7 @@ public bool SupportsFileName(string fileName)
     }
 
     /// <inheritdoc />
-    public string[] SupportedFileExtensions { get; } = [".properties"];
+    public IEnumerable<string> SupportedFileExtensions { get; } = [".properties"];
     /// <inheritdoc />
     public IFormatBuilder<JavaPropertiesFormat> GetFormatBuilder() => new JavaPropertiesFormatBuilder();
 }
diff --git a/src/Ashampoo.Translation.Systems.Formats/src/Json/JsonFormatProvider.cs b/src/Ashampoo.Translation.Systems.Formats/src/Json/JsonFormatProvider.cs
@@ -8,7 +8,7 @@ namespace Ashampoo.Translation.Systems.Formats.Json;
 public sealed class JsonFormatProvider : IFormatProvider<JsonFormat>
 {
     /// <inheritdoc />
-    public string Id { get; } = "json";
+    public string Id => "json";
 
     /// <inheritdoc />
     public JsonFormat Create() => new();
@@ -20,7 +20,7 @@ public bool SupportsFileName(string fileName)
     }
 
     /// <inheritdoc />
-    public string[] SupportedFileExtensions { get; } = [".json"];
+    public IEnumerable<string> SupportedFileExtensions { get; } = [".json"];
 
     /// <inheritdoc />
     public IFormatBuilder<JsonFormat> GetFormatBuilder() => new JsonFormatBuilder();

diff --git a/src/Ashampoo.Translation.Systems.Formats/src/NLang/NLangFormatProvider.cs b/src/Ashampoo.Translation.Systems.Formats/src/NLang/NLangFormatProvider.cs
@@ -3,12 +3,12 @@
 namespace Ashampoo.Translation.Systems.Formats.NLang;
 
 /// <summary>
-/// Implementation of <see cref="IFormatProvider"/> for the NLang format.
+/// Implementation of <see cref="IFormatProvider{T}"/> for the NLang format.
 /// </summary>
 public sealed class NLangFormatProvider : IFormatProvider<NLangFormat>
 {
     /// <inheritdoc />
-    public string Id { get; } = "nlang";
+    public string Id => "nlang";
 
     /// <inheritdoc />
     public NLangFormat Create() => new();
@@ -20,7 +20,7 @@ public bool SupportsFileName(string fileName)
     }
 
     /// <inheritdoc />
-    public string[] SupportedFileExtensions { get; } = [".nlang3"];
+    public IEnumerable<string> SupportedFileExtensions { get; } = [".nlang3"];
 
     /// <inheritdoc />
     public IFormatBuilder<NLangFormat> GetFormatBuilder() => new NLangFormatBuilder();

diff --git a/src/Ashampoo.Translation.Systems.Formats/src/PO/POFormatProvider.cs b/src/Ashampoo.Translation.Systems.Formats/src/PO/POFormatProvider.cs
@@ -9,7 +9,7 @@ namespace Ashampoo.Translation.Systems.Formats.PO;
 public sealed class POFormatProvider : IFormatProvider<POFormat>
 {
     /// <inheritdoc />
-    public string Id { get; } = "po";
+    public string Id => "po";
 
     /// <inheritdoc />
     public POFormat Create() => new();
@@ -21,7 +21,7 @@ public bool SupportsFileName(string fileName)
     }
 
     /// <inheritdoc />
-    public string[] SupportedFileExtensions { get; } = [".po"];
+    public IEnumerable<string> SupportedFileExtensions { get; } = [".po"];
 
     /// <inheritdoc />
     public IFormatBuilder<POFormat> GetFormatBuilder() => new POFormatBuilder();

diff --git a/src/Ashampoo.Translation.Systems.Formats/src/ResX/ResXFormatProvider.cs b/src/Ashampoo.Translation.Systems.Formats/src/ResX/ResXFormatProvider.cs
@@ -3,12 +3,12 @@
 namespace Ashampoo.Translation.Systems.Formats.ResX;
 
 /// <summary>
-/// Implementation of <see cref="IFormatProvider"/> interface for the ResX format.
+/// Implementation of <see cref="IFormatProvider{T}"/> interface for the ResX format.
 /// </summary>
 public sealed class ResXFormatProvider : IFormatProvider<ResXFormat>
 {
     /// <inheritdoc />
-    public string Id { get; } = "resx";
+    public string Id => "resx";
 
     /// <inheritdoc />
     public ResXFormat Create() => new();
@@ -20,7 +20,7 @@ public bool SupportsFileName(string fileName)
     }
 
     /// <inheritdoc />
-    public string[] SupportedFileExtensions { get; } = [".resx"];
+    public IEnumerable<string> SupportedFileExtensions { get; } = [".resx"];
 
     /// <inheritdoc />
     public IFormatBuilder<ResXFormat> GetFormatBuilder() => new ResXFormatBuilder();

diff --git a/src/Ashampoo.Translation.Systems.Formats/src/TsProj/TsProjFormatProvider.cs b/src/Ashampoo.Translation.Systems.Formats/src/TsProj/TsProjFormatProvider.cs
@@ -6,7 +6,7 @@ namespace Ashampoo.Translation.Systems.Formats.TsProj;
 public sealed class TsProjFormatProvider : IFormatProvider<TsProjFormat>
 {
     /// <inheritdoc />
-    public string Id { get; } = "tsproj";
+    public string Id => "tsproj";
 
     /// <inheritdoc />
     public TsProjFormat Create() => new();
@@ -18,7 +18,7 @@ public bool SupportsFileName(string fileName)
     }
 
     /// <inheritdoc />
-    public string[] SupportedFileExtensions { get; } = [".tsproj"];
+    public IEnumerable<string> SupportedFileExtensions { get; } = [".tsproj"];
 
     /// <inheritdoc />
     public IFormatBuilder<TsProjFormat> GetFormatBuilder() => new TsProjFormatBuilder();