Merge pull request #21 from DNNCommunity/development

Merging Dev to Master for v5.0.0 release
DNNCommunity · Jul 13, 2018 · af85a52 · af85a52
2 parents 3434d0d + 4ed1fea
commit af85a52
Show file tree

Hide file tree

Showing 20 changed files with 355 additions and 401 deletions.
diff --git a/Build/ModulePackageSource.targets b/Build/ModulePackageSource.targets
@@ -82,7 +82,7 @@ OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
       <Output TaskParameter="Include" ItemName="PackageTxtFiles" />
     </CreateItem>
 
-    <CreateItem Include="**\$(Version).txt">
+    <CreateItem Include="**\*.txt">
       <Output TaskParameter="Include" ItemName="PackageTxtFiles" />
     </CreateItem>
 

diff --git a/Modules/Media/Components/DataProvider.cs b/Modules/Media/Components/DataProvider.cs
@@ -1,6 +1,6 @@
 //
 // DNN Corp - http://www.dnnsoftware.com
-// Copyright (c) 2002-2014
+// Copyright (c) 2002-2018
 // by DNN Corp
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated 
@@ -18,7 +18,6 @@
 // DEALINGS IN THE SOFTWARE.
 //
 
-//INSTANT C# NOTE: Formerly VB project-level imports:
 using DotNetNuke;
 using DotNetNuke.Common;
 using DotNetNuke.Common.Utilities;
@@ -45,7 +44,6 @@ namespace DotNetNuke.Modules.Media
 	/// -----------------------------------------------------------------------------
 	public abstract class DataProvider
 	{
-
 #region  Constants 
 
         private const string ASSEMBLY = "DotNetNuke.Modules.Media.SqlDataprovider, DotNetNuke.Modules.Media";
@@ -93,7 +91,5 @@ private static void CreateProvider()
 		public abstract void DeleteMedia(int ModuleId);
 
 #endregion
-
 	}
-
 }