Skip to content

Commit 1b29cd2

Browse files
milesibastosmilesibastos
committed
Merge pull request #47 from lnu/master
nuget.targets removed in favor of automatic package restore
2 parents 3ba2b93 + 5aec50c commit 1b29cd2

File tree

5 files changed

+5
-38
lines changed

5 files changed

+5
-38
lines changed

‎source/NHibernate.AspNet.Identity.Tests/NHibernate.AspNet.Identity.Tests.csproj

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<TestProjectType>UnitTest</TestProjectType>
1919
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
2020
<RestorePackages>true</RestorePackages>
21-
<NuGetPackageImportStamp>94697c12</NuGetPackageImportStamp>
2221
</PropertyGroup>
2322
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2423
<DebugSymbols>true</DebugSymbols>
@@ -140,15 +139,7 @@
140139
</Choose>
141140
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
142141
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
143-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
144142
<Import Project="..\..\packages\System.Data.SQLite.Core.1.0.96.0\build\net451\System.Data.SQLite.Core.targets" Condition="Exists('..\..\packages\System.Data.SQLite.Core.1.0.96.0\build\net451\System.Data.SQLite.Core.targets')" />
145-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
146-
<PropertyGroup>
147-
<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>
148-
</PropertyGroup>
149-
<Error Condition="!Exists('..\..\packages\System.Data.SQLite.Core.1.0.96.0\build\net451\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\System.Data.SQLite.Core.1.0.96.0\build\net451\System.Data.SQLite.Core.targets'))" />
150-
<Error Condition="!Exists('..\..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets'))" />
151-
</Target>
152143
<Import Project="..\..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets" Condition="Exists('..\..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets')" />
153144
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
154145
Other similar extension points exist, see Microsoft.Common.targets.

‎source/NHibernate.AspNet.Identity.sln

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.30110.0
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.23107.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.AspNet.Identity", "NHibernate.AspNet.Identity\NHibernate.AspNet.Identity.csproj", "{C620FAAE-F1B6-479E-9959-C46C20ED0A8A}"
77
EndProject
88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{B4B93010-9348-456C-9F18-1305854364F9}"
99
ProjectSection(SolutionItems) = preProject
1010
.nuget\NuGet.Config = .nuget\NuGet.Config
11-
.nuget\NuGet.targets = .nuget\NuGet.targets
1211
EndProjectSection
1312
EndProject
1413
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.AspNet.Identity.Tests", "NHibernate.AspNet.Identity.Tests\NHibernate.AspNet.Identity.Tests.csproj", "{4AB55157-6F8F-423C-9C6F-A3A92B2101CE}"

‎source/NHibernate.AspNet.Identity/NHibernate.AspNet.Identity.csproj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1515
<RestorePackages>true</RestorePackages>
1616
<TargetFrameworkProfile />
17-
<NuGetPackageImportStamp>427afa72</NuGetPackageImportStamp>
1817
</PropertyGroup>
1918
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2019
<DebugSymbols>true</DebugSymbols>
@@ -99,14 +98,7 @@
9998
<None Include="packages.config" />
10099
</ItemGroup>
101100
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
102-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
103101
<Import Project="..\..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets" Condition="Exists('..\..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets')" />
104-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
105-
<PropertyGroup>
106-
<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>
107-
</PropertyGroup>
108-
<Error Condition="!Exists('..\..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets'))" />
109-
</Target>
110102
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
111103
Other similar extension points exist, see Microsoft.Common.targets.
112104
<Target Name="BeforeBuild">

‎source/NHibernate.AspNet.Web.Specs/NHibernate.AspNet.Web.Specs.csproj

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<FileAlignment>512</FileAlignment>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1515
<RestorePackages>true</RestorePackages>
16-
<NuGetPackageImportStamp>b4ed4886</NuGetPackageImportStamp>
1716
</PropertyGroup>
1817
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1918
<DebugSymbols>true</DebugSymbols>
@@ -182,8 +181,10 @@
182181
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
183182
</None>
184183
</ItemGroup>
184+
<ItemGroup>
185+
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
186+
</ItemGroup>
185187
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
186-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
187188
<PropertyGroup>
188189
<PostBuildEvent>
189190
</PostBuildEvent>
@@ -211,13 +212,6 @@
211212
<Exec Condition="!Exists('$(ChromeDriverPath)')" Command="$(PowerShellExe) -NonInteractive -executionpolicy Unrestricted -command &quot;&amp; { &amp;'$(ChromeDriverInitScriptPath)' '$(ChromeDriverInstallPath)' '$(ChromeDriverToolsPath)'} &quot;" />
212213
</Target>
213214
<Import Project="..\..\packages\System.Data.SQLite.Core.1.0.96.0\build\net451\System.Data.SQLite.Core.targets" Condition="Exists('..\..\packages\System.Data.SQLite.Core.1.0.96.0\build\net451\System.Data.SQLite.Core.targets')" />
214-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
215-
<PropertyGroup>
216-
<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>
217-
</PropertyGroup>
218-
<Error Condition="!Exists('..\..\packages\System.Data.SQLite.Core.1.0.96.0\build\net451\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\System.Data.SQLite.Core.1.0.96.0\build\net451\System.Data.SQLite.Core.targets'))" />
219-
<Error Condition="!Exists('..\..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets'))" />
220-
</Target>
221215
<Import Project="..\..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets" Condition="Exists('..\..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets')" />
222216
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
223217
Other similar extension points exist, see Microsoft.Common.targets.

‎source/NHibernate.AspNet.Web/NHibernate.AspNet.Web.csproj

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
<IISExpressUseClassicPipelineMode />
2323
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
2424
<RestorePackages>true</RestorePackages>
25-
<NuGetPackageImportStamp>302f55c5</NuGetPackageImportStamp>
2625
</PropertyGroup>
2726
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2827
<DebugSymbols>true</DebugSymbols>
@@ -303,15 +302,7 @@
303302
</FlavorProperties>
304303
</VisualStudio>
305304
</ProjectExtensions>
306-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
307305
<Import Project="..\..\packages\System.Data.SQLite.Core.1.0.96.0\build\net451\System.Data.SQLite.Core.targets" Condition="Exists('..\..\packages\System.Data.SQLite.Core.1.0.96.0\build\net451\System.Data.SQLite.Core.targets')" />
308-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
309-
<PropertyGroup>
310-
<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>
311-
</PropertyGroup>
312-
<Error Condition="!Exists('..\..\packages\System.Data.SQLite.Core.1.0.96.0\build\net451\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\System.Data.SQLite.Core.1.0.96.0\build\net451\System.Data.SQLite.Core.targets'))" />
313-
<Error Condition="!Exists('..\..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets'))" />
314-
</Target>
315306
<Import Project="..\..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets" Condition="Exists('..\..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets')" />
316307
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
317308
Other similar extension points exist, see Microsoft.Common.targets.

0 commit comments

Comments
 (0)