Skip to content

Tasks/resolving ef issue #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WillStrohl wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Tasks/resolving ef issue #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3fe1f12
Added Glimpse EF6 to resolve errors in newer DNN instances
WillStrohl Aug 12, 2020
02c506b
Prepping for potential release :)
WillStrohl Aug 12, 2020
5e8f7e2
Prevents configuration error causing site downtime during re-install
WillStrohl Aug 12, 2020
7987cad
Fixes typo with EF DLL
WillStrohl Aug 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Libraries/DotNetNuke.Extensions.Glimpse/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
1 change: 1 addition & 0 deletions Modules/dnnGlimpse/BuildScripts/ModulePackage.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
4 changes: 2 additions & 2 deletions Modules/dnnGlimpse/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
5 changes: 5 additions & 0 deletions Modules/dnnGlimpse/ReleaseNotes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 3 additions & 0 deletions Modules/dnnGlimpse/dnnGlimpse.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
15 changes: 10 additions & 5 deletions Modules/dnnGlimpse/dnnGlimpse.dnn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -107,6 +107,11 @@
<name>Glimpse.Ado.dll</name>
<version>01.07.03</version>
</assembly>
<assembly>
<path>bin</path>
<name>Glimpse.EF6.dll</name>
<version>01.06.05</version>
</assembly>
</assemblies>
</component>

Expand Down Expand Up @@ -139,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">
Copy link
Collaborator

@bdukes bdukes Aug 12, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the change to overwrite?

Copy link
Contributor Author

@WillStrohl WillStrohl Aug 12, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you reinstall, it adds it a second time, crashing the site.

<tabs>
<ignoredTypes>
<add type="Glimpse.AspNet.Tab.Cache,Glimpse.AspNet" />
Expand Down
1 change: 1 addition & 0 deletions Modules/dnnGlimpse/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>