Merge branch 'develop'

dd4t · Jul 7, 2016 · 2dddee8 · 2dddee8
2 parents 3cbbfba + 9297349
commit 2dddee8
Show file tree

Hide file tree

Showing 11 changed files with 48 additions and 13 deletions.
diff --git a/DD4T Model.Targets b/DD4T Model.Targets
@@ -48,7 +48,7 @@
 			<Code Type="Fragment" Language="cs">
 				<![CDATA[
 					Log.LogMessage("Getting version details of assembly " + this.AssemblyFile, MessageImportance.High);
-					this.Version = FileVersionInfo.GetVersionInfo(this.AssemblyFile.Split(';')[0]).ProductVersion;
+					this.Version = FileVersionInfo.GetVersionInfo(this.AssemblyFile.Split(';').Where(a => a.Contains("DD4T")).ToList()[0]).ProductVersion;
 					Log.LogMessage("AssemblyVersion: " + this.Version, MessageImportance.High);
 				]]>
 			</Code>

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,6 @@
-version: 2.0.7
+version: 2.0.7.{build}-alpha
+pull_requests:
+  do_not_increment_build_number: true
 branches:
   only:
   - master

diff --git a/configuration/DD4T.Model.nuspec b/configuration/DD4T.Model.nuspec
@@ -9,7 +9,7 @@
     <description>Content model classes of DD4T</description>
     <releaseNotes>
     </releaseNotes>
-    <tags>SDLTridion Tridion DD4T</tags>
+    <tags>SDLTridion Tridion DD4T SDL Web SDLWeb SDLWeb8</tags>
     <dependencies>
       <dependency id="Newtonsoft.Json" version="6.0.8" />
     </dependencies>

diff --git a/source/DD4T Model.sln b/source/DD4T Model.sln
@@ -1,6 +1,7 @@
+
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DD4T.ContentModel.Contracts", "DD4T.ContentModel.Contracts\DD4T.ContentModel.Contracts.csproj", "{C21F66F0-01CE-4AF3-B76C-CD262B7EA1C0}"
 EndProject

diff --git a/source/DD4T.ContentModel.Contracts/DD4T.ContentModel.Contracts.csproj b/source/DD4T.ContentModel.Contracts/DD4T.ContentModel.Contracts.csproj
@@ -48,6 +48,7 @@
     <Compile Include="..\Solution Items\AssemblyInfo.cs">
       <Link>Properties\AssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="IBinaryMeta.cs" />
     <Compile Include="ICondition.cs" />
     <Compile Include="IModel.cs" />
     <Compile Include="IItem.cs" />

diff --git a/source/DD4T.ContentModel.Contracts/IBinaryMeta.cs b/source/DD4T.ContentModel.Contracts/IBinaryMeta.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.IO;
+
+namespace DD4T.ContentModel
+{  
+    public interface IBinaryMeta
+    {
+        string Id { get; }
+        string VariantId { get; }
+        DateTime LastPublishedDate { get; }
+        bool HasLastPublishedDate { get; }
+    }
+}
diff --git a/source/DD4T.ContentModel/BinaryMeta.cs b/source/DD4T.ContentModel/BinaryMeta.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace DD4T.ContentModel
+{
+    public class BinaryMeta : IBinaryMeta
+    {
+        public string VariantId { get; set; }
+        public string Id { get; set; }
+        public DateTime LastPublishedDate { get; set; }
+        public bool HasLastPublishedDate { get; set; }
+    }
+}
diff --git a/source/DD4T.ContentModel/DD4T.ContentModel.csproj b/source/DD4T.ContentModel/DD4T.ContentModel.csproj
@@ -48,6 +48,7 @@
     <Compile Include="..\Solution Items\AssemblyInfo.cs">
       <Link>Properties\AssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="BinaryMeta.cs" />
     <Compile Include="ContentModel.cs" />
     <Compile Include="Exceptions\FieldHasNoValueException.cs" />
     <Compile Include="Exceptions\FieldTypeNotDefinedException.cs" />

diff --git a/source/DD4T.Serialization/DD4T.Serialization.csproj b/source/DD4T.Serialization/DD4T.Serialization.csproj
@@ -39,10 +39,9 @@
   <ItemGroup>
     <Reference Include="DD4T.ContentModel.XmlSerializers">
       <HintPath>..\..\build\bin\DD4T.ContentModel.XmlSerializers.dll</HintPath>
-      <Private>True</Private>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net40\Newtonsoft.Json.dll</HintPath>
       <Private>False</Private>
     </Reference>
@@ -99,7 +98,7 @@
   <Import Project="..\..\DD4T Model.Targets" />
   <Target Name="AfterBuild">
     <CallTarget Targets="Package" />
-    <Message Text="Installing package to local NuGet repo" Importance="high" Condition="'$(NUGET_LOCALREPO)' != ''"/>
-    <CallTarget Targets="Install" Condition="'$(NUGET_LOCALREPO)' != ''"/>
+    <Message Text="Installing package to local NuGet repo" Importance="high" Condition="'$(NUGET_LOCALREPO)' != ''" />
+    <CallTarget Targets="Install" Condition="'$(NUGET_LOCALREPO)' != ''" />
   </Target>
 </Project>
diff --git a/source/DD4T.Serialization/packages.config b/source/DD4T.Serialization/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net4" />
 </packages>
diff --git a/source/Solution Items/AssemblyInfo.cs b/source/Solution Items/AssemblyInfo.cs
@@ -27,7 +27,7 @@
 //      Revision (anything under 100 is beta or pre-release)
 //      The last digit is left to 0
 //  
-[assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.2.0")]
-[assembly: AssemblyInformationalVersion("2.0.0-alpha6")]
+[assembly: AssemblyVersion("2.0.8.0")]
+[assembly: AssemblyFileVersion("2.0.8.0")]
+[assembly: AssemblyInformationalVersion("2.0.8")]
 [assembly: AssemblyProduct("DD4T")]