Skip to content

Commit e498b03

Browse files
quirijnslingsquirijnslings
authored
Merge pull request #1 from dd4t/release/2.5
Release/2.5
2 parents 4a3c248 + e5a317f commit e498b03

8 files changed

+56
-47
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -182,3 +182,4 @@ UpgradeLog*.htm
182182

183183
# Microsoft Fakes
184184
FakesAssemblies/
185+
source/.vs/

‎README.md

+6-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22

33
[![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)
44

5-
# DD4T Essentials
6-
DD4T - delivery framework for Microsoft.NET
5+
# DD4T.Logging.NLog
6+
Lets DD4T log with NLog
77

8-
DD4T Logging NLog
8+
## Release 2.5
9+
10+
- Upgraded to DD4T.Core 2.5
11+
- Downgraded from .NET Framework 4.5.2 to 4.5.1 (in line with the rest of the DD4T framework)

‎appveyor.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: 2.2.0
1+
version: 2.5
22
pull_requests:
33
do_not_increment_build_number: true
44
branches:
@@ -27,6 +27,9 @@ notifications:
2727
auth_token:
2828
secure: sPqYbVki+502+OjRT+o3eITyiG8UDZ0Fu4M1fejZxs3O6OKtYu9JCNS9Ssw3/XjL
2929
channel: '#development'
30+
skip_commits:
31+
message: /\[nobuild\]/
32+
skip_tags: true
3033
deploy:
3134
- provider: NuGet
3235
api_key:

‎configuration/DD4T.Logging.NLog.nuspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns:nuget="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>DD4T.Logging.NLog</id>
5-
<version>1.0.0.0-build20160601222839</version>
5+
<version></version>
66
<authors>DD4T Community</authors>
77
<owners>DD4T Community</owners>
88
<requireLicenseAcceptance>false</requireLicenseAcceptance>
@@ -11,7 +11,7 @@
1111
</releaseNotes>
1212
<tags>SDLTridion Tridion SDL SDLWeb DD4T DD4T2 Logging NLog</tags>
1313
<dependencies>
14-
<dependency id="DD4T.Core" version="2.2.2" />
14+
<dependency id="DD4T.Core" version="2.5" />
1515
<dependency id="NLog" version="4.4.4" />
1616
</dependencies>
1717
</metadata>

‎source/DD4T.Logging.NLog/DD4T.Logging.NLog.csproj

+20-28
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>DD4T.Logging.NLog</RootNamespace>
1111
<AssemblyName>DD4T.Logging.NLog</AssemblyName>
12-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile />
1515
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
@@ -33,41 +33,32 @@
3333
<WarningLevel>4</WarningLevel>
3434
</PropertyGroup>
3535
<ItemGroup>
36-
<Reference Include="DD4T.ContentModel, Version=2.2.1.0, Culture=neutral, PublicKeyToken=4450e3c7f68bf872, processorArchitecture=MSIL">
37-
<HintPath>..\packages\DD4T.Model.2.2.1\lib\net45\DD4T.ContentModel.dll</HintPath>
38-
<Private>False</Private>
36+
<Reference Include="DD4T.ContentModel, Version=2.5.0.0, Culture=neutral, PublicKeyToken=4450e3c7f68bf872, processorArchitecture=MSIL">
37+
<HintPath>..\packages\DD4T.Model.2.5.0\lib\net45\DD4T.ContentModel.dll</HintPath>
3938
</Reference>
40-
<Reference Include="DD4T.ContentModel.Contracts, Version=2.2.1.0, Culture=neutral, PublicKeyToken=4450e3c7f68bf872, processorArchitecture=MSIL">
41-
<HintPath>..\packages\DD4T.Model.2.2.1\lib\net45\DD4T.ContentModel.Contracts.dll</HintPath>
42-
<Private>False</Private>
39+
<Reference Include="DD4T.ContentModel.Contracts, Version=2.5.0.0, Culture=neutral, PublicKeyToken=4450e3c7f68bf872, processorArchitecture=MSIL">
40+
<HintPath>..\packages\DD4T.Model.2.5.0\lib\net45\DD4T.ContentModel.Contracts.dll</HintPath>
4341
</Reference>
44-
<Reference Include="DD4T.ContentModel.XmlSerializers, Version=2.2.1.0, Culture=neutral, PublicKeyToken=4450e3c7f68bf872, processorArchitecture=MSIL">
45-
<HintPath>..\packages\DD4T.Model.2.2.1\lib\net45\DD4T.ContentModel.XmlSerializers.dll</HintPath>
46-
<Private>False</Private>
42+
<Reference Include="DD4T.ContentModel.XmlSerializers, Version=2.5.0.0, Culture=neutral, PublicKeyToken=4450e3c7f68bf872, processorArchitecture=MSIL">
43+
<HintPath>..\packages\DD4T.Model.2.5.0\lib\net45\DD4T.ContentModel.XmlSerializers.dll</HintPath>
4744
</Reference>
48-
<Reference Include="DD4T.Core.Contracts, Version=2.2.2.0, Culture=neutral, processorArchitecture=MSIL">
49-
<HintPath>..\packages\DD4T.Core.2.2.2\lib\net45\DD4T.Core.Contracts.dll</HintPath>
50-
<Private>False</Private>
45+
<Reference Include="DD4T.Core.Contracts, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
46+
<HintPath>..\packages\DD4T.Core.2.5.0\lib\net45\DD4T.Core.Contracts.dll</HintPath>
5147
</Reference>
52-
<Reference Include="DD4T.Factories, Version=2.2.2.0, Culture=neutral, processorArchitecture=MSIL">
53-
<HintPath>..\packages\DD4T.Core.2.2.2\lib\net45\DD4T.Factories.dll</HintPath>
54-
<Private>False</Private>
48+
<Reference Include="DD4T.Factories, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
49+
<HintPath>..\packages\DD4T.Core.2.5.0\lib\net45\DD4T.Factories.dll</HintPath>
5550
</Reference>
56-
<Reference Include="DD4T.Serialization, Version=2.2.1.0, Culture=neutral, PublicKeyToken=4450e3c7f68bf872, processorArchitecture=MSIL">
57-
<HintPath>..\packages\DD4T.Model.2.2.1\lib\net45\DD4T.Serialization.dll</HintPath>
58-
<Private>False</Private>
51+
<Reference Include="DD4T.Serialization, Version=2.5.0.0, Culture=neutral, PublicKeyToken=4450e3c7f68bf872, processorArchitecture=MSIL">
52+
<HintPath>..\packages\DD4T.Model.2.5.0\lib\net45\DD4T.Serialization.dll</HintPath>
5953
</Reference>
60-
<Reference Include="DD4T.Utils, Version=2.2.2.0, Culture=neutral, processorArchitecture=MSIL">
61-
<HintPath>..\packages\DD4T.Core.2.2.2\lib\net45\DD4T.Utils.dll</HintPath>
62-
<Private>False</Private>
54+
<Reference Include="DD4T.Utils, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
55+
<HintPath>..\packages\DD4T.Core.2.5.0\lib\net45\DD4T.Utils.dll</HintPath>
6356
</Reference>
64-
<Reference Include="DD4T.ViewModels, Version=2.2.2.0, Culture=neutral, processorArchitecture=MSIL">
65-
<HintPath>..\packages\DD4T.Core.2.2.2\lib\net45\DD4T.ViewModels.dll</HintPath>
66-
<Private>False</Private>
57+
<Reference Include="DD4T.ViewModels, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
58+
<HintPath>..\packages\DD4T.Core.2.5.0\lib\net45\DD4T.ViewModels.dll</HintPath>
6759
</Reference>
68-
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
69-
<HintPath>..\packages\Newtonsoft.Json.10.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
70-
<Private>False</Private>
60+
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
61+
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
7162
</Reference>
7263
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
7364
<HintPath>..\packages\NLog.4.4.4\lib\net45\NLog.dll</HintPath>
@@ -94,6 +85,7 @@
9485
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
9586
<Import Project="..\..\DD4T.Essentials.Targets" />
9687
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
88+
<Import Project="$(SolutionDir)\PrivateFalse.targets" Condition="Exists('$(SolutionDir)\PrivateFalse.targets')" />
9789
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
9890
<PropertyGroup>
9991
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>

‎source/DD4T.Logging.NLog/app.config

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<runtime>
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
6-
<assemblyIdentity name="DD4T.ContentModel" publicKeyToken="4450e3c7f68bf872" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-2.0.7.0" newVersion="2.0.7.0" />
6+
<assemblyIdentity name="DD4T.ContentModel" publicKeyToken="4450e3c7f68bf872" culture="neutral"/>
7+
<bindingRedirect oldVersion="0.0.0.0-2.0.7.0" newVersion="2.0.7.0"/>
88
</dependentAssembly>
99
<dependentAssembly>
10-
<assemblyIdentity name="DD4T.ContentModel.Contracts" publicKeyToken="4450e3c7f68bf872" culture="neutral" />
11-
<bindingRedirect oldVersion="0.0.0.0-2.0.7.0" newVersion="2.0.7.0" />
10+
<assemblyIdentity name="DD4T.ContentModel.Contracts" publicKeyToken="4450e3c7f68bf872" culture="neutral"/>
11+
<bindingRedirect oldVersion="0.0.0.0-2.0.7.0" newVersion="2.0.7.0"/>
1212
</dependentAssembly>
1313
<dependentAssembly>
14-
<assemblyIdentity name="DD4T.Serialization" publicKeyToken="4450e3c7f68bf872" culture="neutral" />
15-
<bindingRedirect oldVersion="0.0.0.0-2.0.7.0" newVersion="2.0.7.0" />
14+
<assemblyIdentity name="DD4T.Serialization" publicKeyToken="4450e3c7f68bf872" culture="neutral"/>
15+
<bindingRedirect oldVersion="0.0.0.0-2.0.7.0" newVersion="2.0.7.0"/>
1616
</dependentAssembly>
1717
<dependentAssembly>
18-
<assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
19-
<bindingRedirect oldVersion="0.0.0.0-1.2.15.0" newVersion="1.2.15.0" />
18+
<assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral"/>
19+
<bindingRedirect oldVersion="0.0.0.0-1.2.15.0" newVersion="1.2.15.0"/>
2020
</dependentAssembly>
2121
</assemblyBinding>
2222
</runtime>
23-
</configuration>
23+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1"/></startup></configuration>

‎source/DD4T.Logging.NLog/packages.config

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="DD4T.Core" version="2.2.2" targetFramework="net452" />
4-
<package id="DD4T.Model" version="2.2.1" targetFramework="net452" />
5-
<package id="Newtonsoft.Json" version="10.0.1" targetFramework="net452" />
3+
<package id="DD4T.Core" version="2.5.0" targetFramework="net451" />
4+
<package id="DD4T.Model" version="2.5.0" targetFramework="net451" />
5+
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net451" />
66
<package id="NLog" version="4.4.4" targetFramework="net452" />
77
</packages>

‎source/PrivateFalse.targets

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
4+
<!-- make all references non-private, so they won't be copied to the output folder -->
5+
<Target Name="ClearReferenceCopyLocalPaths" AfterTargets="ResolveAssemblyReferences">
6+
<ItemGroup>
7+
<ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)" />
8+
</ItemGroup>
9+
</Target>
10+
</Project>

0 commit comments

Comments
 (0)