Skip to content

Commit 79f7710

Browse files
aaronpowellaaronpowell
committed
upgrading some nuget packages
1 parent 7c7fa6e commit 79f7710

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+3460
-8541
lines changed

‎src/FunnelWeb.Extensions.CommentNotification/FunnelWeb.Extensions.CommentNotification.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434
</PropertyGroup>
3535
<ItemGroup>
3636
<Reference Include="Autofac">
37-
<HintPath>..\packages\Autofac.2.5.2.830\lib\NET40\Autofac.dll</HintPath>
37+
<HintPath>..\packages\Autofac.2.6.1.841\lib\NET40\Autofac.dll</HintPath>
3838
</Reference>
3939
<Reference Include="Autofac.Configuration">
40-
<HintPath>..\packages\Autofac.2.5.2.830\lib\NET40\Autofac.Configuration.dll</HintPath>
40+
<HintPath>..\packages\Autofac.2.6.1.841\lib\NET40\Autofac.Configuration.dll</HintPath>
4141
</Reference>
4242
<Reference Include="System" />
4343
<Reference Include="System.ComponentModel.Composition" />

‎src/FunnelWeb.Extensions.CommentNotification/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Autofac" version="2.5.2.830" />
3+
<package id="Autofac" version="2.6.1.841" />
44
</packages>

‎src/FunnelWeb.Tests/FunnelWeb.Tests.csproj‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
</PropertyGroup>
3636
<ItemGroup>
3737
<Reference Include="Autofac">
38-
<HintPath>..\packages\Autofac.2.5.2.830\lib\NET40\Autofac.dll</HintPath>
38+
<HintPath>..\packages\Autofac.2.6.1.841\lib\NET40\Autofac.dll</HintPath>
3939
</Reference>
4040
<Reference Include="Autofac.Configuration">
41-
<HintPath>..\packages\Autofac.2.5.2.830\lib\NET40\Autofac.Configuration.dll</HintPath>
41+
<HintPath>..\packages\Autofac.2.6.1.841\lib\NET40\Autofac.Configuration.dll</HintPath>
4242
</Reference>
4343
<Reference Include="DbUp, Version=2.0.67.0, Culture=neutral, PublicKeyToken=4b419c53bdfd4cbf, processorArchitecture=MSIL">
4444
<SpecificVersion>False</SpecificVersion>
@@ -59,9 +59,8 @@
5959
<HintPath>..\..\lib\Watin\Microsoft.mshtml.dll</HintPath>
6060
<Private>True</Private>
6161
</Reference>
62-
<Reference Include="NHibernate, Version=3.2.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
63-
<SpecificVersion>False</SpecificVersion>
64-
<HintPath>..\packages\NHibernate.3.2.0.4000\lib\Net35\NHibernate.dll</HintPath>
62+
<Reference Include="NHibernate">
63+
<HintPath>..\packages\NHibernate.3.3.0.4000\lib\Net35\NHibernate.dll</HintPath>
6564
</Reference>
6665
<Reference Include="NSubstitute">
6766
<HintPath>..\packages\NSubstitute.1.3.0.0\lib\NET40\NSubstitute.dll</HintPath>

‎src/FunnelWeb.Tests/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Autofac" version="2.4.2.696" />
4-
<package id="Autofac" version="2.5.2.830" />
4+
<package id="Autofac" version="2.6.1.841" />
55
<package id="dbup" version="2.0.67" />
66
<package id="dbup-sqlce" version="2.0.67" />
77
<package id="Iesi.Collections" version="3.2.0.4000" />
8-
<package id="NHibernate" version="3.2.0.4000" />
8+
<package id="NHibernate" version="3.3.0.4000" />
99
<package id="NSubstitute" version="1.3.0.0" />
1010
<package id="SqlServerCompact" version="4.0.8482.1" />
1111
</packages>

‎src/FunnelWeb.Web/Areas/Admin/Views/Shared/_Private.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
Powered by <a href="http://www.funnelweblog.com/">FunnelWeb</a> @Html.Version()</p>
6262
</footer>
6363
@{
64-
Html.RequiresJs("jquery-1.7.1.min.js", "Scripts", 0);
64+
Html.RequiresJs("jquery-1.7.2.min.js", "Scripts", 0);
6565
Html.RequiresJs("jsdate.js", "Scripts", 1);
6666
Html.RequiresJs("prettify.js", "Scripts", 1);
6767
Html.RequiresJs("showdown.js", "Scripts", 1);

‎src/FunnelWeb.Web/Content/themes/base/jquery-ui.css‎

Lines changed: 15 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
1-
/*
2-
* jQuery UI CSS Framework 1.8.17
3-
*
4-
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
5-
* Dual licensed under the MIT or GPL Version 2 licenses.
6-
* http://jquery.org/license
7-
*
8-
* http://docs.jquery.com/UI/Theming/API
9-
*/
1+
/*! jQuery UI - v1.8.19 - 2012-04-16
2+
* https://github.com/jquery/jquery-ui
3+
* Includes: jquery.ui.core.css, jquery.ui.accordion.css, jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css, jquery.ui.dialog.css, jquery.ui.progressbar.css, jquery.ui.resizable.css, jquery.ui.selectable.css, jquery.ui.slider.css, jquery.ui.tabs.css, jquery.ui.theme.css
4+
* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
105

116
/* Layout helpers
127
----------------------------------*/
@@ -36,15 +31,7 @@
3631

3732
/* Overlays */
3833
.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
39-
/*
40-
* jQuery UI Accordion 1.8.17
41-
*
42-
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
43-
* Dual licensed under the MIT or GPL Version 2 licenses.
44-
* http://jquery.org/license
45-
*
46-
* http://docs.jquery.com/UI/Accordion#theming
47-
*/
34+
4835
/* IE/Win - Fix animation bug - #4615 */
4936
.ui-accordion { width: 100%; }
5037
.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
@@ -55,22 +42,14 @@
5542
.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
5643
.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
5744
.ui-accordion .ui-accordion-content-active { display: block; }
58-
/*
59-
* jQuery UI Autocomplete 1.8.17
60-
*
61-
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
62-
* Dual licensed under the MIT or GPL Version 2 licenses.
63-
* http://jquery.org/license
64-
*
65-
* http://docs.jquery.com/UI/Autocomplete#theming
66-
*/
45+
6746
.ui-autocomplete { position: absolute; cursor: default; }
6847

6948
/* workarounds */
7049
* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
7150

7251
/*
73-
* jQuery UI Menu 1.8.17
52+
* jQuery UI Menu 1.8.19
7453
*
7554
* Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
7655
* Dual licensed under the MIT or GPL Version 2 licenses.
@@ -108,15 +87,7 @@
10887
font-weight: normal;
10988
margin: -1px;
11089
}
111-
/*
112-
* jQuery UI Button 1.8.17
113-
*
114-
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
115-
* Dual licensed under the MIT or GPL Version 2 licenses.
116-
* http://jquery.org/license
117-
*
118-
* http://docs.jquery.com/UI/Button#theming
119-
*/
90+
12091
.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
12192
.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
12293
button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
@@ -146,15 +117,7 @@ input.ui-button { padding: .4em 1em; }
146117

147118
/* workarounds */
148119
button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
149-
/*
150-
* jQuery UI Datepicker 1.8.17
151-
*
152-
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
153-
* Dual licensed under the MIT or GPL Version 2 licenses.
154-
* http://jquery.org/license
155-
*
156-
* http://docs.jquery.com/UI/Datepicker#theming
157-
*/
120+
158121
.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
159122
.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
160123
.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
@@ -213,15 +176,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
213176
left: -4px; /*must have*/
214177
width: 200px; /*must have*/
215178
height: 200px; /*must have*/
216-
}/*
217-
* jQuery UI Dialog 1.8.17
218-
*
219-
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
220-
* Dual licensed under the MIT or GPL Version 2 licenses.
221-
* http://jquery.org/license
222-
*
223-
* http://docs.jquery.com/UI/Dialog#theming
224-
*/
179+
}
225180
.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
226181
.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative; }
227182
.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; }
@@ -234,25 +189,9 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
234189
.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
235190
.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
236191
.ui-draggable .ui-dialog-titlebar { cursor: move; }
237-
/*
238-
* jQuery UI Progressbar 1.8.17
239-
*
240-
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
241-
* Dual licensed under the MIT or GPL Version 2 licenses.
242-
* http://jquery.org/license
243-
*
244-
* http://docs.jquery.com/UI/Progressbar#theming
245-
*/
192+
246193
.ui-progressbar { height:2em; text-align: left; overflow: hidden; }
247-
.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }/*
248-
* jQuery UI Resizable 1.8.17
249-
*
250-
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
251-
* Dual licensed under the MIT or GPL Version 2 licenses.
252-
* http://jquery.org/license
253-
*
254-
* http://docs.jquery.com/UI/Resizable#theming
255-
*/
194+
.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
256195
.ui-resizable { position: relative;}
257196
.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block; }
258197
.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
@@ -263,25 +202,9 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
263202
.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
264203
.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
265204
.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
266-
.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*
267-
* jQuery UI Selectable 1.8.17
268-
*
269-
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
270-
* Dual licensed under the MIT or GPL Version 2 licenses.
271-
* http://jquery.org/license
272-
*
273-
* http://docs.jquery.com/UI/Selectable#theming
274-
*/
205+
.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}
275206
.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
276-
/*
277-
* jQuery UI Slider 1.8.17
278-
*
279-
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
280-
* Dual licensed under the MIT or GPL Version 2 licenses.
281-
* http://jquery.org/license
282-
*
283-
* http://docs.jquery.com/UI/Slider#theming
284-
*/
207+
285208
.ui-slider { position: relative; text-align: left; }
286209
.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
287210
.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
@@ -296,15 +219,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
296219
.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
297220
.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
298221
.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
299-
.ui-slider-vertical .ui-slider-range-max { top: 0; }/*
300-
* jQuery UI Tabs 1.8.17
301-
*
302-
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
303-
* Dual licensed under the MIT or GPL Version 2 licenses.
304-
* http://jquery.org/license
305-
*
306-
* http://docs.jquery.com/UI/Tabs#theming
307-
*/
222+
.ui-slider-vertical .ui-slider-range-max { top: 0; }
308223
.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
309224
.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
310225
.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
@@ -314,18 +229,6 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
314229
.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
315230
.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
316231
.ui-tabs .ui-tabs-hide { display: none !important; }
317-
/*
318-
* jQuery UI CSS Framework 1.8.17
319-
*
320-
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
321-
* Dual licensed under the MIT or GPL Version 2 licenses.
322-
* http://jquery.org/license
323-
*
324-
* http://docs.jquery.com/UI/Theming/API
325-
*
326-
* To view and modify this theme, visit http://jqueryui.com/themeroller/
327-
*/
328-
329232

330233
/* Component containers
331234
----------------------------------*/

‎src/FunnelWeb.Web/Content/themes/base/jquery.ui.accordion.css‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
/*
2-
* jQuery UI Accordion 1.8.17
1+
/*!
2+
* jQuery UI Accordion 1.8.19
33
*
4-
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
4+
* Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
55
* Dual licensed under the MIT or GPL Version 2 licenses.
66
* http://jquery.org/license
77
*

‎src/FunnelWeb.Web/Content/themes/base/jquery.ui.all.css‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
/*
2-
* jQuery UI CSS Framework 1.8.17
1+
/*!
2+
* jQuery UI CSS Framework 1.8.19
33
*
4-
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
4+
* Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
55
* Dual licensed under the MIT or GPL Version 2 licenses.
66
* http://jquery.org/license
77
*

‎src/FunnelWeb.Web/Content/themes/base/jquery.ui.autocomplete.css‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
/*
2-
* jQuery UI Autocomplete 1.8.17
1+
/*!
2+
* jQuery UI Autocomplete 1.8.19
33
*
4-
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
4+
* Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
55
* Dual licensed under the MIT or GPL Version 2 licenses.
66
* http://jquery.org/license
77
*
@@ -13,7 +13,7 @@
1313
* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
1414

1515
/*
16-
* jQuery UI Menu 1.8.17
16+
* jQuery UI Menu 1.8.19
1717
*
1818
* Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
1919
* Dual licensed under the MIT or GPL Version 2 licenses.

‎src/FunnelWeb.Web/Content/themes/base/jquery.ui.base.css‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
/*
2-
* jQuery UI CSS Framework 1.8.17
1+
/*!
2+
* jQuery UI CSS Framework 1.8.19
33
*
4-
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
4+
* Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
55
* Dual licensed under the MIT or GPL Version 2 licenses.
66
* http://jquery.org/license
77
*

0 commit comments

Comments
 (0)