Skip to content

Commit 70f88e7

Browse files
committed
Revert "Hacked nuget.targets to work on Windows/mono"
This reverts commit bf28c73. See npgsql#137
1 parent 4a8171d commit 70f88e7

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

.nuget/NuGet.targets

+4-10
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
<PropertyGroup>
44
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
55

6-
<NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
7-
86
<!-- Enable the restore command to run before builds -->
97
<RestorePackages Condition=" '$(RestorePackages)' == '' ">false</RestorePackages>
108

@@ -27,19 +25,15 @@
2725
-->
2826
</ItemGroup>
2927

30-
<!-- Windows specific commands -->
31-
<!--
3228
<PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
29+
<!-- Windows specific commands -->
3330
<NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
3431
</PropertyGroup>
35-
-->
36-
37-
<!-- We need to launch nuget.exe with the mono command if we're not on windows -->
38-
<!--
32+
3933
<PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
34+
<!-- We need to launch nuget.exe with the mono command if we're not on windows -->
4035
<NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
4136
</PropertyGroup>
42-
-->
4337

4438
<PropertyGroup>
4539
<PackagesProjectConfig Condition=" '$(OS)' == 'Windows_NT'">$(MSBuildProjectDirectory)\packages.$(MSBuildProjectName.Replace(' ', '_')).config</PackagesProjectConfig>
@@ -103,8 +97,8 @@
10397
<Exec Command="$(RestoreCommand)"
10498
Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
10599

106-
<!-- LogStandardErrorAsError="true" -->
107100
<Exec Command="$(RestoreCommand)"
101+
LogStandardErrorAsError="true"
108102
Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
109103
</Target>
110104

0 commit comments

Comments
 (0)