Skip to content

Commit 7fe1830

Browse files
committed
Merge pull request #428 from sharwell/keyreporting
Use Rackspace.KeyReporting package from NuGet
2 parents 612fe3e + 91752ee commit 7fe1830

File tree

6 files changed

+16
-21
lines changed

6 files changed

+16
-21
lines changed

build/KeyReporting.targets

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/corelib/corelib.v3.5.csproj

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -650,8 +650,14 @@
650650
<None Include="Icons\openstack_net_logo.png" />
651651
</ItemGroup>
652652
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
653-
<Import Project="$(SolutionDir)\..\build\KeyReporting.targets" />
654653
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
654+
<Import Project="..\packages\Rackspace.KeyReporting.1.0.0\build\Rackspace.KeyReporting.targets" Condition="Exists('..\packages\Rackspace.KeyReporting.1.0.0\build\Rackspace.KeyReporting.targets')" />
655+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
656+
<PropertyGroup>
657+
<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>
658+
</PropertyGroup>
659+
<Error Condition="!Exists('..\packages\Rackspace.KeyReporting.1.0.0\build\Rackspace.KeyReporting.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Rackspace.KeyReporting.1.0.0\build\Rackspace.KeyReporting.targets'))" />
660+
</Target>
655661
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
656662
Other similar extension points exist, see Microsoft.Common.targets.
657663
<Target Name="BeforeBuild">

src/corelib/corelib.v4.0.csproj

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,8 +640,14 @@
640640
<None Include="Icons\openstack_net_logo.png" />
641641
</ItemGroup>
642642
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
643-
<Import Project="$(SolutionDir)\..\build\KeyReporting.targets" />
644643
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
644+
<Import Project="..\packages\Rackspace.KeyReporting.1.0.0\build\Rackspace.KeyReporting.targets" Condition="Exists('..\packages\Rackspace.KeyReporting.1.0.0\build\Rackspace.KeyReporting.targets')" />
645+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
646+
<PropertyGroup>
647+
<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>
648+
</PropertyGroup>
649+
<Error Condition="!Exists('..\packages\Rackspace.KeyReporting.1.0.0\build\Rackspace.KeyReporting.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Rackspace.KeyReporting.1.0.0\build\Rackspace.KeyReporting.targets'))" />
650+
</Target>
645651
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
646652
Other similar extension points exist, see Microsoft.Common.targets.
647653
<Target Name="BeforeBuild">
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Newtonsoft.Json" version="5.0.8" targetFramework="net35" />
4+
<package id="Rackspace.KeyReporting" version="1.0.0" targetFramework="net35" developmentDependency="true" />
45
<package id="SimpleRESTServices" version="1.3.0.1" targetFramework="net35" />
56
<package id="TaskParallelLibrary" version="1.0.2856.0" targetFramework="net35" />
67
</packages>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Newtonsoft.Json" version="5.0.8" targetFramework="net40" />
4+
<package id="Rackspace.KeyReporting" version="1.0.0" targetFramework="net40" developmentDependency="true" />
45
<package id="SimpleRESTServices" version="1.3.0.1" targetFramework="net40" />
56
</packages>

src/openstack.net.sln

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{EFFA0DAE
5555
ProjectSection(SolutionItems) = preProject
5656
..\build\build.ps1 = ..\build\build.ps1
5757
..\build\check-key.ps1 = ..\build\check-key.ps1
58-
..\build\KeyReporting.targets = ..\build\KeyReporting.targets
5958
..\build\keys.ps1 = ..\build\keys.ps1
6059
..\build\push.ps1 = ..\build\push.ps1
6160
..\build\version.ps1 = ..\build\version.ps1

0 commit comments

Comments
 (0)