Skip to content
This repository has been archived by the owner on Jun 8, 2019. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Updated NuGet packages to use CC build version number.
  • Loading branch information
jkowalski committed Jul 6, 2011
1 parent c843f4b commit 799394c
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 23 deletions.
59 changes: 42 additions & 17 deletions src/NLog.proj
Expand Up @@ -52,6 +52,7 @@
<BuildInfoFile>$(BaseOutputDirectory)\obj\BuildInfo.cs</BuildInfoFile> <BuildInfoFile>$(BaseOutputDirectory)\obj\BuildInfo.cs</BuildInfoFile>
<NuGetTool>NuGet.exe</NuGetTool> <NuGetTool>NuGet.exe</NuGetTool>
<NuGetBuildPath>$(BaseOutputDirectory)\obj\$(Configuration)\NuGet</NuGetBuildPath> <NuGetBuildPath>$(BaseOutputDirectory)\obj\$(Configuration)\NuGet</NuGetBuildPath>
<NuGetProperties>BuildVersion=$(BuildVersion)</NuGetProperties>
</PropertyGroup> </PropertyGroup>


<!-- detect location of various SDKs and tools--> <!-- detect location of various SDKs and tools-->
Expand Down Expand Up @@ -156,7 +157,7 @@
<TargetFramework Include="Silverlight for Windows Phone 7.1" Condition="'$(BuildWP71)'=='true'"> <TargetFramework Include="Silverlight for Windows Phone 7.1" Condition="'$(BuildWP71)'=='true'">
<ProjectFileSuffix>.wp71</ProjectFileSuffix> <ProjectFileSuffix>.wp71</ProjectFileSuffix>
<DocReferences>$(DocReferencesWP71)</DocReferences> <DocReferences>$(DocReferencesWP71)</DocReferences>
<NuGetDir>sl4-wp</NuGetDir> <NuGetDir>sl4-windowsphone71</NuGetDir>
</TargetFramework> </TargetFramework>
<TargetFramework Include=".NET Compact Framework 2.0" Condition="'$(BuildNetCF20)'=='true'"> <TargetFramework Include=".NET Compact Framework 2.0" Condition="'$(BuildNetCF20)'=='true'">
<ProjectFileSuffix>.netcf20</ProjectFileSuffix> <ProjectFileSuffix>.netcf20</ProjectFileSuffix>
Expand Down Expand Up @@ -201,8 +202,8 @@
<PropertyGroup> <PropertyGroup>
<CommonProperties>BuildLabel=$(BuildLabel);BuildVersion=$(BuildVersion)</CommonProperties> <CommonProperties>BuildLabel=$(BuildLabel);BuildVersion=$(BuildVersion)</CommonProperties>
</PropertyGroup> </PropertyGroup>
<MSBuild Projects="$(MSBuildProjectFile)" Targets="DeepClean;Clean;Build;DumpApi;XSD;Documentation;Archive;Installer;BuildTests;Web" Properties="Configuration=Release;$(CommonProperties)" /> <MSBuild Projects="$(MSBuildProjectFile)" Targets="DeepClean;Clean;Build;DumpApi;XSD;Documentation;Archive;Installer;NuGet;BuildTests;Web" Properties="Configuration=Release;$(CommonProperties)" />
<MSBuild Projects="$(MSBuildProjectFile)" Targets="Clean;Build;DumpApi;XSD;Documentation;Archive;Installer;BuildTests" Properties="Configuration=Debug;$(CommonProperties)" /> <MSBuild Projects="$(MSBuildProjectFile)" Targets="Clean;Build;DumpApi;XSD;Documentation;Archive;Installer;NuGet;BuildTests" Properties="Configuration=Debug;$(CommonProperties)" />
<CallTarget Targets="SourceArchive" /> <CallTarget Targets="SourceArchive" />
</Target> </Target>


Expand Down Expand Up @@ -448,20 +449,22 @@


<Target Name="NuGetBasePackage"> <Target Name="NuGetBasePackage">
<ItemGroup> <ItemGroup>
<NuGetFiles Include="NuGet/NLog/**" /> <NuGetFiles Include="NuGet/NLog/**" />
</ItemGroup> </ItemGroup>


<!-- prepare static files --> <!-- prepare static files -->
<RemoveDir Directories="$(NuGetBuildPath)\NLog" /> <RemoveDir Directories="$(NuGetBuildPath)\NLog" />
<Copy SourceFiles="@(NuGetFiles)" DestinationFolder="$(NuGetBuildPath)\NLog\%(RecursiveDir)" /> <Copy SourceFiles="@(NuGetFiles)" DestinationFolder="$(NuGetBuildPath)\NLog\%(RecursiveDir)" />


<!-- copy binaries --> <!-- copy binaries -->
<MakeDir Directories="$(NuGetBuildPath)\NLog\lib\%(TargetFramework.NuGetDir)" /> <MakeDir Directories="$(NuGetBuildPath)\NLog\lib\%(TargetFramework.NuGetDir)" />
<Copy DestinationFolder="$(NuGetBuildPath)\NLog\lib\%(TargetFramework.NuGetDir)" SourceFiles="$(BaseOutputDirectory)\bin\$(Configuration)\%(TargetFramework.Identity)\NLog.dll" Condition=" '%(TargetFramework.NuGetDir)' != '' " /> <Copy DestinationFolder="$(NuGetBuildPath)\NLog\lib\%(TargetFramework.NuGetDir)" SourceFiles="$(BaseOutputDirectory)\bin\$(Configuration)\%(TargetFramework.Identity)\NLog.dll" Condition=" '%(TargetFramework.NuGetDir)' != '' " />
<Copy DestinationFolder="$(NuGetBuildPath)\NLog\lib\%(TargetFramework.NuGetDir)" SourceFiles="$(BaseOutputDirectory)\bin\$(Configuration)\%(TargetFramework.Identity)\NLog.pdb" Condition=" '%(TargetFramework.NuGetDir)' != '' " /> <Copy DestinationFolder="$(NuGetBuildPath)\NLog\lib\%(TargetFramework.NuGetDir)" SourceFiles="$(BaseOutputDirectory)\bin\$(Configuration)\%(TargetFramework.Identity)\NLog.pdb" Condition=" '%(TargetFramework.NuGetDir)' != '' " />

<TokenReplace Path="$(NuGetBuildPath)\NLog\NLog.nuspec" Token="$BuildVersion$" Replacement="$(BuildVersion)" />


<!-- package --> <!-- package -->
<MakeDir Directories="$(NuGetOutputPath)" /> <MakeDir Directories="$(NuGetOutputPath)" />
<Exec Command='"$(NuGetTool)" pack NLog.nuspec -Symbols -OutputDirectory "$(NuGetOutputPath)"' WorkingDirectory="$(NuGetBuildPath)\NLog" /> <Exec Command='"$(NuGetTool)" pack NLog.nuspec -Symbols -OutputDirectory "$(NuGetOutputPath)"' WorkingDirectory="$(NuGetBuildPath)\NLog" />
</Target> </Target>


Expand All @@ -474,17 +477,19 @@
<RemoveDir Directories="$(NuGetBuildPath)\NLog.Extended" /> <RemoveDir Directories="$(NuGetBuildPath)\NLog.Extended" />
<Copy SourceFiles="@(NuGetExtendedFiles)" DestinationFolder="$(NuGetBuildPath)\NLog.Extended\%(RecursiveDir)" /> <Copy SourceFiles="@(NuGetExtendedFiles)" DestinationFolder="$(NuGetBuildPath)\NLog.Extended\%(RecursiveDir)" />


<!-- copy binaries --> <!-- copy binaries -->
<MakeDir Directories="$(NuGetBuildPath)\NLog.Extended\lib\%(TargetFramework.NuGetDir)-full" <MakeDir Directories="$(NuGetBuildPath)\NLog.Extended\lib\%(TargetFramework.NuGetDir)-full"
Condition=" '%(TargetFramework.NuGetDir)' != '' and Exists('$(BaseOutputDirectory)\bin\$(Configuration)\%(TargetFramework.Identity)\NLog.Extended.pdb')" /> Condition=" '%(TargetFramework.NuGetDir)' != '' and Exists('$(BaseOutputDirectory)\bin\$(Configuration)\%(TargetFramework.Identity)\NLog.Extended.pdb')" />
<Copy DestinationFolder="$(NuGetBuildPath)\NLog.Extended\lib\%(TargetFramework.NuGetDir)-full" <Copy DestinationFolder="$(NuGetBuildPath)\NLog.Extended\lib\%(TargetFramework.NuGetDir)-full"
SourceFiles="$(BaseOutputDirectory)\bin\$(Configuration)\%(TargetFramework.Identity)\NLog.Extended.dll" SourceFiles="$(BaseOutputDirectory)\bin\$(Configuration)\%(TargetFramework.Identity)\NLog.Extended.dll"
Condition=" '%(TargetFramework.NuGetDir)' != '' and Exists('$(BaseOutputDirectory)\bin\$(Configuration)\%(TargetFramework.Identity)\NLog.Extended.dll')" /> Condition=" '%(TargetFramework.NuGetDir)' != '' and Exists('$(BaseOutputDirectory)\bin\$(Configuration)\%(TargetFramework.Identity)\NLog.Extended.dll')" />
<Copy DestinationFolder="$(NuGetBuildPath)\NLog.Extended\lib\%(TargetFramework.NuGetDir)-full" <Copy DestinationFolder="$(NuGetBuildPath)\NLog.Extended\lib\%(TargetFramework.NuGetDir)-full"
SourceFiles="$(BaseOutputDirectory)\bin\$(Configuration)\%(TargetFramework.Identity)\NLog.Extended.pdb" SourceFiles="$(BaseOutputDirectory)\bin\$(Configuration)\%(TargetFramework.Identity)\NLog.Extended.pdb"
Condition=" '%(TargetFramework.NuGetDir)' != '' and Exists('$(BaseOutputDirectory)\bin\$(Configuration)\%(TargetFramework.Identity)\NLog.Extended.pdb')" /> Condition=" '%(TargetFramework.NuGetDir)' != '' and Exists('$(BaseOutputDirectory)\bin\$(Configuration)\%(TargetFramework.Identity)\NLog.Extended.pdb')" />


<!-- package --> <TokenReplace Path="$(NuGetBuildPath)\NLog.Extended\NLog.Extended.nuspec" Token="$BuildVersion$" Replacement="$(BuildVersion)" />

<!-- package -->
<MakeDir Directories="$(NuGetOutputPath)" /> <MakeDir Directories="$(NuGetOutputPath)" />
<Exec Command='"$(NuGetTool)" pack NLog.Extended.nuspec -Symbols -OutputDirectory "$(NuGetOutputPath)"' WorkingDirectory="$(NuGetBuildPath)\NLog.Extended" /> <Exec Command='"$(NuGetTool)" pack NLog.Extended.nuspec -Symbols -OutputDirectory "$(NuGetOutputPath)"' WorkingDirectory="$(NuGetBuildPath)\NLog.Extended" />
</Target> </Target>
Expand All @@ -500,6 +505,8 @@
<Copy SourceFiles="$(BaseOutputDirectory)\bin\$(Configuration)\NLog.xsd" <Copy SourceFiles="$(BaseOutputDirectory)\bin\$(Configuration)\NLog.xsd"
DestinationFolder="$(NuGetBuildPath)\NLog.Config\content" /> DestinationFolder="$(NuGetBuildPath)\NLog.Config\content" />


<TokenReplace Path="$(NuGetBuildPath)\NLog.Config\NLog.Config.nuspec" Token="$BuildVersion$" Replacement="$(BuildVersion)" />

<!-- package --> <!-- package -->
<MakeDir Directories="$(NuGetOutputPath)" /> <MakeDir Directories="$(NuGetOutputPath)" />
<Exec Command='"$(NuGetTool)" pack NLog.Config.nuspec -OutputDirectory "$(NuGetOutputPath)"' WorkingDirectory="$(NuGetBuildPath)\NLog.Config" /> <Exec Command='"$(NuGetTool)" pack NLog.Config.nuspec -OutputDirectory "$(NuGetOutputPath)"' WorkingDirectory="$(NuGetBuildPath)\NLog.Config" />
Expand All @@ -516,10 +523,12 @@
<Copy SourceFiles="$(BaseOutputDirectory)\bin\$(Configuration)\NLog.xsd" <Copy SourceFiles="$(BaseOutputDirectory)\bin\$(Configuration)\NLog.xsd"
DestinationFolder="$(NuGetBuildPath)\NLog.Schema\content" /> DestinationFolder="$(NuGetBuildPath)\NLog.Schema\content" />


<TokenReplace Path="$(NuGetBuildPath)\NLog.Schema\NLog.Schema.nuspec" Token="$BuildVersion$" Replacement="$(BuildVersion)" />

<!-- package --> <!-- package -->
<MakeDir Directories="$(NuGetOutputPath)" /> <MakeDir Directories="$(NuGetOutputPath)" />
<Exec Command='"$(NuGetTool)" pack NLog.Schema.nuspec -OutputDirectory "$(NuGetOutputPath)"' WorkingDirectory="$(NuGetBuildPath)\NLog.Schema" /> <Exec Command='"$(NuGetTool)" pack NLog.Schema.nuspec -OutputDirectory "$(NuGetOutputPath)" -Properties $(NuGetProperties)' WorkingDirectory="$(NuGetBuildPath)\NLog.Schema" />
</Target> </Target>




<Target Name="Installer"> <Target Name="Installer">
Expand Down Expand Up @@ -632,6 +641,22 @@
<Exec Command='"$(Git)" archive --format=zip --worktree-attributes -9 head -o build/bin/Release/Packages/NLog2.source$(ArchiveSuffix).zip' WorkingDirectory=".." /> <Exec Command='"$(Git)" archive --format=zip --worktree-attributes -9 head -o build/bin/Release/Packages/NLog2.source$(ArchiveSuffix).zip' WorkingDirectory=".." />
</Target> </Target>


<UsingTask TaskName="TokenReplace" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
<ParameterGroup>
<Path ParameterType="System.String" Required="true" />
<Token ParameterType="System.String" Required="true" />
<Replacement ParameterType="System.String" Required="true" />
</ParameterGroup>
<Task>
<Code Type="Fragment" Language="cs"><![CDATA[
string content = File.ReadAllText(Path);
content = content.Replace(Token, Replacement);
File.WriteAllText(Path, content);
]]></Code>
</Task>
</UsingTask>

<ItemGroup> <ItemGroup>
<FilesToCleanup Include="..\**\*.suo" /> <FilesToCleanup Include="..\**\*.suo" />
<FilesToCleanup Include="..\**\*.ncb" /> <FilesToCleanup Include="..\**\*.ncb" />
Expand Down
4 changes: 2 additions & 2 deletions src/NuGet/NLog.Config/NLog.Config.nuspec
Expand Up @@ -3,7 +3,7 @@
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<id>NLog.Config</id> <id>NLog.Config</id>
<title>NLog Configuration</title> <title>NLog Configuration</title>
<version>2.0.0.0</version> <version>$BuildVersion$</version>
<authors>Jaroslaw Kowalski</authors> <authors>Jaroslaw Kowalski</authors>
<owners>Jaroslaw Kowalski</owners> <owners>Jaroslaw Kowalski</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance> <requireLicenseAcceptance>false</requireLicenseAcceptance>
Expand All @@ -14,7 +14,7 @@
<projectUrl>http://nlog-project.org/</projectUrl> <projectUrl>http://nlog-project.org/</projectUrl>
<licenseUrl>https://raw.github.com/jkowalski/NLog/master/LICENSE.txt</licenseUrl> <licenseUrl>https://raw.github.com/jkowalski/NLog/master/LICENSE.txt</licenseUrl>
<dependencies> <dependencies>
<dependency id="NLog" version="2.0.0.0" /> <dependency id="NLog" version="$BuildVersion$" />
</dependencies> </dependencies>
</metadata> </metadata>
</package> </package>
4 changes: 2 additions & 2 deletions src/NuGet/NLog.Extended/NLog.Extended.nuspec
Expand Up @@ -3,7 +3,7 @@
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<id>NLog.Extended</id> <id>NLog.Extended</id>
<title>NLog for Extended Profile</title> <title>NLog for Extended Profile</title>
<version>2.0.0.0</version> <version>$BuildVersion$</version>
<authors>Jaroslaw Kowalski</authors> <authors>Jaroslaw Kowalski</authors>
<owners>Jaroslaw Kowalski</owners> <owners>Jaroslaw Kowalski</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance> <requireLicenseAcceptance>false</requireLicenseAcceptance>
Expand All @@ -14,7 +14,7 @@
<projectUrl>http://nlog-project.org/</projectUrl> <projectUrl>http://nlog-project.org/</projectUrl>
<licenseUrl>https://raw.github.com/jkowalski/NLog/master/LICENSE.txt</licenseUrl> <licenseUrl>https://raw.github.com/jkowalski/NLog/master/LICENSE.txt</licenseUrl>
<dependencies> <dependencies>
<dependency id="NLog" version="[2.0.0.0]" /> <dependency id="NLog" version="[$BuildVersion$]" />
</dependencies> </dependencies>
</metadata> </metadata>
</package> </package>
2 changes: 1 addition & 1 deletion src/NuGet/NLog.Schema/NLog.Schema.nuspec
Expand Up @@ -3,7 +3,7 @@
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<id>NLog.Schema</id> <id>NLog.Schema</id>
<title>NLog Schema for Intellisense(TM)</title> <title>NLog Schema for Intellisense(TM)</title>
<version>2.0.0.0</version> <version>$BuildVersion$</version>
<authors>Jaroslaw Kowalski</authors> <authors>Jaroslaw Kowalski</authors>
<owners>Jaroslaw Kowalski</owners> <owners>Jaroslaw Kowalski</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance> <requireLicenseAcceptance>false</requireLicenseAcceptance>
Expand Down
2 changes: 1 addition & 1 deletion src/NuGet/NLog/NLog.nuspec
Expand Up @@ -3,7 +3,7 @@
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<id>NLog</id> <id>NLog</id>
<title>NLog</title> <title>NLog</title>
<version>2.0.0.0</version> <version>$BuildVersion$</version>
<authors>Jaroslaw Kowalski</authors> <authors>Jaroslaw Kowalski</authors>
<owners>Jaroslaw Kowalski</owners> <owners>Jaroslaw Kowalski</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance> <requireLicenseAcceptance>false</requireLicenseAcceptance>
Expand Down

0 comments on commit 799394c

Please sign in to comment.