Repository: incubator-reef Updated Branches: refs/heads/master 73fe0057c -> b88ea6b6c
[REEF 180] pushing REEF.NET NuGet packages to Nuget.org automatically Added PushPackages and NuGetRepository properties to build.props. When PushPackages is set to true and Configuration is set to Release, the NuGet packages that are generated will be pushed to NuGet.Org. You can also change the repository that the packages are pushed to using the NuGetRepository property. If pushing to NuGet.org, you must set the NuGetApiKey environment variable to be a valid API key. You must also be an owner of the REEF.NET packages on NuGet.org. Jira REEF-180. https://issues.apache.org/jira/browse/REEF-180 Author: tmajest ([email protected]) This closes #95 This closes #94 Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/b88ea6b6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/b88ea6b6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/b88ea6b6 Branch: refs/heads/master Commit: b88ea6b6c18a61310ca96f52de069b27b1708223 Parents: 73fe005 Author: Julia Wang <[email protected]> Authored: Fri Feb 27 18:03:59 2015 -0800 Committer: Julia Wang <[email protected]> Committed: Fri Feb 27 18:11:31 2015 -0800 ---------------------------------------------------------------------- lang/cs/.nuget/NuGet.targets | 55 +++++++++++++++++++++++---------------- lang/cs/build.props | 5 ++-- 2 files changed, 36 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/b88ea6b6/lang/cs/.nuget/NuGet.targets ---------------------------------------------------------------------- diff --git a/lang/cs/.nuget/NuGet.targets b/lang/cs/.nuget/NuGet.targets index 0a5b958..2be5345 100644 --- a/lang/cs/.nuget/NuGet.targets +++ b/lang/cs/.nuget/NuGet.targets @@ -19,7 +19,7 @@ under the License. --> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> <PropertyGroup> - <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir> + <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..</SolutionDir> <!-- Enable the restore command to run before builds --> <RestorePackages Condition=" '$(RestorePackages)' == '' ">false</RestorePackages> @@ -50,7 +50,7 @@ under the License. <PropertyGroup Condition=" '$(OS)' != 'Windows_NT'"> <!-- We need to launch nuget.exe with the mono command if we're not on windows --> - <NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath> + <NuGetToolsPath>$(SolutionDir)\.nuget</NuGetToolsPath> </PropertyGroup> <PropertyGroup> @@ -71,7 +71,7 @@ under the License. <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand> <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 "$(NuGetExePath)"</NuGetCommand> - <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir> + <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(SolutionDir)\.nuget\packages</PackageOutputDir> <RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch> <NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch> @@ -100,6 +100,16 @@ under the License. $(BuildDependsOn); BuildPackage; </BuildDependsOn> + + <BuildDependsOn Condition="$(PushPackages) == 'true'"> + $(BuildDependsOn); + PushPackages; + </BuildDependsOn> + </PropertyGroup> + + <!-- Make sure clean will clean up .nuget/packages and .nuget/nuspec directories --> + <PropertyGroup> + <CleanDependsOn>$(CleanDependsOn);CleanNugetPackages</CleanDependsOn> </PropertyGroup> <!-- Make sure clean will clean up .nuget/packages and .nuget/nuspec directories --> @@ -116,6 +126,7 @@ under the License. parallel builds will have to wait for it to complete. --> <MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadNuGetExe=$(DownloadNuGetExe)" /> + <MakeDir Directories="$(PackageOutputDir)" /> </Target> <Target Name="_DownloadNuGet"> @@ -131,10 +142,7 @@ under the License. Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" /> </Target> - <Target Name="BuildPackage" DependsOnTargets="BuildNupkg; MoveNuGetPackage"> - </Target> - - <Target Name="BuildNupkg" DependsOnTargets="CheckPrerequisites; FinalizeNuspecFiles"> + <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites; FinalizeNuspecFiles"> <Exec Command="$(BuildCommand)" Condition=" '$(OS)' != 'Windows_NT' " /> @@ -149,24 +157,12 @@ under the License. <ScriptCommand Condition="'$(IsSnapshot)' == 'true'">$(FinalizeNuspecScript) -SolutionDir $(SolutionDir) -Snapshot -SnapshotNumber $(SnapshotNumber)</ScriptCommand> <ScriptCommand Condition="'$(IsSnapshot)' == 'false'">$(FinalizeNuspecScript) -SolutionDir $(SolutionDir)</ScriptCommand> </PropertyGroup> - <Message Text="===SCRIPT: $(ScriptCommand)" /> - <Exec Command="powershell -NonInteractive -NoProfile -Command $(ScriptCommand)" > + <Exec Command="powershell -NonInteractive -NoProfile -Command $(ScriptCommand)" + LogStandardErrorAsError="true"> </Exec> </Target> - <Target Name="MoveNuGetPackage" DependsOnTargets="BuildNupkg"> - <ItemGroup> - <NugetPackageFiles Include="$(SolutionDir)\bin\$(Platform)\$(Configuration)\$(RootNamespace)\*.nupkg" /> - </ItemGroup> - - <PropertyGroup> - <NugetPackageOutputDir>$(SolutionDir)\.nuget\packages</NugetPackageOutputDir> - </PropertyGroup> - - <Copy SourceFiles="@(NugetPackageFiles)" DestinationFolder="$(NugetPackageOutputDir)" /> - </Target> - <Target Name="CleanNugetPackages"> <PropertyGroup> <NuspecFilesDir>$(SolutionDir)\.nuget\nuspec</NuspecFilesDir> @@ -176,7 +172,22 @@ under the License. <RemoveDir Directories="$(NuspecFilesDir);$(PackagesDir)" /> </Target> + <Target Name="PushPackages" > + <ItemGroup> + <PackageFile Include="$(SolutionDir).nuget\packages\$(RootNamespace)*.nupkg" /> + </ItemGroup> + + <PropertyGroup> + <PushCommand Condition="'$(NuGetApiKey)' == '' OR '$(NuGetApiKey)' == '*Undefined*'">$(NuGetCommand) push @(PackageFile) -Source $(NuGetRepository)</PushCommand> + <PushCommand Condition="'$(NuGetApiKey)' != '' AND '$(NuGetApiKey)' != '*Undefined*'">$(NuGetCommand) push @(PackageFile) $(NuGetApiKey) -Source $(NuGetRepository)</PushCommand> + </PropertyGroup> + <Exec + Condition="'$(BuildPackage)' == 'true'" + Command="$(PushCommand)" + LogStandardErrorAsError="true"> + </Exec> + </Target> <UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll"> <ParameterGroup> @@ -208,4 +219,4 @@ under the License. </Code> </Task> </UsingTask> -</Project> +</Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/b88ea6b6/lang/cs/build.props ---------------------------------------------------------------------- diff --git a/lang/cs/build.props b/lang/cs/build.props index ae783c6..c0f3887 100644 --- a/lang/cs/build.props +++ b/lang/cs/build.props @@ -74,6 +74,8 @@ under the License. <PropertyGroup> <IsSnapshot>true</IsSnapshot> <SnapshotNumber>0</SnapshotNumber> + <PushPackages>false</PushPackages> + <NuGetRepository>https://www.nuget.org</NuGetRepository> </PropertyGroup> <!-- Package versions --> @@ -84,5 +86,4 @@ under the License. <RxVersion>2.2.5</RxVersion> </PropertyGroup> -</Project> - +</Project> \ No newline at end of file
