Fixes to allow restore and build on macOS

novotnyllc · Nov 27, 2018 · 1e37f53 · 1e37f53
1 parent 1432809
commit 1e37f53
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/Tools/MSBuild.DevLocal.targets b/Tools/MSBuild.DevLocal.targets
@@ -3,6 +3,8 @@
   <!-- Tools to make local dev easier -->
   <Target Name="_EnsureTempPackageSource" BeforeTargets="Restore;_LocalPublish">
     <PropertyGroup>
+      <!-- TEMP is not defined by default on macOS. TMPDIR, however, is. -->
+      <TEMP Condition="'$(TEMP)' == ''">$(TMPDIR)</TEMP>
       <TempPackagePath Condition="'$(TempPackagePath)' == ''">$(TEMP)\Packages</TempPackagePath>
     </PropertyGroup>
     <MakeDir Directories="$(TempPackagePath)" Condition="!Exists('$(TempPackagePath)')" />
@@ -14,7 +16,8 @@
     </ItemGroup>
 
     <Delete Files="@(ToDelete)"/>
-    <Exec Command='rd "$(NuGetPackageRoot)$(PackageId.ToLowerInvariant())" /q /s' Condition="Exists('$(NuGetPackageRoot)$(PackageId.ToLowerInvariant())')"/>
+    <Exec Command='rd "$(NuGetPackageRoot)$(PackageId.ToLowerInvariant())" /q /s' Condition="Exists('$(NuGetPackageRoot)$(PackageId.ToLowerInvariant())') and $([MSBuild]::IsOSPlatform(Windows))"/>
+    <Exec Command='rm -rf "$(NuGetPackageRoot)$(PackageId.ToLowerInvariant())"' Condition="Exists('$(NuGetPackageRoot)$(PackageId.ToLowerInvariant())') and !$([MSBuild]::IsOSPlatform(Windows))"/>
   </Target>
 
   <Target Name="_SetFixedVersion"
@@ -32,4 +35,4 @@
     <Copy SourceFiles="$(PackageOutputPath)$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$(TempPackagePath)"/>
   </Target>
 
-</Project>
+</Project>