Permalink
Browse files

Merge branch 'develop'

  • Loading branch information...
2 parents 865ed48 + 3204dd9 commit 1c6c57ca27e6b705e297314a5aad7e9013b2c899 @danielwertheim committed Mar 11, 2013
Showing with 295 additions and 315 deletions.
  1. +1 −1 Deploy/rake-build.rb
  2. +1 −1 Deploy/sisodb.glimpse.nuspec
  3. +1 −1 Deploy/sisodb.miniprofiler.nuspec
  4. +1 −1 Deploy/sisodb.servicestack.nuspec
  5. +6 −5 Source/Projects/SisoDb.Glimpse/SisoDb.Glimpse.csproj
  6. +3 −5 Source/Projects/SisoDb.Glimpse/SisoDbGlimpsePlugin.cs
  7. +1 −1 Source/Projects/SisoDb.Glimpse/packages.config
  8. +2 −2 Source/Projects/SisoDb.MiniProfiler/ProfiledConnectionWrapper.cs
  9. +3 −2 Source/Projects/SisoDb.MiniProfiler/SisoDb.MiniProfiler.csproj
  10. +1 −1 Source/Projects/SisoDb.MiniProfiler/packages.config
  11. +2 −2 Source/Projects/SisoDb.ServiceStack/SisoDb.ServiceStack.csproj
  12. +1 −1 Source/Projects/SisoDb.ServiceStack/packages.config
  13. +1 −1 Source/Projects/SisoDb.SqlCe4/SqlCe4ConnectionInfo.cs
  14. +9 −16 Source/Samples/SisoDb.SampleApp/App.config
  15. +15 −18 Source/Tests/SisoDb.Specifications.Azure/App.config
  16. +4 −4 Source/Tests/SisoDb.Specifications.Azure/SisoDb.Specifications.Azure.csproj
  17. +1 −1 Source/Tests/SisoDb.Specifications.Azure/packages.config
  18. +17 −21 Source/Tests/SisoDb.Specifications.Sql2005/App.config
  19. +4 −4 Source/Tests/SisoDb.Specifications.Sql2005/SisoDb.Specifications.Sql2005.csproj
  20. +1 −1 Source/Tests/SisoDb.Specifications.Sql2005/packages.config
  21. +17 −21 Source/Tests/SisoDb.Specifications.Sql2008/App.config
  22. +4 −4 Source/Tests/SisoDb.Specifications.Sql2008/SisoDb.Specifications.Sql2008.csproj
  23. +1 −1 Source/Tests/SisoDb.Specifications.Sql2008/packages.config
  24. +17 −21 Source/Tests/SisoDb.Specifications.Sql2012/App.config
  25. +4 −4 Source/Tests/SisoDb.Specifications.Sql2012/SisoDb.Specifications.Sql2012.csproj
  26. +1 −1 Source/Tests/SisoDb.Specifications.Sql2012/packages.config
  27. +11 −10 Source/Tests/SisoDb.Specifications.SqlCe4/App.config
  28. +4 −4 Source/Tests/SisoDb.Specifications.SqlCe4/SisoDb.Specifications.SqlCe4.csproj
  29. +1 −1 Source/Tests/SisoDb.Specifications.SqlCe4/packages.config
  30. +5 −9 Source/Tests/SisoDb.Specifications.SqlProfiler/App.config
  31. +4 −4 Source/Tests/SisoDb.Specifications.SqlProfiler/SisoDb.Specifications.SqlProfiler.csproj
  32. +1 −1 Source/Tests/SisoDb.Specifications.SqlProfiler/packages.config
  33. +4 −4 Source/Tests/SisoDb.Specifications/SisoDb.Specifications.csproj
  34. +1 −1 Source/Tests/SisoDb.Specifications/packages.config
  35. +6 −6 Source/Tests/SisoDb.Testing/SisoDb.Testing.csproj
  36. +2 −2 Source/Tests/SisoDb.Testing/packages.config
  37. +1 −1 Source/Tests/SisoDb.UnitTests/Diagnostics/DbDiagnosticsBuilderTests.Build.approved.txt
  38. +1 −1 Source/Tests/SisoDb.UnitTests/Glimpse/SisoDbGlimpsePluginTests.GetData.approved.txt
  39. +2 −1 Source/Tests/SisoDb.UnitTests/Glimpse/SisoDbGlimpsePluginTests.cs
  40. +1 −1 ...ringFunctionTests.GenerateQuery_for_Where_with_String_Contains_GeneratesCorrectQuery.approved.txt
  41. +1 −1 ...ringFunctionTests.GenerateQuery_for_Where_with_String_EndsWith_GeneratesCorrectQuery.approved.txt
  42. +1 −1 ...erateQuery_for_Where_with_String_EndsWith_on_Nullable_ToString_GeneratesCorrectQuery.approved.txt
  43. +1 −1 ...erateQuery_for_Where_with_String_Equals_and_EndsWith_on_String_GeneratesCorrectQuery.approved.txt
  44. +1 −1 ...ateQuery_for_Where_with_String_Equals_and_StartsWith_on_String_GeneratesCorrectQuery.approved.txt
  45. +1 −1 ...ngFunctionTests.GenerateQuery_for_Where_with_String_QxContains_GeneratesCorrectQuery.approved.txt
  46. +1 −1 ...ngFunctionTests.GenerateQuery_for_Where_with_String_QxEndsWith_GeneratesCorrectQuery.approved.txt
  47. +1 −1 ...gFunctionTests.GenerateQuery_for_Where_with_String_QxIsExactly_GeneratesCorrectQuery.approved.txt
  48. +1 −1 ...StringFunctionTests.GenerateQuery_for_Where_with_String_QxLike_GeneratesCorrectQuery.approved.txt
  49. +1 −1 ...FunctionTests.GenerateQuery_for_Where_with_String_QxStartsWith_GeneratesCorrectQuery.approved.txt
  50. +1 −1 ...ingFunctionTests.GenerateQuery_for_Where_with_String_QxToLower_GeneratesCorrectQuery.approved.txt
  51. +1 −1 ...ingFunctionTests.GenerateQuery_for_Where_with_String_QxToUpper_GeneratesCorrectQuery.approved.txt
  52. +1 −1 ...ngFunctionTests.GenerateQuery_for_Where_with_String_StartsWith_GeneratesCorrectQuery.approved.txt
  53. +1 −1 ...ateQuery_for_Where_with_String_StartsWith_on_Nullable_ToString_GeneratesCorrectQuery.approved.txt
  54. +1 −1 ...tringFunctionTests.GenerateQuery_for_Where_with_String_ToLower_GeneratesCorrectQuery.approved.txt
  55. +1 −1 ...tringFunctionTests.GenerateQuery_for_Where_with_String_ToUpper_GeneratesCorrectQuery.approved.txt
  56. +1 −1 ...ion/Sql2005QueryGeneratorTests.GenerateQuery_WithChainedWheres_GeneratesCorrectQuery.approved.txt
  57. +1 −1 ...ryGeneration/Sql2005QueryGeneratorTests.GenerateQuery_WithEnum_GeneratesCorrectQuery.approved.txt
  58. +1 −1 ...yGeneration/Sql2005QueryGeneratorTests.GenerateQuery_WithFirst_GeneratesCorrectQuery.approved.txt
  59. +1 −1 ...Generation/Sql2005QueryGeneratorTests.GenerateQuery_WithSingle_GeneratesCorrectQuery.approved.txt
  60. +1 −1 ...ion/Sql2005QueryGeneratorTests.GenerateQuery_WithSkip13AndSort_GeneratesCorrectQuery.approved.txt
  61. +1 −1 ...ratorTests.GenerateQuery_WithTake2AndPage2WithSize10AndSorting_GeneratesCorrectQuery.approved.txt
  62. +1 −1 ...ryGeneration/Sql2005QueryGeneratorTests.GenerateQuery_WithTake_GeneratesCorrectQuery.approved.txt
  63. +1 −1 ...nerateQuery_WithWhereContainingNullableIntComparedAgainstValue_GeneratesCorrectQuery.approved.txt
  64. +1 −1 ...eQuery_WithWhereContainingNullableIntValueComparedAgainstValue_GeneratesCorrectQuery.approved.txt
  65. +1 −1 ...5QueryGeneratorTests.GenerateQuery_WithWhereHavingExplicitBool_GeneratesCorrectQuery.approved.txt
  66. +1 −1 ...5QueryGeneratorTests.GenerateQuery_WithWhereHavingImplicitBool_GeneratesCorrectQuery.approved.txt
  67. +1 −1 ...ests.GenerateQuery_WithWhereUsingNegationOfNullableIntHasValue_GeneratesCorrectQuery.approved.txt
  68. +1 −1 ...atorTests.GenerateQuery_WithWhereUsingNullableIntHasValueFalse_GeneratesCorrectQuery.approved.txt
  69. +1 −1 ...GeneratorTests.GenerateQuery_WithWhereUsingNullableIntHasValue_GeneratesCorrectQuery.approved.txt
  70. +1 −1 ...eneratorTests.GenerateQuery_WithWhereUsingNullableIntIsNotNull_GeneratesCorrectQuery.approved.txt
  71. +1 −1 ...ryGeneratorTests.GenerateQuery_WithWhereUsingNullableIntIsNull_GeneratesCorrectQuery.approved.txt
  72. +1 −1 ...yGeneration/Sql2005QueryGeneratorTests.GenerateQuery_WithWhere_GeneratesCorrectQuery.approved.txt
  73. +1 −1 ...ery_With_StringQxStartsWith_or_IntEquals_or_ListOfStringsQxAny_GeneratesCorrectQuery.approved.txt
  74. +1 −1 ...ringFunctionTests.GenerateQuery_for_Where_with_String_Contains_GeneratesCorrectQuery.approved.txt
  75. +1 −1 ...ringFunctionTests.GenerateQuery_for_Where_with_String_EndsWith_GeneratesCorrectQuery.approved.txt
  76. +1 −1 ...erateQuery_for_Where_with_String_EndsWith_on_Nullable_ToString_GeneratesCorrectQuery.approved.txt
  77. +1 −1 ...erateQuery_for_Where_with_String_Equals_and_EndsWith_on_String_GeneratesCorrectQuery.approved.txt
  78. +1 −1 ...ateQuery_for_Where_with_String_Equals_and_StartsWith_on_String_GeneratesCorrectQuery.approved.txt
  79. +1 −1 ...ngFunctionTests.GenerateQuery_for_Where_with_String_QxContains_GeneratesCorrectQuery.approved.txt
  80. +1 −1 ...ngFunctionTests.GenerateQuery_for_Where_with_String_QxEndsWith_GeneratesCorrectQuery.approved.txt
  81. +1 −1 ...gFunctionTests.GenerateQuery_for_Where_with_String_QxIsExactly_GeneratesCorrectQuery.approved.txt
  82. +1 −1 ...StringFunctionTests.GenerateQuery_for_Where_with_String_QxLike_GeneratesCorrectQuery.approved.txt
  83. +1 −1 ...FunctionTests.GenerateQuery_for_Where_with_String_QxStartsWith_GeneratesCorrectQuery.approved.txt
  84. +1 −1 ...ingFunctionTests.GenerateQuery_for_Where_with_String_QxToLower_GeneratesCorrectQuery.approved.txt
  85. +1 −1 ...ingFunctionTests.GenerateQuery_for_Where_with_String_QxToUpper_GeneratesCorrectQuery.approved.txt
  86. +1 −1 ...ngFunctionTests.GenerateQuery_for_Where_with_String_StartsWith_GeneratesCorrectQuery.approved.txt
  87. +1 −1 ...ateQuery_for_Where_with_String_StartsWith_on_Nullable_ToString_GeneratesCorrectQuery.approved.txt
  88. +1 −1 ...tringFunctionTests.GenerateQuery_for_Where_with_String_ToLower_GeneratesCorrectQuery.approved.txt
  89. +1 −1 ...tringFunctionTests.GenerateQuery_for_Where_with_String_ToUpper_GeneratesCorrectQuery.approved.txt
  90. +1 −1 ...ion/Sql2008QueryGeneratorTests.GenerateQuery_WithChainedWheres_GeneratesCorrectQuery.approved.txt
  91. +1 −1 ...ryGeneration/Sql2008QueryGeneratorTests.GenerateQuery_WithEnum_GeneratesCorrectQuery.approved.txt
  92. +1 −1 ...yGeneration/Sql2008QueryGeneratorTests.GenerateQuery_WithFirst_GeneratesCorrectQuery.approved.txt
  93. +1 −1 ...QueryGeneratorTests.GenerateQuery_WithPagingAndWhereAndSorting_GeneratesCorrectQuery.approved.txt
  94. +1 −1 ...Generation/Sql2008QueryGeneratorTests.GenerateQuery_WithSingle_GeneratesCorrectQuery.approved.txt
  95. +1 −1 ...ion/Sql2008QueryGeneratorTests.GenerateQuery_WithSkip13AndSort_GeneratesCorrectQuery.approved.txt
  96. +1 −1 ...ratorTests.GenerateQuery_WithTake2AndPage2WithSize10AndSorting_GeneratesCorrectQuery.approved.txt
  97. +1 −1 ...ryGeneration/Sql2008QueryGeneratorTests.GenerateQuery_WithTake_GeneratesCorrectQuery.approved.txt
  98. +1 −1 ...nerateQuery_WithWhereContainingNullableIntComparedAgainstValue_GeneratesCorrectQuery.approved.txt
  99. +1 −1 ...eQuery_WithWhereContainingNullableIntValueComparedAgainstValue_GeneratesCorrectQuery.approved.txt
  100. +1 −1 ...8QueryGeneratorTests.GenerateQuery_WithWhereHavingExplicitBool_GeneratesCorrectQuery.approved.txt
  101. +1 −1 ...8QueryGeneratorTests.GenerateQuery_WithWhereHavingImplicitBool_GeneratesCorrectQuery.approved.txt
  102. +1 −1 ...ests.GenerateQuery_WithWhereUsingNegationOfNullableIntHasValue_GeneratesCorrectQuery.approved.txt
  103. +1 −1 ...atorTests.GenerateQuery_WithWhereUsingNullableIntHasValueFalse_GeneratesCorrectQuery.approved.txt
  104. +1 −1 ...GeneratorTests.GenerateQuery_WithWhereUsingNullableIntHasValue_GeneratesCorrectQuery.approved.txt
  105. +1 −1 ...eneratorTests.GenerateQuery_WithWhereUsingNullableIntIsNotNull_GeneratesCorrectQuery.approved.txt
  106. +1 −1 ...ryGeneratorTests.GenerateQuery_WithWhereUsingNullableIntIsNull_GeneratesCorrectQuery.approved.txt
  107. +1 −1 ...yGeneration/Sql2008QueryGeneratorTests.GenerateQuery_WithWhere_GeneratesCorrectQuery.approved.txt
  108. +1 −1 ...ery_With_StringQxStartsWith_or_IntEquals_or_ListOfStringsQxAny_GeneratesCorrectQuery.approved.txt
  109. +1 −1 ...ringFunctionTests.GenerateQuery_for_Where_with_String_Contains_GeneratesCorrectQuery.approved.txt
  110. +1 −1 ...ringFunctionTests.GenerateQuery_for_Where_with_String_EndsWith_GeneratesCorrectQuery.approved.txt
  111. +1 −1 ...erateQuery_for_Where_with_String_EndsWith_on_Nullable_ToString_GeneratesCorrectQuery.approved.txt
  112. +1 −1 ...erateQuery_for_Where_with_String_Equals_and_EndsWith_on_String_GeneratesCorrectQuery.approved.txt
  113. +1 −1 ...ateQuery_for_Where_with_String_Equals_and_StartsWith_on_String_GeneratesCorrectQuery.approved.txt
  114. +1 −1 ...ngFunctionTests.GenerateQuery_for_Where_with_String_QxContains_GeneratesCorrectQuery.approved.txt
  115. +1 −1 ...ngFunctionTests.GenerateQuery_for_Where_with_String_QxEndsWith_GeneratesCorrectQuery.approved.txt
  116. +1 −1 ...gFunctionTests.GenerateQuery_for_Where_with_String_QxIsExactly_GeneratesCorrectQuery.approved.txt
  117. +1 −1 ...StringFunctionTests.GenerateQuery_for_Where_with_String_QxLike_GeneratesCorrectQuery.approved.txt
  118. +1 −1 ...FunctionTests.GenerateQuery_for_Where_with_String_QxStartsWith_GeneratesCorrectQuery.approved.txt
  119. +1 −1 ...ingFunctionTests.GenerateQuery_for_Where_with_String_QxToLower_GeneratesCorrectQuery.approved.txt
  120. +1 −1 ...ingFunctionTests.GenerateQuery_for_Where_with_String_QxToUpper_GeneratesCorrectQuery.approved.txt
  121. +1 −1 ...ngFunctionTests.GenerateQuery_for_Where_with_String_StartsWith_GeneratesCorrectQuery.approved.txt
  122. +1 −1 ...ateQuery_for_Where_with_String_StartsWith_on_Nullable_ToString_GeneratesCorrectQuery.approved.txt
  123. +1 −1 ...tringFunctionTests.GenerateQuery_for_Where_with_String_ToLower_GeneratesCorrectQuery.approved.txt
  124. +1 −1 ...tringFunctionTests.GenerateQuery_for_Where_with_String_ToUpper_GeneratesCorrectQuery.approved.txt
  125. +1 −1 ...ion/Sql2012QueryGeneratorTests.GenerateQuery_WithChainedWheres_GeneratesCorrectQuery.approved.txt
  126. +1 −1 ...ryGeneration/Sql2012QueryGeneratorTests.GenerateQuery_WithEnum_GeneratesCorrectQuery.approved.txt
  127. +1 −1 ...yGeneration/Sql2012QueryGeneratorTests.GenerateQuery_WithFirst_GeneratesCorrectQuery.approved.txt
  128. +1 −1 ...QueryGeneratorTests.GenerateQuery_WithPagingAndWhereAndSorting_GeneratesCorrectQuery.approved.txt
  129. +1 −1 ...Generation/Sql2012QueryGeneratorTests.GenerateQuery_WithSingle_GeneratesCorrectQuery.approved.txt
  130. +1 −1 ...ion/Sql2012QueryGeneratorTests.GenerateQuery_WithSkip13AndSort_GeneratesCorrectQuery.approved.txt
  131. +1 −1 ...ratorTests.GenerateQuery_WithTake2AndPage2WithSize10AndSorting_GeneratesCorrectQuery.approved.txt
  132. +1 −1 ...ryGeneration/Sql2012QueryGeneratorTests.GenerateQuery_WithTake_GeneratesCorrectQuery.approved.txt
  133. +1 −1 ...nerateQuery_WithWhereContainingNullableIntComparedAgainstValue_GeneratesCorrectQuery.approved.txt
  134. +1 −1 ...eQuery_WithWhereContainingNullableIntValueComparedAgainstValue_GeneratesCorrectQuery.approved.txt
  135. +1 −1 ...2QueryGeneratorTests.GenerateQuery_WithWhereHavingExplicitBool_GeneratesCorrectQuery.approved.txt
  136. +1 −1 ...2QueryGeneratorTests.GenerateQuery_WithWhereHavingImplicitBool_GeneratesCorrectQuery.approved.txt
  137. +1 −1 ...ests.GenerateQuery_WithWhereUsingNegationOfNullableIntHasValue_GeneratesCorrectQuery.approved.txt
  138. +1 −1 ...atorTests.GenerateQuery_WithWhereUsingNullableIntHasValueFalse_GeneratesCorrectQuery.approved.txt
  139. +1 −1 ...GeneratorTests.GenerateQuery_WithWhereUsingNullableIntHasValue_GeneratesCorrectQuery.approved.txt
  140. +1 −1 ...eneratorTests.GenerateQuery_WithWhereUsingNullableIntIsNotNull_GeneratesCorrectQuery.approved.txt
  141. +1 −1 ...ryGeneratorTests.GenerateQuery_WithWhereUsingNullableIntIsNull_GeneratesCorrectQuery.approved.txt
  142. +1 −1 ...yGeneration/Sql2012QueryGeneratorTests.GenerateQuery_WithWhere_GeneratesCorrectQuery.approved.txt
  143. +1 −1 ...ery_With_StringQxStartsWith_or_IntEquals_or_ListOfStringsQxAny_GeneratesCorrectQuery.approved.txt
  144. +1 −1 ...ryGeneration/SqlCe4QueryGeneratorTests.GenerateQuery_WithFirst_GeneratesCorrectQuery.approved.txt
  145. +1 −1 ...QueryGeneratorTests.GenerateQuery_WithPagingAndWhereAndSorting_GeneratesCorrectQuery.approved.txt
  146. +1 −1 ...yGeneration/SqlCe4QueryGeneratorTests.GenerateQuery_WithSingle_GeneratesCorrectQuery.approved.txt
  147. +1 −1 ...tion/SqlCe4QueryGeneratorTests.GenerateQuery_WithSkip13AndSort_GeneratesCorrectQuery.approved.txt
  148. +1 −1 ...ratorTests.GenerateQuery_WithTake2AndPage2WithSize10AndSorting_GeneratesCorrectQuery.approved.txt
  149. +1 −1 ...eryGeneration/SqlCe4QueryGeneratorTests.GenerateQuery_WithTake_GeneratesCorrectQuery.approved.txt
  150. +9 −8 Source/Tests/SisoDb.UnitTests/SisoDb.UnitTests.csproj
  151. +1 −1 Source/Tests/SisoDb.UnitTests/Spatial/GeographyFactoryTests.When_Castle.approved.txt
  152. +1 −1 ...Tests/Spatial/GeographyFactoryTests.When_Coordinates_has_correct_order_and_is_closed.approved.txt
  153. +1 −1 ...s/Spatial/GeographyFactoryTests.When_Coordinates_has_correct_order_and_is_not_closed.approved.txt
  154. +1 −1 ....UnitTests/Spatial/GeographyFactoryTests.When_Coordinates_has_wrong_order_and_closed.approved.txt
  155. +1 −1 ...tTests/Spatial/GeographyFactoryTests.When_Coordinates_has_wrong_order_and_not_closed.approved.txt
  156. +1 −1 ...ates_has_wrong_order_starting_south_to_north_and_many_to_west_and_back_and_is_closed.approved.txt
  157. +1 −0 ...b.UnitTests/Spatial/GeographyFactoryTests.When_Star_that_is_wrong_from_the_beginning.approved.txt
  158. +1 −1 ...oDb.UnitTests/Spatial/GeographyFactoryTests.When_drawn_lower_right_counter_clockwise.approved.txt
  159. +3 −1 Source/Tests/SisoDb.UnitTests/StringApprovals.cs
  160. +3 −3 Source/Tests/SisoDb.UnitTests/packages.config
@@ -28,7 +28,7 @@
@env_projectnameSpatial = 'SisoDb.Spatial'
@env_buildfolderpath = 'build'
-@env_assversion = "16.2.0"
+@env_assversion = "16.2.1"
@env_version = "#{@env_assversion}"
@env_buildversion = @env_version + (ENV['env_buildnumber'].to_s.empty? ? "" : ".#{ENV['env_buildnumber'].to_s}")
@env_buildconfigname = ENV['env_buildconfigname'].to_s.empty? ? "Release" : ENV['env_buildconfigname'].to_s
@@ -19,7 +19,7 @@
<tags>glimpse, diagnostics, sisodb,document-database,db,structure,key-value,json,poco,blob,sql,sqlserver,sql-server,sql2005,sql2008,sql2012,sqlazure,azure,sqlce,sqlce4,nosql</tags>
<dependencies>
<dependency id="SisoDb" version="[$version$]" />
- <dependency id="Glimpse" version="0.87" />
+ <dependency id="Glimpse" version="1.0.1" />
</dependencies>
</metadata>
<files>
@@ -19,7 +19,7 @@
<tags>miniprofiler,profiling,sisodb,document-database,db,structure,key-value,json,poco,blob,sql,sqlserver,sql-server,sql2005,sql2008,sql2012,sqlazure,azure,sqlce,sqlce4,nosql</tags>
<dependencies>
<dependency id="SisoDb" version="[$version$]" />
- <dependency id="MiniProfiler" version="2.0.2" />
+ <dependency id="MiniProfiler" version="2.1.0" />
</dependencies>
</metadata>
<files>
@@ -21,7 +21,7 @@
<tags>servicestack,sisodb,document-database,db,structure,key-value,json,poco,blob,sql,sqlserver,sql-server,sql2005,sql2008,sql2012,sqlazure,azure,sqlce,sqlce4,nosql</tags>
<dependencies>
<dependency id="SisoDb" version="[$version$]" />
- <dependency id="ServiceStack.Text" version="3.9.28" />
+ <dependency id="ServiceStack.Text" version="3.9.38" />
</dependencies>
</metadata>
<files>
@@ -33,8 +33,9 @@
<NoWarn>1591</NoWarn>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Glimpse.Core">
- <HintPath>..\..\packages\Glimpse.0.87\lib\net40\Glimpse.Core.dll</HintPath>
+ <Reference Include="Glimpse.Core, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\packages\Glimpse.1.0.1\lib\net40\Glimpse.Core.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
@@ -52,14 +53,14 @@
<Compile Include="SisoDbGlimpsePlugin.cs" />
</ItemGroup>
<ItemGroup>
- <None Include="packages.config" />
- </ItemGroup>
- <ItemGroup>
<ProjectReference Include="..\SisoDb\SisoDb.csproj">
<Project>{B0DBD485-B46D-4566-A755-4BF445FD6375}</Project>
<Name>SisoDb</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,17 +1,15 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Web;
using Glimpse.Core.Extensibility;
using SisoDb.Diagnostics;
using SisoDb.Diagnostics.Builders;
namespace SisoDb.Glimpse
{
- [GlimpsePlugin]
- public class SisoDbGlimpsePlugin : IGlimpsePlugin
+ public class SisoDbGlimpsePlugin : TabBase
{
- public string Name
+ public override string Name
{
get { return "SisoDb"; }
}
@@ -22,7 +20,7 @@ public string Name
public virtual void SetupInit() { }
- public virtual object GetData(HttpContextBase context)
+ public override object GetData(ITabContext context)
{
var data = new List<object[]>();
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Glimpse" version="0.87" />
+ <package id="Glimpse" version="1.0.1" targetFramework="net40" />
</packages>
@@ -14,12 +14,12 @@ public ProfiledConnectionWrapper(DbConnection connection, IDbProfiler profiler)
public IDbConnection GetInnerConnection()
{
- return _conn;
+ return _connection;
}
protected override DbTransaction BeginDbTransaction(IsolationLevel isolationLevel)
{
- return new ProfiledTransactionWrapper(_conn.BeginTransaction(isolationLevel), this);
+ return new ProfiledTransactionWrapper(_connection.BeginTransaction(isolationLevel), this);
}
}
}
@@ -33,8 +33,9 @@
<NoWarn>1591</NoWarn>
</PropertyGroup>
<ItemGroup>
- <Reference Include="MiniProfiler">
- <HintPath>..\..\packages\MiniProfiler.2.0.2\lib\net40\MiniProfiler.dll</HintPath>
+ <Reference Include="MiniProfiler, Version=2.1.0.0, Culture=neutral, PublicKeyToken=b44f9351044011a3, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="MiniProfiler" version="2.0.2" targetFramework="net40" />
+ <package id="MiniProfiler" version="2.1.0" targetFramework="net40" />
</packages>
@@ -32,9 +32,9 @@
<DocumentationFile>bin\Release\SisoDb.ServiceStack.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
- <Reference Include="ServiceStack.Text, Version=3.9.28.0, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="ServiceStack.Text, Version=3.9.38.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\packages\ServiceStack.Text.3.9.29\lib\net35\ServiceStack.Text.dll</HintPath>
+ <HintPath>..\..\packages\ServiceStack.Text.3.9.38\lib\net35\ServiceStack.Text.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="ServiceStack.Text" version="3.9.29" targetFramework="net40" />
+ <package id="ServiceStack.Text" version="3.9.38" targetFramework="net40" />
</packages>
@@ -61,7 +61,7 @@ protected string ExtractFilePath(string connectionString)
{
filePath = filePath.Substring(dataDirectorySwitch.Length);
if (HttpContext.Current != null)
- filePath = Path.Combine(HttpContext.Current.Server.MapPath("App_Data"), filePath);
+ filePath = Path.Combine(HttpContext.Current.Server.MapPath("~/App_Data"), filePath);
}
return filePath;
@@ -9,21 +9,14 @@
connectionString="data source=.;initial catalog=SisoDb.SampleApp;integrated security=SSPI;"/>
<add name="SisoDb.SqlCe4"
connectionString="data source=c:\Temp\SisoDb\SisoDb.SampleApp.sdf;Enlist=true;"/>
- <!--Speedie-->
- <add name="pls-speedie_SisoDb.Sql2005"
- connectionString="data source=.\Sql2012Dev;initial catalog=SisoDb.SampleApp;integrated security=SSPI;"/>
- <add name="pls-speedie_SisoDb.Sql2008"
- connectionString="data source=.\Sql2012Dev;initial catalog=SisoDb.SampleApp;integrated security=SSPI;"/>
- <add name="pls-speedie_SisoDb.Sql2012"
- connectionString="data source=.\Sql2012Dev;initial catalog=SisoDb.SampleApp;integrated security=SSPI;"/>
- <add name="pls-speedie_SisoDb.SqlCe4"
- connectionString="data source=d:\Temp\SisoDb\SisoDb.SampleApp.sdf;Enlist=true;"/>
- <!--Gameboy-->
- <add name="pls-gameboy_SisoDb.Sql2005"
- connectionString="data source=.\Sql2012Dev;initial catalog=SisoDb.SampleApp;integrated security=SSPI;"/>
- <add name="pls-gameboy_SisoDb.Sql2008"
- connectionString="data source=.\Sql2012Dev;initial catalog=SisoDb.SampleApp;integrated security=SSPI;"/>
- <add name="pls-gameboy_SisoDb.Sql2012"
- connectionString="data source=.\Sql2012Dev;initial catalog=SisoDb.SampleApp;integrated security=SSPI;"/>
+ <!-- custom computername -->
+ <add name="yourcomputername_SisoDb.Sql2005"
+ connectionString="data source=.;initial catalog=SisoDb.SampleApp;integrated security=SSPI;"/>
+ <add name="yourcomputername_SisoDb.Sql2008"
+ connectionString="data source=.;initial catalog=SisoDb.SampleApp;integrated security=SSPI;"/>
+ <add name="yourcomputername_SisoDb.Sql2012"
+ connectionString="data source=.;initial catalog=SisoDb.SampleApp;integrated security=SSPI;"/>
+ <add name="yourcomputername_SisoDb.SqlCe4"
+ connectionString="data source=c:\Temp\SisoDb\SisoDb.SampleApp.sdf;Enlist=true;"/>
</connectionStrings>
</configuration>
@@ -1,23 +1,20 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
- <connectionStrings>
- <add name="SisoDb.Azure"
- connectionString="data source=.;initial catalog=SisoDbSpecsAzure;integrated security=SSPI;" />
+ <connectionStrings>
+ <add name="SisoDb.Azure"
+ connectionString="data source=.;initial catalog=SisoDbSpecsAzure;integrated security=SSPI;" />
- <add name="pls-speedie_SisoDb.Azure"
- connectionString="data source=.\Sql2012Dev;initial catalog=SisoDbSpecsAzure;integrated security=SSPI;" />
+ <!-- computer specific -->
+ <add name="yourcomputername_SisoDb.Azure"
+ connectionString="data source=.;initial catalog=SisoDbSpecsAzure;integrated security=SSPI;" />
- <add name="pls-gameboy_SisoDb.Azure"
- connectionString="data source=.\Sql2012Dev;initial catalog=SisoDbSpecsAzure;integrated security=SSPI;" />
-
- <!--
- <add name="SisoDb.Azure"
- connectionString="data source=pls-virtual\sqlexpress2012;initial catalog=SisoDbSpecsAzure;integrated security=SSPI;" />
- -->
-
- <!--
- <add name="SisoDb.Azure"
- connectionString="server=tcp:.database.windows.net,1433;database=SisoDbSpecsAzure;User ID=;Password=;Trusted_Connection=False;Encrypt=True;" />
- -->
- </connectionStrings>
+ <!--
+ <add name="SisoDb.Azure"
+ connectionString="data source=pls-virtual\sqlexpress2012;initial catalog=SisoDbSpecsAzure;integrated security=SSPI;" />
+ -->
+ <!--
+ <add name="SisoDb.Azure"
+ connectionString="server=tcp:.database.windows.net,1433;database=SisoDbSpecsAzure;User ID=;Password=;Trusted_Connection=False;Encrypt=True;" />
+ -->
+ </connectionStrings>
</configuration>
@@ -31,13 +31,13 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Machine.Specifications, Version=0.5.9.0, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="Machine.Specifications, Version=0.5.12.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\packages\Machine.Specifications.0.5.9\lib\net40\Machine.Specifications.dll</HintPath>
+ <HintPath>..\..\packages\Machine.Specifications.0.5.12\lib\net40\Machine.Specifications.dll</HintPath>
</Reference>
- <Reference Include="Machine.Specifications.Clr4, Version=0.5.9.0, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="Machine.Specifications.Clr4, Version=0.5.12.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\packages\Machine.Specifications.0.5.9\lib\net40\Machine.Specifications.Clr4.dll</HintPath>
+ <HintPath>..\..\packages\Machine.Specifications.0.5.12\lib\net40\Machine.Specifications.Clr4.dll</HintPath>
</Reference>
<Reference Include="Machine.Specifications.TDNetRunner">
<HintPath>..\..\packages\Machine.Specifications.0.5.9\lib\net40\Machine.Specifications.TDNetRunner.dll</HintPath>
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Machine.Specifications" version="0.5.9" targetFramework="net40" />
+ <package id="Machine.Specifications" version="0.5.12" targetFramework="net40" />
</packages>
@@ -1,26 +1,22 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
- <connectionStrings>
- <add name="SisoDb.Sql2005"
- connectionString="data source=.;initial catalog=SisoDbSpecs05;integrated security=SSPI;" />
- <add name="SisoDb.Sql2005.Temp"
- connectionString="data source=.;initial catalog=SisoDbSpecs05Temp;integrated security=SSPI;" />
+ <connectionStrings>
+ <add name="SisoDb.Sql2005"
+ connectionString="data source=.;initial catalog=SisoDbSpecs05;integrated security=SSPI;" />
+ <add name="SisoDb.Sql2005.Temp"
+ connectionString="data source=.;initial catalog=SisoDbSpecs05Temp;integrated security=SSPI;" />
- <add name="pls-speedie_SisoDb.Sql2005"
- connectionString="data source=.\Sql2012Dev;initial catalog=SisoDbSpecs05;integrated security=SSPI;" />
- <add name="pls-speedie_SisoDb.Sql2005.Temp"
- connectionString="data source=.\Sql2012Dev;initial catalog=SisoDbSpecs05Temp;integrated security=SSPI;" />
+ <!-- computer specific -->
+ <add name="yourcomputername_SisoDb.Sql2005"
+ connectionString="data source=.;initial catalog=SisoDbSpecs05;integrated security=SSPI;" />
+ <add name="yourcomputername_SisoDb.Sql2005.Temp"
+ connectionString="data source=.;initial catalog=SisoDbSpecs05Temp;integrated security=SSPI;" />
- <add name="pls-gameboy_SisoDb.Sql2005"
- connectionString="data source=.\Sql2012Dev;initial catalog=SisoDbSpecs05;integrated security=SSPI;" />
- <add name="pls-gameboy_SisoDb.Sql2005.Temp"
- connectionString="data source=.\Sql2012Dev;initial catalog=SisoDbSpecs05Temp;integrated security=SSPI;" />
-
- <!--
- <add name="SisoDb.Sql2005"
- connectionString="data source=pls-virtual\sqlexpress2005;initial catalog=SisoDbSpecs05;integrated security=SSPI;" />
- <add name="SisoDb.Sql2005.Temp"
- connectionString="data source=pls-virtual\sqlexpress2005;initial catalog=SisoDbSpecs05Temp;integrated security=SSPI;" />
- -->
- </connectionStrings>
+ <!--
+ <add name="SisoDb.Sql2005"
+ connectionString="data source=pls-virtual\sqlexpress2005;initial catalog=SisoDbSpecs05;integrated security=SSPI;" />
+ <add name="SisoDb.Sql2005.Temp"
+ connectionString="data source=pls-virtual\sqlexpress2005;initial catalog=SisoDbSpecs05Temp;integrated security=SSPI;" />
+ -->
+ </connectionStrings>
</configuration>
@@ -31,13 +31,13 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Machine.Specifications, Version=0.5.9.0, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="Machine.Specifications, Version=0.5.12.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\packages\Machine.Specifications.0.5.9\lib\net40\Machine.Specifications.dll</HintPath>
+ <HintPath>..\..\packages\Machine.Specifications.0.5.12\lib\net40\Machine.Specifications.dll</HintPath>
</Reference>
- <Reference Include="Machine.Specifications.Clr4, Version=0.5.9.0, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="Machine.Specifications.Clr4, Version=0.5.12.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\packages\Machine.Specifications.0.5.9\lib\net40\Machine.Specifications.Clr4.dll</HintPath>
+ <HintPath>..\..\packages\Machine.Specifications.0.5.12\lib\net40\Machine.Specifications.Clr4.dll</HintPath>
</Reference>
<Reference Include="Machine.Specifications.TDNetRunner">
<HintPath>..\..\packages\Machine.Specifications.0.5.9\lib\net40\Machine.Specifications.TDNetRunner.dll</HintPath>
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Machine.Specifications" version="0.5.9" targetFramework="net40" />
+ <package id="Machine.Specifications" version="0.5.12" targetFramework="net40" />
</packages>
@@ -1,26 +1,22 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
- <connectionStrings>
- <add name="SisoDb.Sql2008"
- connectionString="data source=.\;initial catalog=SisoDbSpecs08;integrated security=SSPI;" />
- <add name="SisoDb.Sql2008.Temp"
- connectionString="data source=.;initial catalog=SisoDbSpecs08Temp;integrated security=SSPI;" />
+ <connectionStrings>
+ <add name="SisoDb.Sql2008"
+ connectionString="data source=.\;initial catalog=SisoDbSpecs08;integrated security=SSPI;" />
+ <add name="SisoDb.Sql2008.Temp"
+ connectionString="data source=.;initial catalog=SisoDbSpecs08Temp;integrated security=SSPI;" />
- <add name="pls-speedie_SisoDb.Sql2008"
- connectionString="data source=.\Sql2012Dev;initial catalog=SisoDbSpecs08;integrated security=SSPI;" />
- <add name="pls-speedie_SisoDb.Sql2008.Temp"
- connectionString="data source=.\Sql2012Dev;initial catalog=SisoDbSpecs08Temp;integrated security=SSPI;" />
+ <!-- computer specific -->
+ <add name="yourcomputername_SisoDb.Sql2008"
+ connectionString="data source=.;initial catalog=SisoDbSpecs08;integrated security=SSPI;" />
+ <add name="yourcomputername_SisoDb.Sql2008.Temp"
+ connectionString="data source=.;initial catalog=SisoDbSpecs08Temp;integrated security=SSPI;" />
- <add name="pls-gameboy_SisoDb.Sql2008"
- connectionString="data source=.\Sql2012Dev;initial catalog=SisoDbSpecs08;integrated security=SSPI;" />
- <add name="pls-gameboy_SisoDb.Sql2008.Temp"
- connectionString="data source=.\Sql2012Dev;initial catalog=SisoDbSpecs08Temp;integrated security=SSPI;" />
-
- <!--
- <add name="SisoDb.Sql2008"
- connectionString="data source=pls-virtual\sqlexpress2008;initial catalog=SisoDbSpecs08;integrated security=SSPI;" />
- <add name="SisoDb.Sql2008.Temp"
- connectionString="data source=pls-virtual\sqlexpress2008;initial catalog=SisoDbSpecs08Temp;integrated security=SSPI;" />
- -->
- </connectionStrings>
+ <!--
+ <add name="SisoDb.Sql2008"
+ connectionString="data source=pls-virtual\sqlexpress2008;initial catalog=SisoDbSpecs08;integrated security=SSPI;" />
+ <add name="SisoDb.Sql2008.Temp"
+ connectionString="data source=pls-virtual\sqlexpress2008;initial catalog=SisoDbSpecs08Temp;integrated security=SSPI;" />
+ -->
+ </connectionStrings>
</configuration>
Oops, something went wrong.

0 comments on commit 1c6c57c

Please sign in to comment.