DNN-18172: clean build warnings.

dnnsoftware · Mar 19, 2018 · 9fc41fe · 9fc41fe
1 parent b27c005
commit 9fc41fe
Show file tree

Hide file tree

Showing 51 changed files with 243 additions and 42 deletions.
diff --git a/Build/BuildScripts/Module.build b/Build/BuildScripts/Module.build
@@ -1,5 +1,5 @@
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="AfterBuild" DependsOnTargets="CopyBin;GetFiles;DebugProject;Package">
+  <Target Name="AfterBuild" DependsOnTargets="CopyBin;GetFiles;UpdateFiles;DebugProject;Package">
   </Target>
   <Target Name="GetFiles">
     <ItemGroup>
@@ -52,5 +52,7 @@
     <Copy SourceFiles="@(Views)" DestinationFolder="$(ModuleFolderName)/Views" />
     <Copy SourceFiles="@(MVCViews)" DestinationFolder="$(ModuleFolderName)/Views/%(RecursiveDir)" />
     <Copy SourceFiles="@(MVCConfig)" DestinationFolder="$(ModuleFolderName)/Views" />
-  </Target> 
+  </Target>
+  <Target Name="UpdateFiles">
+  </Target>
 </Project>
diff --git a/DNN Platform/Admin Modules/Dnn.Modules.Console/Dnn.Modules.Console.csproj b/DNN Platform/Admin Modules/Dnn.Modules.Console/Dnn.Modules.Console.csproj
@@ -129,6 +129,9 @@
   <ItemGroup>
     <Content Include="App_LocalResources\Settings.ascx.resx" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="web.config" />
+  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

diff --git a/DNN Platform/Admin Modules/Dnn.Modules.Console/Module.build b/DNN Platform/Admin Modules/Dnn.Modules.Console/Module.build
@@ -9,4 +9,9 @@
   </PropertyGroup>
   <Import Project="$(BuildScriptsPath)\Package.Targets" />
   <Import Project="$(BuildScriptsPath)\Module.Build"/>
+  <Target Name="UpdateFiles">
+    <ItemGroup>
+      <Resources Remove="web.config" />
+    </ItemGroup>
+  </Target>
 </Project>
diff --git a/DNN Platform/Admin Modules/Dnn.Modules.Console/web.config b/DNN Platform/Admin Modules/Dnn.Modules.Console/web.config
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<configuration>
+	<runtime>
+		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<dependentAssembly>
+				<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30AD4FE6B2A6AEED" culture="neutral"/>
+				<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0"/>
+			</dependentAssembly>
+		</assemblyBinding>
+	</runtime>
+</configuration>
diff --git a/DNN Platform/Admin Modules/Dnn.Modules.ModuleCreator/Dnn.Modules.ModuleCreator.csproj b/DNN Platform/Admin Modules/Dnn.Modules.ModuleCreator/Dnn.Modules.ModuleCreator.csproj
@@ -208,6 +208,9 @@
     <Content Include="Templates\C#\Module - Razor\_template.cshtml" />
     <Content Include="Templates\VB\Module - Razor\_template.vbhtml" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="web.config" />
+  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

diff --git a/DNN Platform/Admin Modules/Dnn.Modules.ModuleCreator/Module.build b/DNN Platform/Admin Modules/Dnn.Modules.ModuleCreator/Module.build
@@ -34,4 +34,9 @@
                  @(Keys);@(Services);@(RootConfig);@(ConfigFiles);@(Templates);@(DataFiles);@(SharedScripts);@(Controls);@(Views);@(MVCViews); @(MVCConfig)" />
         </ItemGroup>
     </Target>
+    <Target Name="UpdateFiles">
+        <ItemGroup>
+            <Resources Remove="web.config" />
+        </ItemGroup>
+    </Target>
 </Project>
diff --git a/DNN Platform/Admin Modules/Dnn.Modules.ModuleCreator/web.config b/DNN Platform/Admin Modules/Dnn.Modules.ModuleCreator/web.config
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<configuration>
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+            <dependentAssembly>
+                <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30AD4FE6B2A6AEED" culture="neutral"/>
+                <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0"/>
+            </dependentAssembly>
+        </assemblyBinding>
+    </runtime>
+</configuration>
diff --git a/DNN Platform/Components/ClientDependency/Source/ClientDependency.Core.csproj b/DNN Platform/Components/ClientDependency/Source/ClientDependency.Core.csproj
@@ -29,7 +29,7 @@
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <DocumentationFile>bin\ClientDependency.Core.XML</DocumentationFile>
-    <NoWarn>1591,1573</NoWarn>
+    <NoWarn>1591,1573,618</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -40,7 +40,7 @@
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <DocumentationFile>bin\ClientDependency.Core.XML</DocumentationFile>
-    <NoWarn>1591,1573</NoWarn>
+    <NoWarn>1591,1573,618</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

diff --git a/DNN Platform/Dnn.AuthServices.Jwt/Dnn.Jwt.dnn b/DNN Platform/Dnn.AuthServices.Jwt/Dnn.Jwt.dnn
@@ -31,12 +31,14 @@
         </component>
         <component type="Script">
           <scripts>
-            <basePath>DesktopModules\AuthenticationServices\JWTAuth\Data\Scripts</basePath>
+            <basePath>DesktopModules\AuthenticationServices\JWTAuth</basePath>
             <script type="Install">
+              <path>Data\Scripts</path>
               <name>01.00.00.SqlDataProvider</name>
               <version>01.00.00</version>
             </script>
             <script type="UnInstall">
+              <path>Data\Scripts</path>
               <name>Uninstall.SqlDataProvider</name>
               <version>01.00.00</version>
             </script>

diff --git a/DNN Platform/Dnn.AuthServices.Jwt/Library.build b/DNN Platform/Dnn.AuthServices.Jwt/Library.build
@@ -9,13 +9,7 @@
     <ModuleFolderName>$(WebsitePath)\DesktopModules\AuthenticationServices\JWTAuth</ModuleFolderName>
   </PropertyGroup>
   <Import Project="$(BuildScriptsPath)\Package.Targets" />
-  <Target Name="AfterBuild" DependsOnTargets="CopyBin;GetFiles;Package" />
-  <Target Name="GetFiles">
-    <CreateItem Include="**\*.sqldataprovider">
-      <Output TaskParameter="Include" ItemName="SqlDataProviderFiles" />
-    </CreateItem>
-    <Copy SourceFiles="@(SqlDataProviderFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
-  </Target>
+  <Target Name="AfterBuild" DependsOnTargets="CopyBin;Package" />
   <Target Name="CopyBin">
     <Copy SourceFiles="$(MSBuildProjectDirectory)\bin\$(AssemblyName).dll" DestinationFolder="$(WebsitePath)/bin" />
     <Copy SourceFiles="$(MSBuildProjectDirectory)\bin\$(AssemblyName).pdb" DestinationFolder="$(WebsitePath)/bin" />

diff --git a/DNN Platform/Library/Entities/Portals/PortalController.cs b/DNN Platform/Library/Entities/Portals/PortalController.cs
@@ -1394,19 +1394,19 @@ private void ParsePortalSettings(XmlNode nodeSettings, int portalId)
 
             if (!String.IsNullOrEmpty(XmlUtils.GetNodeValue(nodeSettings, "skinsrc", "")))
             {
-				UpdatePortalSetting(portalId, "DefaultPortalSkin", XmlUtils.GetNodeValue(nodeSettings, "skinsrc", ""), currentCulture);
+				UpdatePortalSetting(portalId, "DefaultPortalSkin", XmlUtils.GetNodeValue(nodeSettings, "skinsrc", ""), true, currentCulture);
             }
             if (!String.IsNullOrEmpty(XmlUtils.GetNodeValue(nodeSettings, "skinsrcadmin", "")))
             {
-				UpdatePortalSetting(portalId, "DefaultAdminSkin", XmlUtils.GetNodeValue(nodeSettings, "skinsrcadmin", ""), currentCulture);
+				UpdatePortalSetting(portalId, "DefaultAdminSkin", XmlUtils.GetNodeValue(nodeSettings, "skinsrcadmin", ""), true, currentCulture);
             }
             if (!String.IsNullOrEmpty(XmlUtils.GetNodeValue(nodeSettings, "containersrc", "")))
             {
-				UpdatePortalSetting(portalId, "DefaultPortalContainer", XmlUtils.GetNodeValue(nodeSettings, "containersrc", ""), currentCulture);
+				UpdatePortalSetting(portalId, "DefaultPortalContainer", XmlUtils.GetNodeValue(nodeSettings, "containersrc", ""), true, currentCulture);
             }
             if (!String.IsNullOrEmpty(XmlUtils.GetNodeValue(nodeSettings, "containersrcadmin", "")))
             {
-				UpdatePortalSetting(portalId, "DefaultAdminContainer", XmlUtils.GetNodeValue(nodeSettings, "containersrcadmin", ""), currentCulture);
+				UpdatePortalSetting(portalId, "DefaultAdminContainer", XmlUtils.GetNodeValue(nodeSettings, "containersrcadmin", ""), true, currentCulture);
             }
 
             //Enable Skin Widgets Setting

diff --git a/DNN Platform/Library/Entities/Urls/RewriteController.cs b/DNN Platform/Library/Entities/Urls/RewriteController.cs
@@ -786,7 +786,6 @@ internal static string GetTabFromDictionary(string url, NameValueCollection quer
             int maxTabPathDepth;
             int minAliasPathDepth;
             int minTabPathDepth;
-            bool triedFixingSubdomain = false;
             int curAliasPathDepth = 0;
 
             var tabDict = TabIndexController.FetchTabDictionary(result.PortalId,

diff --git a/DNN Platform/Library/Services/Authentication/AuthenticationLoginBase.cs b/DNN Platform/Library/Services/Authentication/AuthenticationLoginBase.cs
@@ -73,7 +73,9 @@ public string IPAddress
         {
             get
             {
-                return GetIPAddress();
+                var controller = UserRequestIPAddressController.Instance;
+                var request = new HttpRequestWrapper(HttpContext.Current.Request);
+                return controller.GetUserRequestIPAddress(request); ;
             }
         }
 

diff --git a/DNN Platform/Library/Services/FileSystem/Internal/SecurityCheckers/SvgFileChecker.cs b/DNN Platform/Library/Services/FileSystem/Internal/SecurityCheckers/SvgFileChecker.cs
@@ -48,7 +48,7 @@ public bool Validate(Stream fileContent)
 
                 return PortalSecurity.Instance.ValidateInput(svgContent, PortalSecurity.FilterFlag.NoScripting);
             }
-            catch (Exception ex)
+            catch (Exception)
             {
                 //when there have exception occur, just return false as not validated, no need log the error.
             }

diff --git a/DNN Platform/Library/Services/GeneratedImage/ImageHandlerInternal.cs b/DNN Platform/Library/Services/GeneratedImage/ImageHandlerInternal.cs
@@ -15,6 +15,7 @@
 using DotNetNuke.Entities.Portals;
 using DotNetNuke.Services.GeneratedImage.ImageQuantization;
 using DotNetNuke.Services.Log.EventLog;
+using DotNetNuke.Services.UserRequest;
 
 namespace DotNetNuke.Services.GeneratedImage
 {
@@ -144,7 +145,7 @@ public void HandleImageRequest(HttpContextBase context, Func<NameValueCollection
         {
             context.Response.Clear();
 
-            string ipAddress = IPCount.GetVisitorIPAddress(context);
+            string ipAddress = UserRequestIPAddressController.Instance.GetUserRequestIPAddress(context.Request);
 
             // Check if allowed standalone
             if (!AllowStandalone && context.Request.UrlReferrer == null && !context.Request.IsLocal)

diff --git a/DNN Platform/Library/Services/Installer/Util.cs b/DNN Platform/Library/Services/Installer/Util.cs
@@ -612,7 +612,7 @@ public static bool TryToCreateAndExecute(string path, Action<FileStream> action,
                         break;
                     }
                 }
-                catch (IOException ex)
+                catch (IOException)
                 {
                     // Init only once and only if needed. Prevent against many instantiation in case of multhreaded 
                     // file access concurrency (if file is frequently accessed by someone else). Better memory usage.

diff --git a/DNN Platform/Library/UI/Skins/SkinController.cs b/DNN Platform/Library/UI/Skins/SkinController.cs
@@ -378,7 +378,7 @@ public static void SetSkin(string skinRoot, int portalId, SkinType skinType, str
                         }
                         else
                         {
-                            PortalController.UpdatePortalSetting(portalId, "DefaultAdminSkin", skinSrc, selectedCultureCode);
+                            PortalController.UpdatePortalSetting(portalId, "DefaultAdminSkin", skinSrc, true, selectedCultureCode);
                         }
                     }
                     else
@@ -389,7 +389,7 @@ public static void SetSkin(string skinRoot, int portalId, SkinType skinType, str
                         }
                         else
                         {
-                            PortalController.UpdatePortalSetting(portalId, "DefaultPortalSkin", skinSrc, selectedCultureCode);
+                            PortalController.UpdatePortalSetting(portalId, "DefaultPortalSkin", skinSrc, true, selectedCultureCode);
                         }
                     }
                     break;
@@ -402,7 +402,7 @@ public static void SetSkin(string skinRoot, int portalId, SkinType skinType, str
                         }
                         else
                         {
-                            PortalController.UpdatePortalSetting(portalId, "DefaultAdminContainer", skinSrc, selectedCultureCode);
+                            PortalController.UpdatePortalSetting(portalId, "DefaultAdminContainer", skinSrc, true, selectedCultureCode);
                         }
                     }
                     else
@@ -413,7 +413,7 @@ public static void SetSkin(string skinRoot, int portalId, SkinType skinType, str
                         }
                         else
                         {
-                            PortalController.UpdatePortalSetting(portalId, "DefaultPortalContainer", skinSrc, selectedCultureCode);
+                            PortalController.UpdatePortalSetting(portalId, "DefaultPortalContainer", skinSrc, true, selectedCultureCode);
                         }
                     }
                     break;

diff --git a/DNN Platform/Modules/CoreMessaging/DotNetNuke.Modules.CoreMessaging.csproj b/DNN Platform/Modules/CoreMessaging/DotNetNuke.Modules.CoreMessaging.csproj
@@ -127,6 +127,7 @@
     </None>
     <Content Include="Module.build" />
     <Content Include="packages.config" />
+    <Content Include="web.config" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="ie-messages.css" />

diff --git a/DNN Platform/Modules/CoreMessaging/Module.build b/DNN Platform/Modules/CoreMessaging/Module.build
@@ -9,4 +9,9 @@
   </PropertyGroup>
   <Import Project="$(BuildScriptsPath)\Package.Targets" />
   <Import Project="$(BuildScriptsPath)\Module.Build"/>
+  <Target Name="UpdateFiles">
+    <ItemGroup>
+      <Resources Remove="web.config" />
+    </ItemGroup>
+  </Target>
 </Project>
diff --git a/DNN Platform/Modules/CoreMessaging/web.config b/DNN Platform/Modules/CoreMessaging/web.config
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<configuration>
+	<runtime>
+		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<dependentAssembly>
+				<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30AD4FE6B2A6AEED" culture="neutral"/>
+				<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0"/>
+			</dependentAssembly>
+		</assemblyBinding>
+	</runtime>
+</configuration>
diff --git a/DNN Platform/Modules/DigitalAssets/DotNetNuke.Modules.DigitalAssets.csproj b/DNN Platform/Modules/DigitalAssets/DotNetNuke.Modules.DigitalAssets.csproj
@@ -334,6 +334,9 @@
   <ItemGroup>
     <Content Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="web.config" />
+  </ItemGroup>
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">

diff --git a/DNN Platform/Modules/DigitalAssets/Module.build b/DNN Platform/Modules/DigitalAssets/Module.build
@@ -9,4 +9,9 @@
   </PropertyGroup>
   <Import Project="$(BuildScriptsPath)\Package.Targets" />
   <Import Project="$(BuildScriptsPath)\Module.Build"/>
+  <Target Name="UpdateFiles">
+    <ItemGroup>
+      <Resources Remove="web.config" />
+    </ItemGroup>
+  </Target>
 </Project>
diff --git a/DNN Platform/Modules/DigitalAssets/web.config b/DNN Platform/Modules/DigitalAssets/web.config
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<configuration>
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+            <dependentAssembly>
+                <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30AD4FE6B2A6AEED" culture="neutral"/>
+                <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0"/>
+            </dependentAssembly>
+        </assemblyBinding>
+    </runtime>
+</configuration>
diff --git a/DNN Platform/Modules/Groups/DotNetNuke.Modules.Groups.csproj b/DNN Platform/Modules/Groups/DotNetNuke.Modules.Groups.csproj
@@ -207,6 +207,7 @@
     <None Include="module.css" />
     <None Include="ReleaseNotes.txt" />
     <None Include="License.txt" />
+    <Content Include="web.config" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Create.ascx" />

diff --git a/DNN Platform/Modules/Groups/Module.build b/DNN Platform/Modules/Groups/Module.build
@@ -9,4 +9,9 @@
   </PropertyGroup>
   <Import Project="$(BuildScriptsPath)\Package.Targets" />
   <Import Project="$(BuildScriptsPath)\Module.Build"/>
+  <Target Name="UpdateFiles">
+    <ItemGroup>
+      <Resources Remove="web.config" />
+    </ItemGroup>
+  </Target>
 </Project>
diff --git a/DNN Platform/Modules/Groups/web.config b/DNN Platform/Modules/Groups/web.config
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<configuration>
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+            <dependentAssembly>
+                <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30AD4FE6B2A6AEED" culture="neutral"/>
+                <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0"/>
+            </dependentAssembly>
+        </assemblyBinding>
+    </runtime>
+</configuration>
diff --git a/DNN Platform/Modules/HTML/DotNetNuke.Modules.Html.csproj b/DNN Platform/Modules/HTML/DotNetNuke.Modules.Html.csproj
@@ -204,6 +204,7 @@
     <None Include="Providers\DataProviders\SqlDataProvider\06.01.00.SqlDataProvider" />
     <None Include="Providers\DataProviders\SqlDataProvider\Uninstall.SqlDataProvider" />
     <None Include="Providers\DataProviders\SqlDataProvider\Upgrade.SqlDataProvider" />
+    <Content Include="web.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\DotNetNuke.Web\DotNetNuke.Web.csproj">

diff --git a/DNN Platform/Modules/HTML/Module.build b/DNN Platform/Modules/HTML/Module.build
@@ -9,4 +9,9 @@
   </PropertyGroup>
   <Import Project="$(BuildScriptsPath)\Package.Targets" />
   <Import Project="$(BuildScriptsPath)\Module.Build"/>
+  <Target Name="UpdateFiles">
+    <ItemGroup>
+      <Resources Remove="web.config" />
+    </ItemGroup>
+  </Target>
 </Project>
diff --git a/DNN Platform/Modules/HTML/web.config b/DNN Platform/Modules/HTML/web.config
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<configuration>
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+            <dependentAssembly>
+                <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30AD4FE6B2A6AEED" culture="neutral"/>
+                <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0"/>
+            </dependentAssembly>
+        </assemblyBinding>
+    </runtime>
+</configuration>
diff --git a/DNN Platform/Modules/HtmlEditorManager/DotNetNuke.Modules.HtmlEditorManager.csproj b/DNN Platform/Modules/HtmlEditorManager/DotNetNuke.Modules.HtmlEditorManager.csproj
@@ -121,6 +121,7 @@
     <Content Include="Images\HtmlEditorManager_Standard_16x16.png" />
     <Content Include="packages.config" />
     <Content Include="Module.build" />
+    <Content Include="web.config" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="license.txt" />

diff --git a/DNN Platform/Modules/HtmlEditorManager/Module.build b/DNN Platform/Modules/HtmlEditorManager/Module.build
@@ -9,4 +9,9 @@
   </PropertyGroup>
   <Import Project="$(BuildScriptsPath)\Package.Targets" />
   <Import Project="$(BuildScriptsPath)\Module.Build"/>
+  <Target Name="UpdateFiles">
+    <ItemGroup>
+      <Resources Remove="web.config" />
+    </ItemGroup>
+  </Target>
 </Project>