From 882859c963f910d4f2b4e09bdb9c2a5afc27eae3 Mon Sep 17 00:00:00 2001 From: Paul Irwin Date: Wed, 2 Mar 2022 09:39:42 -0700 Subject: [PATCH 1/5] Upgrade test project to .NET 6, upgrade NuGet dependencies, remove .NET 4.5 support --- src/F23.StringSimilarity/F23.StringSimilarity.csproj | 4 ++-- .../F23.StringSimilarity.Tests.csproj | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/F23.StringSimilarity/F23.StringSimilarity.csproj b/src/F23.StringSimilarity/F23.StringSimilarity.csproj index 1874382..fbfabbc 100644 --- a/src/F23.StringSimilarity/F23.StringSimilarity.csproj +++ b/src/F23.StringSimilarity/F23.StringSimilarity.csproj @@ -1,7 +1,7 @@  - netstandard2.0;net45 + netstandard2.0 F23.StringSimilarity 4.1.0 string;similarity;distance;levenshtein;jaro-winkler;lcs;cosine @@ -21,7 +21,7 @@ - + diff --git a/test/F23.StringSimilarity.Tests/F23.StringSimilarity.Tests.csproj b/test/F23.StringSimilarity.Tests/F23.StringSimilarity.Tests.csproj index 1f0ee0f..f567e6e 100644 --- a/test/F23.StringSimilarity.Tests/F23.StringSimilarity.Tests.csproj +++ b/test/F23.StringSimilarity.Tests/F23.StringSimilarity.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net6.0 @@ -15,9 +15,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers From a0d3e68c685eb11c0811f4e366287e1322f8c86e Mon Sep 17 00:00:00 2001 From: Paul Irwin Date: Wed, 2 Mar 2022 09:40:29 -0700 Subject: [PATCH 2/5] Use .NET 6 in GitHub Actions --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index ad830fe..31607fa 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -16,7 +16,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v1 with: - dotnet-version: 3.1.x + dotnet-version: 6.0.x - name: Restore dependencies run: dotnet restore - name: Build From b8eb73347cba5d6e6597884a56b67a3661de1cba Mon Sep 17 00:00:00 2001 From: Paul Irwin Date: Wed, 2 Mar 2022 09:41:28 -0700 Subject: [PATCH 3/5] Include develop branch in GH Actions --- .github/workflows/dotnet.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 31607fa..b59793c 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -2,9 +2,9 @@ name: .NET on: push: - branches: [ main ] + branches: [ main, develop ] pull_request: - branches: [ main ] + branches: [ main, develop ] jobs: build: From 187b49a37c367d7a5d429f342ae83616490a12e5 Mon Sep 17 00:00:00 2001 From: Paul Irwin Date: Wed, 2 Mar 2022 09:59:43 -0700 Subject: [PATCH 4/5] Update README for Jaro-Winkler per upstream. See: https://github.com/tdebatty/java-string-similarity/commit/f97b04b4b294b848cc37dc030f3991595b39e19c --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 829acb7..983d883 100644 --- a/README.md +++ b/README.md @@ -222,10 +222,10 @@ Will produce: ## Jaro-Winkler -Jaro-Winkler is a string edit distance that was developed in the area of record linkage (duplicate detection) (Winkler, 1990). The Jaro–Winkler distance metric is designed and best suited for short strings such as person names, and to detect typos. +Jaro-Winkler is a string edit distance that was developed in the area of record linkage (duplicate detection) (Winkler, 1990). The Jaro–Winkler distance metric is designed and best suited for short strings such as person names, and to detect transposition typos. Jaro-Winkler computes the similarity between 2 strings, and the returned value lies in the interval [0.0, 1.0]. -It is (roughly) a variation of Damerau-Levenshtein, where the substitution of 2 close characters is considered less important then the substitution of 2 characters that a far from each other. +It is (roughly) a variation of Damerau-Levenshtein, where the transposition of 2 close characters is considered less important than the transposition of 2 characters that are far from each other. Jaro-Winkler penalizes additions or substitutions that cannot be expressed as transpositions. The distance is computed as 1 - Jaro-Winkler similarity. From 9b65f88d0a56ff7ecbbd7279413df2d38d76e4b9 Mon Sep 17 00:00:00 2001 From: Paul Irwin Date: Wed, 2 Mar 2022 10:08:45 -0700 Subject: [PATCH 5/5] Bump version to 5.0.0 --- src/F23.StringSimilarity/F23.StringSimilarity.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/F23.StringSimilarity/F23.StringSimilarity.csproj b/src/F23.StringSimilarity/F23.StringSimilarity.csproj index fbfabbc..cd57f41 100644 --- a/src/F23.StringSimilarity/F23.StringSimilarity.csproj +++ b/src/F23.StringSimilarity/F23.StringSimilarity.csproj @@ -3,7 +3,7 @@ netstandard2.0 F23.StringSimilarity - 4.1.0 + 5.0.0 string;similarity;distance;levenshtein;jaro-winkler;lcs;cosine StringSimilarity.NET James Blair, Paul Irwin