Reverted the AU Demo projects to reference Sif.Framework NuGet packag…

…es rather than project references.
nsip · May 26, 2021 · f0131da · f0131da
1 parent a58ccec
commit f0131da
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 32 deletions.
diff --git a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Consumer/Sif.Framework.Demo.Au.Consumer.csproj b/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Consumer/Sif.Framework.Demo.Au.Consumer.csproj
@@ -74,6 +74,9 @@
     <PackageReference Include="log4net">
       <Version>2.0.12</Version>
     </PackageReference>
+    <PackageReference Include="Sif.Framework.EntityFramework">
+      <Version>1.0.0</Version>
+    </PackageReference>
     <PackageReference Include="Sif.Specification.DataModel.Au">
       <Version>3.4.7</Version>
     </PackageReference>
@@ -87,15 +90,5 @@
       <Version>11.1.0</Version>
     </PackageReference>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Sif3Framework\Sif.Framework.EntityFramework\Sif.Framework.EntityFramework.csproj">
-      <Project>{1a926191-955e-4da1-ab71-b333660cc49a}</Project>
-      <Name>Sif.Framework.EntityFramework</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Sif3Framework\Sif.Framework\Sif.Framework.csproj">
-      <Project>{5d4b26bf-8e6e-4c9b-9def-32a12aec90d5}</Project>
-      <Name>Sif.Framework</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/Sif.Framework.Demo.Au.Provider.csproj b/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/Sif.Framework.Demo.Au.Provider.csproj
@@ -115,6 +115,12 @@
     <Reference Include="Remotion.Linq.EagerFetching, Version=2.2.0.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b, processorArchitecture=MSIL">
       <HintPath>..\packages\Remotion.Linq.EagerFetching.2.2.0\lib\net45\Remotion.Linq.EagerFetching.dll</HintPath>
     </Reference>
+    <Reference Include="Sif.Framework, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Sif.Framework.5.0.0\lib\net461\Sif.Framework.dll</HintPath>
+    </Reference>
+    <Reference Include="Sif.Framework.EntityFramework, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Sif.Framework.EntityFramework.1.0.0\lib\net461\Sif.Framework.EntityFramework.dll</HintPath>
+    </Reference>
     <Reference Include="Sif.Specification.DataModel.Au, Version=3.4.7.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Sif.Specification.DataModel.Au.3.4.7\lib\netstandard2.0\Sif.Specification.DataModel.Au.dll</HintPath>
     </Reference>
@@ -277,16 +283,6 @@
       <DependentUpon>Web.config</DependentUpon>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Sif3Framework\Sif.Framework.EntityFramework\Sif.Framework.EntityFramework.csproj">
-      <Project>{1a926191-955e-4da1-ab71-b333660cc49a}</Project>
-      <Name>Sif.Framework.EntityFramework</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Sif3Framework\Sif.Framework\Sif.Framework.csproj">
-      <Project>{5d4b26bf-8e6e-4c9b-9def-32a12aec90d5}</Project>
-      <Name>Sif.Framework</Name>
-    </ProjectReference>
-  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

diff --git a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/packages.config b/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/packages.config
@@ -25,6 +25,8 @@
   <package id="NHibernate" version="5.3.5" targetFramework="net461" />
   <package id="Remotion.Linq" version="2.2.0" targetFramework="net461" />
   <package id="Remotion.Linq.EagerFetching" version="2.2.0" targetFramework="net461" />
+  <package id="Sif.Framework" version="5.0.0" targetFramework="net461" />
+  <package id="Sif.Framework.EntityFramework" version="1.0.0" targetFramework="net461" />
   <package id="Sif.Specification.DataModel.Au" version="3.4.7" targetFramework="net461" />
   <package id="Sif.Specification.Infrastructure" version="3.2.1" targetFramework="net461" />
   <package id="slf4net" version="1.1.0" targetFramework="net461" />

diff --git a/Code/Sif3FrameworkDemo/Sif3FrameworkDemo.sln b/Code/Sif3FrameworkDemo/Sif3FrameworkDemo.sln
@@ -21,10 +21,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sif.Framework.Demo.Hits.Con
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sif.Framework.Demo.Broker", "Sif.Framework.Demo.Broker\Sif.Framework.Demo.Broker.csproj", "{B058872B-5A62-4D45-BC67-2AB7B411444B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sif.Framework.EntityFramework", "..\Sif3Framework\Sif.Framework.EntityFramework\Sif.Framework.EntityFramework.csproj", "{1A926191-955E-4DA1-AB71-B333660CC49A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sif.Framework", "..\Sif3Framework\Sif.Framework\Sif.Framework.csproj", "{5D4B26BF-8E6E-4C9B-9DEF-32A12AEC90D5}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -67,14 +63,6 @@ Global
 		{B058872B-5A62-4D45-BC67-2AB7B411444B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B058872B-5A62-4D45-BC67-2AB7B411444B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B058872B-5A62-4D45-BC67-2AB7B411444B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1A926191-955E-4DA1-AB71-B333660CC49A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1A926191-955E-4DA1-AB71-B333660CC49A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1A926191-955E-4DA1-AB71-B333660CC49A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1A926191-955E-4DA1-AB71-B333660CC49A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5D4B26BF-8E6E-4C9B-9DEF-32A12AEC90D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5D4B26BF-8E6E-4C9B-9DEF-32A12AEC90D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5D4B26BF-8E6E-4C9B-9DEF-32A12AEC90D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5D4B26BF-8E6E-4C9B-9DEF-32A12AEC90D5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Data/Databases/SQLite/SifFrameworkDatabase.db b/Data/Databases/SQLite/SifFrameworkDatabase.db