Upgrade to netstandard 2.0 and add Linq support

.gitignore

@@ -7,7 +7,8 @@ build/
 *.suo
 *.sln.cache
 _ReSharper.*/
-AssemblyInfo.cs
 *.user
 /Rhino.Security/Rhino.Security.xml
-/Rhino.Security/Rhino.Security.XML
+/Rhino.Security/Rhino.Security.XML
+.vs
+[Pp]ackages

How to build.txt

@@ -1,10 +1 @@
-In order to build this project, you need to execute the psake build script from the PowerShell console.
-You do this using the following command from the root project directory:
-
-	.\psake.ps1 default.ps1
-
-You may need to allow script execution by running the following command as administrator:
-
-	Set-ExecutionPolicy unrestricted
-
-Also note that the build script assume that you have git.exe on your path.
+Open in Visual Studio 2019 and build. No special steps needed.

Rhino.Security.ActiveRecord/Rhino.Security.ActiveRecord.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Rhino.Security.ActiveRecord</RootNamespace>
     <AssemblyName>Rhino.Security.ActiveRecord</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
@@ -31,6 +31,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -41,6 +42,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -50,32 +52,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Castle.ActiveRecord, Version=3.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Castle.Activerecord.3.0.0.1\lib\net35\Castle.ActiveRecord.dll</HintPath>
-    </Reference>
-    <Reference Include="Castle.ActiveRecord.Web, Version=0.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Castle.Activerecord.3.0.0.1\lib\net35\Castle.ActiveRecord.Web.dll</HintPath>
-    </Reference>
-    <Reference Include="Castle.Components.Validator, Version=2.5.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Castle.Components.Validator.2.5.0\lib\NET35\Castle.Components.Validator.dll</HintPath>
-    </Reference>
-    <Reference Include="Castle.Core, Version=3.1.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Castle.Core.3.1.0\lib\net35\Castle.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Iesi.Collections.3.3.1.4000\lib\Net35\Iesi.Collections.dll</HintPath>
-    </Reference>
-    <Reference Include="NHibernate, Version=3.3.1.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\NHibernate.3.3.1.4000\lib\Net35\NHibernate.dll</HintPath>
-    </Reference>
-    <Reference Include="NHibernate.Search, Version=0.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Castle.Activerecord.3.0.0.1\lib\net35\NHibernate.Search.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -87,12 +66,6 @@
     <Compile Include="RegisterRhinoSecurityModels.cs" />
     <Compile Include="RhinoSecurity.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Rhino.Security\Rhino.Security.csproj">
-      <Project>{DBA372FE-3D52-45B3-AF82-B37696328764}</Project>
-      <Name>Rhino.Security</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
       <Visible>False</Visible>
@@ -111,7 +84,15 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <PackageReference Include="Castle.Activerecord">
+      <Version>3.0.0.1</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Rhino.Security\Rhino.Security.csproj">
+      <Project>{2ffcef0e-cead-4187-bbcd-cb0f60cf09aa}</Project>
+      <Name>Rhino.Security</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

Rhino.Security.Tests/AccountInfromationExtractor.cs → Rhino.Security.Tests/AccountInformationExtractor.cs

@@ -1,40 +1,41 @@
-using NHibernate;
-using NHibernate.Criterion;
-using Rhino.Security.Interfaces;
-
-namespace Rhino.Security.Tests
-{
-    using System;
-
-    public class AccountInfromationExtractor : IEntityInformationExtractor<Account>
-    {
-        private readonly ISession session;
-
-        public AccountInfromationExtractor(ISession session)
-        {
-            this.session = session;
-        }
-
-        public Guid GetSecurityKeyFor(Account entity)
-        {
-            return entity.SecurityKey;
-        }
-
-        public string GetDescription(Guid securityKey)
-        {
-            Account account = session.CreateCriteria<Account>()
-                .Add(Restrictions.Eq("SecurityKey", securityKey))
-                .UniqueResult<Account>();
-            return string.Format("Account: {0}", account.Name);
-        }
-
-        /// <summary>
-        /// Gets the name of the security key property.
-        /// </summary>
-        /// <value>The name of the security key property.</value>
-        public string SecurityKeyPropertyName
-        {
-            get { return "SecurityKey"; }
-        }
-    }
+using System.Linq.Expressions;
+using NHibernate;
+using NHibernate.Criterion;
+using Rhino.Security.Interfaces;
+
+namespace Rhino.Security.Tests
+{
+    using System;
+
+    public class AccountInformationExtractor : IEntityInformationExtractor<Account>
+    {
+        private readonly ISession session;
+
+        public AccountInformationExtractor(ISession session)
+        {
+            this.session = session;
+        }
+
+        public Guid GetSecurityKeyFor(Account entity)
+        {
+            return entity.SecurityKey;
+        }
+
+        public string GetDescription(Guid securityKey)
+        {
+            Account account = session.CreateCriteria<Account>()
+                .Add(Restrictions.Eq("SecurityKey", securityKey))
+                .UniqueResult<Account>();
+            return string.Format("Account: {0}", account.Name);
+        }
+
+        /// <summary>
+        /// Gets the name of the security key property.
+        /// </summary>
+        /// <value>The name of the security key property.</value>
+        public string SecurityKeyPropertyName
+        {
+            get { return "SecurityKey"; }
+        }
+    }
 }