From a043d4b1d4f1ce58bceca1532b1f7f0552d22444 Mon Sep 17 00:00:00 2001
From: Andrei Borodin <andrei.borodin@microsoft.com>
Date: Thu, 30 Jan 2020 14:47:32 -0800
Subject: [PATCH] In the dependencies project we can explicitly set the target
 framework after importing the commons file. This fixes an issue with VS2019

---
 ...nityDependencies.Unity.Dependencies.msb4u.csproj |  3 +--
 Samples/CrossUnityDependencies.Unity/README.md      |  3 +--
 .../Assets/Project.Unity.Dependencies.msb4u.csproj  |  5 ++---
 Samples/IntegratedDependencies.Unity/README.md      |  6 ++----
 .../Assets/Project.Unity.Dependencies.msb4u.csproj  |  3 +--
 .../DependenciesProjectTemplate.csproj.template     |  3 +--
 .../DependenciesProjectTemplate.g.props.template    | 13 +------------
 7 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/Samples/CrossUnityDependencies.Unity/Assets/CrossUnityDependencies.Unity.Dependencies.msb4u.csproj b/Samples/CrossUnityDependencies.Unity/Assets/CrossUnityDependencies.Unity.Dependencies.msb4u.csproj
index a26e7c4..60ca062 100644
--- a/Samples/CrossUnityDependencies.Unity/Assets/CrossUnityDependencies.Unity.Dependencies.msb4u.csproj
+++ b/Samples/CrossUnityDependencies.Unity/Assets/CrossUnityDependencies.Unity.Dependencies.msb4u.csproj
@@ -26,8 +26,7 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove(MSBuildForUnity.Common.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(MSBuildForUnity.Common.props))')" />
 
   <PropertyGroup>
-    <!--anborod: This is a weird thing, it is a required property (even if commented)-->
-    <!--<TargetFrameworks>netstandard2.0;uap10.0;net46</TargetFrameworks> -->
+    <TargetFramework>$(UnityCurrentTargetFramework)</TargetFramework>
   </PropertyGroup>
 
   <!-- SDK.props is imported inside this props file -->
diff --git a/Samples/CrossUnityDependencies.Unity/README.md b/Samples/CrossUnityDependencies.Unity/README.md
index b4813a0..1c1bea5 100644
--- a/Samples/CrossUnityDependencies.Unity/README.md
+++ b/Samples/CrossUnityDependencies.Unity/README.md
@@ -52,8 +52,7 @@ In addition to that, the same line was added to the specific MSB4U project that
   
   <Import Project="$([MSBuild]::GetPathOfFileAbove(MSBuildForUnity.Common.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(MSBuildForUnity.Common.props))')" />
   <PropertyGroup>
-    <!--anborod: This is a weird thing, it is a required property (even if commented)-->
-    <!--<TargetFrameworks>netstandard2.0;uap10.0;net46</TargetFrameworks> -->
+    <TargetFramework>$(UnityCurrentTargetFramework)</TargetFramework>
   </PropertyGroup>
 
   <!-- SDK.props is imported inside this props file -->
diff --git a/Samples/IntegratedDependencies.Unity/Assets/Project.Unity.Dependencies.msb4u.csproj b/Samples/IntegratedDependencies.Unity/Assets/Project.Unity.Dependencies.msb4u.csproj
index ffc3e86..3eeab19 100644
--- a/Samples/IntegratedDependencies.Unity/Assets/Project.Unity.Dependencies.msb4u.csproj
+++ b/Samples/IntegratedDependencies.Unity/Assets/Project.Unity.Dependencies.msb4u.csproj
@@ -1,4 +1,4 @@
-<Project ToolsVersion="15.0">
+<Project ToolsVersion="15.0">
   <!--GENERATED FILE-->
   <!--
     This file can be modified and checked in.
@@ -26,8 +26,7 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove(MSBuildForUnity.Common.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(MSBuildForUnity.Common.props))')" />
 
   <PropertyGroup>
-    <!--anborod: This is a weird thing, it is a required property (even if commented)-->
-    <!--<TargetFrameworks>netstandard2.0;uap10.0;net46</TargetFrameworks> -->
+    <TargetFramework>$(UnityCurrentTargetFramework)</TargetFramework>
   </PropertyGroup>
 
   <!-- SDK.props is imported inside this props file -->
diff --git a/Samples/IntegratedDependencies.Unity/README.md b/Samples/IntegratedDependencies.Unity/README.md
index a85a92c..707bd29 100644
--- a/Samples/IntegratedDependencies.Unity/README.md
+++ b/Samples/IntegratedDependencies.Unity/README.md
@@ -53,8 +53,7 @@ In order to add dependencies to your project, you can open any C# project under
   
   <Import Project="$([MSBuild]::GetPathOfFileAbove(MSBuildForUnity.Common.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(MSBuildForUnity.Common.props))')" />
   <PropertyGroup>
-    <!--anborod: This is a weird thing, it is a required property (even if commented)-->
-    <!--<TargetFrameworks>netstandard2.0;uap10.0;net46</TargetFrameworks> -->
+    <TargetFramework>$(UnityCurrentTargetFramework)</TargetFramework>
   </PropertyGroup>
 
   <Import Project="$(MSBuildForUnityGeneratedOutputDirectory)\$(MSBuildProjectName).g.props" />
@@ -102,8 +101,7 @@ The generated project `Assets/WSASpecific/Component.WSA.msb4u.csproj` contains a
   
   <Import Project="$([MSBuild]::GetPathOfFileAbove(MSBuildForUnity.Common.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(MSBuildForUnity.Common.props))')" />
   <PropertyGroup>
-    <!--anborod: This is a weird thing, it is a required property (even if commented)-->
-    <!--<TargetFrameworks>netstandard2.0;uap10.0;net46</TargetFrameworks> -->
+    <TargetFramework>$(UnityCurrentTargetFramework)</TargetFramework>
   </PropertyGroup>
 
   <Import Project="$(MSBuildForUnityGeneratedOutputDirectory)\$(MSBuildProjectName).g.props" />
diff --git a/Samples/SimpleNuGetDependency.Unity/Assets/Project.Unity.Dependencies.msb4u.csproj b/Samples/SimpleNuGetDependency.Unity/Assets/Project.Unity.Dependencies.msb4u.csproj
index ffc3e86..544fc63 100644
--- a/Samples/SimpleNuGetDependency.Unity/Assets/Project.Unity.Dependencies.msb4u.csproj
+++ b/Samples/SimpleNuGetDependency.Unity/Assets/Project.Unity.Dependencies.msb4u.csproj
@@ -26,8 +26,7 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove(MSBuildForUnity.Common.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(MSBuildForUnity.Common.props))')" />
 
   <PropertyGroup>
-    <!--anborod: This is a weird thing, it is a required property (even if commented)-->
-    <!--<TargetFrameworks>netstandard2.0;uap10.0;net46</TargetFrameworks> -->
+    <TargetFramework>$(UnityCurrentTargetFramework)</TargetFramework>
   </PropertyGroup>
 
   <!-- SDK.props is imported inside this props file -->
diff --git a/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/MSBuildTemplates/DependenciesProjectTemplate.csproj.template b/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/MSBuildTemplates/DependenciesProjectTemplate.csproj.template
index 8b8ae06..bdbffe1 100644
--- a/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/MSBuildTemplates/DependenciesProjectTemplate.csproj.template
+++ b/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/MSBuildTemplates/DependenciesProjectTemplate.csproj.template
@@ -26,8 +26,7 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove(MSBuildForUnity.Common.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(MSBuildForUnity.Common.props))')" />
 
   <PropertyGroup>
-    <!--anborod: This is a weird thing, it is a required property (even if commented)-->
-    <!--<TargetFrameworks>netstandard2.0;uap10.0;net46</TargetFrameworks> -->
+    <TargetFramework>$(UnityCurrentTargetFramework)</TargetFramework>
   </PropertyGroup>
 
   <!-- SDK.props is imported inside this props file -->
diff --git a/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/MSBuildTemplates/DependenciesProjectTemplate.g.props.template b/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/MSBuildTemplates/DependenciesProjectTemplate.g.props.template
index f295722..bb7907b 100644
--- a/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/MSBuildTemplates/DependenciesProjectTemplate.g.props.template
+++ b/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/MSBuildTemplates/DependenciesProjectTemplate.g.props.template
@@ -1,17 +1,6 @@
 <Project ToolsVersion="15.0">
-  <PropertyGroup Condition="'$(UnityCurrentTargetFramework)' == ''">
-    <TargetFramework>netstandard2.0</TargetFramework>
-  </PropertyGroup>
-  
-  <PropertyGroup Condition="'$(UnityCurrentTargetFramework)' != ''">
-    <TargetFramework>$(UnityCurrentTargetFramework)</TargetFramework>
-  </PropertyGroup>
-  
-  <PropertyGroup Condition="'$(UnityCurrentPlatform)'!=''">
-    <UnityPlatform>$(UnityCurrentPlatform)</UnityPlatform>
-  </PropertyGroup>
-
   <PropertyGroup>
+	<UnityPlatform>$(UnityCurrentPlatform)</UnityPlatform>
     <ProjectGuid><!--PROJECT_GUID_TOKEN--></ProjectGuid>
     <UnityConfiguration>InEditor</UnityConfiguration>
     <!-- Make sure Unity ignores the contents of the intermediate output path. -->