Permalink
Browse files

update packages and vs 2015 support

  • Loading branch information...
1 parent 5699cc7 commit b5a663e33098d174575701898c910b2717405fa2 @volkanceylan committed Aug 5, 2015
Showing with 2,947 additions and 1,280 deletions.
  1. +1,019 −0 .vs/config/applicationhost.config
  2. +3 −3 Serenity.Caching.Couchbase/Serenity.Caching.Couchbase.csproj
  3. +1 −1 Serenity.Caching.Couchbase/app.config
  4. +1 −1 Serenity.Caching.Couchbase/packages.config
  5. +6 −5 Serenity.Caching.Redis/Serenity.Caching.Redis.csproj
  6. +1 −1 Serenity.Caching.Redis/packages.config
  7. +12 −10 Serenity.CodeGenerator/Serenity.CodeGenerator.csproj
  8. +3 −3 Serenity.CodeGenerator/packages.config
  9. +3 −3 Serenity.Core/Serenity.Core.csproj
  10. +1 −1 Serenity.Core/packages.config
  11. +3 −3 Serenity.Data.Entity/Serenity.Data.Entity.csproj
  12. +1 −1 Serenity.Data.Entity/packages.config
  13. +3 −3 Serenity.Data/Serenity.Data.csproj
  14. +1 −1 Serenity.Data/packages.config
  15. +1 −67 Serenity.Script.Core/Resources/Serenity.Externals.js
  16. +1 −1 Serenity.Script.Core/Serenity.Script.Core.csproj
  17. +6 −6 Serenity.Script.Core/packages.config
  18. +2 −2 Serenity.Script.Imports/Serenity.Script.Imports.csproj
  19. +6 −6 Serenity.Script.Imports/packages.config
  20. +2 −2 Serenity.Script.Test/Serenity.Script.Test.csproj
  21. +1 −1 Serenity.Script.Test/UI/EmailEditorTests.cs
  22. +7 −7 Serenity.Script.Test/packages.config
  23. +11 −0 Serenity.Script.UI/Grid/GridUtils.cs
  24. +3 −2 Serenity.Script.UI/Serenity.Script.UI.csproj
  25. +6 −6 Serenity.Script.UI/packages.config
  26. +3 −3 Serenity.Services/Serenity.Services.csproj
  27. +1 −1 Serenity.Services/packages.config
  28. +132 −15 Serenity.Test/Content/bootstrap-theme.css
  29. +1 −1 Serenity.Test/Content/bootstrap-theme.css.map
  30. +3 −3 Serenity.Test/Content/bootstrap-theme.min.css
  31. +578 −110 Serenity.Test/Content/bootstrap.css
  32. +1 −1 Serenity.Test/Content/bootstrap.css.map
  33. +3 −3 Serenity.Test/Content/bootstrap.min.css
  34. +2 −2 Serenity.Test/Content/themes/base/accordion.css
  35. +2 −2 Serenity.Test/Content/themes/base/all.css
  36. +2 −2 Serenity.Test/Content/themes/base/autocomplete.css
  37. +2 −2 Serenity.Test/Content/themes/base/base.css
  38. +2 −2 Serenity.Test/Content/themes/base/button.css
  39. +2 −2 Serenity.Test/Content/themes/base/core.css
  40. +2 −2 Serenity.Test/Content/themes/base/datepicker.css
  41. +2 −2 Serenity.Test/Content/themes/base/dialog.css
  42. +2 −2 Serenity.Test/Content/themes/base/draggable.css
  43. +2 −2 Serenity.Test/Content/themes/base/menu.css
  44. +2 −2 Serenity.Test/Content/themes/base/progressbar.css
  45. +2 −2 Serenity.Test/Content/themes/base/resizable.css
  46. +2 −2 Serenity.Test/Content/themes/base/selectable.css
  47. +2 −2 Serenity.Test/Content/themes/base/selectmenu.css
  48. +2 −2 Serenity.Test/Content/themes/base/slider.css
  49. +2 −2 Serenity.Test/Content/themes/base/sortable.css
  50. +2 −2 Serenity.Test/Content/themes/base/spinner.css
  51. +2 −2 Serenity.Test/Content/themes/base/tabs.css
  52. +2 −2 Serenity.Test/Content/themes/base/theme.css
  53. +2 −2 Serenity.Test/Content/themes/base/tooltip.css
  54. +1 −0 Serenity.Test/Core/AuthorizationTests.cs
  55. +1 −0 Serenity.Test/Core/Caching/DistributedCacheTests.cs
  56. +1 −0 Serenity.Test/Core/Caching/LocalCacheTests.cs
  57. +1 −0 Serenity.Test/Core/Caching/TwoLevelCacheTests.cs
  58. +1 −0 Serenity.Test/Core/Config/AppSettingsJsonConfigRepositoryTests.cs
  59. +11 −10 Serenity.Test/Core/Config/ConfigTests.cs
  60. +1 −0 Serenity.Test/Core/DependencyTests.cs
  61. +1 −0 Serenity.Test/Core/Localization/EnumLocalTextRegistrationTests.cs
  62. +2 −1 Serenity.Test/Core/Localization/JsonLocalTextRegistrationTests.cs
  63. +1 −0 Serenity.Test/Core/Localization/LocalTextRegistryTests.cs
  64. +7 −17 Serenity.Test/Core/Localization/LocalTextTests.cs
  65. +1 −0 Serenity.Test/Core/Localization/NestedLocalTextRegistrationTests.cs
  66. +1 −0 Serenity.Test/Core/Logging/SqlLoggerTests.cs
  67. +1 −0 Serenity.Test/Data/DisplayOrderTests.cs
  68. +1 −0 Serenity.Test/Data/RowMappingTests.cs
  69. +2 −2 Serenity.Test/ScriptTests.html
  70. +259 −216 Serenity.Test/Scripts/bootstrap.js
  71. +5 −5 Serenity.Test/Scripts/bootstrap.min.js
  72. +0 −4 Serenity.Test/Scripts/jquery-2.1.3.min.js
  73. +0 −1 Serenity.Test/Scripts/jquery-2.1.3.min.map
  74. 0 Serenity.Test/Scripts/{jquery-2.1.3.intellisense.js → jquery-2.1.4.intellisense.js}
  75. +9 −4 Serenity.Test/Scripts/{jquery-2.1.3.js → jquery-2.1.4.js}
  76. +5 −0 Serenity.Test/Scripts/jquery-2.1.4.min.js
  77. +1 −0 Serenity.Test/Scripts/jquery-2.1.4.min.map
  78. +0 −13 Serenity.Test/Scripts/jquery-ui-1.11.2.min.js
  79. +268 −233 Serenity.Test/Scripts/{jquery-ui-1.11.2.js → jquery-ui-1.11.4.js}
  80. +13 −0 Serenity.Test/Scripts/jquery-ui-1.11.4.min.js
  81. +2 −2 Serenity.Test/Scripts/jquery.validate-vsdoc.js
  82. +114 −81 Serenity.Test/Scripts/jquery.validate.js
  83. +3 −3 Serenity.Test/Scripts/jquery.validate.min.js
  84. +0 −13 Serenity.Test/Scripts/npm.js
  85. +1 −0 Serenity.Test/Selenium/ScriptTests.cs
  86. +49 −42 Serenity.Test/Serenity.Test.csproj
  87. +1 −0 Serenity.Test/Sql/SqlConnectionExtensionsTests.cs
  88. +1 −0 Serenity.Test/Sql/WrappedConnectionTests.cs
  89. BIN Serenity.Test/fonts/glyphicons-halflings-regular.eot
  90. +273 −214 Serenity.Test/fonts/glyphicons-halflings-regular.svg
  91. BIN Serenity.Test/fonts/glyphicons-halflings-regular.ttf
  92. BIN Serenity.Test/fonts/glyphicons-halflings-regular.woff
  93. BIN Serenity.Test/fonts/glyphicons-halflings-regular.woff2
  94. +17 −13 Serenity.Test/packages.config
  95. +3 −3 Serenity.Testing/Serenity.Testing.csproj
  96. +0 −67 Serenity.Testing/SqlScript/CreateDatabase.sql
  97. +1 −1 Serenity.Testing/packages.config
  98. +17 −17 Serenity.Web/Serenity.Web.csproj
  99. +4 −4 Serenity.Web/packages.config
  100. +1 −1 Tools/Saltarelle/Saltarelle.Compiler.targets
Oops, something went wrong.
@@ -39,9 +39,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>$(SolutionDir)packages\CouchbaseNetClient.1.3.10\lib\net40\Enyim.Caching.dll</HintPath>
</Reference>
- <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>$(SolutionDir)packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <HintPath>$(SolutionDir)packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
@@ -4,7 +4,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+ <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="CouchbaseNetClient" version="1.3.10" targetFramework="net45" />
- <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
+ <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
</packages>
@@ -31,8 +31,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="StackExchange.Redis">
- <HintPath>$(SolutionDir)packages\StackExchange.Redis.1.0.414\lib\net45\StackExchange.Redis.dll</HintPath>
+ <Reference Include="StackExchange.Redis, Version=1.0.316.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>$(SolutionDir)packages\StackExchange.Redis.1.0.481\lib\net45\StackExchange.Redis.dll</HintPath>
+ <Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Web" />
@@ -48,14 +49,14 @@
<Compile Include="RedisDistributedCache.cs" />
</ItemGroup>
<ItemGroup>
- <None Include="packages.config" />
- </ItemGroup>
- <ItemGroup>
<ProjectReference Include="..\Serenity.Core\Serenity.Core.csproj">
<Project>{f76a7628-d2e9-43cc-a3f4-98f76c33dcdb}</Project>
<Name>Serenity.Core</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <None Include="packages.config" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- 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.
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="StackExchange.Redis" version="1.0.414" targetFramework="net45" />
+ <package id="StackExchange.Redis" version="1.0.481" targetFramework="net45" />
</packages>
@@ -32,7 +32,8 @@
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
- <NuGetPackageImportStamp>4bc9b78f</NuGetPackageImportStamp>
+ <NuGetPackageImportStamp>
+ </NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<PlatformTarget>x86</PlatformTarget>
@@ -75,20 +76,20 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>$(SolutionDir)packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <HintPath>$(SolutionDir)packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <Private>True</Private>
</Reference>
<Reference Include="RazorGenerator.Templating, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>$(SolutionDir)packages\RazorGenerator.Templating.2.3.3\lib\portable-net40+sl50+win+wpa81+wp80\RazorGenerator.Templating.dll</HintPath>
+ <HintPath>$(SolutionDir)packages\RazorGenerator.Templating.2.3.9\lib\portable-Profile328\RazorGenerator.Templating.dll</HintPath>
+ <Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Data" />
- <Reference Include="System.Data.SQLite, Version=1.0.96.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>$(SolutionDir)packages\System.Data.SQLite.Core.1.0.96.0\lib\net45\System.Data.SQLite.dll</HintPath>
+ <Reference Include="System.Data.SQLite, Version=1.0.98.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\System.Data.SQLite.Core.1.0.98.1\lib\net45\System.Data.SQLite.dll</HintPath>
+ <Private>True</Private>
</Reference>
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
@@ -288,7 +289,8 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <Import Project="$(SolutionDir)packages\System.Data.SQLite.Core.1.0.96.0\build\net45\System.Data.SQLite.Core.targets" Condition="Exists('..\..\packages\System.Data.SQLite.Core.1.0.96.0\build\net45\System.Data.SQLite.Core.targets')" />
+ <Import Project="$(SolutionDir)packages\System.Data.SQLite.Core.1.0.97.0\build\net45\System.Data.SQLite.Core.targets" Condition="Exists('$(SolutionDir)packages\System.Data.SQLite.Core.1.0.97.0\build\net45\System.Data.SQLite.Core.targets')" />
+ <Import Project="..\..\packages\System.Data.SQLite.Core.1.0.98.1\build\net45\System.Data.SQLite.Core.targets" Condition="Exists('..\..\packages\System.Data.SQLite.Core.1.0.98.1\build\net45\System.Data.SQLite.Core.targets')" />
<!-- 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">
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
- <package id="RazorGenerator.Templating" version="2.3.3" targetFramework="net45" />
- <package id="System.Data.SQLite.Core" version="1.0.96.0" targetFramework="net45" />
+ <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
+ <package id="RazorGenerator.Templating" version="2.3.9" targetFramework="net45" />
+ <package id="System.Data.SQLite.Core" version="1.0.98.1" targetFramework="net45" />
</packages>
@@ -31,9 +31,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>$(SolutionDir)packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <HintPath>$(SolutionDir)packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <Private>True</Private>
</Reference>
<Reference Include="System" />
</ItemGroup>
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
+ <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
</packages>
@@ -31,9 +31,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>$(SolutionDir)packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <HintPath>$(SolutionDir)packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
+ <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
</packages>
@@ -31,9 +31,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>$(SolutionDir)packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <HintPath>$(SolutionDir)packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
+ <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
</packages>
@@ -780,21 +780,14 @@ Q$Externals.jQueryValidationInitialization = function () {
}
$(this.currentForm)
- .validateDelegate(":text, :password, :file, select, textarea", "focusin", delegate);
+ .on(":text, :password, :file, select, textarea", "focusin.validate", delegate);
}
$.validator.prototype.oldfocusInvalid = $.validator.prototype.focusInvalid;
$.validator.prototype.focusInvalid = function () {
if (this.settings.abortHandler)
this.settings.abortHandler(this);
this.oldfocusInvalid.call(this);
-
- if ($.fn.qtip) {
- var lbl = $('label.error', this.currentForm).not('.checked').eq(0);
- if (lbl.length) {
- lbl.qtip('show');
- }
- }
}
$.validator.prototype.oldstopRequest = $.validator.prototype.focusInvalid;
@@ -837,66 +830,8 @@ Q$Externals.validatorAbortHandler = function (validator) {
}
}
-Q$Externals.validateAddTip = function(error) {
- if ($.fn.qtip) {
- error.qtip({
- style: {
- classes: 'ui-tooltip-red',
- widget: false
- }
- });
- }
-}
-
-Q$Externals.validateDelTip = function(error) {
- if ($.fn.qtip && error.data('qtip')) {
- error.qtip('destroy').attr('title', '');
- }
-}
-
-Q$Externals.validateShowLabel = function(element, message) {
- var label = this.errorsFor( element );
- if ( label.length ) {
- // refresh error/success class
- label.removeClass().addClass( this.settings.errorClass );
-
- // check if we have a generated label, replace the message then
- if (label.attr("generated"))
- label.attr('title', message);
-
- Q$Externals.validateAddTip(label);
- } else {
- // create label
- label = $("<" + this.settings.errorElement + "/>")
- .attr({"for": this.idOrName(element), generated: true})
- .addClass(this.settings.errorClass)
- .attr('title', message || '');
-
- if ( this.settings.wrapper ) {
- // make sure the element is visible, even in IE
- // actually showing the wrapped element is handled elsewhere
- label = label.hide().show().wrap("<" + this.settings.wrapper + "/>").parent();
- }
- if ( !this.labelContainer.append(label).length )
- this.settings.errorPlacement
- ? this.settings.errorPlacement(label, $(element) )
- : label.insertAfter(element);
-
- Q$Externals.validateAddTip(label);
- }
- if ( !message && this.settings.success ) {
- typeof this.settings.success == "string"
- ? label.addClass( this.settings.success )
- : this.settings.success( label );
- label.attr('title', '');
-
- }
- this.toShow = this.toShow.add(label);
-},
Q$Externals.validateOptions = function(options) {
- $.validator.prototype.showLabel = Q$Externals.validateShowLabel;
-
return $.extend({
ignore: ":hidden",
meta: 'v',
@@ -933,7 +868,6 @@ Q$Externals.validateOptions = function(options) {
},
success: function(label) {
label.addClass('checked');
- Q$Externals.validateDelTip(label);
}
}, options);
}
@@ -105,7 +105,7 @@
</ItemGroup>
<ItemGroup>
<Reference Include="mscorlib">
- <HintPath>$(SolutionDir)packages\Saltarelle.Runtime.2.6.2\tools\Assemblies\mscorlib.dll</HintPath>
+ <HintPath>$(SolutionDir)packages\Saltarelle.Runtime.2.7.0\tools\Assemblies\mscorlib.dll</HintPath>
</Reference>
<Reference Include="Saltarelle.jQuery, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a4048e8fcc593f14, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Saltarelle.Compiler" version="2.6.2" targetFramework="net20" />
- <package id="Saltarelle.jQuery" version="1.10.1" targetFramework="net20" />
- <package id="Saltarelle.jQuery.UI" version="1.10.1" targetFramework="net20" />
- <package id="Saltarelle.Linq" version="2.4.0" targetFramework="net20" />
- <package id="Saltarelle.Runtime" version="2.6.2" targetFramework="net20" />
- <package id="Saltarelle.Web" version="3.1.0" targetFramework="net20" />
+ <package id="Saltarelle.Compiler" version="2.7.0" targetFramework="net2" />
+ <package id="Saltarelle.jQuery" version="1.10.1" targetFramework="net2" />
+ <package id="Saltarelle.jQuery.UI" version="1.10.1" targetFramework="net2" />
+ <package id="Saltarelle.Linq" version="2.4.0" targetFramework="net2" />
+ <package id="Saltarelle.Runtime" version="2.7.0" targetFramework="net2" />
+ <package id="Saltarelle.Web" version="3.1.0" targetFramework="net2" />
</packages>
@@ -83,7 +83,7 @@
</ItemGroup>
<ItemGroup>
<Reference Include="mscorlib">
- <HintPath>$(SolutionDir)packages\Saltarelle.Runtime.2.6.2\tools\Assemblies\mscorlib.dll</HintPath>
+ <HintPath>$(SolutionDir)packages\Saltarelle.Runtime.2.7.0\tools\Assemblies\mscorlib.dll</HintPath>
</Reference>
<Reference Include="Saltarelle.jQuery, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a4048e8fcc593f14, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -101,7 +101,7 @@
<HintPath>$(SolutionDir)packages\Saltarelle.Web.3.1.0\lib\Saltarelle.Web.dll</HintPath>
</Reference>
</ItemGroup>
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <Import Project="$(ProjectDir)..\tools\Saltarelle\Saltarelle.Compiler.targets" />
<!-- 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">
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Saltarelle.Compiler" version="2.6.2" targetFramework="net20" />
- <package id="Saltarelle.jQuery" version="1.10.1" targetFramework="net20" />
- <package id="Saltarelle.jQuery.UI" version="1.10.1" targetFramework="net20" />
- <package id="Saltarelle.Linq" version="2.4.0" targetFramework="net20" />
- <package id="Saltarelle.Runtime" version="2.6.2" targetFramework="net20" />
- <package id="Saltarelle.Web" version="3.1.0" targetFramework="net20" />
+ <package id="Saltarelle.Compiler" version="2.7.0" targetFramework="net2" />
+ <package id="Saltarelle.jQuery" version="1.10.1" targetFramework="net2" />
+ <package id="Saltarelle.jQuery.UI" version="1.10.1" targetFramework="net2" />
+ <package id="Saltarelle.Linq" version="2.4.0" targetFramework="net2" />
+ <package id="Saltarelle.Runtime" version="2.7.0" targetFramework="net2" />
+ <package id="Saltarelle.Web" version="3.1.0" targetFramework="net2" />
</packages>
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
@@ -53,7 +53,7 @@
</ItemGroup>
<ItemGroup>
<Reference Include="mscorlib">
- <HintPath>$(SolutionDir)packages\Saltarelle.Runtime.2.6.2\tools\Assemblies\mscorlib.dll</HintPath>
+ <HintPath>$(SolutionDir)packages\Saltarelle.Runtime.2.7.0\tools\Assemblies\mscorlib.dll</HintPath>
</Reference>
<Reference Include="Saltarelle.jQuery, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a4048e8fcc593f14, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -107,7 +107,7 @@ public void EmailUserValidationMethodWorks()
Assert.IsTrue(jq.validator.methods.emailuser.call(validator, "some.user", user.Value("some.user")[0]), title + "2");
domain.Value("");
- Assert.IsTrue(jq.validator.methods.emailuser.call(validator, " ", user.Value(" ")[0]), title + "3");
+ Assert.IsFalse(jq.validator.methods.emailuser.call(validator, " ", user.Value(" ")[0]), title + "3");
domain.Value(onlyAscii ? "ascii.domain.co.uk" : "unıcõde.domaîn.co.uk");
Oops, something went wrong.

0 comments on commit b5a663e

Please sign in to comment.