Merge pull request #1442 from dotMorten/dotMorten/AddHelpWarning

Add build error to help users know they need to retarget to 19041 when targeting net5.0-windows
dotnet · Nov 23, 2020 · af4f990 · af4f990
2 parents d847ae4 + 415d91f
commit af4f990
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj b/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj
@@ -184,10 +184,11 @@
 
   <ItemGroup>
     <None Include="build\_._" PackagePath="lib\netcoreapp3.1" Pack="true" />
-    <None Include="build\_._" PackagePath="build\net5.0" Pack="true" />
-    <None Include="build\_._" PackagePath="buildTransitive\net5.0" Pack="true" />
+    <None Include="build\_._" PackagePath="build\net5.0;build\net5.0-windows10.0.19041" Pack="true" />
+    <None Include="build\_._" PackagePath="buildTransitive\net5.0;buildTransitive\net5.0-windows10.0.19041" Pack="true" />
     <None Include="build\System.Reactive.targets" PackagePath="buildTransitive\netcoreapp3.1" Pack="true" />
     <None Include="build\System.Reactive.targets" PackagePath="build\netcoreapp3.1" Pack="true" />
+	<None Include="build\System.Reactive.net5.0-windows.targets" PackagePath="build\net5.0-windows\$(PackageId).targets;buildTransitive\net5.0-windows\$(PackageId).targets" Pack="true" />
     <None Include="Linq\QbservableEx.NAry.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>

diff --git a/Rx.NET/Source/src/System.Reactive/build/System.Reactive.net5.0-windows.targets b/Rx.NET/Source/src/System.Reactive/build/System.Reactive.net5.0-windows.targets
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Target Name="_RXNETWindowsTFMCheck" BeforeTargets="ResolveAssemblyReferences;Build;Rebuild">
+    <Error 
+        Text = "The 'System.Reactive' nuget package cannot be used to target '$(TargetFramework)'. Target 'net5.0-windows10.0.19041' or later instead." />
+  </Target>
+
+</Project>