Updates for DNN 8 & resolving EVS warnings & cleanup license & releas…

…e notes. Closes #2
DNNCommunity · Feb 24, 2016 · 6652471 · 6652471
1 parent 6eadb34
commit 6652471
Show file tree

Hide file tree

Showing 36 changed files with 4,404 additions and 1,197 deletions.
diff --git a/App_LocalResources/ExportCSV.ascx.resx b/App_LocalResources/ExportCSV.ascx.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 

diff --git a/App_LocalResources/FieldEditor.ascx.resx b/App_LocalResources/FieldEditor.ascx.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 

diff --git a/App_LocalResources/ImportCSV.ascx.resx b/App_LocalResources/ImportCSV.ascx.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 

diff --git a/App_LocalResources/configuration.ascx.resx b/App_LocalResources/configuration.ascx.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 

diff --git a/App_LocalResources/default.ascx.resx b/App_LocalResources/default.ascx.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 

diff --git a/App_LocalResources/form.ascx.resx b/App_LocalResources/form.ascx.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 

diff --git a/App_LocalResources/helppopup.aspx.resx b/App_LocalResources/helppopup.aspx.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 

diff --git a/App_LocalResources/list.ascx.resx b/App_LocalResources/list.ascx.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 

diff --git a/App_LocalResources/settings.ascx.resx b/App_LocalResources/settings.ascx.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 

diff --git a/App_LocalResources/sharedresources.resx b/App_LocalResources/sharedresources.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 

diff --git a/App_LocalResources/template.ascx.resx b/App_LocalResources/template.ascx.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 

diff --git a/App_LocalResources/templatelist.ascx.resx b/App_LocalResources/templatelist.ascx.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 

diff --git a/App_LocalResources/token2xsl.ascx.resx b/App_LocalResources/token2xsl.ascx.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 

diff --git a/AssemblyInfo.cs b/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 
 [assembly: AssemblyTitle("DotNetNuke.Modules.UserDefinedTable")]
 [assembly: AssemblyDescription("ASP.NET Open Source Portal Application,Form and List Module")]
-[assembly: AssemblyCompany("DotNetNuke Inc")]
+[assembly: AssemblyCompany("DNN Corp")]
 [assembly: AssemblyProduct("http://www.dotnetnuke.com")]
 [assembly:
     AssemblyCopyright("Portal engine source code is copyright &copy; 2002-YYYY by DotNetNuke. All Rights Reserved")]
@@ -32,5 +32,7 @@
 // übernehmen, indem Sie "*" eingeben:
 // <Assembly: AssemblyVersion("1.0.*")>
 
-[assembly: AssemblyVersion("06.02.00.*")]
-[assembly: CLSCompliant(true)]
+[assembly: AssemblyVersion("06.02.00.00")]
+[assembly: CLSCompliant(true)]
+[assembly: AssemblyFileVersion("06.02.00.00")]
+
diff --git a/BuildScripts/ModulePackage.targets b/BuildScripts/ModulePackage.targets
@@ -80,6 +80,10 @@
       <Output TaskParameter="Include" ItemName="PackageTxtFiles" />
     </CreateItem>
 
+    <CreateItem Include="**\Cleanup_*.txt">
+      <Output TaskParameter="Include" ItemName="PackageTxtFiles" />
+    </CreateItem>
+
 
     <CreateItem Include="**\*.sqldataprovider">
       <Output TaskParameter="Include" ItemName="SqlDataProviderFiles" />

diff --git a/DataTypes/Time.cs b/DataTypes/Time.cs
@@ -25,7 +25,7 @@ namespace DotNetNuke.Modules.UserDefinedTable.DataTypes
     public class EditTime : EditControl
     {
         DnnTimePicker _ctlTime;
-    
+
 
         public override string Value
         {
@@ -49,7 +49,7 @@ public override string Value
             {
                 if (value == string.Empty)
                 {
-                   
+
                 }
                 else
                 {
@@ -59,7 +59,7 @@ public override string Value
             }
         }
 
-     
+
 
         void EditTime_Init(object sender, EventArgs e)
         {
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,7 +25,7 @@ namespace DotNetNuke.Modules.UserDefinedTable.DataTypes @@
         public class EditTime : EditControl
         {
             DnnTimePicker _ctlTime;
             public override string Value
             {
@@ Expand All / @@ -49,7 +49,7 @@ public override string Value @@
                 {
                     if (value == string.Empty)
                     {
                     }
                     else
                     {
@@ Expand All / @@ -59,7 +59,7 @@ public override string Value @@
                 }
             }
             void EditTime_Init(object sender, EventArgs e)
             {
@@ Expand Down @@