Updated Branches: refs/heads/master 4b5a0ca4c -> 3f8741a4e
Changes for fixing the hyperv agent build on windows using mono. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3f8741a4 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3f8741a4 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3f8741a4 Branch: refs/heads/master Commit: 3f8741a4ece956126f24752b7f1a1e4542cbc5ca Parents: 4b5a0ca Author: Donal Lafferty <[email protected]> Authored: Wed Dec 4 12:14:45 2013 +0530 Committer: Devdeep Singh <[email protected]> Committed: Wed Dec 4 12:21:36 2013 +0530 ---------------------------------------------------------------------- .../DotNet/ServerResource/.nuget/NuGet.targets | 48 +++++++++----------- 1 file changed, 22 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3f8741a4/plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/NuGet.targets ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/NuGet.targets b/plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/NuGet.targets index d0ebc75..c4211a2 100644 --- a/plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/NuGet.targets +++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/NuGet.targets @@ -2,7 +2,7 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> <PropertyGroup> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir> - + <!-- Enable the restore command to run before builds --> <RestorePackages Condition=" '$(RestorePackages)' == '' ">false</RestorePackages> @@ -11,11 +11,10 @@ <!-- Determines if package restore consent is required to restore packages --> <RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent> - + <!-- Download NuGet.exe if it does not already exist --> <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe> </PropertyGroup> - <ItemGroup Condition=" '$(PackageSources)' == '' "> <!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used --> <!-- The official NuGet package source (https://www.nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list --> @@ -25,37 +24,34 @@ --> </ItemGroup> - <PropertyGroup Condition=" '$(OS)' == 'Windows_NT'"> + <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' And '$(BuildWithMono)' != 'true'"> <!-- Windows specific commands --> <NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath> <PackagesConfig>$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig> </PropertyGroup> - - <PropertyGroup Condition=" '$(OS)' != 'Windows_NT'"> + + <PropertyGroup Condition=" '$(OS)' != 'Windows_NT' Or '$(BuildWithMono)' == 'true'"> <!-- We need to launch nuget.exe with the mono command if we're not on windows --> <NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath> - <PackagesConfig>packages.config</PackagesConfig> + <PackagesConfig>$(ProjectDir)packages.config</PackagesConfig> </PropertyGroup> - + <PropertyGroup> <!-- NuGet command --> <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\NuGet.exe</NuGetExePath> <PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources> - - <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand> - <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand> + + <NuGetCommand Condition=" '$(OS)' == 'Windows_NT' And '$(BuildWithMono)' != 'true' ">"$(NuGetExePath)"</NuGetCommand> + <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' Or '$(BuildWithMono)' == 'true' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand> <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir> - + <RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch> <NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch> - - <PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir) "</PaddedSolutionDir> - <PaddedSolutionDir Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)"</PaddedSolutionDir> <!-- Commands --> - <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)</RestoreCommand> - <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand> + <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir "$(SolutionDir) " </RestoreCommand> + <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties Configuration=$(Configuration) $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand> <!-- We need to ensure packages are restored prior to assembly resolve --> <BuildDependsOn Condition="$(RestorePackages) == 'true'"> @@ -87,22 +83,22 @@ <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites"> <Exec Command="$(RestoreCommand)" - Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" /> - + Condition="( '$(OS)' != 'Windows_NT' Or '$(BuildWithMono)' == 'true' ) And Exists('$(PackagesConfig)')" /> + <Exec Command="$(RestoreCommand)" LogStandardErrorAsError="true" - Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" /> + Condition="'$(OS)' == 'Windows_NT' And '$(BuildWithMono)' != 'true' And Exists('$(PackagesConfig)')" /> </Target> <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites"> - <Exec Command="$(BuildCommand)" - Condition=" '$(OS)' != 'Windows_NT' " /> - + <Exec Command="$(BuildCommand)" + Condition=" '$(OS)' != 'Windows_NT' Or '$(BuildWithMono)' " /> + <Exec Command="$(BuildCommand)" LogStandardErrorAsError="true" - Condition=" '$(OS)' == 'Windows_NT' " /> + Condition=" '$(OS)' == 'Windows_NT' And '$(BuildWithMono)' != 'true' " /> </Target> - + <UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll"> <ParameterGroup> <OutputFilename ParameterType="System.String" Required="true" /> @@ -133,4 +129,4 @@ </Code> </Task> </UsingTask> -</Project> \ No newline at end of file +</Project>
