Skip to content

Commit 30a478b

Browse files
committed
Fix build break on machines without NuProj installed
1 parent dbb2eab commit 30a478b

File tree

4 files changed

+10
-1
lines changed

4 files changed

+10
-1
lines changed

src/Xunit.SkippableFact.Desktop/Xunit.SkippableFact.Desktop.csproj

+4-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<CodeAnalysisRuleSet>Xunit.SkippableFact.Desktop.ruleset</CodeAnalysisRuleSet>
15+
<NuGetPackageImportStamp>
16+
</NuGetPackageImportStamp>
1517
</PropertyGroup>
1618
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1719
<DebugSymbols>true</DebugSymbols>
@@ -80,16 +82,17 @@
8082
</ItemGroup>
8183
<Import Project="..\Xunit.SkippableFact.Shared\Xunit.SkippableFact.Shared.projitems" Label="Shared" />
8284
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
83-
<Import Project="..\..\packages\NuProj.0.10.18-beta-gcd398090a4\tools\Microsoft.Common.NuProj.targets" Condition="Exists('..\..\packages\NuProj.0.10.18-beta-gcd398090a4\tools\Microsoft.Common.NuProj.targets')" />
8485
<Import Project="..\..\packages\Nerdbank.GitVersioning.1.1.52-rc\build\dotnet\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.1.1.52-rc\build\dotnet\Nerdbank.GitVersioning.targets')" />
8586
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
8687
<PropertyGroup>
8788
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
8889
</PropertyGroup>
8990
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.1.1.52-rc\build\dotnet\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.1.1.52-rc\build\dotnet\Nerdbank.GitVersioning.targets'))" />
9091
<Error Condition="!Exists('..\..\packages\StyleCop.Analyzers.1.0.0-beta015\build\StyleCop.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\StyleCop.Analyzers.1.0.0-beta015\build\StyleCop.Analyzers.targets'))" />
92+
<Error Condition="!Exists('..\..\packages\NuProj.Common.0.10.4-beta\build\NuProj.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuProj.Common.0.10.4-beta\build\NuProj.Common.targets'))" />
9193
</Target>
9294
<Import Project="..\..\packages\StyleCop.Analyzers.1.0.0-beta015\build\StyleCop.Analyzers.targets" Condition="Exists('..\..\packages\StyleCop.Analyzers.1.0.0-beta015\build\StyleCop.Analyzers.targets')" />
95+
<Import Project="..\..\packages\NuProj.Common.0.10.4-beta\build\NuProj.Common.targets" Condition="Exists('..\..\packages\NuProj.Common.0.10.4-beta\build\NuProj.Common.targets')" />
9396
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
9497
Other similar extension points exist, see Microsoft.Common.targets.
9598
<Target Name="BeforeBuild">

src/Xunit.SkippableFact.Desktop/packages.config

+1
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="Nerdbank.GitVersioning" version="1.1.52-rc" targetFramework="net452" developmentDependency="true" />
4+
<package id="NuProj.Common" version="0.10.4-beta" targetFramework="net452" developmentDependency="true" />
45
<package id="StyleCop.Analyzers" version="1.0.0-beta015" targetFramework="net452" developmentDependency="true" />
56
<package id="Validation" version="2.2.8" targetFramework="net452" />
67
<package id="xunit.abstractions" version="2.0.0" targetFramework="net452" />

src/Xunit.SkippableFact.Dotnet/Xunit.SkippableFact.Dotnet.csproj

+4
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1818
<AssemblyOriginatorKeyFile>..\opensourcekey.snk</AssemblyOriginatorKeyFile>
1919
<CodeAnalysisRuleSet>..\Xunit.SkippableFact.Desktop\Xunit.SkippableFact.Desktop.ruleset</CodeAnalysisRuleSet>
20+
<NuGetPackageImportStamp>
21+
</NuGetPackageImportStamp>
2022
</PropertyGroup>
2123
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2224
<DebugSymbols>true</DebugSymbols>
@@ -83,8 +85,10 @@
8385
</PropertyGroup>
8486
<Error Condition="!Exists('..\..\packages\StyleCop.Analyzers.1.0.0-beta015\build\StyleCop.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\StyleCop.Analyzers.1.0.0-beta015\build\StyleCop.Analyzers.targets'))" />
8587
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.1.1.52-rc\build\portable-net+win+wpa+wp+sl+net-cf+netmf+MonoAndroid+MonoTouch+Xamarin.iOS\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.1.1.52-rc\build\portable-net+win+wpa+wp+sl+net-cf+netmf+MonoAndroid+MonoTouch+Xamarin.iOS\Nerdbank.GitVersioning.targets'))" />
88+
<Error Condition="!Exists('..\..\packages\NuProj.Common.0.10.4-beta\build\NuProj.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuProj.Common.0.10.4-beta\build\NuProj.Common.targets'))" />
8689
</Target>
8790
<Import Project="..\..\packages\Nerdbank.GitVersioning.1.1.52-rc\build\portable-net+win+wpa+wp+sl+net-cf+netmf+MonoAndroid+MonoTouch+Xamarin.iOS\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.1.1.52-rc\build\portable-net+win+wpa+wp+sl+net-cf+netmf+MonoAndroid+MonoTouch+Xamarin.iOS\Nerdbank.GitVersioning.targets')" />
91+
<Import Project="..\..\packages\NuProj.Common.0.10.4-beta\build\NuProj.Common.targets" Condition="Exists('..\..\packages\NuProj.Common.0.10.4-beta\build\NuProj.Common.targets')" />
8892
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
8993
Other similar extension points exist, see Microsoft.Common.targets.
9094
<Target Name="BeforeBuild">

src/Xunit.SkippableFact.Dotnet/packages.config

+1
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="Nerdbank.GitVersioning" version="1.1.52-rc" targetFramework="portable45-net45+win8+wpa81" developmentDependency="true" />
4+
<package id="NuProj.Common" version="0.10.4-beta" targetFramework="portable45-net45+win8+wp8+wpa81" developmentDependency="true" />
45
<package id="StyleCop.Analyzers" version="1.0.0-beta015" targetFramework="portable45-net45+win8+wpa81" developmentDependency="true" />
56
<package id="Validation" version="2.2.8" targetFramework="portable45-net45+win8+wpa81" />
67
<package id="xunit.abstractions" version="2.0.0" targetFramework="portable45-net45+win8+wpa81" />

0 commit comments

Comments
 (0)