From 3fe1f128650ffe46c3ce82cb6300d6ea1a94493a Mon Sep 17 00:00:00 2001
From: Will Strohl <will@upendoventures.com>
Date: Wed, 12 Aug 2020 10:20:20 -0700
Subject: [PATCH 1/4] Added Glimpse EF6 to resolve errors in newer DNN
 instances

---
 Modules/dnnGlimpse/BuildScripts/ModulePackage.targets | 1 +
 Modules/dnnGlimpse/dnnGlimpse.csproj                  | 3 +++
 Modules/dnnGlimpse/packages.config                    | 1 +
 3 files changed, 5 insertions(+)

diff --git a/Modules/dnnGlimpse/BuildScripts/ModulePackage.targets b/Modules/dnnGlimpse/BuildScripts/ModulePackage.targets
index f2a64a9..45e0c36 100644
--- a/Modules/dnnGlimpse/BuildScripts/ModulePackage.targets
+++ b/Modules/dnnGlimpse/BuildScripts/ModulePackage.targets
@@ -92,6 +92,7 @@
     <Copy SourceFiles="$(MSBuildDnnBinPath)\Glimpse.core.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin" />
     <Copy SourceFiles="$(MSBuildDnnBinPath)\Glimpse.webforms.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin" />
     <Copy SourceFiles="$(MSBuildDnnBinPath)\Glimpse.ado.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin" />
+    <Copy SourceFiles="$(MSBuildDnnBinPath)\Glimpse.EF6.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin" />
     <Copy SourceFiles="@(SqlDataProviderFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package\%(RecursiveDir)" />
     <Copy SourceFiles="@(PackageManifestFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
     <Copy SourceFiles="@(PackageTxtFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
diff --git a/Modules/dnnGlimpse/dnnGlimpse.csproj b/Modules/dnnGlimpse/dnnGlimpse.csproj
index 27c1869..32f691d 100644
--- a/Modules/dnnGlimpse/dnnGlimpse.csproj
+++ b/Modules/dnnGlimpse/dnnGlimpse.csproj
@@ -67,6 +67,9 @@
     <Reference Include="Glimpse.Core, Version=1.8.6.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Glimpse.1.8.6\lib\net45\Glimpse.Core.dll</HintPath>
     </Reference>
+    <Reference Include="Glimpse.EF6, Version=1.6.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Glimpse.EF6.1.6.5\lib\net45\Glimpse.EF6.dll</HintPath>
+    </Reference>
     <Reference Include="Glimpse.WebForms, Version=1.1.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Glimpse.WebForms.1.1.1\lib\net45\Glimpse.WebForms.dll</HintPath>
     </Reference>
diff --git a/Modules/dnnGlimpse/packages.config b/Modules/dnnGlimpse/packages.config
index b683058..508c31f 100644
--- a/Modules/dnnGlimpse/packages.config
+++ b/Modules/dnnGlimpse/packages.config
@@ -6,6 +6,7 @@
   <package id="Glimpse" version="1.8.6" targetFramework="net451" />
   <package id="Glimpse.Ado" version="1.7.3" targetFramework="net451" />
   <package id="Glimpse.AspNet" version="1.9.2" targetFramework="net451" />
+  <package id="Glimpse.EF6" version="1.6.5" targetFramework="net451" />
   <package id="Glimpse.WebForms" version="1.1.1" targetFramework="net451" />
   <package id="MSBuildTasks" version="1.4.0.61" targetFramework="net40" />
 </packages>
\ No newline at end of file

From 02c506b64195d9cd2e8c17bbbaf0dff4fb744185 Mon Sep 17 00:00:00 2001
From: Will Strohl <will@upendoventures.com>
Date: Wed, 12 Aug 2020 10:20:33 -0700
Subject: [PATCH 2/4] Prepping for potential release :)

---
 .../Properties/AssemblyInfo.cs                      |  4 ++--
 Modules/dnnGlimpse/Properties/AssemblyInfo.cs       |  4 ++--
 Modules/dnnGlimpse/ReleaseNotes.txt                 |  5 +++++
 Modules/dnnGlimpse/dnnGlimpse.dnn                   | 13 +++++++++----
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/Libraries/DotNetNuke.Extensions.Glimpse/Properties/AssemblyInfo.cs b/Libraries/DotNetNuke.Extensions.Glimpse/Properties/AssemblyInfo.cs
index 2c570a6..9584444 100644
--- a/Libraries/DotNetNuke.Extensions.Glimpse/Properties/AssemblyInfo.cs
+++ b/Libraries/DotNetNuke.Extensions.Glimpse/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("01.01.00")]
-[assembly: AssemblyFileVersion("01.00.00")]
+[assembly: AssemblyVersion("01.01.01")]
+[assembly: AssemblyFileVersion("01.01.01")]
diff --git a/Modules/dnnGlimpse/Properties/AssemblyInfo.cs b/Modules/dnnGlimpse/Properties/AssemblyInfo.cs
index c69b6d4..1d6575d 100644
--- a/Modules/dnnGlimpse/Properties/AssemblyInfo.cs
+++ b/Modules/dnnGlimpse/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("01.01.00")]
-[assembly: AssemblyFileVersion("01.01.00")]
+[assembly: AssemblyVersion("01.01.01")]
+[assembly: AssemblyFileVersion("01.01.01")]
diff --git a/Modules/dnnGlimpse/ReleaseNotes.txt b/Modules/dnnGlimpse/ReleaseNotes.txt
index ab3629a..bbd2e11 100644
--- a/Modules/dnnGlimpse/ReleaseNotes.txt
+++ b/Modules/dnnGlimpse/ReleaseNotes.txt
@@ -17,6 +17,11 @@
     <hr/>
     <div class="notes">
 	    <h3>About dnnGlimpse </h3>
+		<h5>Version 1.1.1</h5>
+	    <p>This version includes the following changes:</p>
+        <ul>
+            <li>Resolves page load issues by updating to EF 6, thanks <a href="https://github.com/UpendoVentures">@UpendoVentures</a>!</li>
+        </ul>
 		<h5>Version 1.1.0</h5>
 	    <p>This version includes the following changes:</p>
         <ul>
diff --git a/Modules/dnnGlimpse/dnnGlimpse.dnn b/Modules/dnnGlimpse/dnnGlimpse.dnn
index 52a8e9c..7b9e045 100644
--- a/Modules/dnnGlimpse/dnnGlimpse.dnn
+++ b/Modules/dnnGlimpse/dnnGlimpse.dnn
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="dnnGlimpse" type="Module" version="01.01.00">
+    <package name="dnnGlimpse" type="Module" version="01.01.01">
       <friendlyName>dnnGlimpse</friendlyName>
       <description>DotNetNuke dnnGlimpse module</description>
       <iconFile>DesktopModules\dnnglimpse\icons\Glimpse_64px.gif</iconFile>
@@ -70,7 +70,7 @@
             <attributes>
               <businessControllerClass>DotNetNuke.Modules.dnnGlimpse.Components.FeatureController, dnnGlimpse</businessControllerClass>
               <desktopModuleID>[DESKTOPMODULEID]</desktopModuleID>
-              <upgradeVersionsList>01.00.00,01.01.00</upgradeVersionsList>
+              <upgradeVersionsList>01.00.00,01.01.00,01.01.01</upgradeVersionsList>
             </attributes>
           </eventMessage>          
         </component>
@@ -80,12 +80,12 @@
             <assembly>
               <path>bin</path>
               <name>dnnGlimpse.dll</name>
-              <version>01.01.00</version>
+              <version>01.01.01</version>
             </assembly>
             <assembly>
               <path>bin</path>
               <name>DotNetNuke.Extensions.Glimpse.dll</name>
-              <version>01.01.00</version>
+              <version>01.01.01</version>
             </assembly>
             <assembly>
               <path>bin</path>
@@ -107,6 +107,11 @@
               <name>Glimpse.Ado.dll</name>
               <version>01.07.03</version>
             </assembly>
+            <assembly>
+              <path>bin</path>
+              <name>Glimpse.Ado.dll</name>
+              <version>01.06.05</version>
+            </assembly>
           </assemblies>
         </component>
 

From 5e8f7e2e7a518af79db3f3975610f6e3cf01f8f3 Mon Sep 17 00:00:00 2001
From: Will Strohl <will@upendoventures.com>
Date: Wed, 12 Aug 2020 10:31:07 -0700
Subject: [PATCH 3/4] Prevents configuration error causing site downtime during
 re-install

---
 Modules/dnnGlimpse/dnnGlimpse.dnn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Modules/dnnGlimpse/dnnGlimpse.dnn b/Modules/dnnGlimpse/dnnGlimpse.dnn
index 7b9e045..608e34a 100644
--- a/Modules/dnnGlimpse/dnnGlimpse.dnn
+++ b/Modules/dnnGlimpse/dnnGlimpse.dnn
@@ -144,7 +144,7 @@
                       </runtimePolicies>
                     </glimpse>
                   </node>
-                  <node path="/configuration/glimpse" action="update" targetpath="/configuration/glimpse/tabs" collision="ignore">
+                  <node path="/configuration/glimpse" action="update" targetpath="/configuration/glimpse/tabs" collision="overwrite">
                     <tabs>
                       <ignoredTypes>
                         <add type="Glimpse.AspNet.Tab.Cache,Glimpse.AspNet" />

From 7987cadae774d2b66801a9194fe6da70bf298000 Mon Sep 17 00:00:00 2001
From: Will Strohl <will@upendoventures.com>
Date: Wed, 12 Aug 2020 12:57:33 -0700
Subject: [PATCH 4/4] Fixes typo with EF DLL

---
 Modules/dnnGlimpse/dnnGlimpse.dnn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Modules/dnnGlimpse/dnnGlimpse.dnn b/Modules/dnnGlimpse/dnnGlimpse.dnn
index 608e34a..57b8984 100644
--- a/Modules/dnnGlimpse/dnnGlimpse.dnn
+++ b/Modules/dnnGlimpse/dnnGlimpse.dnn
@@ -109,7 +109,7 @@
             </assembly>
             <assembly>
               <path>bin</path>
-              <name>Glimpse.Ado.dll</name>
+              <name>Glimpse.EF6.dll</name>
               <version>01.06.05</version>
             </assembly>
           </assemblies>