Skip to content

Commit c5f26c0

Browse files
quirijnslingsquirijnslings
authored
Merge pull request #4 from dd4t/release/2.6
fixed msbuildtasks, updated all dependencies along with the nuspec, u…
2 parents 955b74b + 3d6d280 commit c5f26c0

File tree

7 files changed

+84
-42
lines changed

7 files changed

+84
-42
lines changed

‎DD4T.Essentials.Targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<ConfigurationDirectory Include="$(ConfigurationDirectory)"/>
3535
</ItemGroup>
3636

37-
<Import Project="$(MSBuildExtensionsPath)\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets"/>
37+
<Import Project="$(SolutionDir)packages\MSBuildTasks.1.5.0.235\tools\MSBuild.Community.Tasks.Targets"/>
3838

3939
<Target Name="Prepare">
4040
<Message Text="MSBuildProjectDirectory: $(MSBuildProjectDirectory)" Importance="High"/>

‎README.md

+4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
# DD4T.Logging.NLog
66
Lets DD4T log with NLog
77

8+
## Release 2.6
9+
- Upgraded NLog to 5.3.4
10+
- Upgraded DD4T Core and Model to 2.6.1
11+
812
## Release 2.5
913

1014
- Upgraded to DD4T.Core 2.5

‎configuration/DD4T.Logging.NLog.nuspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
</releaseNotes>
1212
<tags>SDLTridion Tridion SDL SDLWeb DD4T DD4T2 Logging NLog</tags>
1313
<dependencies>
14-
<dependency id="DD4T.Core" version="2.5" />
15-
<dependency id="NLog" version="4.4.4" />
14+
<dependency id="DD4T.Core" version="2.6.1" />
15+
<dependency id="NLog" version="5.3.4" />
1616
</dependencies>
1717
</metadata>
1818
</package>

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

+45-22
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\SixLabors.ImageSharp.3.1.6\build\SixLabors.ImageSharp.props" Condition="Exists('..\packages\SixLabors.ImageSharp.3.1.6\build\SixLabors.ImageSharp.props')" />
34
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
45
<PropertyGroup>
56
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,11 +10,13 @@
910
<AppDesignerFolder>Properties</AppDesignerFolder>
1011
<RootNamespace>DD4T.Logging.NLog</RootNamespace>
1112
<AssemblyName>DD4T.Logging.NLog</AssemblyName>
12-
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1314
<FileAlignment>512</FileAlignment>
1415
<TargetFrameworkProfile />
1516
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1617
<RestorePackages>true</RestorePackages>
18+
<NuGetPackageImportStamp>
19+
</NuGetPackageImportStamp>
1720
</PropertyGroup>
1821
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1922
<DebugSymbols>true</DebugSymbols>
@@ -33,39 +36,56 @@
3336
<WarningLevel>4</WarningLevel>
3437
</PropertyGroup>
3538
<ItemGroup>
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>
39+
<Reference Include="DD4T.ContentModel, Version=2.6.1.0, Culture=neutral, PublicKeyToken=4450e3c7f68bf872, processorArchitecture=MSIL">
40+
<HintPath>..\packages\DD4T.Model.2.6.1\lib\net45\DD4T.ContentModel.dll</HintPath>
3841
</Reference>
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>
42+
<Reference Include="DD4T.ContentModel.Contracts, Version=2.6.1.0, Culture=neutral, PublicKeyToken=4450e3c7f68bf872, processorArchitecture=MSIL">
43+
<HintPath>..\packages\DD4T.Model.2.6.1\lib\net45\DD4T.ContentModel.Contracts.dll</HintPath>
4144
</Reference>
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>
45+
<Reference Include="DD4T.ContentModel.XmlSerializers, Version=2.6.1.0, Culture=neutral, PublicKeyToken=4450e3c7f68bf872, processorArchitecture=MSIL">
46+
<HintPath>..\packages\DD4T.Model.2.6.1\lib\net45\DD4T.ContentModel.XmlSerializers.dll</HintPath>
4447
</Reference>
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>
48+
<Reference Include="DD4T.Core.Contracts, Version=2.6.1.0, Culture=neutral, processorArchitecture=MSIL">
49+
<HintPath>..\packages\DD4T.Core.2.6.1\lib\net45\DD4T.Core.Contracts.dll</HintPath>
4750
</Reference>
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>
51+
<Reference Include="DD4T.Factories, Version=2.6.1.0, Culture=neutral, processorArchitecture=MSIL">
52+
<HintPath>..\packages\DD4T.Core.2.6.1\lib\net45\DD4T.Factories.dll</HintPath>
5053
</Reference>
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>
54+
<Reference Include="DD4T.Serialization, Version=2.6.1.0, Culture=neutral, PublicKeyToken=4450e3c7f68bf872, processorArchitecture=MSIL">
55+
<HintPath>..\packages\DD4T.Model.2.6.1\lib\net45\DD4T.Serialization.dll</HintPath>
5356
</Reference>
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>
57+
<Reference Include="DD4T.Utils, Version=2.6.1.0, Culture=neutral, processorArchitecture=MSIL">
58+
<HintPath>..\packages\DD4T.Core.2.6.1\lib\net45\DD4T.Utils.dll</HintPath>
5659
</Reference>
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>
60+
<Reference Include="DD4T.ViewModels, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
61+
<HintPath>..\packages\DD4T.Core.2.6.1\lib\net45\DD4T.ViewModels.dll</HintPath>
5962
</Reference>
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>
63+
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
64+
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
6265
</Reference>
63-
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
64-
<HintPath>..\packages\NLog.4.4.4\lib\net45\NLog.dll</HintPath>
65-
<Private>False</Private>
66+
<Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
67+
<HintPath>..\packages\NLog.5.3.4\lib\net46\NLog.dll</HintPath>
6668
</Reference>
6769
<Reference Include="System" />
70+
<Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
71+
<HintPath>..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
72+
</Reference>
73+
<Reference Include="System.Configuration" />
6874
<Reference Include="System.Core" />
75+
<Reference Include="System.IO.Compression" />
76+
<Reference Include="System.Memory, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
77+
<HintPath>..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll</HintPath>
78+
</Reference>
79+
<Reference Include="System.Numerics" />
80+
<Reference Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
81+
<HintPath>..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll</HintPath>
82+
</Reference>
83+
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
84+
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
85+
</Reference>
86+
<Reference Include="System.Text.Encoding.CodePages, Version=9.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
87+
<HintPath>..\packages\System.Text.Encoding.CodePages.9.0.1\lib\net462\System.Text.Encoding.CodePages.dll</HintPath>
88+
</Reference>
6989
<Reference Include="System.Xml.Linq" />
7090
<Reference Include="System.Data.DataSetExtensions" />
7191
<Reference Include="Microsoft.CSharp" />
@@ -91,7 +111,10 @@
91111
<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>
92112
</PropertyGroup>
93113
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
114+
<!-- <Error Condition="!Exists('..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets'))" /> -->
115+
<Error Condition="!Exists('..\packages\SixLabors.ImageSharp.3.1.6\build\SixLabors.ImageSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SixLabors.ImageSharp.3.1.6\build\SixLabors.ImageSharp.props'))" />
94116
</Target>
117+
<!-- <Import Project="..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets" Condition="Exists('..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets')" /> -->
95118
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
96119
Other similar extension points exist, see Microsoft.Common.targets.
97120
<Target Name="BeforeBuild">

‎source/DD4T.Logging.NLog/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.2")]
36-
[assembly: AssemblyFileVersion("1.0.2")]
37-
[assembly: AssemblyInformationalVersion("1.0.2-alpha")]
35+
[assembly: AssemblyVersion("2.6.0")]
36+
[assembly: AssemblyFileVersion("2.6.0")]
37+
[assembly: AssemblyInformationalVersion("2.6.0")]

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

+18-10
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,31 @@
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.6.1.0" newVersion="2.6.1.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.6.1.0" newVersion="2.6.1.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.6.1.0" newVersion="2.6.1.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" />
20+
</dependentAssembly>
21+
<dependentAssembly>
22+
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
23+
<bindingRedirect oldVersion="0.0.0.0-6.0.1.0" newVersion="6.0.1.0" />
24+
</dependentAssembly>
25+
<dependentAssembly>
26+
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
27+
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
2028
</dependentAssembly>
2129
</assemblyBinding>
2230
</runtime>
23-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1"/></startup></configuration>
31+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" /></startup></configuration>

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

+11-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
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" />
6-
<package id="NLog" version="4.4.4" targetFramework="net452" />
3+
<package id="DD4T.Core" version="2.6.1" targetFramework="net48" />
4+
<package id="DD4T.Model" version="2.6.1" targetFramework="net48" />
5+
<package id="MSBuildTasks" version="1.5.0.235" targetFramework="net48" developmentDependency="true" />
6+
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
7+
<package id="NLog" version="5.3.4" targetFramework="net48" />
8+
<package id="SixLabors.ImageSharp" version="3.1.6" targetFramework="net48" />
9+
<package id="System.Buffers" version="4.6.0" targetFramework="net48" />
10+
<package id="System.Memory" version="4.6.0" targetFramework="net48" />
11+
<package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net48" />
12+
<package id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" targetFramework="net48" />
13+
<package id="System.Text.Encoding.CodePages" version="9.0.1" targetFramework="net48" />
714
</packages>

0 commit comments

Comments
 (0)