Fixes

hazelcast · Dec 7, 2022 · ade657c · ade657c
1 parent f5a7e0b
commit ade657c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/hz.ps1 b/hz.ps1
@@ -1536,7 +1536,6 @@ function hz-build {
         $buildArgs += "-p:VersionSuffix=$versionSuffix"
     }
 
-    $buildArgs += "-p:SolutionDir=`"$slnRoot`""
     $buildArgs += "-p:ReleaseBranch=$isReleaseBranch"
 
     $projs | foreach {

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,9 +1,20 @@
 <Project>
 
+  <PropertyGroup>
+    <!-- 
+      the supposedly built-in $(SolutionDir) macro in MSBuild is confusing,
+      not always defined, there are issues with IDE vs command-line, etc so
+      we define our own alternative
+
+      this file is in ~/src and the solution is one level up
+    -->
+    <SolutionDirectory>$(MSBuildThisFileDirectory)/..</SolutionDirectory>
+  </PropertyGroup>
+
   <!-- import our targets (once) -->
   <PropertyGroup><HazelcastTargets>true</HazelcastTargets></PropertyGroup>
   <Import Project="Directory.Build.targets" Condition="'$(HazelcastTargets)' == ''"/>
-  <Import Project="$(SolutionDir)/build/AnalysisRules.props" />
+  <Import Project="$(SolutionDirectory)/build/AnalysisRules.props" />
 
   <PropertyGroup>
     <GitRepositoryRemoteName></GitRepositoryRemoteName>

diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
@@ -1,6 +1,6 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <UsingTask
+    <UsingTask
     TaskName="GetGitRepositoryRemoteName"
     TaskFactory="RoslynCodeTaskFactory"
     AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll" >