diff options
author | Jose <jose@zeroc.com> | 2018-02-08 18:32:13 +0100 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2018-02-08 18:32:13 +0100 |
commit | 4fe93b575e36a2d0735543ae7dd4450757f48daf (patch) | |
tree | 95d08a2a6ebc831f89fa8fc057cf55fd17f52d2f /csharp/test/Ice/seqMapping | |
parent | Merge branch '3.7' of github.com:zeroc-ice/ice into 3.7 (diff) | |
download | ice-4fe93b575e36a2d0735543ae7dd4450757f48daf.tar.bz2 ice-4fe93b575e36a2d0735543ae7dd4450757f48daf.tar.xz ice-4fe93b575e36a2d0735543ae7dd4450757f48daf.zip |
Update msbuild projects to use 5.0.2 builder
Diffstat (limited to 'csharp/test/Ice/seqMapping')
15 files changed, 30 insertions, 30 deletions
diff --git a/csharp/test/Ice/seqMapping/msbuild/client/net45/client.csproj b/csharp/test/Ice/seqMapping/msbuild/client/net45/client.csproj index 482c2555850..5f7867e266b 100644 --- a/csharp/test/Ice/seqMapping/msbuild/client/net45/client.csproj +++ b/csharp/test/Ice/seqMapping/msbuild/client/net45/client.csproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.props')"/> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.props')"/> <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/> <PropertyGroup Label="Globals"> <NuGetPackageImportStamp> @@ -74,8 +74,8 @@ <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.props'))"/> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.targets'))"/> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.props'))"/> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.targets'))"/> </Target> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.targets')"/> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.targets')"/> </Project> diff --git a/csharp/test/Ice/seqMapping/msbuild/client/net45/packages.config b/csharp/test/Ice/seqMapping/msbuild/client/net45/packages.config index ecfaac17929..cf2ecf6c286 100644 --- a/csharp/test/Ice/seqMapping/msbuild/client/net45/packages.config +++ b/csharp/test/Ice/seqMapping/msbuild/client/net45/packages.config @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <packages> <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" /> - <package id="zeroc.icebuilder.msbuild" version="5.0.1" targetFramework="net451" /> + <package id="zeroc.icebuilder.msbuild" version="5.0.2" targetFramework="net451" /> </packages>
\ No newline at end of file diff --git a/csharp/test/Ice/seqMapping/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/seqMapping/msbuild/client/netstandard2.0/client.csproj index f7fb906a21f..89744ab6cb6 100644 --- a/csharp/test/Ice/seqMapping/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/seqMapping/msbuild/client/netstandard2.0/client.csproj @@ -16,7 +16,7 @@ <Compile Include="../../../Custom.cs"/> <Compile Include="../../../Twoways.cs"/> <Compile Include="../../../TwowaysAMI.cs"/> - <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.1"/> + <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.2"/> <SliceCompile Include="../../../Test.ice"/> </ItemGroup> <ItemGroup> diff --git a/csharp/test/Ice/seqMapping/msbuild/collocated/net45/collocated.csproj b/csharp/test/Ice/seqMapping/msbuild/collocated/net45/collocated.csproj index 0d5b9b786c0..ed8043eca76 100644 --- a/csharp/test/Ice/seqMapping/msbuild/collocated/net45/collocated.csproj +++ b/csharp/test/Ice/seqMapping/msbuild/collocated/net45/collocated.csproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.props')"/> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.props')"/> <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/> <PropertyGroup Label="Globals"> <NuGetPackageImportStamp> @@ -89,8 +89,8 @@ <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.props'))"/> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.targets'))"/> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.props'))"/> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.targets'))"/> </Target> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.targets')"/> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.targets')"/> </Project> diff --git a/csharp/test/Ice/seqMapping/msbuild/collocated/net45/packages.config b/csharp/test/Ice/seqMapping/msbuild/collocated/net45/packages.config index ecfaac17929..cf2ecf6c286 100644 --- a/csharp/test/Ice/seqMapping/msbuild/collocated/net45/packages.config +++ b/csharp/test/Ice/seqMapping/msbuild/collocated/net45/packages.config @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <packages> <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" /> - <package id="zeroc.icebuilder.msbuild" version="5.0.1" targetFramework="net451" /> + <package id="zeroc.icebuilder.msbuild" version="5.0.2" targetFramework="net451" /> </packages>
\ No newline at end of file diff --git a/csharp/test/Ice/seqMapping/msbuild/collocated/netstandard2.0/collocated.csproj b/csharp/test/Ice/seqMapping/msbuild/collocated/netstandard2.0/collocated.csproj index d1ff0259240..36e26512344 100644 --- a/csharp/test/Ice/seqMapping/msbuild/collocated/netstandard2.0/collocated.csproj +++ b/csharp/test/Ice/seqMapping/msbuild/collocated/netstandard2.0/collocated.csproj @@ -17,7 +17,7 @@ <Compile Include="../../../TwowaysAMI.cs"/> <Compile Include="../../../Collocated.cs"/> <Compile Include="../../../Custom.cs"/> - <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.1"/> + <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.2"/> <SliceCompile Include="../../../Test.ice"/> </ItemGroup> <ItemGroup> diff --git a/csharp/test/Ice/seqMapping/msbuild/serializable/net45/packages.config b/csharp/test/Ice/seqMapping/msbuild/serializable/net45/packages.config index ecfaac17929..cf2ecf6c286 100644 --- a/csharp/test/Ice/seqMapping/msbuild/serializable/net45/packages.config +++ b/csharp/test/Ice/seqMapping/msbuild/serializable/net45/packages.config @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <packages> <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" /> - <package id="zeroc.icebuilder.msbuild" version="5.0.1" targetFramework="net451" /> + <package id="zeroc.icebuilder.msbuild" version="5.0.2" targetFramework="net451" /> </packages>
\ No newline at end of file diff --git a/csharp/test/Ice/seqMapping/msbuild/serializable/net45/serializable.csproj b/csharp/test/Ice/seqMapping/msbuild/serializable/net45/serializable.csproj index c78fcf0812f..4ce69657e4d 100644 --- a/csharp/test/Ice/seqMapping/msbuild/serializable/net45/serializable.csproj +++ b/csharp/test/Ice/seqMapping/msbuild/serializable/net45/serializable.csproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.props')"/> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.props')"/> <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/> <PropertyGroup Label="Globals"> <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> @@ -48,8 +48,8 @@ <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.props'))"/> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.targets'))"/> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.props'))"/> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.targets'))"/> </Target> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.targets')"/> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.targets')"/> </Project> diff --git a/csharp/test/Ice/seqMapping/msbuild/serializable/netstandard2.0/serializable.csproj b/csharp/test/Ice/seqMapping/msbuild/serializable/netstandard2.0/serializable.csproj index 4d318f57174..dfbaa1ec691 100644 --- a/csharp/test/Ice/seqMapping/msbuild/serializable/netstandard2.0/serializable.csproj +++ b/csharp/test/Ice/seqMapping/msbuild/serializable/netstandard2.0/serializable.csproj @@ -12,7 +12,7 @@ <Compile Include="../../../Serializable.cs"/> </ItemGroup> <ItemGroup> - <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.1"/> + <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.2"/> </ItemGroup> <Choose> <When Condition="'$(ICE_BIN_DIST)' == 'all'"> diff --git a/csharp/test/Ice/seqMapping/msbuild/server/net45/packages.config b/csharp/test/Ice/seqMapping/msbuild/server/net45/packages.config index ecfaac17929..cf2ecf6c286 100644 --- a/csharp/test/Ice/seqMapping/msbuild/server/net45/packages.config +++ b/csharp/test/Ice/seqMapping/msbuild/server/net45/packages.config @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <packages> <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" /> - <package id="zeroc.icebuilder.msbuild" version="5.0.1" targetFramework="net451" /> + <package id="zeroc.icebuilder.msbuild" version="5.0.2" targetFramework="net451" /> </packages>
\ No newline at end of file diff --git a/csharp/test/Ice/seqMapping/msbuild/server/net45/server.csproj b/csharp/test/Ice/seqMapping/msbuild/server/net45/server.csproj index 5b719678b5b..987ce6a617c 100644 --- a/csharp/test/Ice/seqMapping/msbuild/server/net45/server.csproj +++ b/csharp/test/Ice/seqMapping/msbuild/server/net45/server.csproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.props')"/> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.props')"/> <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/> <PropertyGroup Label="Globals"> <NuGetPackageImportStamp> @@ -68,8 +68,8 @@ <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.props'))"/> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.targets'))"/> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.props'))"/> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.targets'))"/> </Target> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.targets')"/> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.targets')"/> </Project> diff --git a/csharp/test/Ice/seqMapping/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/seqMapping/msbuild/server/netstandard2.0/server.csproj index c4546b77707..d2f1b04bff4 100644 --- a/csharp/test/Ice/seqMapping/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/seqMapping/msbuild/server/netstandard2.0/server.csproj @@ -14,7 +14,7 @@ <Compile Include="../../../Custom.cs"/> <Compile Include="../../../MyClassI.cs"/> <Compile Include="../../../Server.cs"/> - <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.1"/> + <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.2"/> <SliceCompile Include="../../../Test.ice"/> </ItemGroup> <ItemGroup> diff --git a/csharp/test/Ice/seqMapping/msbuild/serveramd/net45/packages.config b/csharp/test/Ice/seqMapping/msbuild/serveramd/net45/packages.config index ecfaac17929..cf2ecf6c286 100644 --- a/csharp/test/Ice/seqMapping/msbuild/serveramd/net45/packages.config +++ b/csharp/test/Ice/seqMapping/msbuild/serveramd/net45/packages.config @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <packages> <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" /> - <package id="zeroc.icebuilder.msbuild" version="5.0.1" targetFramework="net451" /> + <package id="zeroc.icebuilder.msbuild" version="5.0.2" targetFramework="net451" /> </packages>
\ No newline at end of file diff --git a/csharp/test/Ice/seqMapping/msbuild/serveramd/net45/serveramd.csproj b/csharp/test/Ice/seqMapping/msbuild/serveramd/net45/serveramd.csproj index 726405049bb..cbdd46337e2 100644 --- a/csharp/test/Ice/seqMapping/msbuild/serveramd/net45/serveramd.csproj +++ b/csharp/test/Ice/seqMapping/msbuild/serveramd/net45/serveramd.csproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.props')"/> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.props')"/> <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/> <PropertyGroup Label="Globals"> <NuGetPackageImportStamp> @@ -68,8 +68,8 @@ <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.props'))"/> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.targets'))"/> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.props'))"/> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.targets'))"/> </Target> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.targets')"/> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.targets')"/> </Project> diff --git a/csharp/test/Ice/seqMapping/msbuild/serveramd/netstandard2.0/serveramd.csproj b/csharp/test/Ice/seqMapping/msbuild/serveramd/netstandard2.0/serveramd.csproj index c0480c348e4..fddd387cea7 100644 --- a/csharp/test/Ice/seqMapping/msbuild/serveramd/netstandard2.0/serveramd.csproj +++ b/csharp/test/Ice/seqMapping/msbuild/serveramd/netstandard2.0/serveramd.csproj @@ -14,7 +14,7 @@ <Compile Include="../../../Custom.cs"/> <Compile Include="../../../MyClassAMDI.cs"/> <Compile Include="../../../ServerAMD.cs"/> - <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.1"/> + <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.2"/> <SliceCompile Include="../../../TestAMD.ice"/> </ItemGroup> <ItemGroup> |