Skip to content

Commit

Permalink
NuGet package updates, Added NLog.Schema package.
Browse files Browse the repository at this point in the history
  • Loading branch information
jkowalski committed Jul 6, 2011
1 parent c5a4b17 commit 41191bb
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 10 deletions.
35 changes: 27 additions & 8 deletions src/NLog.proj
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<WebsiteDir Condition="'$(WebsiteDir)' == ''">$(BaseOutputDirectory)\bin\$(Configuration)\Website</WebsiteDir>
<LastTestRunSummary>$(BaseOutputDirectory)\bin\LastTestRunSummary.cmd</LastTestRunSummary>
<BuildInfoFile>$(BaseOutputDirectory)\obj\BuildInfo.cs</BuildInfoFile>
<NuGetTool>c:\apps\nuget\NuGet.exe</NuGetTool>
<NuGetTool>NuGet.exe</NuGetTool>
<NuGetBuildPath>$(BaseOutputDirectory)\obj\$(Configuration)\NuGet</NuGetBuildPath>
</PropertyGroup>

Expand Down Expand Up @@ -438,7 +438,7 @@
<MSBuild Projects="$(MSBuildProjectFile)" Targets="PostProcessSingleDoc" Properties="DocBuildDir=$(BaseOutputDirectory)\bin\$(Configuration)\Documentation" />
</Target>

<Target Name="NuGetPackage" DependsOnTargets="NuGetBasePackage;NuGetExtendedPackage;NuGetConfigPackage">
<Target Name="NuGetPackage" DependsOnTargets="NuGetBasePackage;NuGetExtendedPackage;NuGetConfigPackage;NuGetSchemaPackage">
</Target>

<Target Name="NuGetBasePackage">
Expand Down Expand Up @@ -486,18 +486,37 @@

<Target Name="NuGetConfigPackage">
<ItemGroup>
<NuGetConfigFiles Include="NuGet/NLog.Config/**" />
</ItemGroup>
<NuGetConfigFiles Include="NuGet/NLog.Config/**" />
</ItemGroup>

<!-- prepare static files -->
<RemoveDir Directories="$(NuGetBuildPath)\NLog.Config" />
<Copy SourceFiles="@(NuGetConfigFiles)" DestinationFolder="$(NuGetBuildPath)\NLog.Config\%(RecursiveDir)" />
<!-- prepare static files -->
<RemoveDir Directories="$(NuGetBuildPath)\NLog.Config" />
<Copy SourceFiles="@(NuGetConfigFiles)" DestinationFolder="$(NuGetBuildPath)\NLog.Config\%(RecursiveDir)" />
<Copy SourceFiles="$(BaseOutputDirectory)\bin\$(Configuration)\NLog.xsd"
DestinationFolder="$(NuGetBuildPath)\NLog.Config\content" />

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

<Target Name="NuGetSchemaPackage">
<ItemGroup>
<NuGetSchemaFiles Include="NuGet/NLog.Schema/**" />
</ItemGroup>

<!-- prepare static files -->
<RemoveDir Directories="$(NuGetBuildPath)\NLog.Schema" />
<Copy SourceFiles="@(NuGetSchemaFiles)" DestinationFolder="$(NuGetBuildPath)\NLog.Schema\%(RecursiveDir)" />
<Copy SourceFiles="$(BaseOutputDirectory)\bin\$(Configuration)\NLog.xsd"
DestinationFolder="$(NuGetBuildPath)\NLog.Schema\content" />

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


<Target Name="Installer">
<PropertyGroup>
<CommonInstallerProperties>Configuration=$(Configuration);BuildLabel=$(BuildLabel);BuildVersion=$(BuildVersion)</CommonInstallerProperties>
Expand Down
2 changes: 1 addition & 1 deletion src/NuGet/NLog.Config/NLog.Config.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<id>NLog.Config</id>
<title>NLog Configuration</title>
<version>2.0</version>
<version>2.0.0.0</version>
<authors>Jaroslaw Kowalski</authors>
<owners>Jaroslaw Kowalski</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
Expand Down
2 changes: 1 addition & 1 deletion src/NuGet/NLog.Extended/NLog.Extended.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<id>NLog.Extended</id>
<title>NLog for Extended Profile</title>
<version>2.0</version>
<version>2.0.0.0</version>
<authors>Jaroslaw Kowalski</authors>
<owners>Jaroslaw Kowalski</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
Expand Down
20 changes: 20 additions & 0 deletions src/NuGet/NLog.Schema/NLog.Schema.nuspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0"?>
<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<id>NLog.Schema</id>
<title>NLog Schema for Intellisense(TM)</title>
<version>2.0.0.0</version>
<authors>Jaroslaw Kowalski</authors>
<owners>Jaroslaw Kowalski</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<summary>Enables Intellisense(TM) when editing NLog.config.</summary>
<description>Enables Intellisense(TM) when editing NLog configuration file.</description>
<language>en-US</language>
<iconUrl>http://nlog-project.org/NConfig.png</iconUrl>
<projectUrl>http://nlog-project.org/</projectUrl>
<licenseUrl>https://raw.github.com/jkowalski/NLog/master/LICENSE.txt</licenseUrl>
<dependencies>
<dependency id="NLog.Config" version="2.0.0.0" />
</dependencies>
</metadata>
</package>

0 comments on commit 41191bb

Please sign in to comment.