Added support for LiquidProjections 3.0. {Breaking} (#6)

liquidprojections · Apr 28, 2018 · cb4455d · cb4455d
1 parent 28d726b
commit cb4455d
Show file tree

Hide file tree

Showing 17 changed files with 226 additions and 316 deletions.
diff --git a/.vs/LiquidProjections.RavenDB/v15/Server/sqlite3/db.lock b/.vs/LiquidProjections.RavenDB/v15/Server/sqlite3/db.lock
diff --git a/.vs/LiquidProjections.RavenDB/v15/Server/sqlite3/storage.ide b/.vs/LiquidProjections.RavenDB/v15/Server/sqlite3/storage.ide
diff --git a/LiquidProjections.RavenDB.sln b/LiquidProjections.RavenDB.sln
@@ -15,12 +15,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Specs", "Specs", "{15D45AC7
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LiquidProjections.RavenDB", "Src\LiquidProjections.RavenDB\LiquidProjections.RavenDB.csproj", "{F5953539-5C27-4A7C-89BD-7FBE4A67915A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LiquidProjections.RavenDB.Specs", "Tests\LiquidProjections.RavenDB.Specs\LiquidProjections.RavenDB.Specs.csproj", "{44DC67E0-56FE-4ADD-BFBC-7FB2136114BD}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{A778B012-D3DB-4B65-AECB-F18ECD677CCD}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExampleHost", "Samples\ExampleHost\ExampleHost.csproj", "{1B10C576-5212-402E-AC19-8CA1547E3F34}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LiquidProjections.RavenDB.Specs", "Tests\LiquidProjections.RavenDB.Specs\LiquidProjections.RavenDB.Specs.csproj", "{D022DA9C-D7A7-4E5F-B6A3-BD09FE0ECAC5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -31,21 +31,21 @@ Global
 		{F5953539-5C27-4A7C-89BD-7FBE4A67915A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F5953539-5C27-4A7C-89BD-7FBE4A67915A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F5953539-5C27-4A7C-89BD-7FBE4A67915A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{44DC67E0-56FE-4ADD-BFBC-7FB2136114BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{44DC67E0-56FE-4ADD-BFBC-7FB2136114BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{44DC67E0-56FE-4ADD-BFBC-7FB2136114BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{44DC67E0-56FE-4ADD-BFBC-7FB2136114BD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1B10C576-5212-402E-AC19-8CA1547E3F34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1B10C576-5212-402E-AC19-8CA1547E3F34}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1B10C576-5212-402E-AC19-8CA1547E3F34}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1B10C576-5212-402E-AC19-8CA1547E3F34}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D022DA9C-D7A7-4E5F-B6A3-BD09FE0ECAC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D022DA9C-D7A7-4E5F-B6A3-BD09FE0ECAC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D022DA9C-D7A7-4E5F-B6A3-BD09FE0ECAC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D022DA9C-D7A7-4E5F-B6A3-BD09FE0ECAC5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{F5953539-5C27-4A7C-89BD-7FBE4A67915A} = {AE89AB5E-BC68-4AA3-9183-A222AC81691C}
-		{44DC67E0-56FE-4ADD-BFBC-7FB2136114BD} = {15D45AC7-E234-431A-8EF9-0A3311A33926}
 		{1B10C576-5212-402E-AC19-8CA1547E3F34} = {A778B012-D3DB-4B65-AECB-F18ECD677CCD}
+		{D022DA9C-D7A7-4E5F-B6A3-BD09FE0ECAC5} = {15D45AC7-E234-431A-8EF9-0A3311A33926}
 	EndGlobalSection
 EndGlobal
diff --git a/LiquidProjections.RavenDB.sln.DotSettings b/LiquidProjections.RavenDB.sln.DotSettings
@@ -6,6 +6,7 @@
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOREACH/@EntryValue">Required</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_IFELSE/@EntryValue">Required</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_WHILE/@EntryValue">Required</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ANONYMOUSMETHOD_ON_SINGLE_LINE/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_WHILE_ON_NEW_LINE/@EntryValue">True</s:Boolean>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIMIT/@EntryValue">130</s:Int64>
@@ -51,7 +52,12 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=NAMESPACE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/UnitTesting/DisabledProviders/=MSTest/@EntryIndexedValue">True</s:Boolean>

diff --git a/Samples/ExampleHost/App.config b/Samples/ExampleHost/App.config
@@ -7,19 +7,19 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.4.0" newVersion="5.2.4.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.4.0" newVersion="5.2.4.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Http.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.4.0" newVersion="5.2.4.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Owin.Hosting" publicKeyToken="31bf3856ad364e35" culture="neutral" />

diff --git a/Samples/ExampleHost/ExampleHost.csproj b/Samples/ExampleHost/ExampleHost.csproj
@@ -39,11 +39,13 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="LiquidProjections, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\LiquidProjections.2.0.0\lib\netstandard1.1\LiquidProjections.dll</HintPath>
+    <Reference Include="LiquidProjections, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\..\packages\LiquidProjections.3.0.0\lib\netstandard1.1\LiquidProjections.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="LiquidProjections.Abstractions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\LiquidProjections.Abstractions.2.0.0\lib\netstandard1.1\LiquidProjections.Abstractions.dll</HintPath>
+    <Reference Include="LiquidProjections.Abstractions, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\..\packages\LiquidProjections.Abstractions.3.0.0\lib\netstandard1.1\LiquidProjections.Abstractions.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Owin, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.Owin.3.1.0\lib\net45\Microsoft.Owin.dll</HintPath>
@@ -65,35 +67,35 @@
       <HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Ploeh.AutoFixture, Version=3.50.2.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\AutoFixture.3.50.2\lib\net40\Ploeh.AutoFixture.dll</HintPath>
+    <Reference Include="Ploeh.AutoFixture, Version=3.51.0.0, Culture=neutral, PublicKeyToken=b24654c590009d4f">
+      <HintPath>..\..\packages\AutoFixture.3.51.0\lib\net40\Ploeh.AutoFixture.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Raven.Abstractions, Version=3.5.3.0, Culture=neutral, PublicKeyToken=37f41c7f99471593, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\RavenDB.Database.3.5.3\lib\net45\Raven.Abstractions.dll</HintPath>
+    <Reference Include="Raven.Abstractions, Version=3.5.6.0, Culture=neutral, PublicKeyToken=37f41c7f99471593">
+      <HintPath>..\..\packages\RavenDB.Database.3.5.6\lib\net45\Raven.Abstractions.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Raven.Client.Lightweight, Version=3.5.3.0, Culture=neutral, PublicKeyToken=37f41c7f99471593, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\RavenDB.Client.3.5.3\lib\net45\Raven.Client.Lightweight.dll</HintPath>
+    <Reference Include="Raven.Client.Lightweight, Version=3.5.6.0, Culture=neutral, PublicKeyToken=37f41c7f99471593">
+      <HintPath>..\..\packages\RavenDB.Client.3.5.6\lib\net45\Raven.Client.Lightweight.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Raven.Database, Version=3.5.3.0, Culture=neutral, PublicKeyToken=37f41c7f99471593, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\RavenDB.Database.3.5.3\lib\net45\Raven.Database.dll</HintPath>
+    <Reference Include="Raven.Database, Version=3.5.6.0, Culture=neutral, PublicKeyToken=37f41c7f99471593">
+      <HintPath>..\..\packages\RavenDB.Database.3.5.6\lib\net45\Raven.Database.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Core" />
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.IO.Compression.FileSystem" />
-    <Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Net.Http.Formatting, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.4\lib\net45\System.Net.Http.Formatting.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.Http, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Web.Http, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.4\lib\net45\System.Web.Http.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.Http.Owin, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Owin.5.2.3\lib\net45\System.Web.Http.Owin.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Web.Http.Owin, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Owin.5.2.4\lib\net45\System.Web.Http.Owin.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -158,11 +160,11 @@
   <PropertyGroup>
     <PreBuildEvent>del /f /s /q "$(TargetDir)"</PreBuildEvent>
   </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
   -->
 </Project>
diff --git a/Samples/ExampleHost/packages.config b/Samples/ExampleHost/packages.config
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AutoFixture" version="3.50.2" targetFramework="net452" />
-  <package id="LiquidProjections" version="2.0.0" targetFramework="net45" />
-  <package id="LiquidProjections.Abstractions" version="2.0.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.Owin" version="5.2.3" targetFramework="net452" />
+  <package id="AutoFixture" version="3.51.0" targetFramework="net45" />
+  <package id="LiquidProjections" version="3.0.0" targetFramework="net45" />
+  <package id="LiquidProjections.Abstractions" version="3.0.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.4" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.4" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebApi.Owin" version="5.2.4" targetFramework="net45" />
   <package id="Microsoft.Owin" version="3.1.0" targetFramework="net45" />
   <package id="Microsoft.Owin.Diagnostics" version="3.1.0" targetFramework="net45" />
   <package id="Microsoft.Owin.Host.HttpListener" version="3.1.0" targetFramework="net45" />
   <package id="Microsoft.Owin.Hosting" version="3.1.0" targetFramework="net45" />
   <package id="Microsoft.Owin.SelfHost" version="3.1.0" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
   <package id="Owin" version="1.0" targetFramework="net452" />
-  <package id="RavenDB.Client" version="3.5.3" targetFramework="net452" />
-  <package id="RavenDB.Database" version="3.5.3" targetFramework="net452" />
-  <package id="RavenDB.Embedded" version="3.5.3" targetFramework="net452" />
+  <package id="RavenDB.Client" version="3.5.6" targetFramework="net45" />
+  <package id="RavenDB.Database" version="3.5.6" targetFramework="net45" />
+  <package id="RavenDB.Embedded" version="3.5.6" targetFramework="net45" />
   <package id="TinyIoC" version="1.3" targetFramework="net452" developmentDependency="true" />
 </packages>
diff --git a/Src/LiquidProjections.RavenDB/.nuspec b/Src/LiquidProjections.RavenDB/.nuspec
@@ -14,7 +14,7 @@
       <dependencies>
         <group>
 			<dependency id="RavenDB.Client" version="[3.0, 4.0)"/>
-			<dependency id="LiquidProjections" version="[2.0, 3.0)"/>
+			<dependency id="LiquidProjections" version="[3.0, 4.0)"/>
 		</group>
       </dependencies>
     </metadata>

diff --git a/Src/LiquidProjections.RavenDB/LiquidProjections.RavenDB.csproj b/Src/LiquidProjections.RavenDB/LiquidProjections.RavenDB.csproj
@@ -31,8 +31,9 @@
     <Compile Include="..\..\SharedAssemblyInfo.cs" Link="SharedAssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="LiquidProjections" Version="2.0.0" />
-    <PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
-    <PackageReference Include="RavenDB.Client" Version="3.5.3" />
+    <PackageReference Include="LiquidProjections" Version="3.0.0" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.4.1" />
+    <PackageReference Include="NETStandard.Library" Version="2.0.2" />
+    <PackageReference Include="RavenDB.Client" Version="3.5.6" />
   </ItemGroup>
 </Project>