Skip to content

Commit

Permalink
Merge pull request #9 from sawest/version-6.0.0
Browse files Browse the repository at this point in the history
Version 6.0.0
  • Loading branch information
sawest authored Jan 2, 2017
2 parents 0e9e104 + 84ff2fd commit 75dc2ed
Show file tree
Hide file tree
Showing 23 changed files with 693 additions and 690 deletions.
15 changes: 10 additions & 5 deletions ActiveDirectory.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DNN_ActiveDirectoryAuthentication" type="Auth_System" version="05.00.06">
<package name="DNN_ActiveDirectoryAuthentication" type="Auth_System" version="06.00.00">
<friendlyName>DNN_ActiveDirectoryAuthentication</friendlyName>
<description>The DotNetNuke Active Directory Authentication Project is an Authentication provider for DotNetNuke that uses the Windows
Active Directory authentication protocol to authenticate users.
Expand All @@ -16,7 +16,7 @@

<dependencies>
<dependency type="Permission">AspNetHostingPermission</dependency>
<dependency type="CoreVersion">06.00.00</dependency>
<dependency type="CoreVersion">07.00.00</dependency>
</dependencies>

<components>
Expand All @@ -33,7 +33,7 @@
<assembly>
<path>bin\Providers</path>
<name>DotNetNuke.Authentication.ActiveDirectory.dll</name>
<version>05.00.06</version>
<version>06.00.00</version>
</assembly>
<assembly>
<path>bin</path>
Expand Down Expand Up @@ -82,6 +82,10 @@
<path>install\AuthSystem</path>
<name>ActiveDirectory_05.00.02_install.resources</name>
</file>
<file>
<path>install\AuthSystem</path>
<name>ActiveDirectory_06.00.00_install.resources</name>
</file>
</files>
</component>

Expand Down Expand Up @@ -116,9 +120,10 @@
<formsAuthenticationWrapper enabled="false" />
<system.webServer>
<security>
<!-- Enable IIS Windows authentication for the login page -->
<!-- Change enabled to true if you want to enable IIS Windows authentication for the login page -->
<!-- False by default due to unfavorable behavior -->
<authentication>
<windowsAuthentication enabled="true" />
<windowsAuthentication enabled="false" />
<anonymousAuthentication enabled="false" />
</authentication>
</security>
Expand Down
10 changes: 8 additions & 2 deletions App_LocalResources/Settings.ascx.resx
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,10 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ControlTitle_.Text" xml:space="preserve">
<value>Active Directory Authentication</value>
Expand Down Expand Up @@ -267,4 +267,10 @@
<data name="plBots.Text" xml:space="preserve">
<value>Allowed Search Bots</value>
</data>
<data name="plSynchronizePhoto.Help" xml:space="preserve">
<value>If a user has a thumbnail image in Active Directory, this option will copy that image to DNN and use it for the profile picture. </value>
</data>
<data name="plSynchronizePhoto.Text" xml:space="preserve">
<value>Synchronize Photo?</value>
</data>
</root>
22 changes: 11 additions & 11 deletions AssemblyInfo.vb
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ Imports System.Runtime.InteropServices
' associated with an assembly.

' Review the values of the assembly attributes
<Assembly: AssemblyTitle("DotNetNuke Corporation")>
<Assembly: AssemblyDescription("A DotNetNuke Provider from DotNetNuke Corporation Software")>
<Assembly: AssemblyConfiguration("")>
<Assembly: AssemblyCompany("")>
<Assembly: AssemblyProduct("")>
<Assembly: AssemblyCopyright("2013 DotNetNuke Corporation")>
<Assembly: AssemblyTrademark("")>
<Assembly: AssemblyTitle("DotNetNuke Corporation")>
<Assembly: AssemblyDescription("A DotNetNuke Provider from DotNetNuke Corporation Software")>
<Assembly: AssemblyConfiguration("")>
<Assembly: AssemblyCompany("")>
<Assembly: AssemblyProduct("")>
<Assembly: AssemblyCopyright("2017 DotNetNuke Corporation")>
<Assembly: AssemblyTrademark("")>

<Assembly: ComVisible(False)>

'The following GUID is for the ID of the typelib if this project is exposed to COM
<Assembly: Guid("334e9cee-0d47-4d70-924b-b5098a3432cb")>
<Assembly: Guid("334e9cee-0d47-4d70-924b-b5098a3432cb")>

' Version information for an assembly consists of the following four values:
'
Expand All @@ -29,7 +29,7 @@ Imports System.Runtime.InteropServices
'
' You can specify all the values or you can default the Build and Revision Numbers
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("05.00.06.2")>
' <Assembly: AssemblyVersion("06.00.00.22")>

<Assembly: AssemblyVersion("05.00.06.2")>
<Assembly: AssemblyFileVersion("05.00.06.2")>
<Assembly: AssemblyVersion("06.00.00.22")>
<Assembly: AssemblyFileVersion("06.00.00.22")>
Loading

0 comments on commit 75dc2ed

Please sign in to comment.