Skip to content

Commit 98777eb

Browse files
valadasvaladas
authored
Merge pull request #28 from juvander/fixreferences
Fixing package references
2 parents 5a17a97 + fec36c3 commit 98777eb

3 files changed

Lines changed: 32 additions & 34 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ DNN [Pp]latform/Syndication/[Bb]in/*
206206
![Ww]ebsite/[Ii]nstall/[Aa]pp_[Ll]ocal[Rr]esources/*.nl-NL.resx
207207

208208
*.zip.manifest
209+
/Resources.zip
209210

210211
############
211212
## Windows

‎DotNetNuke.Modules.Repository.csproj‎

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -98,23 +98,24 @@
9898
<HintPath>packages\DotNetNuke.Bundle.9.1.1.129\lib\ClientDependency.Core.dll</HintPath>
9999
<Private>False</Private>
100100
</Reference>
101-
<Reference Include="DotNetNuke, Version=9.1.1.3, Culture=neutral, processorArchitecture=MSIL">
102-
<HintPath>packages\DotNetNuke.Core.9.1.1.3\lib\net40\DotNetNuke.dll</HintPath>
101+
<Reference Include="DotNetNuke">
102+
<HintPath>packages\DotNetNuke.Core.9.1.1.129\lib\net40\DotNetNuke.dll</HintPath>
103+
<SpecificVersion>False</SpecificVersion>
103104
<Private>False</Private>
104105
</Reference>
105-
<Reference Include="DotNetNuke.HttpModules, Version=9.1.1.129, Culture=neutral, processorArchitecture=MSIL">
106+
<Reference Include="DotNetNuke.HttpModules">
106107
<HintPath>packages\DotNetNuke.Bundle.9.1.1.129\lib\DotNetNuke.HttpModules.dll</HintPath>
107108
<Private>False</Private>
108109
</Reference>
109-
<Reference Include="DotNetNuke.Instrumentation, Version=9.1.1.3, Culture=neutral, processorArchitecture=MSIL">
110-
<HintPath>packages\DotNetNuke.Instrumentation.9.1.1.3\lib\net40\DotNetNuke.Instrumentation.dll</HintPath>
110+
<Reference Include="DotNetNuke.Instrumentation">
111+
<HintPath>packages\DotNetNuke.Instrumentation.9.1.1.129\lib\net40\DotNetNuke.Instrumentation.dll</HintPath>
111112
<Private>False</Private>
112113
</Reference>
113114
<Reference Include="DotNetNuke.Log4Net, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
114-
<HintPath>packages\DotNetNuke.Instrumentation.9.1.1.3\lib\net40\DotNetNuke.Log4Net.dll</HintPath>
115+
<HintPath>packages\DotNetNuke.Instrumentation.9.1.1.129\lib\net40\DotNetNuke.Log4Net.dll</HintPath>
115116
<Private>False</Private>
116117
</Reference>
117-
<Reference Include="DotNetNuke.Modules.DigitalAssets, Version=9.1.1.129, Culture=neutral, processorArchitecture=MSIL">
118+
<Reference Include="DotNetNuke.Modules.DigitalAssets">
118119
<HintPath>packages\DotNetNuke.Bundle.9.1.1.129\lib\DotNetNuke.Modules.DigitalAssets.dll</HintPath>
119120
<Private>False</Private>
120121
</Reference>
@@ -126,28 +127,28 @@
126127
<HintPath>packages\DotNetNuke.Bundle.9.1.1.129\lib\DotNetNuke.Tests.Utilities.dll</HintPath>
127128
<Private>False</Private>
128129
</Reference>
129-
<Reference Include="DotNetNuke.Web, Version=9.1.1.3, Culture=neutral, processorArchitecture=MSIL">
130-
<HintPath>packages\DotNetNuke.Web.9.1.1.3\lib\net40\DotNetNuke.Web.dll</HintPath>
130+
<Reference Include="DotNetNuke.Web">
131+
<HintPath>packages\DotNetNuke.Web.9.1.1.129\lib\net40\DotNetNuke.Web.dll</HintPath>
131132
<Private>False</Private>
132133
</Reference>
133-
<Reference Include="DotNetNuke.Web.Client, Version=9.1.1.3, Culture=neutral, processorArchitecture=MSIL">
134-
<HintPath>packages\DotNetNuke.Web.Client.9.1.1.3\lib\net40\DotNetNuke.Web.Client.dll</HintPath>
134+
<Reference Include="DotNetNuke.Web.Client">
135+
<HintPath>packages\DotNetNuke.Web.Client.9.1.1.129\lib\net40\DotNetNuke.Web.Client.dll</HintPath>
135136
<Private>False</Private>
136137
</Reference>
137-
<Reference Include="DotNetNuke.Web.Deprecated, Version=9.1.1.3, Culture=neutral, processorArchitecture=MSIL">
138-
<HintPath>packages\DotNetNuke.Web.Deprecated.9.1.1.3\lib\net40\DotNetNuke.Web.Deprecated.dll</HintPath>
138+
<Reference Include="DotNetNuke.Web.Deprecated">
139+
<HintPath>packages\DotNetNuke.Web.Deprecated.9.1.1.129\lib\net40\DotNetNuke.Web.Deprecated.dll</HintPath>
139140
<Private>False</Private>
140141
</Reference>
141-
<Reference Include="DotNetNuke.Web.Mvc, Version=9.1.1.3, Culture=neutral, processorArchitecture=MSIL">
142-
<HintPath>packages\DotNetNuke.Web.Mvc.9.1.1.3\lib\net45\DotNetNuke.Web.Mvc.dll</HintPath>
142+
<Reference Include="DotNetNuke.Web.Mvc">
143+
<HintPath>packages\DotNetNuke.Web.Mvc.9.1.1.129\lib\net45\DotNetNuke.Web.Mvc.dll</HintPath>
143144
<Private>False</Private>
144145
</Reference>
145146
<Reference Include="DotNetNuke.WebControls, Version=2.4.0.598, Culture=neutral, processorArchitecture=MSIL">
146147
<HintPath>packages\DotNetNuke.Bundle.9.1.1.129\lib\DotNetNuke.WebControls.dll</HintPath>
147148
<Private>False</Private>
148149
</Reference>
149150
<Reference Include="DotNetNuke.WebUtility, Version=4.2.1.783, Culture=neutral, processorArchitecture=MSIL">
150-
<HintPath>packages\DotNetNuke.Web.9.1.1.3\lib\net40\DotNetNuke.WebUtility.dll</HintPath>
151+
<HintPath>packages\DotNetNuke.Web.9.1.1.129\lib\net40\DotNetNuke.WebUtility.dll</HintPath>
151152
<Private>False</Private>
152153
</Reference>
153154
<Reference Include="FiftyOne.Foundation, Version=3.2.3.2, Culture=neutral, PublicKeyToken=e967ae578dabd98e, processorArchitecture=MSIL">
@@ -159,9 +160,9 @@
159160
<Private>False</Private>
160161
</Reference>
161162
<Reference Include="Microsoft.VisualBasic" />
162-
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
163-
<HintPath>packages\Newtonsoft.Json.4.5.6\lib\net40\Newtonsoft.Json.dll</HintPath>
164-
<Private>False</Private>
163+
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
164+
<HintPath>packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
165+
<SpecificVersion>False</SpecificVersion>
165166
</Reference>
166167
<Reference Include="System">
167168
<Name>System</Name>
@@ -176,9 +177,8 @@
176177
<Name>System.Drawing</Name>
177178
</Reference>
178179
<Reference Include="System.Net.Http" />
179-
<Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
180-
<HintPath>packages\Microsoft.AspNet.WebApi.Client.4.0.20710.0\lib\net40\System.Net.Http.Formatting.dll</HintPath>
181-
<Private>False</Private>
180+
<Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
181+
<HintPath>packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
182182
</Reference>
183183
<Reference Include="System.Net.Http.WebRequest" />
184184
<Reference Include="System.Runtime.Serialization">
@@ -193,9 +193,6 @@
193193
<Reference Include="System.Web">
194194
<Name>System.Web</Name>
195195
</Reference>
196-
<Reference Include="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
197-
<Private>False</Private>
198-
</Reference>
199196
<Reference Include="System.Xml">
200197
<Name>System.XML</Name>
201198
</Reference>

‎packages.config‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="DotNetNuke.Bundle" version="9.1.1.129" targetFramework="net45" />
4-
<package id="DotNetNuke.Core" version="9.1.1.3" targetFramework="net45" />
5-
<package id="DotNetNuke.Instrumentation" version="9.1.1.3" targetFramework="net45" />
6-
<package id="DotNetNuke.Web" version="9.1.1.3" targetFramework="net45" />
7-
<package id="DotNetNuke.Web.Client" version="9.1.1.3" targetFramework="net45" />
8-
<package id="DotNetNuke.Web.Deprecated" version="9.1.1.3" targetFramework="net45" />
9-
<package id="DotNetNuke.Web.Mvc" version="9.1.1.3" targetFramework="net45" />
10-
<package id="DotNetNuke.WebApi" version="9.1.1.3" targetFramework="net45" />
11-
<package id="Microsoft.AspNet.WebApi.Client" version="4.0.20710.0" targetFramework="net45" />
4+
<package id="DotNetNuke.Core" version="9.1.1.129" targetFramework="net45" />
5+
<package id="DotNetNuke.Instrumentation" version="9.1.1.129" targetFramework="net45" />
6+
<package id="DotNetNuke.Web" version="9.1.1.129" targetFramework="net45" />
7+
<package id="DotNetNuke.Web.Client" version="9.1.1.129" targetFramework="net45" />
8+
<package id="DotNetNuke.Web.Deprecated" version="9.1.1.129" targetFramework="net45" />
9+
<package id="DotNetNuke.Web.Mvc" version="9.1.1.129" targetFramework="net45" />
10+
<package id="DotNetNuke.WebApi" version="9.1.1.129" targetFramework="net45" />
11+
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" />
1212
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" />
1313
<package id="MSBuildTasks" version="1.5.0.235" targetFramework="net45" developmentDependency="true" />
14-
<package id="Newtonsoft.Json" version="4.5.6" targetFramework="net45" />
14+
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
1515
</packages>

0 commit comments

Comments
 (0)