Skip to content

Commit 4daec36

Browse files
FObermaierFObermaier
committed
Fix for NetTopologySuite#81 NuGet package restore
Removed properties, imports and tasks related to old MSBuild based NuGet restore Added NuGet.exe and NuGet.config to BuildTools folder Added "RestorePackages" task to TeamCity build script Sorry for hijacking this branch :)
1 parent 545eac8 commit 4daec36

File tree

40 files changed

+358
-749
lines changed

40 files changed

+358
-749
lines changed

‎.nuget/NuGet.exe

-1.61 MB
Binary file not shown.

‎.nuget/NuGet.targets

-133
This file was deleted.

‎.nuget/NuGet.Config ‎BuildTools/NuGet.Config

File renamed without changes.

‎BuildTools/NuGet.exe

3.61 MB
Binary file not shown.

‎NetTopologySuite.Converter/NetTopologySuite.Converter.DotSpatial/NetTopologySuite.Converter.DotSpatial.csproj

+1-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<FileAlignment>512</FileAlignment>
1616
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
1717
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
18-
<RestorePackages>true</RestorePackages>
1918
</PropertyGroup>
2019
<Import Project="$(SolutionDir)BuildTools\GeoAPI.Reference.targets" Condition="Exists('$(SolutionDir)BuildTools\GeoAPI.Reference.targets')" />
2120
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -76,12 +75,11 @@
7675
</ProjectReference>
7776
</ItemGroup>
7877
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
79-
<Import Project="$(SolutionDir).nuget\nuget.targets" />
8078
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
8179
Other similar extension points exist, see Microsoft.Common.targets.
8280
<Target Name="BeforeBuild">
8381
</Target>
8482
<Target Name="AfterBuild">
8583
</Target>
8684
-->
87-
</Project>
85+
</Project>

‎NetTopologySuite.Converter/NetTopologySuite.Converter.Test/NetTopologySuite.Converter.Test.csproj

+1-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<FileAlignment>512</FileAlignment>
1717
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
1818
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
19-
<RestorePackages>true</RestorePackages>
2019
</PropertyGroup>
2120
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2221
<DebugSymbols>true</DebugSymbols>
@@ -78,12 +77,11 @@
7877
</None>
7978
</ItemGroup>
8079
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
81-
<Import Project="$(SolutionDir).nuget\nuget.targets" />
8280
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
8381
Other similar extension points exist, see Microsoft.Common.targets.
8482
<Target Name="BeforeBuild">
8583
</Target>
8684
<Target Name="AfterBuild">
8785
</Target>
8886
-->
89-
</Project>
87+
</Project>

‎NetTopologySuite.CoordinateSystems.Transfromation/DotSpatial.Projections.Wrapper/DotSpatial.Projections.Wrapper.csproj

+1-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<FileAlignment>512</FileAlignment>
1717
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
1818
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
19-
<RestorePackages>true</RestorePackages>
2019
</PropertyGroup>
2120
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2221
<DebugSymbols>true</DebugSymbols>
@@ -59,12 +58,11 @@
5958
<PreBuildEvent>
6059
</PreBuildEvent>
6160
</PropertyGroup>
62-
<Import Project="$(SolutionDir).nuget\nuget.targets" />
6361
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
6462
Other similar extension points exist, see Microsoft.Common.targets.
6563
<Target Name="BeforeBuild">
6664
</Target>
6765
<Target Name="AfterBuild">
6866
</Target>
6967
-->
70-
</Project>
68+
</Project>

‎NetTopologySuite.IO/NetTopologySuite.IO.GDB/NetTopologySuite.IO.GDB.csproj

+1-9
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<FileAlignment>512</FileAlignment>
1717
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
1818
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
19-
<RestorePackages>true</RestorePackages>
2019
</PropertyGroup>
2120
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2221
<DebugSymbols>true</DebugSymbols>
@@ -64,18 +63,11 @@
6463
<None Include="packages.config" />
6564
</ItemGroup>
6665
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
67-
<Import Project="$(SolutionDir).nuget\NuGet.targets" Condition="Exists('$(SolutionDir).nuget\NuGet.targets')" />
68-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
69-
<PropertyGroup>
70-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
71-
</PropertyGroup>
72-
<Error Condition="!Exists('$(SolutionDir).nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir).nuget\NuGet.targets'))" />
73-
</Target>
7466
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
7567
Other similar extension points exist, see Microsoft.Common.targets.
7668
<Target Name="BeforeBuild">
7769
</Target>
7870
<Target Name="AfterBuild">
7971
</Target>
8072
-->
81-
</Project>
73+
</Project>

‎NetTopologySuite.IO/NetTopologySuite.IO.GeoJSON.Pcl/NetTopologySuite.IO.GeoJSON.Pcl.csproj

+1-9
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
<FileAlignment>512</FileAlignment>
2020
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
2121
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
22-
<RestorePackages>true</RestorePackages>
2322
</PropertyGroup>
2423
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2524
<DebugSymbols>true</DebugSymbols>
@@ -99,18 +98,11 @@
9998
<None Include="packages.config" />
10099
</ItemGroup>
101100
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
102-
<Import Project="$(SolutionDir).nuget\NuGet.targets" Condition="Exists('$(SolutionDir).nuget\NuGet.targets')" />
103-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
104-
<PropertyGroup>
105-
<ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Aktivieren Sie die Wiederherstellung von NuGet-Paketen, um die fehlende Datei herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
106-
</PropertyGroup>
107-
<Error Condition="!Exists('$(SolutionDir).nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir).nuget\NuGet.targets'))" />
108-
</Target>
109101
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
110102
Other similar extension points exist, see Microsoft.Common.targets.
111103
<Target Name="BeforeBuild">
112104
</Target>
113105
<Target Name="AfterBuild">
114106
</Target>
115107
-->
116-
</Project>
108+
</Project>

‎NetTopologySuite.IO/NetTopologySuite.IO.GeoJSON/NetTopologySuite.IO.GeoJSON.csproj

+1-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<FileAlignment>512</FileAlignment>
1717
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
1818
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
19-
<RestorePackages>true</RestorePackages>
2019
<JSON Condition=" '$(JSON)' == '' ">net40</JSON>
2120
</PropertyGroup>
2221
<PropertyGroup Condition=" '$(TargetFrameworkVersion)' == 'v2.0' ">
@@ -95,12 +94,11 @@
9594
<PreBuildEvent>
9695
</PreBuildEvent>
9796
</PropertyGroup>
98-
<Import Project="$(SolutionDir).nuget\nuget.targets" />
9997
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
10098
Other similar extension points exist, see Microsoft.Common.targets.
10199
<Target Name="BeforeBuild">
102100
</Target>
103101
<Target Name="AfterBuild">
104102
</Target>
105103
-->
106-
</Project>
104+
</Project>

‎NetTopologySuite.IO/NetTopologySuite.IO.GeoTools/NetTopologySuite.IO.GeoTools.csproj

-8
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<FileAlignment>512</FileAlignment>
1717
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
1818
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
19-
<RestorePackages>true</RestorePackages>
2019
<NeedsPowerCollections Condition=" '$(NeedsPowerCollections)' == '' ">False</NeedsPowerCollections>
2120
</PropertyGroup>
2221
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -109,13 +108,6 @@
109108
<None Include="packages.config" />
110109
</ItemGroup>
111110
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
112-
<Import Project="$(SolutionDir).nuget\NuGet.targets" Condition="Exists('$(SolutionDir).nuget\NuGet.targets')" />
113-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
114-
<PropertyGroup>
115-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
116-
</PropertyGroup>
117-
<Error Condition="!Exists('$(SolutionDir).nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir).nuget\NuGet.targets'))" />
118-
</Target>
119111
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
120112
Other similar extension points exist, see Microsoft.Common.targets.
121113
<Target Name="BeforeBuild">

‎NetTopologySuite.IO/NetTopologySuite.IO.MsSqlSpatial/NetTopologySuite.IO.MsSqlSpatial.csproj

+1-9
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<FileAlignment>512</FileAlignment>
1717
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
1818
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
19-
<RestorePackages>true</RestorePackages>
2019
</PropertyGroup>
2120
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2221
<DebugSymbols>true</DebugSymbols>
@@ -60,18 +59,11 @@
6059
<None Include="packages.config" />
6160
</ItemGroup>
6261
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
63-
<Import Project="$(SolutionDir).nuget\NuGet.targets" Condition="Exists('$(SolutionDir).nuget\NuGet.targets')" />
64-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
65-
<PropertyGroup>
66-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
67-
</PropertyGroup>
68-
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
69-
</Target>
7062
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
7163
Other similar extension points exist, see Microsoft.Common.targets.
7264
<Target Name="BeforeBuild">
7365
</Target>
7466
<Target Name="AfterBuild">
7567
</Target>
7668
-->
77-
</Project>
69+
</Project>

‎NetTopologySuite.IO/NetTopologySuite.IO.Oracle/NetTopologySuite.IO.Oracle.csproj

+1-9
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<FileAlignment>512</FileAlignment>
1717
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
1818
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
19-
<RestorePackages>true</RestorePackages>
2019
</PropertyGroup>
2120
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2221
<DebugSymbols>true</DebugSymbols>
@@ -78,18 +77,11 @@
7877
<Content Include="README.txt" />
7978
</ItemGroup>
8079
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
81-
<Import Project="$(SolutionDir).nuget\NuGet.targets" Condition="Exists('$(SolutionDir).nuget\NuGet.targets')" />
82-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
83-
<PropertyGroup>
84-
<ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Aktivieren Sie die Wiederherstellung von NuGet-Paketen, um die fehlende Datei herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
85-
</PropertyGroup>
86-
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
87-
</Target>
8880
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
8981
Other similar extension points exist, see Microsoft.Common.targets.
9082
<Target Name="BeforeBuild">
9183
</Target>
9284
<Target Name="AfterBuild">
9385
</Target>
9486
-->
95-
</Project>
87+
</Project>

0 commit comments

Comments
 (0)