Skip to content

Commit 1e2eade

Browse files
author
Thijs Borst
committed
Merge branch 'develop'
2 parents 14a5a93 + 638d4c2 commit 1e2eade

17 files changed

+727
-1
lines changed

‎DD4T.Essentials.Targets

+160
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,160 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
3+
<PropertyGroup>
4+
<Configuration Condition="'$(Configuration)'==''">Debug</Configuration>
5+
6+
<!-- Source Directories -->
7+
<BaseDirectory Condition="'$(BaseDirectory)' == ''">$(MSBuildProjectDirectory)\..\..</BaseDirectory>
8+
<BaseDirectory Condition="!Exists('$(BaseDirectory)\source')">..</BaseDirectory>
9+
10+
<SourceDirectory>$(BaseDirectory)\source</SourceDirectory>
11+
<SourceDirectory>$([System.IO.Directory]::GetParent($(SourceDirectory)))\source</SourceDirectory>
12+
13+
<!-- Build Directories -->
14+
<BuildOutputDirectory>$(BaseDirectory)\build</BuildOutputDirectory>
15+
<BuildOutputDirectory>$([System.IO.Directory]::GetParent($(BuildOutputDirectory)))\build</BuildOutputDirectory>
16+
<BuildBinDirectory>$(BuildOutputDirectory)\bin</BuildBinDirectory>
17+
<BuildDocDirectory>$(BuildOutputDirectory)\doc</BuildDocDirectory>
18+
<BuildLogDirectory>$(BuildOutputDirectory)\log</BuildLogDirectory>
19+
<BuildPackageDirectory>$(BuildOutputDirectory)\package</BuildPackageDirectory>
20+
<BuildWorkDirectory>$(BuildOutputDirectory)\work</BuildWorkDirectory>
21+
22+
<DependencyDirectory>$(BaseDirectory)\dependencies</DependencyDirectory>
23+
<NuGetFolder>$(SourceDirectory)\.nuget</NuGetFolder>
24+
25+
<ConfigurationDirectory>$(BaseDirectory)\configuration</ConfigurationDirectory>
26+
27+
<ConfigurationDirectory>$([System.IO.Directory]::GetParent($(ConfigurationDirectory)))\Configuration</ConfigurationDirectory>
28+
<NuGetPath>$([System.IO.Directory]::GetParent($(NuGetFolder)))\.nuget</NuGetPath>
29+
30+
</PropertyGroup>
31+
32+
<ItemGroup>
33+
<BaseDirectory Include="$(BaseDirectory)"/>
34+
<ConfigurationDirectory Include="$(ConfigurationDirectory)"/>
35+
</ItemGroup>
36+
37+
<Import Project="$(MSBuildExtensionsPath)\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets"/>
38+
39+
<Target Name="Prepare">
40+
<Message Text="MSBuildProjectDirectory: $(MSBuildProjectDirectory)" Importance="High"/>
41+
<MakeDir Directories="$(BuildOutputDirectory)"/>
42+
<MakeDir Directories="$(BuildPackageDirectory)"/>
43+
<MakeDir Directories="$(BuildWorkDirectory)"/>
44+
</Target>
45+
46+
<Target Name="AfterBuild" DependsOnTargets="Prepare">
47+
<PropertyGroup>
48+
<ProjectName>$(AssemblyName)</ProjectName>
49+
<ProjectWorkDirectory>$(BuildWorkDirectory)\$(ProjectName)</ProjectWorkDirectory>
50+
<ProjectWorkPackageDirectory>$(ProjectWorkDirectory)</ProjectWorkPackageDirectory>
51+
<ProjectWorkLibDirectory>$(ProjectWorkPackageDirectory)\lib</ProjectWorkLibDirectory>
52+
<ProjectWorkLibNet40Directory>$(ProjectWorkLibDirectory)\net40</ProjectWorkLibNet40Directory>
53+
<ProjectWorkLibNet45Directory>$(ProjectWorkLibDirectory)\net45</ProjectWorkLibNet45Directory>
54+
55+
<NuSpecFileLocation>$(ConfigurationDirectory)\$(ProjectName).nuspec</NuSpecFileLocation>
56+
<NuSpecFile>$(ProjectWorkDirectory)\$(ProjectName).nuspec</NuSpecFile>
57+
<NuGetContentDirectory>$(ConfigurationDirectory)\packageContent</NuGetContentDirectory>
58+
</PropertyGroup>
59+
<ItemGroup>
60+
<NuSpecFile Include="$(NuSpecFileLocation)"/>
61+
<OutputFiles Include="$(BuildBinDirectory)\$(ProjectName).dll"/>
62+
<ContentFiles Include="$(NuGetContentDirectory)\**\*.*" />
63+
<ExistingFiles Include="$(BuildPackageDirectory)\$(ProjectName)*.*"/>
64+
</ItemGroup>
65+
66+
<RemoveDir Directories="$(ProjectWorkDirectory)"/>
67+
<Delete Files="@(ExistingFiles)" />
68+
69+
<Message Text="Creating package for $(ProjectName)" Importance="high"/>
70+
71+
<GetInformationalVersion AssemblyFile="@(OutputFiles)">
72+
<Output TaskParameter="Version" PropertyName="Version"/>
73+
</GetInformationalVersion>
74+
75+
<GetNewDevVersion OldVersion="$(Version)" Condition="'$(Configuration)' == 'Debug'">
76+
<Output TaskParameter="NewVersion" PropertyName="Version"/>
77+
</GetNewDevVersion>
78+
79+
<MakeDir Directories="$(ProjectWorkDirectory)"/>
80+
<MakeDir Directories="$(ProjectWorkPackageDirectory)"/>
81+
<MakeDir Directories="$(ProjectWorkPackageLibDirectory)"/>
82+
<MakeDir Directories="$(ProjectWorkPackageLibNet40Directory)"/>
83+
<MakeDir Directories="$(ProjectWorkPackageLibNet45Directory)"/>
84+
85+
<Copy SourceFiles="@(NuSpecFile)" DestinationFiles="@(NuSpecFile->'$(ProjectWorkDirectory)\%(Filename)%(Extension)')" />
86+
87+
<Copy SourceFiles="@(OutputFiles)" DestinationFiles="@(OutputFiles->'$(ProjectWorkLibNet40Directory)\%(Filename)%(Extension)')" />
88+
<Copy SourceFiles="@(OutputFiles)" DestinationFiles="@(OutputFiles->'$(ProjectWorkLibNet45Directory)\%(Filename)%(Extension)')" />
89+
90+
<Copy SourceFiles="@(ContentFiles)" DestinationFiles="@(ContentFiles->'$(ProjectWorkPackageDirectory)\%(RecursiveDir)%(Filename)%(Extension)')" />
91+
92+
<XmlUpdate XmlFileName="$(NuSpecFile)" XPath="//version" Value="$(Version)" />
93+
94+
<Exec Command='$(NuGetPath)\nuget.exe pack "$(NuSpecFile)"' WorkingDirectory="$(ProjectWorkPackageDirectory)"/>
95+
96+
<ItemGroup>
97+
<NuGetPackage Include="$(ProjectWorkDirectory)\**\*.nupkg"/>
98+
</ItemGroup>
99+
100+
<Copy SourceFiles="@(NuGetPackage)" DestinationFiles="@(NuGetPackage->'$(BuildPackageDirectory)\%(Filename)%(Extension)')" />
101+
102+
<XmlPeek
103+
Namespaces="&lt;Namespace Prefix='nuget' Uri='http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd' /&gt;"
104+
Query="//id/text()"
105+
XmlInputPath="$(NuSpecFileLocation)">
106+
<Output TaskParameter="Result" ItemName="PackageName" />
107+
</XmlPeek>
108+
109+
<!-- Create ZipPackage -->
110+
<Zip Flatten="true" Files="@(OutputFiles)" ZipFileName="$(BuildPackageDirectory)\@(PackageName).$(Version).zip" WorkingDirectory="$(ProjectWorkPackageDirectory)" />
111+
112+
<Message Text="Installing package to local NuGet repo" Importance="high" Condition="'$(NUGET_LOCALREPO)' != ''" />
113+
<CallTarget Targets="Install" Condition="'$(NUGET_LOCALREPO)' != ''" />
114+
</Target>
115+
116+
<Target Name="Install">
117+
<ItemGroup>
118+
<NuGetPackage Include="$(BuildPackageDirectory)\$(AssemblyName)*.nupkg"/>
119+
</ItemGroup>
120+
<Copy SourceFiles="@(NuGetPackage)" DestinationFolder="$(NUGET_LOCALREPO)" />
121+
</Target>
122+
123+
<!-- Task for retrieving ProductVersion from an Assembly -->
124+
<UsingTask TaskName="GetInformationalVersion" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v12.0.dll">
125+
<ParameterGroup>
126+
<AssemblyFile ParameterType="System.String" Required="true" />
127+
<Version ParameterType="System.String" Output="true" />
128+
</ParameterGroup>
129+
<Task>
130+
<Using Namespace="System.Diagnostics" />
131+
<Code Type="Fragment" Language="cs">
132+
<![CDATA[
133+
Log.LogMessage("Getting version details of assembly " + this.AssemblyFile, MessageImportance.High);
134+
this.Version = FileVersionInfo.GetVersionInfo(this.AssemblyFile.Split(';')[0]).ProductVersion;
135+
Log.LogMessage("AssemblyVersion: " + this.Version, MessageImportance.High);
136+
]]>
137+
</Code>
138+
</Task>
139+
</UsingTask>
140+
141+
<!-- Task for generating a new version for local development -->
142+
<UsingTask TaskName="GetNewDevVersion" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v12.0.dll">
143+
<ParameterGroup>
144+
<OldVersion ParameterType="System.String" Required="true" />
145+
<NewVersion ParameterType="System.String" Output="true" />
146+
</ParameterGroup>
147+
<Task>
148+
<Using Namespace="System.Diagnostics" />
149+
<Code Type="Fragment" Language="cs">
150+
<![CDATA[
151+
Log.LogMessage("Getting a new version for " + this.OldVersion, MessageImportance.High);
152+
Version version = new Version(this.OldVersion.Split('-')[0]);
153+
this.NewVersion = version.ToString() + "-build" + DateTime.Now.ToString("yyyyMMddHHmmss");
154+
Log.LogMessage("New Version: " + this.NewVersion, MessageImportance.High);
155+
]]>
156+
</Code>
157+
</Task>
158+
</UsingTask>
159+
160+
</Project>

‎README.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
[![AppVeyor](https://ci.appveyor.com/api/projects/status/github/dd4t/DD4T.Logging.NLog?branch=master&svg=true&passingText=master)](https://ci.appveyor.com/project/DD4T/dd4t-logging-nlog)
2+
3+
[![AppVeyor](https://ci.appveyor.com/api/projects/status/github/dd4t/DD4T.Logging.NLog?branch=develop&svg=true&passingText=develop)](https://ci.appveyor.com/project/DD4T/dd4t-logging-nlog)
4+
15
# DD4T Essentials
26
DD4T - delivery framework for Microsoft.NET
37

4-
DD4T Logging NLog
8+
DD4T Logging NLog

‎appveyor.yml

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
version: 1.0.0.{build}-alpha
2+
pull_requests:
3+
do_not_increment_build_number: true
4+
branches:
5+
only:
6+
- master
7+
- develop
8+
configuration: Release
9+
assembly_info:
10+
patch: true
11+
file: '**\AssemblyInfo.*'
12+
assembly_version: '{version}'
13+
assembly_file_version: '{version}'
14+
assembly_informational_version: '{version}'
15+
install:
16+
- choco install msbuild.communitytasks -y
17+
build:
18+
project: build.msbuild
19+
verbosity: normal
20+
artifacts:
21+
- path: build/package/**/*.nupkg
22+
name: NuGet Package
23+
- path: build/package/**/*.zip
24+
name: Zip Archive
25+
notifications:
26+
- provider: Slack
27+
auth_token:
28+
secure: sPqYbVki+502+OjRT+o3eITyiG8UDZ0Fu4M1fejZxs3O6OKtYu9JCNS9Ssw3/XjL
29+
channel: '#development'
30+
deploy:
31+
- provider: NuGet
32+
api_key:
33+
secure: QmYvNY2pkxjIhWiI/UwFB/rjAkoNhZpElLZhmXiNVKvasN3qRyvvag0/2ZQD5eFb
34+
artifact: /.*\.nupkg/
35+
on:
36+
branch: develop

‎build.msbuild

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project InitialTargets="" DefaultTargets="All" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
3+
<PropertyGroup>
4+
<Configuration Condition="'$(Configuration)'==''">Debug</Configuration>
5+
</PropertyGroup>
6+
7+
<Target Name="All">
8+
<CallTarget Targets="Clean;Compile" />
9+
<Message Text="Build complete."/>
10+
</Target>
11+
12+
<Target Name="Clean">
13+
<!-- Clean removes all build artifacts to prepare for a new build. -->
14+
<MSBuild Projects="$(MSBuildProjectDirectory)\source\DD4T.Logging.NLog.sln" Targets="Clean" />
15+
<RemoveDir Directories="build"/>
16+
</Target>
17+
<Target Name="Compile">
18+
<!-- Build the solution. -->
19+
<MSBuild Projects="$(MSBuildProjectDirectory)\source\DD4T.Logging.Nlog.sln" Targets="Build" Properties="Configuration=$(Configuration)" >
20+
<Output ItemName="OutputFiles" TaskParameter="TargetOutputs"/>
21+
</MSBuild>
22+
</Target>
23+
</Project>

‎configuration/DD4T.Logging.NLog.nuspec

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package xmlns:nuget="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
3+
<metadata>
4+
<id>DD4T.Logging.NLog</id>
5+
<version>1.0.0.0-build20160601222839</version>
6+
<authors>DD4T Community</authors>
7+
<owners>DD4T Community</owners>
8+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
9+
<description>DD4T Logger Implementation with NLog</description>
10+
<releaseNotes>
11+
</releaseNotes>
12+
<tags>SDLTridion Tridion SDL SDLWeb DD4T DD4T2 Logging NLog</tags>
13+
<dependencies>
14+
<dependency id="DD4T.Core" version="2.2.2" />
15+
<dependency id="NLog" version="4.4.4" />
16+
</dependencies>
17+
</metadata>
18+
</package>

‎configuration/packageContent/content/web.config.transform

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<configuration>
2+
<configSections>
3+
<section name="nlog" type="NLog.Config.ConfigSectionHandler, NLog"/>
4+
</configSections>
5+
<nlog>
6+
<targets>
7+
<target name="dd4t" xsi:type="File" fileName="App_Data/dd4t.log"/>
8+
</targets>
9+
<rules>
10+
<logger name="DD4T.*" minlevel="Warn" writeTo="dd4t" />
11+
</logger>
12+
</nlog>
13+
</configuration>

‎configuration/packageContent/readme.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
DD4T 2 Essentials
2+
--------------------------------
3+
DD4T 2 NLog Implementation

‎source/.nuget/NuGet.Config

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<solution>
4+
<add key="disableSourceControlIntegration" value="true" />
5+
</solution>
6+
</configuration>

‎source/.nuget/NuGet.exe

4.07 MB
Binary file not shown.

0 commit comments

Comments
 (0)