Merge branch 'master' of https://github.com/achimismaili/featureadmin…

….git
achimismaili · Jul 12, 2018 · b08f85c · b08f85c
2 parents 28c6b3d + 02d21a2
commit b08f85c
Show file tree

Hide file tree

Showing 43 changed files with 2,048 additions and 1,252 deletions.
diff --git a/src/Backends/Demo/Demo.csproj b/src/Backends/Demo/Demo.csproj
@@ -12,6 +12,8 @@
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -44,6 +46,10 @@
       <HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="NullGuard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1ca091877d12ca03, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NullGuard.Fody.1.6.3\lib\netstandard1.0\NullGuard.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="OrigoDB.Core, Version=0.19.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\OrigoDB.Core.0.19.0\lib\net40\OrigoDB.Core.dll</HintPath>
       <Private>True</Private>
@@ -82,14 +88,23 @@
       <Name>FeatureAdmin.SampleData</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <None Include="FodyWeavers.xml" />
+  </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\..\packages\Fody.2.1.2\build\netstandard1.0\Fody.targets" Condition="Exists('..\..\packages\Fody.2.1.2\build\netstandard1.0\Fody.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\packages\Fody.2.1.2\build\netstandard1.0\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.2.1.2\build\netstandard1.0\Fody.targets'))" />
+  </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">

diff --git a/src/Backends/Demo/FodyWeavers.xml b/src/Backends/Demo/FodyWeavers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Weavers>
+
+</Weavers>
diff --git a/src/Backends/Demo/Repository/DemoRepository.cs b/src/Backends/Demo/Repository/DemoRepository.cs
@@ -4,7 +4,6 @@
 using OrigoDB.Core;
 using System;
 using System.Collections.Generic;
-using FeatureAdmin.Core.Messages.Completed;
 
 namespace FeatureAdmin.Backends.Demo.Repository
 {
@@ -41,9 +40,9 @@ public void AddFeatureDefinitions(IEnumerable<FeatureDefinition> featureDefiniti
         //    store.AddActivatedFeatures(activatedFeatures);
         //}
 
-        public void AddLoadedLocations(Core.Messages.Completed.LocationsLoaded message)
+        public void AddLoadedLocations(LoadedDto message)
         {
-             store.AddLoadedLocations(message.LoadedElements);
+             store.AddLoadedLocations(message);
         }
 
         /// <summary>
@@ -78,17 +77,7 @@ public IEnumerable<Location> GetLocationsCanDeactivate([NotNull] FeatureDefiniti
         {
             return store.GetLocationsCanDeactivate(featureDefinition, location);
         }
-
-        public bool IsFeatureActivated(Guid featureDefinitionId, Guid? locationId = null)
-        {
-            return store.IsFeatureActivated(featureDefinitionId, locationId);
-        }
-
-        public bool IsItPossibleToActivateFeature(FeatureDefinition featureDefinition)
-        {
-            return store.IsItPossibleToActivateFeature(featureDefinition);
-        }
-
+
         public string RemoveActivatedFeature([NotNull] Guid featureId, [NotNull] Guid locationId)
         {
             return store.RemoveActivatedFeature(featureId, locationId);