NuGet SHFB package property file change

Changed the NuGet SHFB package build properties file to use `BuildingInsideVisualStudio` instead of an empty SHFBROOT value to determine when to define SHFBROOT for command line builds. Fixes #955 and should also resolve #920 but only in cases where projects use a package version containing this change (a version later the 2022.10.15.1). See the workaround in #955 for earlier packages.
EWSoftware · Dec 30, 2022 · ffc1b45 · ffc1b45
1 parent 8e2d7a0
commit ffc1b45
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/NuGet/EWSoftware.SHFB.props b/NuGet/EWSoftware.SHFB.props
@@ -1,5 +1,5 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <SHFBROOT Condition="$(SHFBROOT) == ''">$(MSBuildThisFileDirectory)..\tools\</SHFBROOT >
+    <SHFBROOT Condition="$(BuildingInsideVisualStudio) != 'true'">$(MSBuildThisFileDirectory)..\tools\</SHFBROOT>
   </PropertyGroup>
 </Project>
diff --git a/TestCaseProject/Doc/TestCaseProject.shfbproj b/TestCaseProject/Doc/TestCaseProject.shfbproj
@@ -398,8 +398,8 @@
   <!-- Uncomment this to use the nuget packages when SHFB is not installed locally, e.g. in the CI build pipeline.
        Update the package versions as required.
   <ItemGroup>
-    <PackageReference Include="EWSoftware.SHFB" Version="2019.9.15" />
-    <PackageReference Include="EWSoftware.SHFB.NETFramework" Version="4.8.0" />
+    <PackageReference Include="EWSoftware.SHFB" Version="2022.10.15.0" />
+    <PackageReference Include="EWSoftware.SHFB.NETFramework" Version="4.8.0.2" />
   </ItemGroup> -->
   <!-- Import the common build targets during NuGet restore because before the packages are installed, $(SHFBROOT) is not set yet -->
   <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" Condition="'$(MSBuildRestoreSessionId)' != ''" />