Updates for DNN8, removed NewtonSoft config changes.

ChrisHammond · Feb 28, 2016 · d10d195 · d10d195
1 parent 0937d9d
commit d10d195
Show file tree

Hide file tree

Showing 26 changed files with 44 additions and 39 deletions.
diff --git a/02.00.00.txt b/02.00.00.txt
@@ -1,5 +1,4 @@
-bin\SignalRChat.dll
-DesktopModules\SignalRChat\App_LocalResources
+DesktopModules\SignalRChat\App_LocalResources
 DesktopModules\SignalRChat\App_LocalResources\Edit.ascx.resx
 DesktopModules\SignalRChat\App_LocalResources\Settings.ascx.resx
 DesktopModules\SignalRChat\App_LocalResources\SharedResources.resx

diff --git a/Archive.ascx.cs b/Archive.ascx.cs
@@ -1,5 +1,5 @@
 /*
-' Copyright (c) 2015 Christoc.com Software Solutions
+' Copyright (c) 2016 Christoc.com Software Solutions
 '  All rights reserved.
 ' 
 ' Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated 

diff --git a/BuildScripts/ModulePackage.targets b/BuildScripts/ModulePackage.targets
@@ -77,7 +77,7 @@
     <Copy SourceFiles="$(MSBuildDnnBinPath)\Microsoft.Owin.Host.SystemWeb.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin"/>
     <Copy SourceFiles="$(MSBuildDnnBinPath)\Microsoft.Owin.Security.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin"/>
     <Copy SourceFiles="$(MSBuildDnnBinPath)\Owin.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin"/>
-    <Copy SourceFiles="$(MSBuildDnnBinPath)\NewtonSoft.Json.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin\dnnchat"/>
+
 
     <Copy SourceFiles="@(SqlDataProviderFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package\%(RecursiveDir)" />
     <Copy SourceFiles="@(PackageManifestFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
@@ -113,7 +113,7 @@
     <Copy SourceFiles="$(MSBuildDnnBinPath)\Microsoft.Owin.Host.SystemWeb.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin"/>
     <Copy SourceFiles="$(MSBuildDnnBinPath)\Microsoft.Owin.Security.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin"/>
     <Copy SourceFiles="$(MSBuildDnnBinPath)\Owin.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin"/>
-    <Copy SourceFiles="$(MSBuildDnnBinPath)\NewtonSoft.Json.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin\dnnchat"/>
+
 
     <Copy SourceFiles="@(SqlDataProviderFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package\%(RecursiveDir)" />
     <Copy SourceFiles="@(PackageManifestFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package" />

diff --git a/Components/ChatHub.cs b/Components/ChatHub.cs
@@ -1,5 +1,5 @@
 /*
-' Copyright (c) 2015 Christoc.com Software Solutions
+' Copyright (c) 2016 Christoc.com Software Solutions
 '  All rights reserved.
 ' 
 ' Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated 

diff --git a/Components/ConnectionRecord.cs b/Components/ConnectionRecord.cs
@@ -1,5 +1,5 @@
 /*
-' Copyright (c) 2015 Christoc.com Software Solutions
+' Copyright (c) 2016 Christoc.com Software Solutions
 '  All rights reserved.
 ' 
 ' Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated 

diff --git a/Components/ConnectionRecordController.cs b/Components/ConnectionRecordController.cs
@@ -1,5 +1,5 @@
 /*
-' Copyright (c) 2015 Christoc.com Software Solutions
+' Copyright (c) 2016 Christoc.com Software Solutions
 '  All rights reserved.
 ' 
 ' Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated 

diff --git a/Components/ConnectionRecordRoomController.cs b/Components/ConnectionRecordRoomController.cs
@@ -1,5 +1,5 @@
 /*
-' Copyright (c) 2015 Christoc.com Software Solutions
+' Copyright (c) 2016 Christoc.com Software Solutions
 '  All rights reserved.
 ' 
 ' Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated 

diff --git a/Components/Message.cs b/Components/Message.cs
@@ -1,5 +1,5 @@
 /*
-' Copyright (c) 2015 Christoc.com Software Solutions
+' Copyright (c) 2016 Christoc.com Software Solutions
 '  All rights reserved.
 ' 
 ' Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated 

diff --git a/Components/MessageController.cs b/Components/MessageController.cs
@@ -1,5 +1,5 @@
 /*
-' Copyright (c) 2015 Christoc.com Software Solutions
+' Copyright (c) 2016 Christoc.com Software Solutions
 '  All rights reserved.
 ' 
 ' Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated 

diff --git a/Components/Room.cs b/Components/Room.cs
@@ -1,5 +1,5 @@
 /*
-' Copyright (c) 2015 Christoc.com Software Solutions
+' Copyright (c) 2016 Christoc.com Software Solutions
 '  All rights reserved.
 ' 
 ' Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated 

diff --git a/Components/RoomController.cs b/Components/RoomController.cs
@@ -1,5 +1,5 @@
 /*
-' Copyright (c) 2015 Christoc.com Software Solutions
+' Copyright (c) 2016 Christoc.com Software Solutions
 '  All rights reserved.
 ' 
 ' Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated 

diff --git a/Components/RouteMapper.cs b/Components/RouteMapper.cs
@@ -1,5 +1,5 @@
 /*
-' Copyright (c) 2015 Christoc.com Software Solutions
+' Copyright (c) 2016 Christoc.com Software Solutions
 '  All rights reserved.
 ' 
 ' Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated 

diff --git a/Components/UserListRecords.cs b/Components/UserListRecords.cs
@@ -1,5 +1,5 @@
 /*
-' Copyright (c) 2015 Christoc.com Software Solutions
+' Copyright (c) 2016 Christoc.com Software Solutions
 '  All rights reserved.
 ' 
 ' Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated 

diff --git a/DnnChat.csproj b/DnnChat.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -13,7 +13,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Christoc.Modules.DnnChat</RootNamespace>
     <AssemblyName>DnnChat</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <UseIISExpress>false</UseIISExpress>
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />
@@ -30,6 +30,7 @@
     </SccProvider>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">.\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <UseGlobalApplicationHostFile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -51,7 +52,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DotNetNuke, Version=7.1.0.2676, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DotNetNuke, Version=8.0.0.806, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\bin\DotNetNuke.dll</HintPath>
     </Reference>
@@ -90,7 +91,7 @@
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>packages\Newtonsoft.Json.6.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\bin\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

diff --git a/DnnChat.dnn b/DnnChat.dnn
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DnnChat" type="Module" version="02.00.00">
+    <package name="DnnChat" type="Module" version="02.01.00">
       <friendlyName>DnnChat</friendlyName>
       <description>A Chat module for DotNetNuke using SignalR</description>
       <iconFile>/Images/icon_extensions_32px.png</iconFile>
@@ -14,7 +14,7 @@
       <releaseNotes src="ReleaseNotes.txt"></releaseNotes>
       <azureCompatible>true</azureCompatible>
       <dependencies>
-        <dependency type="CoreVersion">07.01.00</dependency>
+        <dependency type="CoreVersion">08.00.00</dependency>
         <!-- .NET 4.5 -->
         <dependency type="type">System.Reflection.ReflectionContext</dependency>
       </dependencies>
@@ -60,7 +60,7 @@
             <script type="UnInstall">
               <path>Data</path>
               <name>Uninstall.SqlDataProvider</name>
-              <version>02.00.00</version>
+              <version>02.01.00</version>
             </script>           
           </scripts>
         </component>
@@ -162,22 +162,16 @@
               <name>Microsoft.Owin.Security.dll</name>
               <path>bin</path>
             </assembly>
-            <assembly>
-              <name>NewtonSoft.Json.dll</name>
-              <path>bin\dnnchat</path>
-              <sourceFileName>bin\dnnchat\NewtonSoft.Json.dll</sourceFileName>
-              <version>6.0.0.0</version>
-            </assembly>
           </assemblies>
         </component>
         <component type="Cleanup" version="02.00.00" fileName="02.00.00.txt" />
-        <component type="Config">
+        <!--<component type="Config">
           <config>
             <configFile>web.config</configFile>
             <install>
               <configuration>
                 <nodes>
-                  <!-- add assembly redirect for Newtonsoft.Json v6.0.0.0-->                
+                  --><!-- add assembly redirect for Newtonsoft.Json v6.0.0.0--><!--                
                   <node path="/configuration/runtime/ab:assemblyBinding" action="update"
                         targetpath="/configuration/runtime/ab:assemblyBinding[ab:dependentAssembly/ab:assemblyIdentity/@name='Newtonsoft.Json']"
                         collision="ignore" nameSpace="urn:schemas-microsoft-com:asm.v1" nameSpacePrefix="ab">
@@ -195,7 +189,7 @@
               </configuration>
             </uninstall>
           </config>
-        </component>
+        </component>-->
       </components>
     </package>
   </packages>

diff --git a/DnnChatModuleBase.cs b/DnnChatModuleBase.cs
@@ -1,5 +1,5 @@
 /*
-' Copyright (c) 2015 Christoc.com Software Solutions
+' Copyright (c) 2016 Christoc.com Software Solutions
 '  All rights reserved.
 ' 
 ' Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated 

diff --git a/DnnChatModuleSettingsBase.cs b/DnnChatModuleSettingsBase.cs
@@ -1,5 +1,5 @@
 /*
-' Copyright (c) 2015 Christoc.com Software Solutions
+' Copyright (c) 2016 Christoc.com Software Solutions
 '  All rights reserved.
 ' 
 ' THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED

diff --git a/Edit.ascx.cs b/Edit.ascx.cs
@@ -1,5 +1,5 @@
 /*
-' Copyright (c) 2015 Christoc.com Software Solutions
+' Copyright (c) 2016 Christoc.com Software Solutions
 '  All rights reserved.
 ' 
 ' Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated 

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -1,5 +1,5 @@
 /*
-' Copyright (c) 2015 Christoc.com Software Solutions
+' Copyright (c) 2016 Christoc.com Software Solutions
 '  All rights reserved.
 ' 
 ' Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated 
@@ -50,5 +50,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("02.00.00.*")]
-[assembly: AssemblyFileVersion("02.00.00.*")]
+[assembly: AssemblyVersion("02.01.00.*")]
+[assembly: AssemblyFileVersion("02.01.00.*")]
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
@@ -11,6 +11,17 @@
 </p>
 <hr/>
 <div class="License">
+
+
+<h3>About the dnnCHAT Module</h3>
+		<p class="Owner">
+		<b>Version 02.01.00</b><br /><br /> 
+	</p>
+	<ul>
+		<li>Updated for DNN 8 references</li>
+		<li>Removed NewtonSoft.Json custom references</li>
+	</ul>
+
 	<h3>About the dnnCHAT Module</h3>
 		<p class="Owner">
 		<b>Version 02.00.00</b><br /><br /> 

diff --git a/Settings.ascx.cs b/Settings.ascx.cs
@@ -1,5 +1,5 @@
 /*
-' Copyright (c) 2015 Christoc.com Software Solutions
+' Copyright (c) 2016 Christoc.com Software Solutions
 '  All rights reserved.
 ' 
 ' Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated 

diff --git a/View.ascx.cs b/View.ascx.cs
@@ -1,5 +1,5 @@
 /*
-' Copyright (c) 2015 Christoc.com Software Solutions
+' Copyright (c) 2016 Christoc.com Software Solutions
 '  All rights reserved.
 ' 
 ' Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated 

diff --git a/install/DnnChat_02.01.00_Install.zip b/install/DnnChat_02.01.00_Install.zip
diff --git a/install/DnnChat_02.01.00_Source.zip b/install/DnnChat_02.01.00_Source.zip
diff --git a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache