diff options
Diffstat (limited to 'cpp/test/IceUtil/stacktrace')
5 files changed, 26 insertions, 26 deletions
diff --git a/cpp/test/IceUtil/stacktrace/StackTrace.debug.macOS b/cpp/test/IceUtil/stacktrace/StackTrace.debug.macOS index 74c8226d375..d583b1ae244 100644 --- a/cpp/test/IceUtil/stacktrace/StackTrace.debug.macOS +++ b/cpp/test/IceUtil/stacktrace/StackTrace.debug.macOS @@ -1,7 +1,7 @@ - 0 IceUtil::Exception::Exception(char const*, int) in libIce.3.7.1.dylib - 1 IceUtil::ExceptionHelper<IceUtil::NullHandleException>::ExceptionHelper(char const*, int) in libIce.3.7.1.dylib - 2 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7.1.dylib - 3 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7.1.dylib + 0 IceUtil::Exception::Exception(char const*, int) in libIce.3.7.2.dylib + 1 IceUtil::ExceptionHelper<IceUtil::NullHandleException>::ExceptionHelper(char const*, int) in libIce.3.7.2.dylib + 2 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7.2.dylib + 3 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7.2.dylib 4 (anonymous namespace)::Thrower::fifth() in client 5 (anonymous namespace)::Thrower::forth() in client 6 (anonymous namespace)::Thrower::third() in client diff --git a/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode10.macOS b/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode10.macOS index 7b581ec5a20..42e5366de0f 100644 --- a/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode10.macOS +++ b/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode10.macOS @@ -1,4 +1,4 @@ - 0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7.1.dylib + 0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7.2.dylib 1 (anonymous namespace)::Thrower::fifth() in client 2 (anonymous namespace)::Thrower::forth() in client 3 (anonymous namespace)::Thrower::third() in client diff --git a/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode9.macOS b/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode9.macOS index 2f4ae2a8cd0..54d694c8b55 100644 --- a/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode9.macOS +++ b/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode9.macOS @@ -1,3 +1,3 @@ - 0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7.1.dylib + 0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7.2.dylib 1 Client::run(int, char**) in client 2 int Test::runTest<Client>(int, char**) in client diff --git a/cpp/test/IceUtil/stacktrace/msbuild/client.vcxproj b/cpp/test/IceUtil/stacktrace/msbuild/client.vcxproj index fc84a29783b..2bd618fee46 100644 --- a/cpp/test/IceUtil/stacktrace/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/stacktrace/msbuild/client.vcxproj @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,10 +89,10 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </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" /> @@ -212,13 +212,13 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceUtil/stacktrace/msbuild/packages.config b/cpp/test/IceUtil/stacktrace/msbuild/packages.config index 3cbc24811b7..84ed779482b 100644 --- a/cpp/test/IceUtil/stacktrace/msbuild/packages.config +++ b/cpp/test/IceUtil/stacktrace/msbuild/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> </packages>
\ No newline at end of file |