From 1b355fe32c2c20b7eb61d2c9a6870072d02c1e2e Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 9 Sep 2024 14:02:54 +0200
Subject: [PATCH] Tweak logic to generate supported OS attributes

---
 src/ComputeSharp.D2D1/ComputeSharp.D2D1.csproj       |  2 +-
 .../ComputeSharp.D3D12MemoryAllocator.csproj         |  2 +-
 src/ComputeSharp.Dxc/ComputeSharp.Dxc.csproj         |  2 +-
 src/ComputeSharp.Pix/ComputeSharp.Pix.csproj         |  2 +-
 src/ComputeSharp/ComputeSharp.csproj                 |  2 +-
 src/Directory.Build.targets                          | 12 +++++++++---
 6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/ComputeSharp.D2D1/ComputeSharp.D2D1.csproj b/src/ComputeSharp.D2D1/ComputeSharp.D2D1.csproj
index 928a5e87c..8f67f5e9b 100644
--- a/src/ComputeSharp.D2D1/ComputeSharp.D2D1.csproj
+++ b/src/ComputeSharp.D2D1/ComputeSharp.D2D1.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <SupportedOSVersion>windows6.1</SupportedOSVersion>
+    <SupportedOSPlatformVersion>6.1</SupportedOSPlatformVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/ComputeSharp.D3D12MemoryAllocator/ComputeSharp.D3D12MemoryAllocator.csproj b/src/ComputeSharp.D3D12MemoryAllocator/ComputeSharp.D3D12MemoryAllocator.csproj
index c494d241d..2bb36ea6b 100644
--- a/src/ComputeSharp.D3D12MemoryAllocator/ComputeSharp.D3D12MemoryAllocator.csproj
+++ b/src/ComputeSharp.D3D12MemoryAllocator/ComputeSharp.D3D12MemoryAllocator.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <SupportedOSVersion>windows6.2</SupportedOSVersion>
+    <SupportedOSPlatformVersion>6.2</SupportedOSPlatformVersion>
   </PropertyGroup>
   
   <ItemGroup>
diff --git a/src/ComputeSharp.Dxc/ComputeSharp.Dxc.csproj b/src/ComputeSharp.Dxc/ComputeSharp.Dxc.csproj
index eb867431d..7a65f212d 100644
--- a/src/ComputeSharp.Dxc/ComputeSharp.Dxc.csproj
+++ b/src/ComputeSharp.Dxc/ComputeSharp.Dxc.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Platforms>AnyCPU;x64;ARM64</Platforms>
-    <SupportedOSVersion>windows6.2</SupportedOSVersion>
+    <SupportedOSPlatformVersion>6.2</SupportedOSPlatformVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/ComputeSharp.Pix/ComputeSharp.Pix.csproj b/src/ComputeSharp.Pix/ComputeSharp.Pix.csproj
index b01f7bb25..1eeb360d9 100644
--- a/src/ComputeSharp.Pix/ComputeSharp.Pix.csproj
+++ b/src/ComputeSharp.Pix/ComputeSharp.Pix.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Platforms>AnyCPU;x64;ARM64</Platforms>
-    <SupportedOSVersion>windows6.2</SupportedOSVersion>
+    <SupportedOSPlatformVersion>6.2</SupportedOSPlatformVersion>
   </PropertyGroup>
 
   <!-- Reference to the main library-->
diff --git a/src/ComputeSharp/ComputeSharp.csproj b/src/ComputeSharp/ComputeSharp.csproj
index 9a0099406..1afa3a348 100644
--- a/src/ComputeSharp/ComputeSharp.csproj
+++ b/src/ComputeSharp/ComputeSharp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <SupportedOSVersion>windows6.2</SupportedOSVersion>
+    <SupportedOSPlatformVersion>6.2</SupportedOSPlatformVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index deb5d4c37..8ccc20f75 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -56,12 +56,18 @@
     <DisableRuntimeMarshalling>true</DisableRuntimeMarshalling>
   </PropertyGroup>
 
-  <!-- Emit the [SupportedOSVersion] attribute if needed -->
+  <!--
+    Emit the [SupportedOSVersion] attribute if needed. Note that the .NET SDK already emits this attribute
+    automatically, but only when targeting the Windows TFM. We use this custom target to emit the same
+    attribute for projects only targeting plain .NET as well. This makes them easier to consume from
+    projects that are not using the Windows TFM as well. Doing so isn't strictly needed anyway unless
+    you're specifically consuming the Windows SDK projections, which those projects are not doing.
+  -->
   <Target Name="EmitSupportedOSVersionAttributeForTargetOS"
           BeforeTargets="PrepareForBuild">
-    <ItemGroup Condition="'$(SupportedOSVersion)' != ''">
+    <ItemGroup Condition="'$(SupportedOSPlatformVersion)' != '' AND !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0-windows'))">
       <AssemblyAttribute Include="System.Runtime.Versioning.SupportedOSPlatformAttribute">
-        <_Parameter1>$(SupportedOSVersion)</_Parameter1>
+        <_Parameter1>Windows$(SupportedOSPlatformVersion)</_Parameter1>
       </AssemblyAttribute>
     </ItemGroup>
   </Target>