jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update: 3rd Party Libraries

Browse Source 
Newtonsoft.Json 5.0.8; RazorGenerator.Mvc 2.1.2; jQuery 2.0.3; jQuery
Validate Unobtrusive 3.0.0; Microsoft.Net.Http 2.1.10; KnockoutJS 2.3.0;
Highcharts 2.0; T4MVC 3.7.4; TinyMCE 4.0.9
This commit is contained in:
Gary Sharp
2013-10-28 17:42:38 +11:00
parent 7096a511c3
commit c13d13c91c
130 changed files with 91487 additions and 42737 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Disco.Web.csproj
+50 -98
View File
@@ -43,10 +43,6 @@
<UseVSHostingProcess>true</UseVSHostingProcess>
</PropertyGroup>
<ItemGroup>
<Reference Include="DotNet.Highcharts, Version=1.1.0.0, Culture=neutral, PublicKeyToken=88854f873df851bf, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\DotNet.Highcharts.1.2\lib\DotNet.Highcharts.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNet.SignalR.Core, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.AspNet.SignalR.Core.1.1.2\lib\net40\Microsoft.AspNet.SignalR.Core.dll</HintPath>
@@ -65,7 +61,7 @@
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.5.0.5\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath>..\packages\Newtonsoft.Json.5.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Owin">
<HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
@@ -76,7 +72,7 @@
</Reference>
<Reference Include="RazorGenerator.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\RazorGenerator.Mvc.2.0.1\lib\net40\RazorGenerator.Mvc.dll</HintPath>
<HintPath>..\packages\RazorGenerator.Mvc.2.1.2\lib\net40\RazorGenerator.Mvc.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -94,13 +90,13 @@
<Reference Include="System.IO.Compression.FileSystem" />
<Reference Include="System.Management" />
<Reference Include="System.Net.Http.Extensions">
<HintPath>..\packages\Microsoft.Net.Http.2.1.10\lib\net45\System.Net.Http.Extensions.dll</HintPath>
<HintPath>..\packages\Microsoft.Net.Http.2.2.15\lib\net45\System.Net.Http.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http.Primitives">
<HintPath>..\packages\Microsoft.Net.Http.2.1.10\lib\net45\System.Net.Http.Primitives.dll</HintPath>
<HintPath>..\packages\Microsoft.Net.Http.2.2.15\lib\net45\System.Net.Http.Primitives.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Core">
<HintPath>..\packages\Rx-Core.2.1.30214.0\lib\Net45\System.Reactive.Core.dll</HintPath>
@@ -173,10 +169,11 @@
</Reference>
<Reference Include="T4MVCExtensions, Version=3.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\T4MVCExtensions.3.6.5\lib\net40\T4MVCExtensions.dll</HintPath>
<HintPath>..\packages\T4MVCExtensions.3.7.4\lib\net40\T4MVCExtensions.dll</HintPath>
</Reference>
<Reference Include="WebActivatorEx">
<HintPath>..\packages\WebActivatorEx.2.0.1\lib\net40\WebActivatorEx.dll</HintPath>
<Reference Include="WebActivatorEx, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\WebActivatorEx.2.0.3\lib\net40\WebActivatorEx.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -565,10 +562,9 @@
<Compile Include="Models\User\ShowModel.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="T4MVC.cs">
<DependentUpon>T4MVC.tt</DependentUpon>
<SubType>Code</SubType>
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>T4MVC.tt</DependentUpon>
</Compile>
<Compile Include="Views\Device\AddOffline.generated.cs">
<DependentUpon>AddOffline.cshtml</DependentUpon>
@@ -915,16 +911,15 @@
<Content Include="ClientSource\Scripts\Core.min.js">
<DependentUpon>Core.js.bundle</DependentUpon>
</Content>
<Content Include="ClientSource\Scripts\Modules\jQuery-Fancytree.js">
<None Include="ClientSource\Scripts\Modules\jQuery-Fancytree.js">
<DependentUpon>jQuery-Fancytree.js.bundle</DependentUpon>
</Content>
<Content Include="ClientSource\Scripts\Modules\jQuery-Fancytree.js.bundle" />
</None>
<None Include="ClientSource\Scripts\Modules\jQuery-Fancytree.js.bundle" />
<None Include="ClientSource\Scripts\Modules\Disco-AjaxHelperIcons.js">
<DependentUpon>Disco-AjaxHelperIcons.js.bundle</DependentUpon>
</None>
<None Include="ClientSource\Scripts\Core\jquery-ui-1.10.3.js" />
<None Include="ClientSource\Scripts\Core\jquery-2.0.2.js" />
<Content Include="ClientSource\Scripts\Core\disco.uicore.js" />
<None Include="ClientSource\Scripts\Core\disco.uicore.js" />
<Content Include="ClientSource\Scripts\Modules\Disco-AjaxHelperIcons.min.js">
<DependentUpon>Disco-AjaxHelperIcons.js.bundle</DependentUpon>
</Content>
@@ -952,9 +947,9 @@
<None Include="ClientSource\Scripts\Modules\Highcharts.min.js.map">
<DependentUpon>Highcharts.js.bundle</DependentUpon>
</None>
<Content Include="ClientSource\Scripts\Modules\jQuery-Fancytree.min.js.map">
<None Include="ClientSource\Scripts\Modules\jQuery-Fancytree.min.js.map">
<DependentUpon>jQuery-Fancytree.js.bundle</DependentUpon>
</Content>
</None>
<None Include="ClientSource\Scripts\Modules\jQuery-Isotope.min.js.map">
<DependentUpon>jQuery-Isotope.js.bundle</DependentUpon>
</None>
@@ -1001,7 +996,7 @@
<Content Include="ClientSource\Scripts\Modules\jQuery-Fancytree.min.js">
<DependentUpon>jQuery-Fancytree.js.bundle</DependentUpon>
</Content>
<Content Include="ClientSource\Scripts\Modules\jQuery-Fancytree\jquery.fancytree-all.js" />
<None Include="ClientSource\Scripts\Modules\jQuery-Fancytree\jquery.fancytree-all.js" />
<Content Include="ClientSource\Scripts\Modules\jQuery-Isotope.min.js">
<DependentUpon>jQuery-Isotope.js.bundle</DependentUpon>
</Content>
@@ -1065,6 +1060,7 @@
<None Include="ClientSource\Scripts\Modules\Shadowbox.js">
<DependentUpon>Shadowbox.js.bundle</DependentUpon>
</None>
<None Include="ClientSource\Scripts\Modules\Knockout\knockout-2.3.0.js" />
<Content Include="ClientSource\Scripts\Modules\Shadowbox.min.js">
<DependentUpon>Shadowbox.js.bundle</DependentUpon>
</Content>
@@ -1102,6 +1098,7 @@
<None Include="ClientSource\Style\BundleSite.css">
<DependentUpon>BundleSite.css.bundle</DependentUpon>
</None>
<None Include="ClientSource\Scripts\Modules\tinymce\themes\simple\theme.js" />
<Content Include="ClientSource\Style\BundleSite.min.css">
<DependentUpon>BundleSite.css.bundle</DependentUpon>
</Content>
@@ -1434,81 +1431,27 @@
</None>
<None Include="Properties\PublishProfiles\HADES3.pubxml" />
<None Include="ClientSource\Scripts\Core\jquery.validate.js" />
<None Include="ClientSource\Scripts\Modules\Knockout\knockout-2.2.1.js" />
<None Include="ClientSource\Scripts\Modules\tinymce\jquery.tinymce.js" />
<Content Include="ClientSource\Scripts\Modules\tinymce\langs\en.js" />
<Content Include="ClientSource\Scripts\Modules\tinymce\license.txt" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\about.htm" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\anchor.htm" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\charmap.htm" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\color_picker.htm" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\editor_template.js" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\editor_template_src.js" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\image.htm" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\img\colorpicker.jpg" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\img\flash.gif" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\img\icons.gif" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\img\iframe.gif" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\img\pagebreak.gif" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\img\quicktime.gif" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\img\realmedia.gif" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\img\shockwave.gif" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\img\trans.gif" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\img\video.gif" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\img\windowsmedia.gif" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\js\about.js" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\js\anchor.js" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\js\charmap.js" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\js\color_picker.js" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\js\image.js" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\js\link.js" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\js\source_editor.js" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\langs\en.js" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\langs\en_dlg.js" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\link.htm" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\shortcuts.htm" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\skins\default\content.css" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\skins\default\dialog.css" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\skins\default\img\buttons.png" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\skins\default\img\items.gif" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\skins\default\img\menu_arrow.gif" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\skins\default\img\menu_check.gif" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\skins\default\img\progress.gif" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\skins\default\img\tabs.gif" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\skins\default\ui.css" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\skins\highcontrast\content.css" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\skins\highcontrast\dialog.css" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\skins\highcontrast\ui.css" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\skins\o2k7\content.css" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\skins\o2k7\dialog.css" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\skins\o2k7\img\button_bg.png" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\skins\o2k7\img\button_bg_black.png" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\skins\o2k7\img\button_bg_silver.png" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\skins\o2k7\ui.css" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\skins\o2k7\ui_black.css" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\skins\o2k7\ui_silver.css" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\advanced\source_editor.htm" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\simple\editor_template.js" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\simple\editor_template_src.js" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\simple\img\icons.gif" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\simple\langs\en.js" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\simple\skins\default\content.css" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\simple\skins\default\ui.css" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\simple\skins\o2k7\content.css" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\simple\skins\o2k7\img\button_bg.png" />
<Content Include="ClientSource\Scripts\Modules\tinymce\themes\simple\skins\o2k7\ui.css" />
<None Include="ClientSource\Scripts\Modules\tinymce\tiny_mce.js" />
<None Include="ClientSource\Scripts\Modules\tinymce\tiny_mce_jquery.js" />
<Content Include="ClientSource\Scripts\Modules\tinymce\tiny_mce_popup.js" />
<None Include="ClientSource\Scripts\Modules\tinymce\tiny_mce_src.js" />
<Content Include="ClientSource\Scripts\Modules\tinymce\utils\editable_selects.js" />
<Content Include="ClientSource\Scripts\Modules\tinymce\utils\form_utils.js" />
<Content Include="ClientSource\Scripts\Modules\tinymce\utils\mctabs.js" />
<Content Include="ClientSource\Scripts\Modules\tinymce\utils\validate.js" />
<None Include="ClientSource\Scripts\Core\jquery.validate.unobtrusive.js" />
<None Include="ClientSource\Scripts\Modules\Highcharts\highcharts.src.js" />
<None Include="ClientSource\Scripts\Modules\jQuery-SignalR\jquery.signalR-1.1.2.js" />
<None Include="ClientSource\Scripts\Core\jquery-2.0.3.js" />
<None Include="ClientSource\Scripts\Modules\tinymce\jquery.tinymce.min.js" />
<None Include="ClientSource\Scripts\Modules\tinymce\license.txt" />
<Content Include="ClientSource\Scripts\Modules\tinymce\skins\lightgray\content.inline.min.css" />
<Content Include="ClientSource\Scripts\Modules\tinymce\skins\lightgray\content.min.css" />
<Content Include="ClientSource\Scripts\Modules\tinymce\skins\lightgray\fonts\tinymce-small.svg" />
<Content Include="ClientSource\Scripts\Modules\tinymce\skins\lightgray\fonts\tinymce-small.woff" />
<Content Include="ClientSource\Scripts\Modules\tinymce\skins\lightgray\fonts\tinymce-small.ttf" />
<Content Include="ClientSource\Scripts\Modules\tinymce\skins\lightgray\fonts\tinymce-small.eot" />
<Content Include="ClientSource\Scripts\Modules\tinymce\skins\lightgray\fonts\tinymce.svg" />
<Content Include="ClientSource\Scripts\Modules\tinymce\skins\lightgray\fonts\tinymce.woff" />
<Content Include="ClientSource\Scripts\Modules\tinymce\skins\lightgray\fonts\tinymce.ttf" />
<Content Include="ClientSource\Scripts\Modules\tinymce\skins\lightgray\fonts\tinymce.eot" />
<None Include="T4MVC.tt.hooks.t4" />
<None Include="T4MVC.tt">
<Generator>TextTemplatingFileGenerator</Generator>
<LastGenOutput>T4MVC.cs</LastGenOutput>
</None>
<None Include="Views\Device\AddOffline.cshtml">
<Generator>RazorGenerator</Generator>
<LastGenOutput>AddOffline.generated.cs</LastGenOutput>
@@ -1930,10 +1873,15 @@
<None Include="_bin_deployableAssemblies\amd64\Microsoft.VC90.CRT\msvcr90.dll" />
<None Include="ClientSource\Scripts\Core\modernizr-2.6.2.js" />
<None Include="T4MVC.tt.settings.xml" />
<Content Include="T4MVC.tt">
<Generator>TextTemplatingFileGenerator</Generator>
<LastGenOutput>T4MVC.cs</LastGenOutput>
</Content>
<Content Include="ClientSource\Scripts\Modules\tinymce\skins\lightgray\img\anchor.gif" />
<Content Include="ClientSource\Scripts\Modules\tinymce\skins\lightgray\img\loader.gif" />
<Content Include="ClientSource\Scripts\Modules\tinymce\skins\lightgray\img\object.gif" />
<Content Include="ClientSource\Scripts\Modules\tinymce\skins\lightgray\img\trans.gif" />
<Content Include="ClientSource\Scripts\Modules\tinymce\skins\lightgray\img\wline.gif" />
<Content Include="ClientSource\Scripts\Modules\tinymce\skins\lightgray\skin.ie7.min.css" />
<Content Include="ClientSource\Scripts\Modules\tinymce\skins\lightgray\skin.min.css" />
<None Include="ClientSource\Scripts\Modules\tinymce\themes\modern\theme.js" />
<None Include="ClientSource\Scripts\Modules\tinymce\tinymce.js" />
<Content Include="Web.config">
<SubType>Designer</SubType>
</Content>
@@ -2024,7 +1972,11 @@
</VisualStudio>
</ProjectExtensions>
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.6\tools\Microsoft.Bcl.Build.targets" />
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" />
<Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
<Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
<Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">