Browse Source

C#: Fix Windows detection for copying MSBuild stub

Previous condition checked only the host
platform. This was a problem as our official
builds are from Linux.

(cherry picked from commit 206501a45e2219e4013ff1fb4ae98311aa5afaad)
Ignacio Etcheverry 5 years ago
parent
commit
939ed5dd5b

+ 1 - 1
modules/mono/editor/GodotTools/GodotTools.ProjectEditor/GodotTools.ProjectEditor.csproj

@@ -22,7 +22,7 @@
   <ItemGroup>
   <ItemGroup>
     <None Include="MSBuild.exe" CopyToOutputDirectory="Always" />
     <None Include="MSBuild.exe" CopyToOutputDirectory="Always" />
   </ItemGroup>
   </ItemGroup>
-  <Target Name="CopyMSBuildStubWindows" AfterTargets="Build" Condition="$([MSBuild]::IsOsPlatform(Windows))">
+  <Target Name="CopyMSBuildStubWindows" AfterTargets="Build" Condition=" '$(GodotPlatform)' == 'windows' Or ( '$(GodotPlatform)' == '' And '$(OS)' == 'Windows_NT' ) ">
     <PropertyGroup>
     <PropertyGroup>
       <GodotSourceRootPath>$(SolutionDir)/../../../../</GodotSourceRootPath>
       <GodotSourceRootPath>$(SolutionDir)/../../../../</GodotSourceRootPath>
       <GodotOutputDataDir>$(GodotSourceRootPath)/bin/GodotSharp</GodotOutputDataDir>
       <GodotOutputDataDir>$(GodotSourceRootPath)/bin/GodotSharp</GodotOutputDataDir>