From 44a3f6eb76accd8f4486e875c26a7d12619db3c1 Mon Sep 17 00:00:00 2001 From: Mikayla Hutchinson Date: Mon, 22 Jan 2024 21:52:01 -0500 Subject: [PATCH] Change mechanism for TFM support warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Apparently when we tried to pack a TFM-specific file called _._ into buildTransitive to indicate that there were no targets for that TFM, NuGet arbitrarily decided to pack the targets file from a different TFM instead ¯\_(ツ)_/¯ Borrow the logic from https://github.com/dotnet/runtime/blob/bb74bb79db53eae474977a0928756a0db7fc6a3f/src/libraries/Microsoft.Extensions.Configuration.Binder/src/buildTransitive/Microsoft.Extensions.Configuration.Binder.targets#L17 as it's easier than overriding NuGet's weird pack behavior. Fixes #174 --- Mono.TextTemplating/Mono.TextTemplating.csproj | 5 +---- .../package/Mono.TextTemplating.targets | 14 +++++++++++++- Mono.TextTemplating/package/_._ | 0 3 files changed, 14 insertions(+), 5 deletions(-) delete mode 100644 Mono.TextTemplating/package/_._ diff --git a/Mono.TextTemplating/Mono.TextTemplating.csproj b/Mono.TextTemplating/Mono.TextTemplating.csproj index 25aab18..b1188a8 100644 --- a/Mono.TextTemplating/Mono.TextTemplating.csproj +++ b/Mono.TextTemplating/Mono.TextTemplating.csproj @@ -24,10 +24,7 @@ - - - - + diff --git a/Mono.TextTemplating/package/Mono.TextTemplating.targets b/Mono.TextTemplating/package/Mono.TextTemplating.targets index 53f0035..2c9ce7e 100644 --- a/Mono.TextTemplating/package/Mono.TextTemplating.targets +++ b/Mono.TextTemplating/package/Mono.TextTemplating.targets @@ -1,6 +1,18 @@ - + + <_Mono_TextTemplating_Warn_Compat_Tfm + Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'netcoreapp2.0')) AND + !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))"> + >net6.0 + <_Mono_TextTemplating_Warn_Compat_Tfm + Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net461')) AND + !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net462'))" + >net462 + + diff --git a/Mono.TextTemplating/package/_._ b/Mono.TextTemplating/package/_._ deleted file mode 100644 index e69de29..0000000