diff options
Diffstat (limited to 'csharp/test/IceDiscovery/simple/msbuild/server/server.csproj')
| -rw-r--r-- | csharp/test/IceDiscovery/simple/msbuild/server/server.csproj | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/csharp/test/IceDiscovery/simple/msbuild/server/server.csproj b/csharp/test/IceDiscovery/simple/msbuild/server/server.csproj index 16f323f7afe..d39780bf581 100644 --- a/csharp/test/IceDiscovery/simple/msbuild/server/server.csproj +++ b/csharp/test/IceDiscovery/simple/msbuild/server/server.csproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha4\build\zeroc.ice.net.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha4\build\zeroc.ice.net.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha4\build\zeroc.ice.net.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha4\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" /> <PropertyGroup Label="Globals"> <NuGetPackageImportStamp> </NuGetPackageImportStamp> @@ -60,11 +60,11 @@ <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(ICE_BIN_DIST)' == 'all'"> <PropertyGroup> <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> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha4\build\zeroc.ice.net.props') and '$(UseBinDist)' == 'yes'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha4\build\zeroc.ice.net.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha4\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha4\build\zeroc.ice.net.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> |