Skip to content
This repository was archived by the owner on Oct 6, 2019. It is now read-only.

Bumps Dnn dependencies to 9.4.0 release packages #1169

Merged
merged 1 commit into from
Sep 24, 2019
Merged

Bumps Dnn dependencies to 9.4.0 release packages #1169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 36 additions & 54 deletions NuGetPackages/NuGetPackages.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,77 +48,60 @@
<Reference Include="ClientDependency.Core, Version=1.9.2.7, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dnn.ClientDependency.1.9.2.7\lib\net45\ClientDependency.Core.dll</HintPath>
</Reference>
<Reference Include="DNN.Integration.Test.Framework, Version=9.4.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\DotNetNuke.Bundle.9.4.0-rc0001\lib\net45\DNN.Integration.Test.Framework.dll</HintPath>
<Private>True</Private>
<Reference Include="DNN.Integration.Test.Framework, Version=9.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\DotNetNuke.Bundle.9.4.0\lib\net45\DNN.Integration.Test.Framework.dll</HintPath>
</Reference>
<Reference Include="DotNetNuke, Version=9.4.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\DotNetNuke.Core.9.4.0-rc0001\lib\net45\DotNetNuke.dll</HintPath>
<Private>True</Private>
<Reference Include="DotNetNuke, Version=9.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\DotNetNuke.Core.9.4.0\lib\net45\DotNetNuke.dll</HintPath>
</Reference>
<Reference Include="DotNetNuke.HttpModules, Version=9.4.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\DotNetNuke.Bundle.9.4.0-rc0001\lib\net45\DotNetNuke.HttpModules.dll</HintPath>
<Private>True</Private>
<Reference Include="DotNetNuke.HttpModules, Version=9.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\DotNetNuke.Bundle.9.4.0\lib\net45\DotNetNuke.HttpModules.dll</HintPath>
</Reference>
<Reference Include="DotNetNuke.Instrumentation, Version=9.4.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\DotNetNuke.Instrumentation.9.4.0-rc0001\lib\net45\DotNetNuke.Instrumentation.dll</HintPath>
<Private>True</Private>
<Reference Include="DotNetNuke.Instrumentation, Version=9.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\DotNetNuke.Instrumentation.9.4.0\lib\net45\DotNetNuke.Instrumentation.dll</HintPath>
</Reference>
<Reference Include="DotNetNuke.log4net, Version=3.0.1.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\DotNetNuke.Instrumentation.9.4.0-rc0001\lib\net45\DotNetNuke.Log4Net.dll</HintPath>
<Private>True</Private>
<Reference Include="DotNetNuke.Log4Net, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\DotNetNuke.Instrumentation.9.4.0\lib\net45\DotNetNuke.Log4Net.dll</HintPath>
</Reference>
<Reference Include="DotNetNuke.Modules.DigitalAssets, Version=9.4.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\DotNetNuke.Bundle.9.4.0-rc0001\lib\net45\DotNetNuke.Modules.DigitalAssets.dll</HintPath>
<Private>True</Private>
<Reference Include="DotNetNuke.Modules.DigitalAssets, Version=9.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\DotNetNuke.Bundle.9.4.0\lib\net45\DotNetNuke.Modules.DigitalAssets.dll</HintPath>
</Reference>
<Reference Include="DotNetNuke.Providers.FolderProviders, Version=9.4.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\DotNetNuke.Providers.FolderProviders.9.4.0-rc0001\lib\net45\DotNetNuke.Providers.FolderProviders.dll</HintPath>
<Private>True</Private>
<Reference Include="DotNetNuke.Providers.FolderProviders, Version=9.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\DotNetNuke.Providers.FolderProviders.9.4.0\lib\net45\DotNetNuke.Providers.FolderProviders.dll</HintPath>
</Reference>
<Reference Include="DotNetNuke.SiteExportImport, Version=9.4.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\DotNetNuke.SiteExportImport.9.4.0-rc0001\lib\net45\DotNetNuke.SiteExportImport.dll</HintPath>
<Private>True</Private>
<Reference Include="DotNetNuke.SiteExportImport, Version=9.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\DotNetNuke.SiteExportImport.9.4.0\lib\net45\DotNetNuke.SiteExportImport.dll</HintPath>
</Reference>
<Reference Include="DotNetNuke.SiteExportImport.Library, Version=9.4.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\DotNetNuke.SiteExportImport.9.4.0-rc0001\lib\net45\DotNetNuke.SiteExportImport.Library.dll</HintPath>
<Private>True</Private>
<Reference Include="DotNetNuke.SiteExportImport.Library, Version=9.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\DotNetNuke.SiteExportImport.9.4.0\lib\net45\DotNetNuke.SiteExportImport.Library.dll</HintPath>
</Reference>
<Reference Include="DotNetNuke.Tests.Utilities, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\DotNetNuke.Bundle.9.4.0-rc0001\lib\net45\DotNetNuke.Tests.Utilities.dll</HintPath>
<Private>True</Private>
<Reference Include="DotNetNuke.Tests.Utilities, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\DotNetNuke.Bundle.9.4.0\lib\net45\DotNetNuke.Tests.Utilities.dll</HintPath>
</Reference>
<Reference Include="DotNetNuke.Web, Version=9.4.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\DotNetNuke.Web.9.4.0-rc0001\lib\net45\DotNetNuke.Web.dll</HintPath>
<Private>True</Private>
<Reference Include="DotNetNuke.Web, Version=9.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\DotNetNuke.Web.9.4.0\lib\net45\DotNetNuke.Web.dll</HintPath>
</Reference>
<Reference Include="DotNetNuke.Web.Client, Version=9.4.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\DotNetNuke.Web.Client.9.4.0-rc0001\lib\net45\DotNetNuke.Web.Client.dll</HintPath>
<Private>True</Private>
<Reference Include="DotNetNuke.Web.Client, Version=9.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\DotNetNuke.Web.Client.9.4.0\lib\net45\DotNetNuke.Web.Client.dll</HintPath>
</Reference>
<Reference Include="DotNetNuke.Web.Deprecated, Version=9.4.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\DotNetNuke.Web.Deprecated.9.4.0-rc0001\lib\net45\DotNetNuke.Web.Deprecated.dll</HintPath>
<Private>True</Private>
<Reference Include="DotNetNuke.Web.Deprecated, Version=9.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\DotNetNuke.Web.Deprecated.9.4.0\lib\net45\DotNetNuke.Web.Deprecated.dll</HintPath>
</Reference>
<Reference Include="DotNetNuke.Web.Mvc, Version=9.4.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\DotNetNuke.Web.Mvc.9.4.0-rc0001\lib\net45\DotNetNuke.Web.Mvc.dll</HintPath>
<Private>True</Private>
<Reference Include="DotNetNuke.Web.Mvc, Version=9.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\DotNetNuke.Web.Mvc.9.4.0\lib\net45\DotNetNuke.Web.Mvc.dll</HintPath>
</Reference>
<Reference Include="DotNetNuke.WebControls, Version=2.4.0.598, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\DotNetNuke.Bundle.9.4.0-rc0001\lib\net45\DotNetNuke.WebControls.dll</HintPath>
<Private>True</Private>
<Reference Include="DotNetNuke.WebControls, Version=2.4.0.598, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\DotNetNuke.Bundle.9.4.0\lib\net45\DotNetNuke.WebControls.dll</HintPath>
</Reference>
<Reference Include="DotNetNuke.WebUtility, Version=4.2.1.783, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\DotNetNuke.Web.9.4.0-rc0001lib\net45\DotNetNuke.WebUtility.dll</HintPath>
<Private>True</Private>
<Reference Include="DotNetNuke.WebUtility, Version=4.2.1.783, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\DotNetNuke.Web.9.4.0\lib\net45\DotNetNuke.WebUtility.dll</HintPath>
</Reference>
<Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.ApplicationBlocks.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\DotNetNuke.Core.9.4.0-rc0001\lib\net45\Microsoft.ApplicationBlocks.Data.dll</HintPath>
<Private>True</Private>
<Reference Include="Microsoft.ApplicationBlocks.Data, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\DotNetNuke.Core.9.4.0\lib\net45\Microsoft.ApplicationBlocks.Data.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
Expand Down Expand Up @@ -203,9 +186,8 @@
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="Telerik.Web.UI, Version=2013.2.717.40, Culture=neutral, PublicKeyToken=121fae78165ba3d4">
<HintPath>..\packages\DotNetNuke.Web.Deprecated.9.4.0-rc0001\lib\net45\Telerik.Web.UI.dll</HintPath>
<Private>True</Private>
<Reference Include="Telerik.Web.UI, Version=2013.2.717.40, Culture=neutral, PublicKeyToken=121fae78165ba3d4, processorArchitecture=MSIL">
<HintPath>..\packages\DotNetNuke.Web.Deprecated.9.4.0\lib\net45\Telerik.Web.UI.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
44 changes: 24 additions & 20 deletions NuGetPackages/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,43 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Moq" publicKeyToken="69f491c39445e920" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.8.0.0" newVersion="4.8.0.0"/>
<assemblyIdentity name="Moq" publicKeyToken="69f491c39445e920" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.8.0.0" newVersion="4.8.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-2.6.3.13283" newVersion="2.6.3.13283"/>
<assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.6.3.13283" newVersion="2.6.3.13283" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NSubstitute" publicKeyToken="92dd2e9066daa5ca" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.8.1.0" newVersion="1.8.1.0"/>
<assemblyIdentity name="NSubstitute" publicKeyToken="92dd2e9066daa5ca" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.8.1.0" newVersion="1.8.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0"/>
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0"/>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Http.WebHost" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
<assemblyIdentity name="System.Web.Http.WebHost" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.4.9.0" newVersion="1.4.9.0"/>
<assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.4.9.0" newVersion="1.4.9.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" /></startup></configuration>
20 changes: 10 additions & 10 deletions NuGetPackages/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
<packages>
<package id="Castle.Core" version="4.2.1" targetFramework="net45" allowedVersions="[4.2.1]" />
<package id="Dnn.ClientDependency" version="1.9.2.7" targetFramework="net45" />
<package id="DotNetNuke.Bundle" version="9.4.0-rc0001" targetFramework="net472" />
<package id="DotNetNuke.Core" version="9.4.0-rc0001" targetFramework="net472" />
<package id="DotNetNuke.Instrumentation" version="9.4.0-rc0001" targetFramework="net472" />
<package id="DotNetNuke.Providers.FolderProviders" version="9.4.0-rc0001" targetFramework="net472" />
<package id="DotNetNuke.SiteExportImport" version="9.4.0-rc0001" targetFramework="net472" />
<package id="DotNetNuke.Web" version="9.4.0-rc0001" targetFramework="net472" />
<package id="DotNetNuke.Web.Client" version="9.4.0-rc0001" targetFramework="net472" />
<package id="DotNetNuke.Web.Deprecated" version="9.4.0-rc0001" targetFramework="net472" />
<package id="DotNetNuke.Web.Mvc" version="9.4.0-rc0001" targetFramework="net472" />
<package id="DotNetNuke.WebApi" version="9.4.0-rc0001" targetFramework="net472" />
<package id="DotNetNuke.Bundle" version="9.4.0" targetFramework="net472" />
<package id="DotNetNuke.Core" version="9.4.0" targetFramework="net472" />
<package id="DotNetNuke.Instrumentation" version="9.4.0" targetFramework="net472" />
<package id="DotNetNuke.Providers.FolderProviders" version="9.4.0" targetFramework="net472" />
<package id="DotNetNuke.SiteExportImport" version="9.4.0" targetFramework="net472" />
<package id="DotNetNuke.Web" version="9.4.0" targetFramework="net472" />
<package id="DotNetNuke.Web.Client" version="9.4.0" targetFramework="net472" />
<package id="DotNetNuke.Web.Deprecated" version="9.4.0" targetFramework="net472" />
<package id="DotNetNuke.Web.Mvc" version="9.4.0" targetFramework="net472" />
<package id="DotNetNuke.WebApi" version="9.4.0" targetFramework="net472" />
<package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net472" />
<package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net472" />
<package id="Microsoft.AspNet.WebApi" version="5.2.3" targetFramework="net45" allowedVersions="[5.2.3]" />
Expand Down