diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-06-02 19:01:11 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-06-02 19:01:11 -0400 |
| commit | 76a730ab18d2cb301b4fcdce14caa92f61a9e6c9 (patch) | |
| tree | 4ddd4b443840017d5da40faf809765eb8147e2dd | |
| parent | Fixed warning when compiling with optimization (diff) | |
| download | ice-76a730ab18d2cb301b4fcdce14caa92f61a9e6c9.tar.bz2 ice-76a730ab18d2cb301b4fcdce14caa92f61a9e6c9.tar.xz ice-76a730ab18d2cb301b4fcdce14caa92f61a9e6c9.zip | |
Fixed 3.7a2 version in msbuild props files
| -rw-r--r-- | config/ice.props | 6 | ||||
| -rw-r--r-- | cpp/msbuild/ice.cpp.props | 6 | ||||
| -rw-r--r-- | cpp/msbuild/zeroc.ice.uwp.props | 4 | ||||
| -rw-r--r-- | cpp/msbuild/zeroc.ice.v120.props | 8 | ||||
| -rw-r--r-- | cpp/msbuild/zeroc.ice.v140.props | 8 | ||||
| -rw-r--r-- | csharp/msbuild/zeroc.ice.net.props | 8 |
6 files changed, 20 insertions, 20 deletions
diff --git a/config/ice.props b/config/ice.props index e0955c842ee..36f0a3e5b14 100644 --- a/config/ice.props +++ b/config/ice.props @@ -2,9 +2,9 @@ <!-- Copyright (c) 2009-2016 ZeroC, Inc. All rights reserved. --> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <IceVersion>3.7a0</IceVersion> - <IceIntVersion>30751</IceIntVersion> + <IceVersion>3.7a2</IceVersion> + <IceIntVersion>30752</IceIntVersion> <IceVersionMM>3.7</IceVersionMM> - <IceSoVersion>37a0</IceSoVersion> + <IceSoVersion>37a2</IceSoVersion> </PropertyGroup> </Project> diff --git a/cpp/msbuild/ice.cpp.props b/cpp/msbuild/ice.cpp.props index be268c3da4e..847f00a36e3 100644 --- a/cpp/msbuild/ice.cpp.props +++ b/cpp/msbuild/ice.cpp.props @@ -5,10 +5,10 @@ yes, set IceHome to point to this source distribution --> <PropertyGroup Condition="'$(UseBinDist)' != 'yes' or '$(Ice_BuildingSrc)' == yes"> <IceHome>$(MSBuildThisFileDirectory)..\..</IceHome> - <IceVersion>3.7a0</IceVersion> - <IceIntVersion>30751</IceIntVersion> + <IceVersion>3.7a2</IceVersion> + <IceIntVersion>30752</IceIntVersion> <IceVersionMM>3.7</IceVersionMM> - <IceSoVersion>37a0</IceSoVersion> + <IceSoVersion>37a2</IceSoVersion> </PropertyGroup> <!-- Define some common properties --> diff --git a/cpp/msbuild/zeroc.ice.uwp.props b/cpp/msbuild/zeroc.ice.uwp.props index dfa3f1880eb..8b85a27b66d 100644 --- a/cpp/msbuild/zeroc.ice.uwp.props +++ b/cpp/msbuild/zeroc.ice.uwp.props @@ -12,8 +12,8 @@ <PropertyGroup> - <IceVersion>3.7a0</IceVersion> - <IceIntVersion>30751</IceIntVersion> + <IceVersion>3.7a2</IceVersion> + <IceIntVersion>30752</IceIntVersion> <IceVersionMM>3.7</IceVersionMM> <IceHome>$(MSBuildThisFileDirectory)..\..</IceHome> diff --git a/cpp/msbuild/zeroc.ice.v120.props b/cpp/msbuild/zeroc.ice.v120.props index 65ad225bbdc..a1320c1e56e 100644 --- a/cpp/msbuild/zeroc.ice.v120.props +++ b/cpp/msbuild/zeroc.ice.v120.props @@ -12,11 +12,11 @@ </PropertyGroup> <PropertyGroup Condition="'$(PlatformToolset)' == 'v120'"> - <IceVersion>3.7a0</IceVersion> - <IceIntVersion>30751</IceIntVersion> + <IceVersion>3.7a2</IceVersion> + <IceIntVersion>30752</IceIntVersion> <IceVersionMM>3.7</IceVersionMM> - <IceSoVersion>37a0</IceSoVersion> - <IceNugetPackageVersion>3.7.0.0</IceNugetPackageVersion> + <IceSoVersion>37a2</IceSoVersion> + <IceNugetPackageVersion>3.7.52.0</IceNugetPackageVersion> <IceHome>$(MSBuildThisFileDirectory)..\..</IceHome> <SliceLibraryName>slice$(IceSoVersion)$(Ice_LibrarySuffix).dll</SliceLibraryName> diff --git a/cpp/msbuild/zeroc.ice.v140.props b/cpp/msbuild/zeroc.ice.v140.props index bbe040a46aa..1b1850f86f0 100644 --- a/cpp/msbuild/zeroc.ice.v140.props +++ b/cpp/msbuild/zeroc.ice.v140.props @@ -11,11 +11,11 @@ </PropertyGroup> <PropertyGroup Condition="'$(PlatformToolset)' == 'v140'"> - <IceVersion>3.7a0</IceVersion> - <IceIntVersion>30751</IceIntVersion> + <IceVersion>3.7a2</IceVersion> + <IceIntVersion>30752</IceIntVersion> <IceVersionMM>3.7</IceVersionMM> - <IceSoVersion>37a0</IceSoVersion> - <IceNugetPackageVersion>3.7.0.0</IceNugetPackageVersion> + <IceSoVersion>37a2</IceSoVersion> + <IceNugetPackageVersion>3.7.52.0</IceNugetPackageVersion> <IceHome>$(MSBuildThisFileDirectory)..\..</IceHome> <IceToolsPath>$(IceHome)\build\native\bin\Win32\Release</IceToolsPath> diff --git a/csharp/msbuild/zeroc.ice.net.props b/csharp/msbuild/zeroc.ice.net.props index bb52795f568..3ff978c7dfa 100644 --- a/csharp/msbuild/zeroc.ice.net.props +++ b/csharp/msbuild/zeroc.ice.net.props @@ -2,11 +2,11 @@ <!-- Copyright (c) 2009-2016 ZeroC, Inc. All rights reserved. --> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <IceVersion>3.7a0</IceVersion> - <IceIntVersion>30751</IceIntVersion> + <IceVersion>3.7a2</IceVersion> + <IceIntVersion>30752</IceIntVersion> <IceVersionMM>3.7</IceVersionMM> - <IceSoVersion>37a0</IceSoVersion> - <IceNugetPackageVersion>3.7.0.0</IceNugetPackageVersion> + <IceSoVersion>37a2</IceSoVersion> + <IceNugetPackageVersion>3.7.52.0</IceNugetPackageVersion> <IceHome>$(MSBuildThisFileDirectory)..</IceHome> <IceToolsPath>$(IceHome)\tools</IceToolsPath> <IceAssembliesDir>$(IceHome)\lib</IceAssembliesDir> |