diff options
Diffstat (limited to 'cpp')
259 files changed, 971 insertions, 975 deletions
diff --git a/cpp/msbuild/ice.proj b/cpp/msbuild/ice.proj index eb116e49ef1..f4056f92cdf 100644 --- a/cpp/msbuild/ice.proj +++ b/cpp/msbuild/ice.proj @@ -12,10 +12,6 @@ <Platform>Win32</Platform> </PropertyGroup> - <PropertyGroup Condition="'$(UseNugetBinDist)' == 'yes'"> - <UseBinDist>yes</UseBinDist> - </PropertyGroup> - <!-- Restore Nuget packages. --> @@ -23,11 +19,11 @@ <Exec Command="$(NugetExe) restore $(MSBuildThisFileDirectory)ice.$(DefaultPlatformToolset).sln"/> </Target> - <Target Name="TestNugetRestore" DependsOnTargets="GetNuget" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="TestNugetRestore" DependsOnTargets="GetNuget" Condition="'$(UseBinDist)' == 'yes'"> <Exec Command="$(NugetExe) restore $(MSBuildThisFileDirectory)ice.test.sln"/> </Target> - <Target Name="UWPTestNugetRestore" DependsOnTargets="GetNuget" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="UWPTestNugetRestore" DependsOnTargets="GetNuget" Condition="'$(UseBinDist)' == 'yes'"> <Exec Command="$(NugetExe) restore $(MSBuildThisFileDirectory)ice.testuwp.sln"/> </Target> diff --git a/cpp/test/Common/msbuild/testcommon.vcxproj b/cpp/test/Common/msbuild/testcommon.vcxproj index 08e1f8cf2be..3ac4af2b10f 100644 --- a/cpp/test/Common/msbuild/testcommon.vcxproj +++ b/cpp/test/Common/msbuild/testcommon.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -174,7 +174,7 @@ <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Common/msbuild/uwp/testcommonuwp++11.vcxproj b/cpp/test/Common/msbuild/uwp/testcommonuwp++11.vcxproj index 8a52d74afd2..328e1363382 100644 --- a/cpp/test/Common/msbuild/uwp/testcommonuwp++11.vcxproj +++ b/cpp/test/Common/msbuild/uwp/testcommonuwp++11.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -114,7 +114,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Glacier2/attack/msbuild/client/client.vcxproj b/cpp/test/Glacier2/attack/msbuild/client/client.vcxproj index 572d2644ba9..2fc9236f3c1 100644 --- a/cpp/test/Glacier2/attack/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/attack/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -312,7 +312,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Glacier2/attack/msbuild/server/server.vcxproj b/cpp/test/Glacier2/attack/msbuild/server/server.vcxproj index d380862e204..bf118efc738 100644 --- a/cpp/test/Glacier2/attack/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/attack/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -313,7 +313,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Glacier2/dynamicFiltering/msbuild/client/client.vcxproj b/cpp/test/Glacier2/dynamicFiltering/msbuild/client/client.vcxproj index 8e3a7530a3d..36129ab6dae 100644 --- a/cpp/test/Glacier2/dynamicFiltering/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/dynamicFiltering/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -311,7 +311,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Glacier2/dynamicFiltering/msbuild/server/server.vcxproj b/cpp/test/Glacier2/dynamicFiltering/msbuild/server/server.vcxproj index 1d1a7dcd25f..aa425c888d2 100644 --- a/cpp/test/Glacier2/dynamicFiltering/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/dynamicFiltering/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -317,7 +317,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Glacier2/override/msbuild/client/client.vcxproj b/cpp/test/Glacier2/override/msbuild/client/client.vcxproj index 11b51ff0d01..b6882df4435 100644 --- a/cpp/test/Glacier2/override/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/override/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -313,7 +313,7 @@ </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Glacier2/override/msbuild/server/server.vcxproj b/cpp/test/Glacier2/override/msbuild/server/server.vcxproj index 6b68c558351..be081cc2cd2 100644 --- a/cpp/test/Glacier2/override/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/override/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -313,7 +313,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Glacier2/router/msbuild/client/client.vcxproj b/cpp/test/Glacier2/router/msbuild/client/client.vcxproj index 2d9b238cf3b..9f3f2149f15 100644 --- a/cpp/test/Glacier2/router/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/router/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -313,7 +313,7 @@ </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Glacier2/router/msbuild/server/server.vcxproj b/cpp/test/Glacier2/router/msbuild/server/server.vcxproj index b26c1aeaaeb..d9329192f85 100644 --- a/cpp/test/Glacier2/router/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/router/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -313,7 +313,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Glacier2/sessionControl/msbuild/client/client.vcxproj b/cpp/test/Glacier2/sessionControl/msbuild/client/client.vcxproj index 6a67793b4c1..5484909da83 100644 --- a/cpp/test/Glacier2/sessionControl/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/sessionControl/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -311,7 +311,7 @@ </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Glacier2/sessionControl/msbuild/server/server.vcxproj b/cpp/test/Glacier2/sessionControl/msbuild/server/server.vcxproj index 4d3e514d901..bb96b307431 100644 --- a/cpp/test/Glacier2/sessionControl/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/sessionControl/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -313,7 +313,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Glacier2/sessionHelper/msbuild/client/client.vcxproj b/cpp/test/Glacier2/sessionHelper/msbuild/client/client.vcxproj index aea44a4a008..192438f8c1b 100644 --- a/cpp/test/Glacier2/sessionHelper/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/sessionHelper/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -311,7 +311,7 @@ </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Glacier2/sessionHelper/msbuild/server/server.vcxproj b/cpp/test/Glacier2/sessionHelper/msbuild/server/server.vcxproj index 27bd37636f5..7649b8b3f71 100644 --- a/cpp/test/Glacier2/sessionHelper/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/sessionHelper/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -311,7 +311,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Glacier2/ssl/msbuild/client/client.vcxproj b/cpp/test/Glacier2/ssl/msbuild/client/client.vcxproj index b01ca191784..b19eeeacaad 100644 --- a/cpp/test/Glacier2/ssl/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/ssl/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -162,7 +162,7 @@ </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Glacier2/ssl/msbuild/server/server.vcxproj b/cpp/test/Glacier2/ssl/msbuild/server/server.vcxproj index 70037e061a0..bf64247d58a 100644 --- a/cpp/test/Glacier2/ssl/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/ssl/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -162,7 +162,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Glacier2/staticFiltering/msbuild/client/client.vcxproj b/cpp/test/Glacier2/staticFiltering/msbuild/client/client.vcxproj index cad642b10bd..49ccdecf761 100644 --- a/cpp/test/Glacier2/staticFiltering/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/staticFiltering/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -312,7 +312,7 @@ </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Glacier2/staticFiltering/msbuild/server/server.vcxproj b/cpp/test/Glacier2/staticFiltering/msbuild/server/server.vcxproj index 266f0fce4cb..622820a1610 100644 --- a/cpp/test/Glacier2/staticFiltering/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/staticFiltering/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -313,7 +313,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/acm/msbuild/client/client.vcxproj b/cpp/test/Ice/acm/msbuild/client/client.vcxproj index 03856f4ae71..366fdc49e60 100644 --- a/cpp/test/Ice/acm/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/acm/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -272,7 +272,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/acm/msbuild/server/server.vcxproj b/cpp/test/Ice/acm/msbuild/server/server.vcxproj index db16f3a3a25..34aa4be1d20 100644 --- a/cpp/test/Ice/acm/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/acm/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -313,7 +313,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/acm/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/acm/msbuild/uwp/client/client.vcxproj index 7e1418eb1f9..84c7ead41db 100644 --- a/cpp/test/Ice/acm/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/acm/msbuild/uwp/client/client.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -248,7 +248,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/acm/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/acm/msbuild/uwp/server/server.vcxproj index b9d4a21ff1a..f36828f8a34 100644 --- a/cpp/test/Ice/acm/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/acm/msbuild/uwp/server/server.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -254,7 +254,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj b/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj index 0facf734fc5..9f3945b1985 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -272,7 +272,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.vcxproj index 9cbc298ccd4..86a3ca5f6a6 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -316,7 +316,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/server/server.vcxproj b/cpp/test/Ice/adapterDeactivation/msbuild/server/server.vcxproj index d8105d0f254..60b2f22e652 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/adapterDeactivation/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -315,7 +315,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/client/client.vcxproj index 1b59c345754..5f7c2d06bfe 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/client/client.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -218,7 +218,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/collocated/collocated.vcxproj index 67be8b29176..38c565f16fd 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/collocated/collocated.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -252,7 +252,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/server/server.vcxproj index b84fef406ca..582377ded87 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/server/server.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -256,7 +256,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/admin/msbuild/client/client.vcxproj b/cpp/test/Ice/admin/msbuild/client/client.vcxproj index 54f994421f0..8a93c18511a 100644 --- a/cpp/test/Ice/admin/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/admin/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -313,7 +313,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/admin/msbuild/server/server.vcxproj b/cpp/test/Ice/admin/msbuild/server/server.vcxproj index 5453e63c93b..6fcb8f865f9 100644 --- a/cpp/test/Ice/admin/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/admin/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -313,7 +313,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/admin/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/admin/msbuild/uwp/client/client.vcxproj index 0f7e39ed1f5..a430759d0bd 100644 --- a/cpp/test/Ice/admin/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/admin/msbuild/uwp/client/client.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -248,7 +248,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/admin/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/admin/msbuild/uwp/server/server.vcxproj index cafa8968ef9..02f538720df 100644 --- a/cpp/test/Ice/admin/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/admin/msbuild/uwp/server/server.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -254,7 +254,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/ami/msbuild/client/client.vcxproj b/cpp/test/Ice/ami/msbuild/client/client.vcxproj index 219b5334f17..38a6c825ee5 100644 --- a/cpp/test/Ice/ami/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/ami/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -272,7 +272,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/ami/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/ami/msbuild/collocated/collocated.vcxproj index 5402945bd3d..ed379ff66b9 100644 --- a/cpp/test/Ice/ami/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/ami/msbuild/collocated/collocated.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -314,7 +314,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/ami/msbuild/server/server.vcxproj b/cpp/test/Ice/ami/msbuild/server/server.vcxproj index 0f993f6e577..5351fe4cec5 100644 --- a/cpp/test/Ice/ami/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/ami/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -313,7 +313,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/ami/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/ami/msbuild/uwp/client/client.vcxproj index a96a93fa409..42a5b088692 100644 --- a/cpp/test/Ice/ami/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/ami/msbuild/uwp/client/client.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -218,7 +218,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/ami/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/ami/msbuild/uwp/collocated/collocated.vcxproj index 8ceb9b1a542..8085d04b625 100644 --- a/cpp/test/Ice/ami/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/ami/msbuild/uwp/collocated/collocated.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -250,7 +250,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/ami/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/ami/msbuild/uwp/server/server.vcxproj index d04cadac25b..ff7ed78182d 100644 --- a/cpp/test/Ice/ami/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/ami/msbuild/uwp/server/server.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -254,7 +254,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/background/msbuild/client/client.vcxproj b/cpp/test/Ice/background/msbuild/client/client.vcxproj index 0214ea0fe7f..ef98df2c202 100644 --- a/cpp/test/Ice/background/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/background/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -314,7 +314,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/background/msbuild/server/server.vcxproj b/cpp/test/Ice/background/msbuild/server/server.vcxproj index e5ffc7009bc..5d97938396b 100644 --- a/cpp/test/Ice/background/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/background/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -315,7 +315,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/background/msbuild/testtransport/testtransport.vcxproj b/cpp/test/Ice/background/msbuild/testtransport/testtransport.vcxproj index 9030e1f7073..cbc007efaf3 100644 --- a/cpp/test/Ice/background/msbuild/testtransport/testtransport.vcxproj +++ b/cpp/test/Ice/background/msbuild/testtransport/testtransport.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -332,7 +332,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/binding/msbuild/client/client.vcxproj b/cpp/test/Ice/binding/msbuild/client/client.vcxproj index 44dd6c8c61a..c4e50aef498 100644 --- a/cpp/test/Ice/binding/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/binding/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -272,7 +272,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/binding/msbuild/server/server.vcxproj b/cpp/test/Ice/binding/msbuild/server/server.vcxproj index cf9d8357a6c..6bbf000452b 100644 --- a/cpp/test/Ice/binding/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/binding/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -313,7 +313,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/binding/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/binding/msbuild/uwp/client/client.vcxproj index bdb6a3685de..7c93766fd4e 100644 --- a/cpp/test/Ice/binding/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/binding/msbuild/uwp/client/client.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -218,7 +218,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/binding/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/binding/msbuild/uwp/server/server.vcxproj index c4b033aac7a..f6e623fea50 100644 --- a/cpp/test/Ice/binding/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/binding/msbuild/uwp/server/server.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -254,7 +254,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/checksum/msbuild/client/client.vcxproj b/cpp/test/Ice/checksum/msbuild/client/client.vcxproj index 279f05ef7da..beeeff00600 100644 --- a/cpp/test/Ice/checksum/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/checksum/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -460,7 +460,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/checksum/msbuild/server/server.vcxproj b/cpp/test/Ice/checksum/msbuild/server/server.vcxproj index 32872b65b49..97b184bc970 100644 --- a/cpp/test/Ice/checksum/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/checksum/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -461,7 +461,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/custom/msbuild/client/client.vcxproj b/cpp/test/Ice/custom/msbuild/client/client.vcxproj index f2217ea5f2c..460019039f0 100644 --- a/cpp/test/Ice/custom/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/custom/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -461,7 +461,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/custom/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/custom/msbuild/collocated/collocated.vcxproj index 5fc502d1b2d..04ff3d0ef10 100644 --- a/cpp/test/Ice/custom/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/custom/msbuild/collocated/collocated.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -465,7 +465,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/custom/msbuild/server/server.vcxproj b/cpp/test/Ice/custom/msbuild/server/server.vcxproj index 8090804b83a..c78eb460565 100644 --- a/cpp/test/Ice/custom/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/custom/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -464,7 +464,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/custom/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/custom/msbuild/serveramd/serveramd.vcxproj index 46b954e3b37..1382ba0093d 100644 --- a/cpp/test/Ice/custom/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/custom/msbuild/serveramd/serveramd.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -464,7 +464,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/defaultServant/msbuild/client.vcxproj b/cpp/test/Ice/defaultServant/msbuild/client.vcxproj index 78ead0f339d..29efd14edcb 100644 --- a/cpp/test/Ice/defaultServant/msbuild/client.vcxproj +++ b/cpp/test/Ice/defaultServant/msbuild/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -313,7 +313,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/defaultValue/msbuild/client.vcxproj b/cpp/test/Ice/defaultValue/msbuild/client.vcxproj index 6fd318d679a..e8de07b71ef 100644 --- a/cpp/test/Ice/defaultValue/msbuild/client.vcxproj +++ b/cpp/test/Ice/defaultValue/msbuild/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -312,7 +312,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/dispatcher/msbuild/client/client.vcxproj b/cpp/test/Ice/dispatcher/msbuild/client/client.vcxproj index c3a599c81a7..7619d9d1f4d 100644 --- a/cpp/test/Ice/dispatcher/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/dispatcher/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -314,7 +314,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/dispatcher/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/dispatcher/msbuild/collocated/collocated.vcxproj index ac795b6732c..9d9e7020938 100644 --- a/cpp/test/Ice/dispatcher/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/dispatcher/msbuild/collocated/collocated.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -316,7 +316,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/dispatcher/msbuild/server/server.vcxproj b/cpp/test/Ice/dispatcher/msbuild/server/server.vcxproj index 6edc74074c0..c241d5f78fc 100644 --- a/cpp/test/Ice/dispatcher/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/dispatcher/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -315,7 +315,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/dispatcher/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/dispatcher/msbuild/uwp/client/client.vcxproj index 3abb12e35f5..eb3144049b6 100644 --- a/cpp/test/Ice/dispatcher/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/dispatcher/msbuild/uwp/client/client.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -250,7 +250,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/dispatcher/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/dispatcher/msbuild/uwp/collocated/collocated.vcxproj index c285a5ebd68..03f83b07f5c 100644 --- a/cpp/test/Ice/dispatcher/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/dispatcher/msbuild/uwp/collocated/collocated.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -252,7 +252,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/dispatcher/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/dispatcher/msbuild/uwp/server/server.vcxproj index 95eb2042000..8335fe1cd59 100644 --- a/cpp/test/Ice/dispatcher/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/dispatcher/msbuild/uwp/server/server.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -256,7 +256,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/echo/msbuild/server.vcxproj b/cpp/test/Ice/echo/msbuild/server.vcxproj index 217767d8110..2c15f544594 100644 --- a/cpp/test/Ice/echo/msbuild/server.vcxproj +++ b/cpp/test/Ice/echo/msbuild/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -313,7 +313,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/enums/msbuild/client/client.vcxproj b/cpp/test/Ice/enums/msbuild/client/client.vcxproj index 2619149f8b9..a73e34c7037 100644 --- a/cpp/test/Ice/enums/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/enums/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -312,7 +312,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/enums/msbuild/server/server.vcxproj b/cpp/test/Ice/enums/msbuild/server/server.vcxproj index 26c30fcc307..d85e54466e4 100644 --- a/cpp/test/Ice/enums/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/enums/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -313,7 +313,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/enums/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/enums/msbuild/uwp/client/client.vcxproj index 2241096c344..7b91c209465 100644 --- a/cpp/test/Ice/enums/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/enums/msbuild/uwp/client/client.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -248,7 +248,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/enums/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/enums/msbuild/uwp/server/server.vcxproj index 338bce28478..8ca1a0f2e7c 100644 --- a/cpp/test/Ice/enums/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/enums/msbuild/uwp/server/server.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -254,7 +254,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj b/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj index f7f36238425..09baa7fb627 100644 --- a/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -273,7 +273,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/exceptions/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/exceptions/msbuild/collocated/collocated.vcxproj index 417f7227635..de333dbd788 100644 --- a/cpp/test/Ice/exceptions/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/collocated/collocated.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -315,7 +315,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/exceptions/msbuild/server/server.vcxproj b/cpp/test/Ice/exceptions/msbuild/server/server.vcxproj index 7fae5a3c995..2114aaf9e86 100644 --- a/cpp/test/Ice/exceptions/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -314,7 +314,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/exceptions/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/exceptions/msbuild/serveramd/serveramd.vcxproj index 600ca2c801f..a400bf4f17b 100644 --- a/cpp/test/Ice/exceptions/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/serveramd/serveramd.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -322,7 +322,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/exceptions/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/exceptions/msbuild/uwp/client/client.vcxproj index 0a11ae96317..199c10f6e32 100644 --- a/cpp/test/Ice/exceptions/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/uwp/client/client.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -219,7 +219,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/exceptions/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/exceptions/msbuild/uwp/collocated/collocated.vcxproj index b43d80bb8fe..10732623c20 100644 --- a/cpp/test/Ice/exceptions/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/uwp/collocated/collocated.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -251,7 +251,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/exceptions/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/exceptions/msbuild/uwp/server/server.vcxproj index 1ee42e0c015..d02ea05006a 100644 --- a/cpp/test/Ice/exceptions/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/uwp/server/server.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -255,7 +255,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj b/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj index 56e14114afc..a03dbe15509 100644 --- a/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -256,7 +256,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/facets/msbuild/client/client.vcxproj b/cpp/test/Ice/facets/msbuild/client/client.vcxproj index 7a821e490ef..d2ca9bc292d 100644 --- a/cpp/test/Ice/facets/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/facets/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -272,7 +272,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/facets/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/facets/msbuild/collocated/collocated.vcxproj index 26115794239..ae3ec06c28d 100644 --- a/cpp/test/Ice/facets/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/facets/msbuild/collocated/collocated.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -314,7 +314,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/facets/msbuild/server/server.vcxproj b/cpp/test/Ice/facets/msbuild/server/server.vcxproj index d9362ac90b4..5f4d16fb64b 100644 --- a/cpp/test/Ice/facets/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/facets/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -313,7 +313,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/facets/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/facets/msbuild/uwp/client/client.vcxproj index dda21a6fb09..3055abade5a 100644 --- a/cpp/test/Ice/facets/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/facets/msbuild/uwp/client/client.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -218,7 +218,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/facets/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/facets/msbuild/uwp/collocated/collocated.vcxproj index 2e6b4567d8b..2b15292fe73 100644 --- a/cpp/test/Ice/facets/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/facets/msbuild/uwp/collocated/collocated.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -250,7 +250,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/facets/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/facets/msbuild/uwp/server/server.vcxproj index 2937370f72f..36ac192c392 100644 --- a/cpp/test/Ice/facets/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/facets/msbuild/uwp/server/server.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -254,7 +254,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj b/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj index 789602ce7ba..cbf33a7a0f9 100644 --- a/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -272,7 +272,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/faultTolerance/msbuild/server/server.vcxproj b/cpp/test/Ice/faultTolerance/msbuild/server/server.vcxproj index 4767df68755..a7e5413f3f6 100644 --- a/cpp/test/Ice/faultTolerance/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/faultTolerance/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -313,7 +313,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/gc/msbuild/client.vcxproj b/cpp/test/Ice/gc/msbuild/client.vcxproj index 1696a9a3816..dcc63a7d5a6 100644 --- a/cpp/test/Ice/gc/msbuild/client.vcxproj +++ b/cpp/test/Ice/gc/msbuild/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -311,7 +311,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/hash/msbuild/client.vcxproj b/cpp/test/Ice/hash/msbuild/client.vcxproj index 7f748d04442..2616cb564dd 100644 --- a/cpp/test/Ice/hash/msbuild/client.vcxproj +++ b/cpp/test/Ice/hash/msbuild/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -311,7 +311,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/hash/msbuild/uwp/client.vcxproj b/cpp/test/Ice/hash/msbuild/uwp/client.vcxproj index 865e0bc4da1..bebca75550f 100644 --- a/cpp/test/Ice/hash/msbuild/uwp/client.vcxproj +++ b/cpp/test/Ice/hash/msbuild/uwp/client.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -247,7 +247,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/hold/msbuild/client/client.vcxproj b/cpp/test/Ice/hold/msbuild/client/client.vcxproj index a6673d3bf72..71c3846ed78 100644 --- a/cpp/test/Ice/hold/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/hold/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -272,7 +272,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/hold/msbuild/server/server.vcxproj b/cpp/test/Ice/hold/msbuild/server/server.vcxproj index 4fc9dd8cdf6..957d730fb24 100644 --- a/cpp/test/Ice/hold/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/hold/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -313,7 +313,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/hold/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/hold/msbuild/uwp/client/client.vcxproj index 876edd70183..9a14243684d 100644 --- a/cpp/test/Ice/hold/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/hold/msbuild/uwp/client/client.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -218,7 +218,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/hold/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/hold/msbuild/uwp/server/server.vcxproj index 054dfbe573d..8f0d582e6e3 100644 --- a/cpp/test/Ice/hold/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/hold/msbuild/uwp/server/server.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -254,7 +254,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/impl/msbuild/server/server.vcxproj b/cpp/test/Ice/impl/msbuild/server/server.vcxproj index 8c14ec791fb..935ef6027b5 100644 --- a/cpp/test/Ice/impl/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/impl/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -324,7 +324,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/info/msbuild/client/client.vcxproj b/cpp/test/Ice/info/msbuild/client/client.vcxproj index 213e7cb0a84..8cefc421294 100644 --- a/cpp/test/Ice/info/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/info/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -314,7 +314,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/info/msbuild/server/server.vcxproj b/cpp/test/Ice/info/msbuild/server/server.vcxproj index 654b5e6e121..f7fe9a1ea84 100644 --- a/cpp/test/Ice/info/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/info/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -313,7 +313,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/info/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/info/msbuild/uwp/client/client.vcxproj index c6fa23c87ee..5b6e442429c 100644 --- a/cpp/test/Ice/info/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/info/msbuild/uwp/client/client.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -248,7 +248,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/info/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/info/msbuild/uwp/server/server.vcxproj index e15b19493e8..1c0223ab227 100644 --- a/cpp/test/Ice/info/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/info/msbuild/uwp/server/server.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -254,7 +254,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/inheritance/msbuild/client/client.vcxproj b/cpp/test/Ice/inheritance/msbuild/client/client.vcxproj index 405772051d9..d3394b892c9 100644 --- a/cpp/test/Ice/inheritance/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/inheritance/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -312,7 +312,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/inheritance/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/inheritance/msbuild/collocated/collocated.vcxproj index 26f309f34d8..71a1887deee 100644 --- a/cpp/test/Ice/inheritance/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/inheritance/msbuild/collocated/collocated.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -314,7 +314,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/inheritance/msbuild/server/server.vcxproj b/cpp/test/Ice/inheritance/msbuild/server/server.vcxproj index 614a1cd616b..8656ede6a93 100644 --- a/cpp/test/Ice/inheritance/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/inheritance/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -313,7 +313,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/inheritance/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/inheritance/msbuild/uwp/client/client.vcxproj index 8e979d1f762..8c81686d089 100644 --- a/cpp/test/Ice/inheritance/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/inheritance/msbuild/uwp/client/client.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -218,7 +218,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/inheritance/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/inheritance/msbuild/uwp/collocated/collocated.vcxproj index 3e75f4e9d75..fb817deefe4 100644 --- a/cpp/test/Ice/inheritance/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/inheritance/msbuild/uwp/collocated/collocated.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -250,7 +250,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/inheritance/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/inheritance/msbuild/uwp/server/server.vcxproj index 5855be47be1..ba2d11ccfcc 100644 --- a/cpp/test/Ice/inheritance/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/inheritance/msbuild/uwp/server/server.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -254,7 +254,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/interceptor/msbuild/client/client.vcxproj b/cpp/test/Ice/interceptor/msbuild/client/client.vcxproj index 99ae595308f..48b2b3737ea 100644 --- a/cpp/test/Ice/interceptor/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/interceptor/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -202,7 +202,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/interceptor/msbuild/interceptortest/interceptortest.vcxproj b/cpp/test/Ice/interceptor/msbuild/interceptortest/interceptortest.vcxproj index 503303124bc..d9dfdf360b2 100644 --- a/cpp/test/Ice/interceptor/msbuild/interceptortest/interceptortest.vcxproj +++ b/cpp/test/Ice/interceptor/msbuild/interceptortest/interceptortest.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -319,7 +319,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/invoke/msbuild/client/client.vcxproj b/cpp/test/Ice/invoke/msbuild/client/client.vcxproj index 5118345ba6c..de9206b3e4c 100644 --- a/cpp/test/Ice/invoke/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/invoke/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -312,7 +312,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/invoke/msbuild/server/server.vcxproj b/cpp/test/Ice/invoke/msbuild/server/server.vcxproj index 856b3eafa70..2bffd39259d 100644 --- a/cpp/test/Ice/invoke/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/invoke/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -313,7 +313,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/invoke/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/invoke/msbuild/uwp/client/client.vcxproj index 3dbdbae942e..b7ec5e78632 100644 --- a/cpp/test/Ice/invoke/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/invoke/msbuild/uwp/client/client.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -218,7 +218,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/invoke/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/invoke/msbuild/uwp/server/server.vcxproj index 9bcceb26327..5a76aff4813 100644 --- a/cpp/test/Ice/invoke/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/invoke/msbuild/uwp/server/server.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -254,7 +254,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/library/msbuild/alltests/alltests.vcxproj b/cpp/test/Ice/library/msbuild/alltests/alltests.vcxproj index f89d329e6ef..eed1f08816b 100644 --- a/cpp/test/Ice/library/msbuild/alltests/alltests.vcxproj +++ b/cpp/test/Ice/library/msbuild/alltests/alltests.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -195,7 +195,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/library/msbuild/client/client.vcxproj b/cpp/test/Ice/library/msbuild/client/client.vcxproj index 4fd1706fd8f..ac187c3819a 100644 --- a/cpp/test/Ice/library/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/library/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -163,7 +163,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/library/msbuild/consumer/consumer.vcxproj b/cpp/test/Ice/library/msbuild/consumer/consumer.vcxproj index b5e31369d37..a063a8d7224 100644 --- a/cpp/test/Ice/library/msbuild/consumer/consumer.vcxproj +++ b/cpp/test/Ice/library/msbuild/consumer/consumer.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -195,7 +195,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/library/msbuild/gencode/gencode.vcxproj b/cpp/test/Ice/library/msbuild/gencode/gencode.vcxproj index b64a1a84811..d60bdb97d53 100644 --- a/cpp/test/Ice/library/msbuild/gencode/gencode.vcxproj +++ b/cpp/test/Ice/library/msbuild/gencode/gencode.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -278,7 +278,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/location/msbuild/client/client.vcxproj b/cpp/test/Ice/location/msbuild/client/client.vcxproj index d4527e5c9d5..939ab454735 100644 --- a/cpp/test/Ice/location/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/location/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -312,7 +312,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/location/msbuild/server/server.vcxproj b/cpp/test/Ice/location/msbuild/server/server.vcxproj index 36b7a7664c7..99cd39eac34 100644 --- a/cpp/test/Ice/location/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/location/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -315,7 +315,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/location/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/location/msbuild/uwp/client/client.vcxproj index 7335e9581c0..a6c67a57c50 100644 --- a/cpp/test/Ice/location/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/location/msbuild/uwp/client/client.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -218,7 +218,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/location/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/location/msbuild/uwp/server/server.vcxproj index 561113c24be..5d7fdd93d0e 100644 --- a/cpp/test/Ice/location/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/location/msbuild/uwp/server/server.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -256,7 +256,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/logger/msbuild/client1/client1.vcxproj b/cpp/test/Ice/logger/msbuild/client1/client1.vcxproj index 4e58b4f3707..27e060d7bb3 100644 --- a/cpp/test/Ice/logger/msbuild/client1/client1.vcxproj +++ b/cpp/test/Ice/logger/msbuild/client1/client1.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -162,7 +162,7 @@ </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/logger/msbuild/client2/client2.vcxproj b/cpp/test/Ice/logger/msbuild/client2/client2.vcxproj index 64387b4a25b..a267a3bf669 100644 --- a/cpp/test/Ice/logger/msbuild/client2/client2.vcxproj +++ b/cpp/test/Ice/logger/msbuild/client2/client2.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -162,7 +162,7 @@ </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/logger/msbuild/client3/client3.vcxproj b/cpp/test/Ice/logger/msbuild/client3/client3.vcxproj index 09ad6ac73a8..78a3ed5744d 100644 --- a/cpp/test/Ice/logger/msbuild/client3/client3.vcxproj +++ b/cpp/test/Ice/logger/msbuild/client3/client3.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -162,7 +162,7 @@ </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/logger/msbuild/client4/client4.vcxproj b/cpp/test/Ice/logger/msbuild/client4/client4.vcxproj index 7d0f57f1054..d57a4faff70 100644 --- a/cpp/test/Ice/logger/msbuild/client4/client4.vcxproj +++ b/cpp/test/Ice/logger/msbuild/client4/client4.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -162,7 +162,7 @@ </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/logger/msbuild/client5/client5.vcxproj b/cpp/test/Ice/logger/msbuild/client5/client5.vcxproj index c42c741e78f..e60cb26f654 100644 --- a/cpp/test/Ice/logger/msbuild/client5/client5.vcxproj +++ b/cpp/test/Ice/logger/msbuild/client5/client5.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -162,7 +162,7 @@ </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/metrics/msbuild/client/client.vcxproj b/cpp/test/Ice/metrics/msbuild/client/client.vcxproj index 3fe500f1e9d..8d63ba5cd13 100644 --- a/cpp/test/Ice/metrics/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -313,7 +313,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/metrics/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/metrics/msbuild/collocated/collocated.vcxproj index 70f930995a2..56b1e90c84e 100644 --- a/cpp/test/Ice/metrics/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/collocated/collocated.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -318,7 +318,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/metrics/msbuild/server/server.vcxproj b/cpp/test/Ice/metrics/msbuild/server/server.vcxproj index 95676847d33..37e97c904d1 100644 --- a/cpp/test/Ice/metrics/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -313,7 +313,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/metrics/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/metrics/msbuild/serveramd/serveramd.vcxproj index 75591998838..42a82f89e9c 100644 --- a/cpp/test/Ice/metrics/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/serveramd/serveramd.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -321,7 +321,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/metrics/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/metrics/msbuild/uwp/client/client.vcxproj index 73c019edfbe..7578dc1c799 100644 --- a/cpp/test/Ice/metrics/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/uwp/client/client.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -249,7 +249,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/metrics/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/metrics/msbuild/uwp/collocated/collocated.vcxproj index b513b47acd6..82545e9e0ea 100644 --- a/cpp/test/Ice/metrics/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/uwp/collocated/collocated.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -251,7 +251,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/metrics/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/metrics/msbuild/uwp/server/server.vcxproj index b48d495bbd6..ea6d404c3ad 100644 --- a/cpp/test/Ice/metrics/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/uwp/server/server.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -254,7 +254,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/metrics/msbuild/uwp/serveramd/serveramd.vcxproj b/cpp/test/Ice/metrics/msbuild/uwp/serveramd/serveramd.vcxproj index 80b09363031..60613c97bad 100644 --- a/cpp/test/Ice/metrics/msbuild/uwp/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/uwp/serveramd/serveramd.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -255,7 +255,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/networkProxy/msbuild/client/client.vcxproj b/cpp/test/Ice/networkProxy/msbuild/client/client.vcxproj index c77aa6dde2a..fb63a4739b2 100644 --- a/cpp/test/Ice/networkProxy/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/networkProxy/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -312,7 +312,7 @@ </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/networkProxy/msbuild/server/server.vcxproj b/cpp/test/Ice/networkProxy/msbuild/server/server.vcxproj index 1b743952d55..d646af36449 100644 --- a/cpp/test/Ice/networkProxy/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/networkProxy/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -311,7 +311,7 @@ </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/objects/msbuild/client/client.vcxproj b/cpp/test/Ice/objects/msbuild/client/client.vcxproj index 9db1d9fb8c9..6ffdb384353 100644 --- a/cpp/test/Ice/objects/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/objects/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -615,7 +615,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/objects/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/objects/msbuild/collocated/collocated.vcxproj index fa0ce53169d..9e6981cba11 100644 --- a/cpp/test/Ice/objects/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/objects/msbuild/collocated/collocated.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -624,7 +624,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/objects/msbuild/server/server.vcxproj b/cpp/test/Ice/objects/msbuild/server/server.vcxproj index 34b58910811..b7c50da29e8 100644 --- a/cpp/test/Ice/objects/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/objects/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -623,7 +623,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/objects/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/objects/msbuild/uwp/client/client.vcxproj index 47cfc4c8142..7e2e2b305e5 100644 --- a/cpp/test/Ice/objects/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/objects/msbuild/uwp/client/client.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -423,7 +423,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/objects/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/objects/msbuild/uwp/collocated/collocated.vcxproj index a439a9f4ddb..8788265444c 100644 --- a/cpp/test/Ice/objects/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/objects/msbuild/uwp/collocated/collocated.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -424,7 +424,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/objects/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/objects/msbuild/uwp/server/server.vcxproj index ae592c30c09..c98a02c0c0b 100644 --- a/cpp/test/Ice/objects/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/objects/msbuild/uwp/server/server.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -428,7 +428,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/operations/msbuild/client/client.vcxproj b/cpp/test/Ice/operations/msbuild/client/client.vcxproj index 7c3f78bc5a6..6032b049d72 100644 --- a/cpp/test/Ice/operations/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/operations/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -318,7 +318,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj index 0af161aec49..460a37fe8c3 100644 --- a/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -328,7 +328,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/operations/msbuild/server/server.vcxproj b/cpp/test/Ice/operations/msbuild/server/server.vcxproj index 1f7820a86f8..eea3d3a3852 100644 --- a/cpp/test/Ice/operations/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/operations/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -321,7 +321,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/operations/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/operations/msbuild/serveramd/serveramd.vcxproj index 801f1dc1816..4a5d68bfdfd 100644 --- a/cpp/test/Ice/operations/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/operations/msbuild/serveramd/serveramd.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -329,7 +329,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/operations/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/operations/msbuild/uwp/client/client.vcxproj index 6938b93fe94..71904fdaa02 100644 --- a/cpp/test/Ice/operations/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/operations/msbuild/uwp/client/client.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -254,7 +254,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/operations/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/operations/msbuild/uwp/collocated/collocated.vcxproj index a5b7a4f77bc..7faf4588adc 100644 --- a/cpp/test/Ice/operations/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/operations/msbuild/uwp/collocated/collocated.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -262,7 +262,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/operations/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/operations/msbuild/uwp/server/server.vcxproj index 4334aacb2fd..8e611d33516 100644 --- a/cpp/test/Ice/operations/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/operations/msbuild/uwp/server/server.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -260,7 +260,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/operations/msbuild/uwp/serveramd/serveramd.vcxproj b/cpp/test/Ice/operations/msbuild/uwp/serveramd/serveramd.vcxproj index ba8919645f4..301ba70295e 100644 --- a/cpp/test/Ice/operations/msbuild/uwp/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/operations/msbuild/uwp/serveramd/serveramd.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -267,7 +267,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/optional/msbuild/client/client.vcxproj b/cpp/test/Ice/optional/msbuild/client/client.vcxproj index ae1769ed778..9b23059d1d0 100644 --- a/cpp/test/Ice/optional/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/optional/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -317,7 +317,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/optional/msbuild/server/server.vcxproj b/cpp/test/Ice/optional/msbuild/server/server.vcxproj index 2e450e1fed2..b5b566de293 100644 --- a/cpp/test/Ice/optional/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/optional/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -317,7 +317,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/optional/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/optional/msbuild/serveramd/serveramd.vcxproj index fec4b8233b5..dc7f7c2e83a 100644 --- a/cpp/test/Ice/optional/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/optional/msbuild/serveramd/serveramd.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -325,7 +325,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/optional/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/optional/msbuild/uwp/client/client.vcxproj index 3815a93be23..433d97228ca 100644 --- a/cpp/test/Ice/optional/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/optional/msbuild/uwp/client/client.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -254,7 +254,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/optional/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/optional/msbuild/uwp/server/server.vcxproj index 48029fd6267..4ca7d5d565a 100644 --- a/cpp/test/Ice/optional/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/optional/msbuild/uwp/server/server.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -260,7 +260,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/optional/msbuild/uwp/serveramd/serveramd.vcxproj b/cpp/test/Ice/optional/msbuild/uwp/serveramd/serveramd.vcxproj index e60b2ec7356..aedea29c313 100644 --- a/cpp/test/Ice/optional/msbuild/uwp/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/optional/msbuild/uwp/serveramd/serveramd.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -267,7 +267,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/plugin/msbuild/client/client.vcxproj b/cpp/test/Ice/plugin/msbuild/client/client.vcxproj index b2a6219232e..91f245d2231 100644 --- a/cpp/test/Ice/plugin/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/plugin/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -127,7 +127,7 @@ </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/plugin/msbuild/testplugin/testplugin.vcxproj b/cpp/test/Ice/plugin/msbuild/testplugin/testplugin.vcxproj index 6b33c9ebc7a..b1abd4c6e47 100644 --- a/cpp/test/Ice/plugin/msbuild/testplugin/testplugin.vcxproj +++ b/cpp/test/Ice/plugin/msbuild/testplugin/testplugin.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -162,7 +162,7 @@ </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/properties/msbuild/client.vcxproj b/cpp/test/Ice/properties/msbuild/client.vcxproj index 78cc80acc6b..47517f674e3 100644 --- a/cpp/test/Ice/properties/msbuild/client.vcxproj +++ b/cpp/test/Ice/properties/msbuild/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -162,7 +162,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/proxy/msbuild/client/client.vcxproj b/cpp/test/Ice/proxy/msbuild/client/client.vcxproj index 3e6584c4674..0a7ea314b40 100644 --- a/cpp/test/Ice/proxy/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -272,7 +272,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj index de75bc99cef..c4f11becaea 100644 --- a/cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -314,7 +314,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/proxy/msbuild/server/server.vcxproj b/cpp/test/Ice/proxy/msbuild/server/server.vcxproj index 20078ebe541..a90f0091997 100644 --- a/cpp/test/Ice/proxy/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -313,7 +313,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj index dff5c925358..62b23c3f101 100644 --- a/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -321,7 +321,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/proxy/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/proxy/msbuild/uwp/client/client.vcxproj index bb5bf2da5bd..c7d6651d4a3 100644 --- a/cpp/test/Ice/proxy/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/uwp/client/client.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -218,7 +218,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/proxy/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/proxy/msbuild/uwp/collocated/collocated.vcxproj index b7e4755ace9..798215af2e8 100644 --- a/cpp/test/Ice/proxy/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/uwp/collocated/collocated.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -250,7 +250,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/proxy/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/proxy/msbuild/uwp/server/server.vcxproj index d76818276ef..d88647fe8b5 100644 --- a/cpp/test/Ice/proxy/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/uwp/server/server.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -254,7 +254,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/proxy/msbuild/uwp/serveramd/serveramd.vcxproj b/cpp/test/Ice/proxy/msbuild/uwp/serveramd/serveramd.vcxproj index 932edee2791..e6336727cff 100644 --- a/cpp/test/Ice/proxy/msbuild/uwp/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/uwp/serveramd/serveramd.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -255,7 +255,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/retry/msbuild/client/client.vcxproj b/cpp/test/Ice/retry/msbuild/client/client.vcxproj index e6bbf4be4d5..5ccb27a95d6 100644 --- a/cpp/test/Ice/retry/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/retry/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -314,7 +314,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/retry/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/retry/msbuild/collocated/collocated.vcxproj index e17e84549fe..c75e96d0d0d 100644 --- a/cpp/test/Ice/retry/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/retry/msbuild/collocated/collocated.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -316,7 +316,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/retry/msbuild/server/server.vcxproj b/cpp/test/Ice/retry/msbuild/server/server.vcxproj index b75ff267ebc..de5b6588707 100644 --- a/cpp/test/Ice/retry/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/retry/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -316,7 +316,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/retry/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/retry/msbuild/uwp/client/client.vcxproj index e337e7ec76a..bf3ca58d5e4 100644 --- a/cpp/test/Ice/retry/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/retry/msbuild/uwp/client/client.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -251,7 +251,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/retry/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/retry/msbuild/uwp/collocated/collocated.vcxproj index 147cb7c8793..17a8f7e716c 100644 --- a/cpp/test/Ice/retry/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/retry/msbuild/uwp/collocated/collocated.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -253,7 +253,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/retry/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/retry/msbuild/uwp/server/server.vcxproj index 7ad14e2b700..afba9a7e736 100644 --- a/cpp/test/Ice/retry/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/retry/msbuild/uwp/server/server.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -257,7 +257,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/servantLocator/msbuild/client/client.vcxproj b/cpp/test/Ice/servantLocator/msbuild/client/client.vcxproj index b9ccdc10f4c..2720b3db140 100644 --- a/cpp/test/Ice/servantLocator/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/servantLocator/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -272,7 +272,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/servantLocator/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/servantLocator/msbuild/collocated/collocated.vcxproj index 9298cb65dc7..f4c1c448dad 100644 --- a/cpp/test/Ice/servantLocator/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/servantLocator/msbuild/collocated/collocated.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -316,7 +316,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/servantLocator/msbuild/server/server.vcxproj b/cpp/test/Ice/servantLocator/msbuild/server/server.vcxproj index 1963247eb61..ee183136fab 100644 --- a/cpp/test/Ice/servantLocator/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/servantLocator/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -315,7 +315,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/servantLocator/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/servantLocator/msbuild/serveramd/serveramd.vcxproj index b310fcb4998..fcb23362815 100644 --- a/cpp/test/Ice/servantLocator/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/servantLocator/msbuild/serveramd/serveramd.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -323,7 +323,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/services/msbuild/client.vcxproj b/cpp/test/Ice/services/msbuild/client.vcxproj index fd2561f5b5f..b4e9f19db4d 100644 --- a/cpp/test/Ice/services/msbuild/client.vcxproj +++ b/cpp/test/Ice/services/msbuild/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -320,7 +320,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/client/client.vcxproj b/cpp/test/Ice/slicing/exceptions/msbuild/client/client.vcxproj index d49a24fd7ab..3715af89c3e 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/slicing/exceptions/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -420,7 +420,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/server/server.vcxproj b/cpp/test/Ice/slicing/exceptions/msbuild/server/server.vcxproj index 361345c9f50..6c679cd43e5 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/slicing/exceptions/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -461,7 +461,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.vcxproj index be98ba01ee4..ede34448aa3 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -469,7 +469,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/slicing/objects/msbuild/client/client.vcxproj b/cpp/test/Ice/slicing/objects/msbuild/client/client.vcxproj index 096e166b8c5..a5e8f602459 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/slicing/objects/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -420,7 +420,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/slicing/objects/msbuild/server/server.vcxproj b/cpp/test/Ice/slicing/objects/msbuild/server/server.vcxproj index e158bf8daaa..fb4d80d1325 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/slicing/objects/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -461,7 +461,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.vcxproj index ac8483054ff..5f65ed9d3e1 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -469,7 +469,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/stream/msbuild/client.vcxproj b/cpp/test/Ice/stream/msbuild/client.vcxproj index d8a32ab3613..2b499814746 100644 --- a/cpp/test/Ice/stream/msbuild/client.vcxproj +++ b/cpp/test/Ice/stream/msbuild/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -295,7 +295,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/stream/msbuild/uwp/client.vcxproj b/cpp/test/Ice/stream/msbuild/uwp/client.vcxproj index 83b4b82f86c..3f586494312 100644 --- a/cpp/test/Ice/stream/msbuild/uwp/client.vcxproj +++ b/cpp/test/Ice/stream/msbuild/uwp/client.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -247,7 +247,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/stringConverter/msbuild/client/client.vcxproj b/cpp/test/Ice/stringConverter/msbuild/client/client.vcxproj index 8d72a5982d4..07f1a3b7c2e 100644 --- a/cpp/test/Ice/stringConverter/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/stringConverter/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -271,7 +271,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/stringConverter/msbuild/server/server.vcxproj b/cpp/test/Ice/stringConverter/msbuild/server/server.vcxproj index 660396da148..c29018601fe 100644 --- a/cpp/test/Ice/stringConverter/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/stringConverter/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -311,7 +311,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/threadPoolPriority/msbuild/client/client.vcxproj b/cpp/test/Ice/threadPoolPriority/msbuild/client/client.vcxproj index 200a291450f..7e023945a02 100644 --- a/cpp/test/Ice/threadPoolPriority/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/threadPoolPriority/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -272,7 +272,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/threadPoolPriority/msbuild/server/server.vcxproj b/cpp/test/Ice/threadPoolPriority/msbuild/server/server.vcxproj index 6deb1f1841f..90ea2493d7b 100644 --- a/cpp/test/Ice/threadPoolPriority/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/threadPoolPriority/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -313,7 +313,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/servercustom.vcxproj b/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/servercustom.vcxproj index c86790a0e2f..0a42585eb6d 100644 --- a/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/servercustom.vcxproj +++ b/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/servercustom.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -313,7 +313,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/timeout/msbuild/client/client.vcxproj b/cpp/test/Ice/timeout/msbuild/client/client.vcxproj index 7cfc6e7193e..780a9ff7a4f 100644 --- a/cpp/test/Ice/timeout/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/timeout/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -314,7 +314,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/timeout/msbuild/server/server.vcxproj b/cpp/test/Ice/timeout/msbuild/server/server.vcxproj index adea970a87f..2119bee6d5e 100644 --- a/cpp/test/Ice/timeout/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/timeout/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -313,7 +313,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/timeout/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/timeout/msbuild/uwp/client/client.vcxproj index 32663fa818f..7064fd3a6c4 100644 --- a/cpp/test/Ice/timeout/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/timeout/msbuild/uwp/client/client.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -249,7 +249,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/timeout/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/timeout/msbuild/uwp/server/server.vcxproj index b1a1180bf33..5b5445a8042 100644 --- a/cpp/test/Ice/timeout/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/timeout/msbuild/uwp/server/server.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -254,7 +254,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/udp/msbuild/client/client.vcxproj b/cpp/test/Ice/udp/msbuild/client/client.vcxproj index fde17811f54..004b690ebdb 100644 --- a/cpp/test/Ice/udp/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/udp/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -272,7 +272,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/udp/msbuild/server/server.vcxproj b/cpp/test/Ice/udp/msbuild/server/server.vcxproj index 31df45f58c3..40680101356 100644 --- a/cpp/test/Ice/udp/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/udp/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -313,7 +313,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/udp/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/udp/msbuild/uwp/client/client.vcxproj index 856d13cacba..568b59ccf0e 100644 --- a/cpp/test/Ice/udp/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/udp/msbuild/uwp/client/client.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -248,7 +248,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Ice/udp/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/udp/msbuild/uwp/server/server.vcxproj index 8747b47aaa0..5c240d0380b 100644 --- a/cpp/test/Ice/udp/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/udp/msbuild/uwp/server/server.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -254,7 +254,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceBox/admin/msbuild/client/client.vcxproj b/cpp/test/IceBox/admin/msbuild/client/client.vcxproj index 84675fd5cd9..2b53e6da386 100644 --- a/cpp/test/IceBox/admin/msbuild/client/client.vcxproj +++ b/cpp/test/IceBox/admin/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -312,7 +312,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceBox/admin/msbuild/testservice/testservice.vcxproj b/cpp/test/IceBox/admin/msbuild/testservice/testservice.vcxproj index de033b17848..55e3e4b1c86 100644 --- a/cpp/test/IceBox/admin/msbuild/testservice/testservice.vcxproj +++ b/cpp/test/IceBox/admin/msbuild/testservice/testservice.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -337,7 +337,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceBox/configuration/msbuild/client/client.vcxproj b/cpp/test/IceBox/configuration/msbuild/client/client.vcxproj index 67de9cd8c8a..afb7244df46 100644 --- a/cpp/test/IceBox/configuration/msbuild/client/client.vcxproj +++ b/cpp/test/IceBox/configuration/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -312,7 +312,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceBox/configuration/msbuild/testservice/testservice.vcxproj b/cpp/test/IceBox/configuration/msbuild/testservice/testservice.vcxproj index b0fc6d62727..df105dd10a0 100644 --- a/cpp/test/IceBox/configuration/msbuild/testservice/testservice.vcxproj +++ b/cpp/test/IceBox/configuration/msbuild/testservice/testservice.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -337,7 +337,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceDiscovery/simple/msbuild/client/client.vcxproj b/cpp/test/IceDiscovery/simple/msbuild/client/client.vcxproj index 356f080426f..5d7bbb58448 100644 --- a/cpp/test/IceDiscovery/simple/msbuild/client/client.vcxproj +++ b/cpp/test/IceDiscovery/simple/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -296,7 +296,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceDiscovery/simple/msbuild/server/server.vcxproj b/cpp/test/IceDiscovery/simple/msbuild/server/server.vcxproj index 6d329b41ccb..6108be2c8c7 100644 --- a/cpp/test/IceDiscovery/simple/msbuild/server/server.vcxproj +++ b/cpp/test/IceDiscovery/simple/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -321,7 +321,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceGrid/activation/msbuild/client/client.vcxproj b/cpp/test/IceGrid/activation/msbuild/client/client.vcxproj index b3400f8bb5c..0b087023d56 100644 --- a/cpp/test/IceGrid/activation/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/activation/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -272,7 +272,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceGrid/activation/msbuild/server/server.vcxproj b/cpp/test/IceGrid/activation/msbuild/server/server.vcxproj index 1797c1d6137..1fb53e58f0b 100644 --- a/cpp/test/IceGrid/activation/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/activation/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -313,7 +313,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceGrid/admin/msbuild/server.vcxproj b/cpp/test/IceGrid/admin/msbuild/server.vcxproj index 612ccc52757..2b333fa7dea 100644 --- a/cpp/test/IceGrid/admin/msbuild/server.vcxproj +++ b/cpp/test/IceGrid/admin/msbuild/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -162,7 +162,7 @@ </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceGrid/allocation/msbuild/client/client.vcxproj b/cpp/test/IceGrid/allocation/msbuild/client/client.vcxproj index 667cb2daf35..07d007518b8 100644 --- a/cpp/test/IceGrid/allocation/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/allocation/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -272,7 +272,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceGrid/allocation/msbuild/server/server.vcxproj b/cpp/test/IceGrid/allocation/msbuild/server/server.vcxproj index fa6b70df630..c9b13ddcd3b 100644 --- a/cpp/test/IceGrid/allocation/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/allocation/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -313,7 +313,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceGrid/allocation/msbuild/verifier/verifier.vcxproj b/cpp/test/IceGrid/allocation/msbuild/verifier/verifier.vcxproj index 8c4e59e4c6e..9d6e4f693a2 100644 --- a/cpp/test/IceGrid/allocation/msbuild/verifier/verifier.vcxproj +++ b/cpp/test/IceGrid/allocation/msbuild/verifier/verifier.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -162,7 +162,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceGrid/deployer/msbuild/client/client.vcxproj b/cpp/test/IceGrid/deployer/msbuild/client/client.vcxproj index b7a6a86bca2..f03b81755e8 100644 --- a/cpp/test/IceGrid/deployer/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/deployer/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -272,7 +272,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceGrid/deployer/msbuild/server/server.vcxproj b/cpp/test/IceGrid/deployer/msbuild/server/server.vcxproj index 50f4100fe35..841c82ef964 100644 --- a/cpp/test/IceGrid/deployer/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/deployer/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -313,7 +313,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceGrid/deployer/msbuild/testservice/testservice.vcxproj b/cpp/test/IceGrid/deployer/msbuild/testservice/testservice.vcxproj index 7e53fa01586..537cd8683f5 100644 --- a/cpp/test/IceGrid/deployer/msbuild/testservice/testservice.vcxproj +++ b/cpp/test/IceGrid/deployer/msbuild/testservice/testservice.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -337,7 +337,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceGrid/distribution/msbuild/client/client.vcxproj b/cpp/test/IceGrid/distribution/msbuild/client/client.vcxproj index 11c5e486c75..26a8286bd59 100644 --- a/cpp/test/IceGrid/distribution/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/distribution/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -272,7 +272,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceGrid/distribution/msbuild/server/server.vcxproj b/cpp/test/IceGrid/distribution/msbuild/server/server.vcxproj index f5930fe04c0..2ebe3408dbd 100644 --- a/cpp/test/IceGrid/distribution/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/distribution/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -313,7 +313,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceGrid/noRestartUpdate/msbuild/client/client.vcxproj b/cpp/test/IceGrid/noRestartUpdate/msbuild/client/client.vcxproj index 47ac121c921..c50262288a2 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -272,7 +272,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceGrid/noRestartUpdate/msbuild/server/server.vcxproj b/cpp/test/IceGrid/noRestartUpdate/msbuild/server/server.vcxproj index 62125c699f3..585ad136df3 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -313,7 +313,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/testservice.vcxproj b/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/testservice.vcxproj index 9c96ee29528..92eb3cc7d21 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/testservice.vcxproj +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/testservice.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -337,7 +337,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceGrid/replicaGroup/msbuild/client/client.vcxproj b/cpp/test/IceGrid/replicaGroup/msbuild/client/client.vcxproj index b21ec5bd819..5afea9ac5cf 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/replicaGroup/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -272,7 +272,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/registryplugin.vcxproj b/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/registryplugin.vcxproj index baa64334cdf..f18fd9b0141 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/registryplugin.vcxproj +++ b/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/registryplugin.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -162,7 +162,7 @@ </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceGrid/replicaGroup/msbuild/server/server.vcxproj b/cpp/test/IceGrid/replicaGroup/msbuild/server/server.vcxproj index 064ebff9f77..38f29497fe9 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/replicaGroup/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -313,7 +313,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceGrid/replicaGroup/msbuild/testservice/testservice.vcxproj b/cpp/test/IceGrid/replicaGroup/msbuild/testservice/testservice.vcxproj index 622a14c13db..5fda5a416ea 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/testservice/testservice.vcxproj +++ b/cpp/test/IceGrid/replicaGroup/msbuild/testservice/testservice.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -337,7 +337,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceGrid/replication/msbuild/client/client.vcxproj b/cpp/test/IceGrid/replication/msbuild/client/client.vcxproj index 082074db803..22b5a260f60 100644 --- a/cpp/test/IceGrid/replication/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/replication/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -272,7 +272,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceGrid/replication/msbuild/server/server.vcxproj b/cpp/test/IceGrid/replication/msbuild/server/server.vcxproj index 45a8335f944..f837f11b11c 100644 --- a/cpp/test/IceGrid/replication/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/replication/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -313,7 +313,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceGrid/session/msbuild/client/client.vcxproj b/cpp/test/IceGrid/session/msbuild/client/client.vcxproj index f40329e6725..adae1a78d6b 100644 --- a/cpp/test/IceGrid/session/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/session/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -272,7 +272,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceGrid/session/msbuild/server/server.vcxproj b/cpp/test/IceGrid/session/msbuild/server/server.vcxproj index 44986c1d0fa..0bdcf1f63c0 100644 --- a/cpp/test/IceGrid/session/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/session/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -311,7 +311,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceGrid/session/msbuild/verifier/verifier.vcxproj b/cpp/test/IceGrid/session/msbuild/verifier/verifier.vcxproj index 69afc96837f..6fac9e63a08 100644 --- a/cpp/test/IceGrid/session/msbuild/verifier/verifier.vcxproj +++ b/cpp/test/IceGrid/session/msbuild/verifier/verifier.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -311,7 +311,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceGrid/simple/msbuild/client/client.vcxproj b/cpp/test/IceGrid/simple/msbuild/client/client.vcxproj index 76206a22d1d..d82a79538b9 100644 --- a/cpp/test/IceGrid/simple/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/simple/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -296,7 +296,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceGrid/simple/msbuild/server/server.vcxproj b/cpp/test/IceGrid/simple/msbuild/server/server.vcxproj index 9023e805965..15c42528fc4 100644 --- a/cpp/test/IceGrid/simple/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/simple/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -313,7 +313,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceGrid/update/msbuild/client/client.vcxproj b/cpp/test/IceGrid/update/msbuild/client/client.vcxproj index 0b8662b5fb8..441875103b7 100644 --- a/cpp/test/IceGrid/update/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/update/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -296,7 +296,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceGrid/update/msbuild/server/server.vcxproj b/cpp/test/IceGrid/update/msbuild/server/server.vcxproj index 7f8a6f6c2b1..255edb9a7fa 100644 --- a/cpp/test/IceGrid/update/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/update/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -313,7 +313,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceSSL/configuration/msbuild/client/client.vcxproj b/cpp/test/IceSSL/configuration/msbuild/client/client.vcxproj index 92e3ca89775..eb9f8e327c3 100644 --- a/cpp/test/IceSSL/configuration/msbuild/client/client.vcxproj +++ b/cpp/test/IceSSL/configuration/msbuild/client/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -312,7 +312,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceSSL/configuration/msbuild/server/server.vcxproj b/cpp/test/IceSSL/configuration/msbuild/server/server.vcxproj index 7a97b74b5c2..f954f1e5ea9 100644 --- a/cpp/test/IceSSL/configuration/msbuild/server/server.vcxproj +++ b/cpp/test/IceSSL/configuration/msbuild/server/server.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -313,7 +313,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceSSL/configuration/msbuild/uwp/client/client.vcxproj b/cpp/test/IceSSL/configuration/msbuild/uwp/client/client.vcxproj index 6dde51110bf..badf6ccc672 100644 --- a/cpp/test/IceSSL/configuration/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/IceSSL/configuration/msbuild/uwp/client/client.vcxproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,10 +78,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -248,7 +248,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceStorm/federation/msbuild/publisher/publisher.vcxproj b/cpp/test/IceStorm/federation/msbuild/publisher/publisher.vcxproj index f104a4af05a..23647696112 100644 --- a/cpp/test/IceStorm/federation/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/federation/msbuild/publisher/publisher.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -271,7 +271,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceStorm/federation/msbuild/subscriber/subscriber.vcxproj b/cpp/test/IceStorm/federation/msbuild/subscriber/subscriber.vcxproj index d74f6325b0e..e536561c02f 100644 --- a/cpp/test/IceStorm/federation/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/federation/msbuild/subscriber/subscriber.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -311,7 +311,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceStorm/federation2/msbuild/publisher/publisher.vcxproj b/cpp/test/IceStorm/federation2/msbuild/publisher/publisher.vcxproj index 2313b23f240..a282decf34c 100644 --- a/cpp/test/IceStorm/federation2/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/federation2/msbuild/publisher/publisher.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -271,7 +271,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceStorm/federation2/msbuild/subscriber/subscriber.vcxproj b/cpp/test/IceStorm/federation2/msbuild/subscriber/subscriber.vcxproj index b14250610d7..07d72454d66 100644 --- a/cpp/test/IceStorm/federation2/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/federation2/msbuild/subscriber/subscriber.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -311,7 +311,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj b/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj index fb8cd1e339b..14e2782dc08 100644 --- a/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -271,7 +271,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj b/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj index 52abb4391ed..f64e926b2de 100644 --- a/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj +++ b/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -311,7 +311,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj b/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj index 61ccad1e618..2831e88039e 100644 --- a/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -311,7 +311,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceStorm/repgrid/msbuild/client.vcxproj b/cpp/test/IceStorm/repgrid/msbuild/client.vcxproj index 33d8d622c7d..fcbec435c7b 100644 --- a/cpp/test/IceStorm/repgrid/msbuild/client.vcxproj +++ b/cpp/test/IceStorm/repgrid/msbuild/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -271,7 +271,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceStorm/repstress/msbuild/control/control.vcxproj b/cpp/test/IceStorm/repstress/msbuild/control/control.vcxproj index 5fb3d4631a7..0b8efe0c3af 100644 --- a/cpp/test/IceStorm/repstress/msbuild/control/control.vcxproj +++ b/cpp/test/IceStorm/repstress/msbuild/control/control.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -456,7 +456,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceStorm/repstress/msbuild/publisher/publisher.vcxproj b/cpp/test/IceStorm/repstress/msbuild/publisher/publisher.vcxproj index 491db8390bc..c83d8ad99a0 100644 --- a/cpp/test/IceStorm/repstress/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/repstress/msbuild/publisher/publisher.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -416,7 +416,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceStorm/repstress/msbuild/subscriber/subscriber.vcxproj b/cpp/test/IceStorm/repstress/msbuild/subscriber/subscriber.vcxproj index 3407697c072..03b03476415 100644 --- a/cpp/test/IceStorm/repstress/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/repstress/msbuild/subscriber/subscriber.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -456,7 +456,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceStorm/single/msbuild/publisher/publisher.vcxproj b/cpp/test/IceStorm/single/msbuild/publisher/publisher.vcxproj index b63ab60b91f..0e4aeceee70 100644 --- a/cpp/test/IceStorm/single/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/single/msbuild/publisher/publisher.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -271,7 +271,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceStorm/single/msbuild/subscriber/subscriber.vcxproj b/cpp/test/IceStorm/single/msbuild/subscriber/subscriber.vcxproj index e72a6632f55..45ece22785f 100644 --- a/cpp/test/IceStorm/single/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/single/msbuild/subscriber/subscriber.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -311,7 +311,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceStorm/stress/msbuild/publisher/publisher.vcxproj b/cpp/test/IceStorm/stress/msbuild/publisher/publisher.vcxproj index 7471edc0156..6ecdd64d589 100644 --- a/cpp/test/IceStorm/stress/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/stress/msbuild/publisher/publisher.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -271,7 +271,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceStorm/stress/msbuild/subscriber/subscriber.vcxproj b/cpp/test/IceStorm/stress/msbuild/subscriber/subscriber.vcxproj index dd5f772cdfe..e37d2f938a4 100644 --- a/cpp/test/IceStorm/stress/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/stress/msbuild/subscriber/subscriber.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -311,7 +311,7 @@ <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceUtil/condvar/msbuild/match/match.vcxproj b/cpp/test/IceUtil/condvar/msbuild/match/match.vcxproj index 9d6fb649d0c..4e49db02ba8 100644 --- a/cpp/test/IceUtil/condvar/msbuild/match/match.vcxproj +++ b/cpp/test/IceUtil/condvar/msbuild/match/match.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -162,7 +162,7 @@ </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceUtil/condvar/msbuild/workqueue/workqueue.vcxproj b/cpp/test/IceUtil/condvar/msbuild/workqueue/workqueue.vcxproj index 17d663a56ba..6d808222c39 100644 --- a/cpp/test/IceUtil/condvar/msbuild/workqueue/workqueue.vcxproj +++ b/cpp/test/IceUtil/condvar/msbuild/workqueue/workqueue.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -162,7 +162,7 @@ </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceUtil/ctrlCHandler/msbuild/client.vcxproj b/cpp/test/IceUtil/ctrlCHandler/msbuild/client.vcxproj index ae39d3ec907..291d288b36e 100644 --- a/cpp/test/IceUtil/ctrlCHandler/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/ctrlCHandler/msbuild/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -162,7 +162,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceUtil/inputUtil/msbuild/client.vcxproj b/cpp/test/IceUtil/inputUtil/msbuild/client.vcxproj index 234690bc2b2..6846dc1dc93 100644 --- a/cpp/test/IceUtil/inputUtil/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/inputUtil/msbuild/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -162,7 +162,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceUtil/priority/msbuild/client.vcxproj b/cpp/test/IceUtil/priority/msbuild/client.vcxproj index 42013ebab77..38dfd4d9775 100644 --- a/cpp/test/IceUtil/priority/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/priority/msbuild/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -174,7 +174,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceUtil/sha1/msbuild/client.vcxproj b/cpp/test/IceUtil/sha1/msbuild/client.vcxproj index c49220c95a4..dfcb80f6f9d 100644 --- a/cpp/test/IceUtil/sha1/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/sha1/msbuild/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -162,7 +162,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceUtil/stacktrace/msbuild/client.vcxproj b/cpp/test/IceUtil/stacktrace/msbuild/client.vcxproj index b50aca670a3..435b2db3723 100644 --- a/cpp/test/IceUtil/stacktrace/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/stacktrace/msbuild/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -186,7 +186,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceUtil/thread/msbuild/client.vcxproj b/cpp/test/IceUtil/thread/msbuild/client.vcxproj index ced1dc7be5e..9f17e25cc06 100644 --- a/cpp/test/IceUtil/thread/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/thread/msbuild/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -186,7 +186,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceUtil/timer/msbuild/client.vcxproj b/cpp/test/IceUtil/timer/msbuild/client.vcxproj index 8012b55d5db..f98d47389af 100644 --- a/cpp/test/IceUtil/timer/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/timer/msbuild/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -162,7 +162,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceUtil/unicode/msbuild/client.vcxproj b/cpp/test/IceUtil/unicode/msbuild/client.vcxproj index 8b4b3d012a5..fd31c50b20c 100644 --- a/cpp/test/IceUtil/unicode/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/unicode/msbuild/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -162,7 +162,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/IceUtil/uuid/msbuild/client.vcxproj b/cpp/test/IceUtil/uuid/msbuild/client.vcxproj index 4182c70959d..bd4d7860323 100644 --- a/cpp/test/IceUtil/uuid/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/uuid/msbuild/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -162,7 +162,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Slice/keyword/msbuild/client.vcxproj b/cpp/test/Slice/keyword/msbuild/client.vcxproj index a1d0392f4b5..b0c7ef8568e 100644 --- a/cpp/test/Slice/keyword/msbuild/client.vcxproj +++ b/cpp/test/Slice/keyword/msbuild/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -311,7 +311,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Slice/macros/msbuild/client.vcxproj b/cpp/test/Slice/macros/msbuild/client.vcxproj index 2fae1eb54d9..3354c27f082 100644 --- a/cpp/test/Slice/macros/msbuild/client.vcxproj +++ b/cpp/test/Slice/macros/msbuild/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -311,7 +311,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Slice/parser/msbuild/client.vcxproj b/cpp/test/Slice/parser/msbuild/client.vcxproj index 5e03f3a3f13..31e1a5e46ba 100644 --- a/cpp/test/Slice/parser/msbuild/client.vcxproj +++ b/cpp/test/Slice/parser/msbuild/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -458,7 +458,7 @@ </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Slice/structure/msbuild/client.vcxproj b/cpp/test/Slice/structure/msbuild/client.vcxproj index 240f3b618ef..f1f15108f43 100644 --- a/cpp/test/Slice/structure/msbuild/client.vcxproj +++ b/cpp/test/Slice/structure/msbuild/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -311,7 +311,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/Slice/utf8BOM/msbuild/client.vcxproj b/cpp/test/Slice/utf8BOM/msbuild/client.vcxproj index 4fc4c76dbe2..74d0cd7bdc4 100644 --- a/cpp/test/Slice/utf8BOM/msbuild/client.vcxproj +++ b/cpp/test/Slice/utf8BOM/msbuild/client.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -310,7 +310,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> diff --git a/cpp/test/uwp/msbuild/uwp.vcxproj b/cpp/test/uwp/msbuild/uwp.vcxproj index 6a5904900ea..3647f10b18c 100644 --- a/cpp/test/uwp/msbuild/uwp.vcxproj +++ b/cpp/test/uwp/msbuild/uwp.vcxproj @@ -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.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" /> <PropertyGroup Label="Globals"> <ProjectGuid>{3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}</ProjectGuid> <RootNamespace>uwp</RootNamespace> @@ -1536,12 +1536,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> <ImportGroup Label="ExtensionTargets"> - <Import Project="..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" /> - <Import Project="..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" /> + <Import Project="..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> <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> |