Workaround for issue 40015: nuget restore uses 'resource' instead of 'resources'

YehezkelShB · YehezkelShB · commit 4180f8f19279 · 2024-11-04T16:27:54.000+02:00
Fixes dotnet#40015
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ResolvedFile.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ResolvedFile.cs
@@ -70,6 +70,11 @@ public ResolvedFile(ITaskItem item, bool isRuntimeTarget)
             {
                 Asset = AssetType.Resources;
             }
+            // Workaround for issue 40015: nuget restore uses 'resource' instead of 'resources'
+            else if (assetType.Equals("resource", StringComparison.OrdinalIgnoreCase))
+            {
+                Asset = AssetType.Resources;
+            }
             else
             {
                 throw new InvalidOperationException($"Unrecognized AssetType '{assetType}' for {SourcePath}");

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,11 @@ public ResolvedFile(ITaskItem item, bool isRuntimeTarget)`
`70`	`70`	`{`
`71`	`71`	`Asset = AssetType.Resources;`
`72`	`72`	`}`
	`73`	`+ // Workaround for issue 40015: nuget restore uses 'resource' instead of 'resources'`
	`74`	`+ else if (assetType.Equals("resource", StringComparison.OrdinalIgnoreCase))`
	`75`	`+ {`
	`76`	`+ Asset = AssetType.Resources;`
	`77`	`+ }`
`73`	`78`	`else`
`74`	`79`	`{`
`75`	`80`	`throw new InvalidOperationException($"Unrecognized AssetType '{assetType}' for {SourcePath}");`