Change langversion to latest instead of preview for VocaDb.Model (#1873)

riipah · FinnRG · web-flow · commit d5cd3ab56c91 · 2024-12-30T15:21:42.000+01:00
* change langversion to latest instead of preview for VocaDb.Model

* fix: Add proper tag target search logic to TagLinkQueryableExtensions.cs

* fix: Use NewTargets for test SkipInvalidTarget

---------

Co-authored-by: Finn Gärtner &lt;finngaertner@protonmail.com&gt;
diff --git a/Tests/Service/Queries/TagUsageQueriesTests.cs b/Tests/Service/Queries/TagUsageQueriesTests.cs
@@ -266,7 +266,7 @@ public async Task AddTag_SendNotifications_IgnorePersonalSongList()
 	[TestMethod]
 	public async Task SkipInvalidTarget()
 	{
-		_existingTag.Targets = TagTargetTypes.Album;
+		_existingTag.NewTargets = new[] { "album" };
 		var tag = _repository.Save(CreateEntry.Tag("vocarock", 39));
 
 		await AddSongTags(_entry.Id, Contract(_existingTag.Id), Contract(tag.Id));
diff --git a/VocaDbModel/Service/QueryableExtensions/TagLinkQueryableExtensions.cs b/VocaDbModel/Service/QueryableExtensions/TagLinkQueryableExtensions.cs
@@ -20,7 +20,7 @@ public static IQueryable<T> WhereTagHasTarget<T>(this IQueryable<T> query, strin
 	{
 		if (target == null) return query;
 
-		return query.Where(t => t.Tag.NewTargets.Any(n => n == target.ToLower()));
+		return query.Where(t => t.Tag.NewTargets.Any(n => n == "all" || n == target || target.StartsWith(n + ':')));
 	}
 	
 	public static IQueryable<T> WhereTagHasTarget<T>(this IQueryable<T> query, ArtistType a) where T : ITagLink
diff --git a/VocaDbModel/VocaDb.Model.csproj b/VocaDbModel/VocaDb.Model.csproj
@@ -16,7 +16,7 @@
     </NuGetPackageImportStamp>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <RuntimeIdentifiers>win</RuntimeIdentifiers>
-    <LangVersion>preview</LangVersion>
+    <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <UseImageSharp>true</UseImageSharp>

Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@ public async Task AddTag_SendNotifications_IgnorePersonalSongList()`
`266`	`266`	`[TestMethod]`
`267`	`267`	`public async Task SkipInvalidTarget()`
`268`	`268`	`{`
`269`		`- _existingTag.Targets = TagTargetTypes.Album;`
	`269`	`+ _existingTag.NewTargets = new[] { "album" };`
`270`	`270`	`var tag = _repository.Save(CreateEntry.Tag("vocarock", 39));`
`271`	`271`
`272`	`272`	`await AddSongTags(_entry.Id, Contract(_existingTag.Id), Contract(tag.Id));`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public static IQueryable<T> WhereTagHasTarget<T>(this IQueryable<T> query, strin`
`20`	`20`	`{`
`21`	`21`	`if (target == null) return query;`
`22`	`22`
`23`		`- return query.Where(t => t.Tag.NewTargets.Any(n => n == target.ToLower()));`
	`23`	`+ return query.Where(t => t.Tag.NewTargets.Any(n => n == "all" \|\| n == target \|\| target.StartsWith(n + ':')));`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`public static IQueryable<T> WhereTagHasTarget<T>(this IQueryable<T> query, ArtistType a) where T : ITagLink`