From 7c6bb6b591b3ea996563f4cf2425dde2c44250b6 Mon Sep 17 00:00:00 2001
From: Sunghwan Bang <sunghwan2789@gmail.com>
Date: Sun, 16 Apr 2023 21:24:52 +0900
Subject: [PATCH] Fixed DotNetVersion blank (#6054)

---
 .../Common/MSBuild/StrawberryShake.targets           | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/StrawberryShake/MetaPackages/Common/MSBuild/StrawberryShake.targets b/src/StrawberryShake/MetaPackages/Common/MSBuild/StrawberryShake.targets
index bb8a04c2c47..56ca96d3206 100644
--- a/src/StrawberryShake/MetaPackages/Common/MSBuild/StrawberryShake.targets
+++ b/src/StrawberryShake/MetaPackages/Common/MSBuild/StrawberryShake.targets
@@ -24,16 +24,18 @@
     </ItemGroup>
   </Target>
 
+  <Target Name="_DotNetVersion">
+    <Exec Command="dotnet --version" StandardOutputImportance="Low" ConsoleToMsBuild="true">
+      <Output TaskParameter="ConsoleOutput" PropertyName="DotNetVersion" />
+    </Exec>
+  </Target>
+
   <Target
     Name="_GenerateGraphQLCode"
+    DependsOnTargets="_DotNetVersion"
     Inputs="@(GenerateGraphQLCodeItems)"
     Outputs="$(MSBuildProjectDirectory)\$(IntermediateOutputPath)berry\.build.info"
     Condition="'@(GraphQL)' != ''">
-
-    <Exec Command="dotnet --version" StandardOutputImportance="Low" ConsoleToMsBuild="true">
-      <Output TaskParameter="ConsoleOutput" PropertyName="DotNetVersion" />
-    </Exec>
-
     <PropertyGroup>
       <DotNetMajor Condition="$([MSBuild]::VersionGreaterThanOrEquals($(DotNetVersion), 6))">6</DotNetMajor>
       <DotNetMajor Condition="$([MSBuild]::VersionGreaterThanOrEquals($(DotNetVersion), 7))">7</DotNetMajor>