diff options
author | Jose <jose@zeroc.com> | 2017-04-13 20:52:16 +0200 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2017-04-13 20:52:16 +0200 |
commit | 1c4d1d3139fed8e41dcb6b4838eb69f5ef75b4c8 (patch) | |
tree | d5b16aea695d7d1471a5e352c2d02e48f3bf06aa | |
parent | Disable IceDB linker warning about lmdb build without debug info (diff) | |
download | ice-1c4d1d3139fed8e41dcb6b4838eb69f5ef75b4c8.tar.bz2 ice-1c4d1d3139fed8e41dcb6b4838eb69f5ef75b4c8.tar.xz ice-1c4d1d3139fed8e41dcb6b4838eb69f5ef75b4c8.zip |
(ICE-7802) Fix NuGet spelling
-rw-r--r-- | CHANGELOG-3.6.md | 2 | ||||
-rw-r--r-- | cpp/BuildInstructionsWindows.md | 20 | ||||
-rw-r--r-- | cpp/msbuild/ice.proj | 38 | ||||
-rw-r--r-- | csharp/BuildInstructions.md | 8 | ||||
-rw-r--r-- | csharp/msbuild/ice.proj | 10 | ||||
-rw-r--r-- | java-compat/msbuild/ice.proj | 2 | ||||
-rw-r--r-- | java/msbuild/ice.proj | 2 | ||||
-rw-r--r-- | php/msbuild/ice.proj | 12 | ||||
-rw-r--r-- | python/msbuild/ice.proj | 8 |
9 files changed, 51 insertions, 51 deletions
diff --git a/CHANGELOG-3.6.md b/CHANGELOG-3.6.md index 47e95c25591..af4ac96beaa 100644 --- a/CHANGELOG-3.6.md +++ b/CHANGELOG-3.6.md @@ -274,7 +274,7 @@ These are the changes since Ice 3.6.0. time. Your application will need to link with the plug-in's dynamic library if it uses the register function. -- C++ source builds in Windows now use third-party packages from Nuget +- C++ source builds in Windows now use third-party packages from NuGet (https://www.nuget.org). - Windows C++ builds now install the required third-party dependencies to the diff --git a/cpp/BuildInstructionsWindows.md b/cpp/BuildInstructionsWindows.md index 284c53ff2a0..85230f77fec 100644 --- a/cpp/BuildInstructionsWindows.md +++ b/cpp/BuildInstructionsWindows.md @@ -27,10 +27,10 @@ Ice has dependencies on a number of third-party libraries: - [mcpp][6] 2.7.2 (with patches) You do not need to build these packages yourself, as ZeroC supplies -[Nuget][7] packages for all these third party dependencies. +[NuGet][7] packages for all these third party dependencies. -The Ice build system for Windows downloads and installs the Nuget command line -executable and these Nuget packages when you build Ice for C++. The third-party +The Ice build system for Windows downloads and installs the NuGet command line +executable and these NuGet packages when you build Ice for C++. The third-party packages are installed in the ``ice/cpp/msbuild/packages`` folder. ## Building Ice for C++ @@ -83,7 +83,7 @@ If you want to authenticode sign the Ice binaries you must set SIGN_CERTIFICATE SIGN_PASSWORD environment variables to the authenticode certificate path and the certificate password respectivelly before build. -It is also possible to build the test suite using the binary Nuget packages, use: +It is also possible to build the test suite using the binary NuGet packages, use: MSbuild msbuild\ice.proj /p:ICE_BIN_DIST=all @@ -134,22 +134,22 @@ with the following command: MSbuild msbuild\ice.proj /t:UWPBuildDist /p:BuildAllConfigurations=yes -It is also possible to build the test suite using the binary Nuget packages, use: +It is also possible to build the test suite using the binary NuGet packages, use: MSbuild msbuild\ice.proj /t:UWPBuild /p:ICE_BIN_DIST=all -## Nuget packages +## NuGet packages -To create a Nuget package for the distribution use the following command: +To create a NuGet package for the distribution use the following command: - MSbuild msbuild\ice.proj /t:NugetPack /p:BuildAllConfigurations=yes + MSbuild msbuild\ice.proj /t:NuGetPack /p:BuildAllConfigurations=yes This will create `zeroc.ice.v120\zeroc.ice.v120.nupkg` or `zeroc.ice.v140\zeroc.ice.v140.nupkg` depending of the compiler version you are using to build the package. -To create UWP Nuget packages you must use the `UWPNugetPack` target instead: +To create UWP NuGet packages you must use the `UWPNuGetPack` target instead: - MSbuild msbuild\ice.proj /t:UWPNugetPack /p:BuildAllConfigurations=yes + MSbuild msbuild\ice.proj /t:UWPNuGetPack /p:BuildAllConfigurations=yes This will create `zeroc.ice.uwp\zeroc.ice.uwp.nupkg`, `zeroc.ice.uwp.arm\zeroc.ice.uwp.arm.nupkg`, `zeroc.ice.uwp.x64\zeroc.ice.uwp.x64.nupkg` and `zeroc.ice.uwp.x86\zeroc.ice.uwp.x96.nupkg` packages. diff --git a/cpp/msbuild/ice.proj b/cpp/msbuild/ice.proj index 12d8ab70d0b..45d3ab56482 100644 --- a/cpp/msbuild/ice.proj +++ b/cpp/msbuild/ice.proj @@ -20,19 +20,19 @@ <!-- - Restore Nuget packages. + Restore NuGet packages. --> - <Target Name="NugetRestore" DependsOnTargets="GetNuget"> - <Exec Command="$(NugetExe) restore $(MSBuildThisFileDirectory)ice.$(DefaultPlatformToolset).sln"/> + <Target Name="NuGetRestore" DependsOnTargets="GetNuGet"> + <Exec Command="$(NuGetExe) restore $(MSBuildThisFileDirectory)ice.$(DefaultPlatformToolset).sln"/> </Target> - <Target Name="TestNugetRestore" DependsOnTargets="GetNuget" Condition="'$(ICE_BIN_DIST)' == 'all'"> - <Exec Command="$(NugetExe) restore $(MSBuildThisFileDirectory)ice.test.sln"/> - <Exec Command="$(NugetExe) restore $(MSBuildThisFileDirectory)ice.openssl.test.sln"/> + <Target Name="TestNuGetRestore" DependsOnTargets="GetNuGet" Condition="'$(ICE_BIN_DIST)' == 'all'"> + <Exec Command="$(NuGetExe) restore $(MSBuildThisFileDirectory)ice.test.sln"/> + <Exec Command="$(NuGetExe) restore $(MSBuildThisFileDirectory)ice.openssl.test.sln"/> </Target> - <Target Name="UWPTestNugetRestore" DependsOnTargets="GetNuget" Condition="'$(ICE_BIN_DIST)' == 'all'"> - <Exec Command="$(NugetExe) restore $(MSBuildThisFileDirectory)ice.testuwp.sln"/> + <Target Name="UWPTestNuGetRestore" DependsOnTargets="GetNuGet" Condition="'$(ICE_BIN_DIST)' == 'all'"> + <Exec Command="$(NuGetExe) restore $(MSBuildThisFileDirectory)ice.testuwp.sln"/> </Target> <!-- @@ -201,7 +201,7 @@ </Choose> <!-- Build distribution targets --> - <Target Name="BuildDist" DependsOnTargets="NugetRestore" + <Target Name="BuildDist" DependsOnTargets="NuGetRestore" Condition="'$(ICE_BIN_DIST)' != 'all'"> <MSBuild Projects="@(DistSolution)" BuildInParallel="true" @@ -218,7 +218,7 @@ </Target> <!-- Build test solution --> - <Target Name="Build" DependsOnTargets="TestNugetRestore;BuildDist"> + <Target Name="Build" DependsOnTargets="TestNuGetRestore;BuildDist"> <MSBuild Projects="@(TestSolution)" BuildInParallel="true" Properties="%(Properties)" /> @@ -241,7 +241,7 @@ </Target> <!-- Create nuget packages --> - <Target Name="NugetPack" + <Target Name="NuGetPack" DependsOnTargets="BuildDist" Condition="$(BuildAllConfigurations) == 'yes'"> <RemoveDir Directories="zeroc.ice.$(DefaultPlatformToolset)" /> @@ -261,14 +261,14 @@ DestinationFiles="zeroc.ice.$(DefaultPlatformToolset)\build\native\zeroc.ice.$(DefaultPlatformToolset).props" /> <Copy SourceFiles="zeroc.ice.$(DefaultPlatformToolset).targets" DestinationFiles="zeroc.ice.$(DefaultPlatformToolset)\build\native\zeroc.ice.$(DefaultPlatformToolset).targets" /> - <Exec Command="$(NugetExe) pack -NoPackageAnalysis -NonInteractive" + <Exec Command="$(NuGetExe) pack -NoPackageAnalysis -NonInteractive" WorkingDirectory="zeroc.ice.$(DefaultPlatformToolset)"/> </Target> <!-- UWP targets --> <!-- Build UWP distribution targetes --> - <Target Name="UWPBuildDist" DependsOnTargets="NugetRestore" + <Target Name="UWPBuildDist" DependsOnTargets="NuGetRestore" Condition="'$(ICE_BIN_DIST)' != 'all'"> <!-- UWP dist soultions require the slice2cpp translator from dist solutions --> <MSBuild Projects="@(DistSolution)" @@ -291,7 +291,7 @@ </Target> <!-- Build UWP test solution --> - <Target Name="UWPBuild" DependsOnTargets="UWPTestNugetRestore;UWPBuildDist"> + <Target Name="UWPBuild" DependsOnTargets="UWPTestNuGetRestore;UWPBuildDist"> <MSBuild Projects="@(UWPTestSolution)" BuildInParallel="true" Properties="%(Properties)" /> @@ -302,8 +302,8 @@ <MSBuild Projects="@(UWPTestSolution)" BuildInParallel="true" Targets="Clean" Properties="%(Properties)" /> </Target> - <!-- Create UWP Nuget packages --> - <Target Name="UWPNugetPack" + <!-- Create UWP NuGet packages --> + <Target Name="UWPNuGetPack" DependsOnTargets="UWPBuildDist" Condition="$(BuildAllConfigurations) == 'yes' and '$(UWPCompiler)' == 'yes' "> @@ -320,7 +320,7 @@ DestinationFolder="zeroc.ice.uwp.$(DefaultPlatformToolset).x86" /> <Copy SourceFiles="zeroc.ice.uwp.$(DefaultPlatformToolset).targets" DestinationFiles="zeroc.ice.uwp.$(DefaultPlatformToolset).x86\build\native\zeroc.ice.uwp.$(DefaultPlatformToolset).x86.targets" /> - <Exec Command="$(NugetExe) pack -NoPackageAnalysis -NonInteractive" + <Exec Command="$(NuGetExe) pack -NoPackageAnalysis -NonInteractive" WorkingDirectory="zeroc.ice.uwp.$(DefaultPlatformToolset).x86"/> <!-- x64 package --> @@ -332,7 +332,7 @@ DestinationFolder="zeroc.ice.uwp.$(DefaultPlatformToolset).x64" /> <Copy SourceFiles="zeroc.ice.uwp.$(DefaultPlatformToolset).targets" DestinationFiles="zeroc.ice.uwp.$(DefaultPlatformToolset).x64\build\native\zeroc.ice.uwp.$(DefaultPlatformToolset).x64.targets" /> - <Exec Command="$(NugetExe) pack -NoPackageAnalysis -NonInteractive" + <Exec Command="$(NuGetExe) pack -NoPackageAnalysis -NonInteractive" WorkingDirectory="zeroc.ice.uwp.$(DefaultPlatformToolset).x64"/> <!-- noarch package --> @@ -342,7 +342,7 @@ DestinationFolder="zeroc.ice.uwp.$(DefaultPlatformToolset)" /> <Copy SourceFiles="zeroc.ice.uwp.$(DefaultPlatformToolset).props" DestinationFiles="zeroc.ice.uwp.$(DefaultPlatformToolset)\build\native\zeroc.ice.uwp.$(DefaultPlatformToolset).props" /> - <Exec Command="$(NugetExe) pack -NoPackageAnalysis -NonInteractive" + <Exec Command="$(NuGetExe) pack -NoPackageAnalysis -NonInteractive" WorkingDirectory="zeroc.ice.uwp.$(DefaultPlatformToolset)"/> </Target> diff --git a/csharp/BuildInstructions.md b/csharp/BuildInstructions.md index 53c2849d4a1..69e3c57176a 100644 --- a/csharp/BuildInstructions.md +++ b/csharp/BuildInstructions.md @@ -31,7 +31,7 @@ To build the Ice assemblies, services and tests, run MSBuild msbuild\ice.proj -It is also possible to build the test suite using the binary Nuget packages, use: +It is also possible to build the test suite using the binary NuGet packages, use: MSbuild msbuild\ice.proj /p:ICE_BIN_DIST=all @@ -65,11 +65,11 @@ configurations. MSBuild msbuild\ice.proj /p:Configuration=Release-Managed -## Nuget packages +## NuGet packages -To create a Nuget package for the distribution use the following command: +To create a NuGet package for the distribution use the following command: - MSbuild msbuild\ice.proj /t:NugetPack + MSbuild msbuild\ice.proj /t:NuGetPack This will create `zeroc.ice.net\zeroc.ice.net.nupkg`. diff --git a/csharp/msbuild/ice.proj b/csharp/msbuild/ice.proj index 2b6ad161dbd..0f3436a4c98 100644 --- a/csharp/msbuild/ice.proj +++ b/csharp/msbuild/ice.proj @@ -7,8 +7,8 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\config\Ice.common.targets" /> - <Target Name="TestNugetRestore" DependsOnTargets="GetNuget" Condition="'$(ICE_BIN_DIST)' == 'all'"> - <Exec Command="$(NugetExe) restore $(MSBuildThisFileDirectory)ice.test.sln"/> + <Target Name="TestNuGetRestore" DependsOnTargets="GetNuGet" Condition="'$(ICE_BIN_DIST)' == 'all'"> + <Exec Command="$(NuGetExe) restore $(MSBuildThisFileDirectory)ice.test.sln"/> </Target> <ItemGroup> @@ -34,7 +34,7 @@ Targets="Clean" /> </Target> - <Target Name="Build" DependsOnTargets="TestNugetRestore;BuildDist"> + <Target Name="Build" DependsOnTargets="TestNuGetRestore;BuildDist"> <MSBuild Projects="@(TestSoution)" BuildInParallel="true" Properties="%(Properties)" /> @@ -46,7 +46,7 @@ <Import Project="$(MSBuildThisFileDirectory)ice.common.targets" /> - <Target Name="NugetPack" DependsOnTargets="BuildDist"> + <Target Name="NuGetPack" DependsOnTargets="BuildDist"> <RemoveDir Directories="zeroc.ice.net" /> <MSBuild Projects="ice.nuget.targets" Properties="PackageDirectory=zeroc.ice.net"/> @@ -72,7 +72,7 @@ <Copy SourceFiles="zeroc.ice.net.props" DestinationFiles="zeroc.ice.net\build\zeroc.ice.net.props" /> - <Exec Command="$(NugetExe) pack -NoPackageAnalysis -NonInteractive" + <Exec Command="$(NuGetExe) pack -NoPackageAnalysis -NonInteractive" WorkingDirectory="zeroc.ice.net"/> </Target> </Project> diff --git a/java-compat/msbuild/ice.proj b/java-compat/msbuild/ice.proj index 2b707f39090..51ef78b50d5 100644 --- a/java-compat/msbuild/ice.proj +++ b/java-compat/msbuild/ice.proj @@ -17,7 +17,7 @@ <Target Name="slice2java"> <MSBuild Projects="$(MSBuildThisFileDirectory)..\..\cpp\msbuild\ice.proj" - Targets="NugetRestore" + Targets="NuGetRestore" BuildInParallel="true"/> <MSBuild Projects="$(MSBuildThisFileDirectory)..\..\cpp\msbuild\ice.$(DefaultPlatformToolset).sln" diff --git a/java/msbuild/ice.proj b/java/msbuild/ice.proj index 2b707f39090..51ef78b50d5 100644 --- a/java/msbuild/ice.proj +++ b/java/msbuild/ice.proj @@ -17,7 +17,7 @@ <Target Name="slice2java"> <MSBuild Projects="$(MSBuildThisFileDirectory)..\..\cpp\msbuild\ice.proj" - Targets="NugetRestore" + Targets="NuGetRestore" BuildInParallel="true"/> <MSBuild Projects="$(MSBuildThisFileDirectory)..\..\cpp\msbuild\ice.$(DefaultPlatformToolset).sln" diff --git a/php/msbuild/ice.proj b/php/msbuild/ice.proj index 84159ad4ce3..70e5c14fa06 100644 --- a/php/msbuild/ice.proj +++ b/php/msbuild/ice.proj @@ -24,9 +24,9 @@ <CppConfiguration Condition="'$(Configuration)' == 'NTS-Release' or '$(Configuration)' == 'Release'">Release</CppConfiguration> </PropertyGroup> - <Target Name="NugetRestore" DependsOnTargets="GetNuget"> - <!-- Restore Nuget packages to build Ice for PHP distribution --> - <Exec Command="$(NugetExe) restore $(MSBuildThisFileDirectory)ice.sln" Condition="'$(UseBinDist)' != 'yes'"/> + <Target Name="NuGetRestore" DependsOnTargets="GetNuGet"> + <!-- Restore NuGet packages to build Ice for PHP distribution --> + <Exec Command="$(NuGetExe) restore $(MSBuildThisFileDirectory)ice.sln" Condition="'$(UseBinDist)' != 'yes'"/> </Target> <ItemGroup> @@ -39,14 +39,14 @@ </ItemGroup> <Target Name="BuildCppDist"> - <Exec Command="$(NugetExe) restore $(MSBuildThisFileDirectory)..\..\cpp\msbuild\ice.$(DefaultPlatformToolset).sln"/> + <Exec Command="$(NuGetExe) restore $(MSBuildThisFileDirectory)..\..\cpp\msbuild\ice.$(DefaultPlatformToolset).sln"/> <MSBuild Projects="$(MSBuildThisFileDirectory)..\..\cpp\msbuild\ice.$(DefaultPlatformToolset).sln" Targets="$(CppDistTargets)" BuildInParallel="true" Properties="Platform=$(Platform);Configuration=$(CppConfiguration)" /> </Target> - <Target Name="BuildDist" DependsOnTargets="NugetRestore;BuildCppDist" Condition="'$(UseBinDist)' != 'yes'"> + <Target Name="BuildDist" DependsOnTargets="NuGetRestore;BuildCppDist" Condition="'$(UseBinDist)' != 'yes'"> <MSBuild Projects="@(DistProjects)" BuildInParallel="true" Properties="%(Properties)" /> @@ -59,7 +59,7 @@ Targets="Clean" /> </Target> - <Target Name="Build" DependsOnTargets="BuildDist;NugetRestore"> + <Target Name="Build" DependsOnTargets="BuildDist;NuGetRestore"> <MSBuild Projects="@(TestProjects)" BuildInParallel="true" Properties="%(Properties)" /> diff --git a/python/msbuild/ice.proj b/python/msbuild/ice.proj index 213c73beb1d..99064ece878 100644 --- a/python/msbuild/ice.proj +++ b/python/msbuild/ice.proj @@ -9,9 +9,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\config\Ice.common.targets" /> - <!-- Restore Nuget packages --> - <Target Name="NugetRestore" DependsOnTargets="GetNuget"> - <Exec Command="$(NugetExe) restore $(MSBuildThisFileDirectory)ice.sln"/> + <!-- Restore NuGet packages --> + <Target Name="NuGetRestore" DependsOnTargets="GetNuGet"> + <Exec Command="$(NuGetExe) restore $(MSBuildThisFileDirectory)ice.sln"/> </Target> <ItemGroup> @@ -24,7 +24,7 @@ </DistProjects> </ItemGroup> - <Target Name="Build" DependsOnTargets="NugetRestore"> + <Target Name="Build" DependsOnTargets="NuGetRestore"> <MSBuild Projects="@(DistProjects)" BuildInParallel="false" Properties="%(Properties)" /> |