Skip to content

Commit

Permalink
preparing release 2.5
Browse files Browse the repository at this point in the history
  • Loading branch information
quirijnslings committed Dec 21, 2019
1 parent b62ade2 commit 9405f12
Show file tree
Hide file tree
Showing 7 changed files with 84 additions and 89 deletions.
5 changes: 4 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 2.3.2
version: 2.5
pull_requests:
do_not_increment_build_number: true
branches:
Expand Down Expand Up @@ -27,6 +27,9 @@ notifications:
auth_token:
secure: sPqYbVki+502+OjRT+o3eITyiG8UDZ0Fu4M1fejZxs3O6OKtYu9JCNS9Ssw3/XjL
channel: '#development'
skip_commits:
message: /\[nobuild\]/
skip_tags: true
deploy:
- provider: NuGet
api_key:
Expand Down
4 changes: 2 additions & 2 deletions configuration/DD4T.Providers.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
</releaseNotes>
<tags>SDLTridion Tridion Tridion9 SDL SDLWeb SDLWeb9 Web DD4T</tags>
<dependencies>
<dependency id="DD4T.Core" version="2.2.9" />
<dependency id="Sdl.Web.Delivery" version="11.0.0" />
<dependency id="DD4T.Core" version="2.5" />
<dependency id="Sdl.Web.Delivery" version="11.0.1062" />
</dependencies>
</metadata>
</package>
122 changes: 46 additions & 76 deletions source/DD4T.Providers.Tridion9.CIL/DD4T.Providers.Tridion9.CIL.csproj

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions source/DD4T.Providers.Tridion9.CIL/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.3.1.0")]
[assembly: AssemblyFileVersion("2.3.1.0")]
[assembly: AssemblyInformationalVersion("2.3.1.0")]
[assembly: AssemblyVersion("2.3.3.0")]
[assembly: AssemblyFileVersion("2.3.3.0")]
[assembly: AssemblyInformationalVersion("2.3.3.0")]
12 changes: 12 additions & 0 deletions source/DD4T.Providers.Tridion9.CIL/app.config
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,18 @@
<assemblyIdentity name="DD4T.Serialization" publicKeyToken="4450e3c7f68bf872" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.2.2.0" newVersion="2.2.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Xml.ReaderWriter" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.Extensions" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /></startup></configuration>
14 changes: 7 additions & 7 deletions source/DD4T.Providers.Tridion9.CIL/packages.config
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net462" />
<package id="DD4T.Core" version="2.2.7" targetFramework="net462" />
<package id="DD4T.Model" version="2.2.2" targetFramework="net462" />
<package id="DD4T.Core" version="2.5.0" targetFramework="net462" />
<package id="DD4T.Model" version="2.5.0" targetFramework="net462" />
<package id="Microsoft.Data.Edm" version="5.8.4" targetFramework="net462" />
<package id="Microsoft.Data.OData" version="5.8.4" targetFramework="net462" />
<package id="Microsoft.Data.Services.Client" version="5.8.4" targetFramework="net462" />
Expand All @@ -20,20 +20,20 @@
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net462" />
<package id="NETStandard.Library" version="1.6.1" targetFramework="net462" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net462" />
<package id="Sdl.Web.Delivery" version="11.0.0" targetFramework="net462" />
<package id="Sdl.Web.Delivery" version="11.0.1062" targetFramework="net462" />
<package id="StackExchange.Redis.StrongName" version="1.1.605" targetFramework="net462" />
<package id="System.AppContext" version="4.3.0" targetFramework="net462" />
<package id="System.Collections" version="4.3.0" targetFramework="net462" />
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net462" />
<package id="System.ComponentModel" version="4.3.0" targetFramework="net462" />
<package id="System.ComponentModel.EventBasedAsync" version="4.3.0" targetFramework="net451" />
<package id="System.ComponentModel.EventBasedAsync" version="4.3.0" targetFramework="net462" />
<package id="System.Configuration.ConfigurationManager" version="4.4.1" targetFramework="net462" />
<package id="System.Console" version="4.3.0" targetFramework="net462" />
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net462" />
<package id="System.Diagnostics.DiagnosticSource" version="4.3.0" targetFramework="net462" />
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net462" />
<package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net462" />
<package id="System.Dynamic.Runtime" version="4.3.0" targetFramework="net451" />
<package id="System.Dynamic.Runtime" version="4.3.0" targetFramework="net462" />
<package id="System.Globalization" version="4.3.0" targetFramework="net462" />
<package id="System.Globalization.Calendars" version="4.3.0" targetFramework="net462" />
<package id="System.IO" version="4.3.0" targetFramework="net462" />
Expand All @@ -43,10 +43,10 @@
<package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net462" />
<package id="System.Linq" version="4.3.0" targetFramework="net462" />
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net462" />
<package id="System.Linq.Queryable" version="4.3.0" targetFramework="net451" />
<package id="System.Linq.Queryable" version="4.3.0" targetFramework="net462" />
<package id="System.Net.Http" version="4.3.0" targetFramework="net462" />
<package id="System.Net.Primitives" version="4.3.0" targetFramework="net462" />
<package id="System.Net.Requests" version="4.3.0" targetFramework="net451" />
<package id="System.Net.Requests" version="4.3.0" targetFramework="net462" />
<package id="System.Net.Sockets" version="4.3.0" targetFramework="net462" />
<package id="System.ObjectModel" version="4.3.0" targetFramework="net462" />
<package id="System.Reflection" version="4.3.0" targetFramework="net462" />
Expand Down
10 changes: 10 additions & 0 deletions source/PrivateFalse.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<!-- make all references non-private, so they won't be copied to the output folder -->
<Target Name="ClearReferenceCopyLocalPaths" AfterTargets="ResolveAssemblyReferences">
<ItemGroup>
<ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)" />
</ItemGroup>
</Target>
</Project>

0 comments on commit 9405f12

Please sign in to comment.