From 5f01c1b45a66b5ebb41360f2b7211582c90fc734 Mon Sep 17 00:00:00 2001
From: Jeff Kluge <jeffkl@microsoft.com>
Date: Fri, 2 Dec 2022 13:51:30 -0800
Subject: [PATCH] Fix import ordering of design-time build targets for
 NoTargets with .proj extension

Fixes https://github.com/microsoft/MSBuildSdks/issues/407
---
 src/NoTargets/Sdk/Sdk.targets | 7 +++----
 src/NoTargets/version.json    | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/NoTargets/Sdk/Sdk.targets b/src/NoTargets/Sdk/Sdk.targets
index 60c3f5f6..d537247c 100644
--- a/src/NoTargets/Sdk/Sdk.targets
+++ b/src/NoTargets/Sdk/Sdk.targets
@@ -24,6 +24,9 @@
   <PropertyGroup>
     <!-- Don't include build output in a package since NoTargets projects don't emit an assembly. -->
     <IncludeBuildOutput Condition="'$(IncludeBuildOutput)' == ''">false</IncludeBuildOutput>
+
+    <!-- For CPS/VS support. See https://github.com/dotnet/project-system/blob/master/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/DesignTimeTargets/Microsoft.Managed.DesignTime.targets#L60 -->
+    <CustomBeforeMicrosoftCommonTargets Condition="'$(ManagedLanguageTargetsGotImported)' == '' And Exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\Managed\Microsoft.Managed.DesignTime.targets')">$(CustomBeforeMicrosoftCommonTargets);$(MSBuildExtensionsPath)\Microsoft\VisualStudio\Managed\Microsoft.Managed.DesignTime.targets</CustomBeforeMicrosoftCommonTargets>
   </PropertyGroup>
 
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" Condition=" '$(CommonTargetsPath)' == '' " />
@@ -65,10 +68,6 @@
   -->
   <Target Name="ComputeIntermediateSatelliteAssemblies" />
 
-  <!-- For CPS/VS support. See https://github.com/dotnet/project-system/blob/master/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/DesignTimeTargets/Microsoft.Managed.DesignTime.targets#L60 -->
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\Managed\Microsoft.Managed.DesignTime.targets" 
-          Condition="'$(DebuggerFlavor)' == '' And Exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\Managed\Microsoft.Managed.DesignTime.targets')" />
-
   <!--
     NoTargets projects do not build an assembly so dependent projects shouldn't get a path to the target.  Override the GetTargetPath to do nothing.
   -->
diff --git a/src/NoTargets/version.json b/src/NoTargets/version.json
index 6e6da54a..5cc12248 100644
--- a/src/NoTargets/version.json
+++ b/src/NoTargets/version.json
@@ -1,4 +1,4 @@
 {
   "inherit": true,
-  "version": "3.6"
+  "version": "3.7"
 }