Skip to content

Commit 4aacd0f

Browse files
FObermaierFObermaier
committed
Update NuGet package restore approach (SharpMap#8)
1 parent 36ebda5 commit 4aacd0f

File tree

32 files changed

+29
-267
lines changed

32 files changed

+29
-267
lines changed

‎.nuget/NuGet.Config

-6
This file was deleted.

‎.nuget/NuGet.exe

-1.59 MB
Binary file not shown.

‎.nuget/NuGet.targets

-152
This file was deleted.

‎BuildTools/NuGet.exe

2.08 MB
Binary file not shown.

‎Examples/DemoWinForm/DemoWinForm.csproj

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1717
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
1818
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
19-
<RestorePackages>true</RestorePackages>
19+
2020
</PropertyGroup>
2121
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2222
<DebugSymbols>true</DebugSymbols>
@@ -188,7 +188,6 @@
188188
<None Include="Resources\Women.png" />
189189
</ItemGroup>
190190
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
191-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
192191
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
193192
Other similar extension points exist, see Microsoft.Common.targets.
194193
<Target Name="BeforeBuild">

‎Examples/ExampleCodeSnippets/ExampleCodeSnippets.csproj

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1717
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
1818
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
19-
<RestorePackages>true</RestorePackages>
19+
2020
</PropertyGroup>
2121
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2222
<DebugSymbols>true</DebugSymbols>
@@ -157,7 +157,6 @@
157157
</ProjectReference>
158158
</ItemGroup>
159159
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
160-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
161160
<PropertyGroup>
162161
<PostBuildEvent>copy /b /y "$(SolutionDir)Examples\DemoWinForm\Resources\Women.png" "$(TargetDir)Women.png"</PostBuildEvent>
163162
</PropertyGroup>

‎Examples/ExampleCodeSnipplets.VB/ExampleCodeSnipplets.VB.vbproj

-7
Original file line numberDiff line numberDiff line change
@@ -121,13 +121,6 @@
121121
</ProjectReference>
122122
</ItemGroup>
123123
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
124-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
125-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
126-
<PropertyGroup>
127-
<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>
128-
</PropertyGroup>
129-
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
130-
</Target>
131124
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
132125
Other similar extension points exist, see Microsoft.Common.targets.
133126
<Target Name="BeforeBuild">

‎Examples/RoutingExample/RoutingExample.csproj

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</TargetFrameworkProfile>
1616
<FileAlignment>512</FileAlignment>
1717
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
18-
<RestorePackages>true</RestorePackages>
18+
1919
</PropertyGroup>
2020
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
2121
<PlatformTarget>x86</PlatformTarget>
@@ -145,7 +145,6 @@
145145
</ProjectReference>
146146
</ItemGroup>
147147
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
148-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
149148
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
150149
Other similar extension points exist, see Microsoft.Common.targets.
151150
<Target Name="BeforeBuild">

‎Examples/SharpMap.Demo.Wms/SharpMap.Demo.Wms.csproj

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<IISExpressWindowsAuthentication />
2525
<IISExpressUseClassicPipelineMode />
2626
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
27-
<RestorePackages>true</RestorePackages>
27+
2828
<MvcProjectUpgradeChecked>true</MvcProjectUpgradeChecked>
2929
<UseGlobalApplicationHostFile />
3030
</PropertyGroup>
@@ -756,7 +756,6 @@
756756
</Properties>
757757
</MonoDevelop>
758758
</ProjectExtensions>
759-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
760759
<Import Project="..\..\packages\System.Data.SQLite.Core.1.0.94.0\build\net45\System.Data.SQLite.Core.targets" Condition="Exists('..\..\packages\System.Data.SQLite.Core.1.0.94.0\build\net45\System.Data.SQLite.Core.targets')" />
761760
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
762761
<PropertyGroup>

‎Examples/WPFSamples/WPFSamples.csproj

+1-8
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<WarningLevel>4</WarningLevel>
1616
<TargetFrameworkProfile />
1717
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
18-
<RestorePackages>true</RestorePackages>
18+
1919
</PropertyGroup>
2020
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2121
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -128,13 +128,6 @@
128128
</ProjectReference>
129129
</ItemGroup>
130130
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
131-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
132-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
133-
<PropertyGroup>
134-
<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>
135-
</PropertyGroup>
136-
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
137-
</Target>
138131
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
139132
Other similar extension points exist, see Microsoft.Common.targets.
140133
<Target Name="BeforeBuild">

‎Examples/WinFormSamples/WinFormSamples.csproj

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
3232
<TargetFrameworkProfile />
3333
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
34-
<RestorePackages>true</RestorePackages>
34+
3535
</PropertyGroup>
3636
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3737
<DebugSymbols>true</DebugSymbols>
@@ -625,7 +625,6 @@
625625
<PostBuildEvent>
626626
</PostBuildEvent>
627627
</PropertyGroup>
628-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
629628
<Import Project="..\..\packages\System.Data.SQLite.Core.1.0.94.0\build\net40\System.Data.SQLite.Core.targets" Condition="Exists('..\..\packages\System.Data.SQLite.Core.1.0.94.0\build\net40\System.Data.SQLite.Core.targets')" />
630629
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
631630
<PropertyGroup>

‎SharpMap.Converters.GeoJSON/GeoJSON/GeoJSONHelper.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
using System;
44
using System.Collections.Generic;
5-
using Data;
5+
using SharpMap.Data;
66

77
/// <summary>
88
/// GeoJSON helper class

‎SharpMap.Data.Providers.FileGdb/SharpMap.Data.Providers.FileGdb.csproj

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<SccAuxPath>SAK</SccAuxPath>
1717
<SccProvider>SAK</SccProvider>
1818
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
19-
<RestorePackages>true</RestorePackages>
19+
2020
</PropertyGroup>
2121
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2222
<DebugSymbols>true</DebugSymbols>
@@ -83,7 +83,6 @@
8383
<Content Include="ReadMe.txt" />
8484
</ItemGroup>
8585
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
86-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
8786
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
8887
<PropertyGroup>
8988
<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>

‎SharpMap.Data.Providers.GeoPackage/SharpMap.Data.Providers.GeoPackage.csproj

+1-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
15-
<RestorePackages>true</RestorePackages>
15+
1616
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
1717
</PropertyGroup>
1818
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -101,12 +101,10 @@
101101
</EmbeddedResource>
102102
</ItemGroup>
103103
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
104-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
105104
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
106105
<PropertyGroup>
107106
<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>
108107
</PropertyGroup>
109-
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
110108
<Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.94.0\build\net40\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.94.0\build\net40\System.Data.SQLite.Core.targets'))" />
111109
</Target>
112110
<Import Project="..\packages\System.Data.SQLite.Core.1.0.94.0\build\net40\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.94.0\build\net40\System.Data.SQLite.Core.targets')" />

‎SharpMap.Data.Providers.Kml/SharpMap.Data.Providers.Kml.csproj

+1-8
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
15-
<RestorePackages>true</RestorePackages>
15+
1616
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
1717
</PropertyGroup>
1818
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -86,13 +86,6 @@
8686
<None Include="packages.config" />
8787
</ItemGroup>
8888
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
89-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
90-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
91-
<PropertyGroup>
92-
<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>
93-
</PropertyGroup>
94-
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
95-
</Target>
9689
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
9790
Other similar extension points exist, see Microsoft.Common.targets.
9891
<Target Name="BeforeBuild">

‎SharpMap.Data.Providers.OracleSpatial/SharpMap.Data.Providers.OracleSpatial.csproj

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
15-
<RestorePackages>true</RestorePackages>
15+
1616
<TargetFrameworkProfile>
1717
</TargetFrameworkProfile>
1818
</PropertyGroup>
@@ -96,7 +96,6 @@
9696
</None>
9797
</ItemGroup>
9898
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
99-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
10099
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
101100
Other similar extension points exist, see Microsoft.Common.targets.
102101
<Target Name="BeforeBuild">

0 commit comments

Comments
 (0)