Skip to content

first stage of async support - async #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexsku wants to merge 12 commits into
base: master
Choose a base branch
from
Open

first stage of async support - async #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
46620d1
first stage of async support - async
alexsku Dec 19, 2016
c951749
addressed feedback
alexsku Dec 20, 2016
af8762f
copying custom timings
alexsku Dec 20, 2016
983bce4
feedback addressed
alexsku Dec 21, 2016
8a6e08f
reverted from IReadOnlyList to List to be similar to v4
alexsku Dec 22, 2016
cae0b9e
rev nuget packages for miniprofiler, mvc4, and ef6
alexsku Dec 23, 2016
a8c601a
feedback addressed
alexsku Jan 4, 2017
46e1551
added support for serializing IReadOnlyDictionary
alexsku Jan 5, 2017
fc2b37d
Added caching for returned copies of collections
alexsku Jan 5, 2017
30621b4
version bumped up
alexsku Jan 5, 2017
f936b01
uses async provider by default
alexsku Jan 5, 2017
8a07228
updated the versions
alexsku Jan 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions MiniProfiler.EF6.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<package>
<metadata>
<id>MiniProfiler.EF6</id>
<version>3.0.11</version>
<authors>Jarrod Dixon, Yaakov Ellis</authors>
<owners>Jarrod Dixon, Yaakov Ellis</owners>
<id>RevMiniProfiler.EF6</id>
<version>3.1.2</version>
<authors>Jarrod Dixon, Yaakov Ellis,rev.com</authors>
<owners>rev.com</owners>
Copy link
Owner Author

@alexsku alexsku Dec 23, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure what else should go here

<description>MiniProfiler integration for Entity Framework 6</description>
<projectUrl>http://miniprofiler.com</projectUrl>
<licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
<tags>profiler sql mvc asp.net performance profiling timing entityframework</tags>
<dependencies>
<dependency id="MiniProfiler" version="3.0.10"/>
<dependency id="RevMiniProfiler" version="3.3.4"/>
<dependency id="EntityFramework" version="6.0.1" />
</dependencies>
<language>en-US</language>
Expand Down
10 changes: 5 additions & 5 deletions MiniProfiler.MVC4.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<package>
<metadata>
<id>MiniProfiler.MVC4</id>
<version>3.0.11</version>
<authors>Marc Gravell, Jarrod Dixon, Yaakov Ellis, Nick Craver</authors>
<owners>Marc Gravell, Jarrod Dixon Yaakov Ellis, Nick Craver</owners>
<id>RevMiniProfiler.MVC4</id>
<version>3.1.2</version>
<authors>Marc Gravell, Jarrod Dixon, Yaakov Ellis, Nick Craver, rev.com</authors>
<owners>rev.com</owners>
<description>MiniProfiler extensions and helpers for ASP.NET MVC 4+</description>
<projectUrl>http://miniprofiler.com</projectUrl>
<licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
<tags>profiler sql mvc asp.net performance profiling timing</tags>
<language>en-US</language>
<dependencies>
<dependency id="MiniProfiler" version="3.0.10" />
<dependency id="RevMiniProfiler" version="3.3.4" />
<dependency id="Microsoft.AspNet.Mvc" version="4.0.30506.0" />
</dependencies>
<releaseNotes>See https://github.com/MiniProfiler/dotnet/releases for more info</releaseNotes>
Expand Down
12 changes: 6 additions & 6 deletions MiniProfiler.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<package>
<metadata>
<id>MiniProfiler</id>
<version>3.2.0.157</version>
<authors>Marc Gravell, Jarrod Dixon, Yaakov Ellis, Nick Craver</authors>
<owners>Marc Gravell, Jarrod Dixon, Yaakov Ellis, Nick Craver</owners>
<description>Lightweight mini-profiler, in particular designed for ASP.NET MVC sites</description>
<id>RevMiniProfiler</id>
<version>3.3.4</version>
<authors>Marc Gravell, Jarrod Dixon, Yaakov Ellis, Nick Craver, Rev.com</authors>
<owners>Rev.com</owners>
<description>A slightly modified mini-profiler with a better support for async and multithreaded</description>
<projectUrl>http://miniprofiler.com</projectUrl>
<licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
<tags>profiler sql mvc asp.net performance profiling timing</tags>
<language>en-US</language>
<releaseNotes>See https://github.com/MiniProfiler/dotnet/releases for more info</releaseNotes>
<releaseNotes>Async support is added</releaseNotes>
</metadata>
<files>
<file src="StackExchange.Profiling\bin\Release\MiniProfiler.*" target="lib\net40" />
Expand Down
10 changes: 5 additions & 5 deletions Sample.Console/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup>

<entityFramework>
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
<parameters>
Expand All @@ -19,9 +18,10 @@
<provider invariantName="System.Data.SQLite.EF6" type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6" />
</providers>
</entityFramework>
<system.data>
<system.data>
<DbProviderFactories>
<remove invariant="System.Data.SQLite.EF6" />
<add name="SQLite Data Provider (Entity Framework 6)" invariant="System.Data.SQLite.EF6" description=".NET Framework Data Provider for SQLite (Entity Framework 6)" type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6" />
<remove invariant="System.Data.SQLite" /><add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".NET Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite" /></DbProviderFactories>
</system.data></configuration>
</system.data>
</configuration>
30 changes: 17 additions & 13 deletions Sample.Console/Sample.Console.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.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>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand All @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Sample.Console</RootNamespace>
<AssemblyName>Sample.Console</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
Expand Down Expand Up @@ -39,6 +39,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand All @@ -48,33 +49,36 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Dapper, Version=1.20.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Dapper.1.22\lib\net40\Dapper.dll</HintPath>
<HintPath>..\packages\Dapper.1.22\lib\net45\Dapper.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="EntityFramework">
<HintPath>..\packages\EntityFramework.6.0.0\lib\net40\EntityFramework.dll</HintPath>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.0.0\lib\net45\EntityFramework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="EntityFramework.SqlServer">
<HintPath>..\packages\EntityFramework.6.0.0\lib\net40\EntityFramework.SqlServer.dll</HintPath>
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.0.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Core" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Data.SQLite, Version=1.0.97.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
<HintPath>..\packages\System.Data.SQLite.Core.1.0.97.0\lib\net40\System.Data.SQLite.dll</HintPath>
<HintPath>..\packages\System.Data.SQLite.Core.1.0.97.0\lib\net451\System.Data.SQLite.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Data.SQLite.EF6, Version=1.0.97.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
<HintPath>..\packages\System.Data.SQLite.EF6.1.0.97.0\lib\net40\System.Data.SQLite.EF6.dll</HintPath>
<HintPath>..\packages\System.Data.SQLite.EF6.1.0.97.0\lib\net451\System.Data.SQLite.EF6.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Data.SQLite.Linq, Version=1.0.97.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
<HintPath>..\packages\System.Data.SQLite.Linq.1.0.97.0\lib\net40\System.Data.SQLite.Linq.dll</HintPath>
<HintPath>..\packages\System.Data.SQLite.Linq.1.0.97.0\lib\net451\System.Data.SQLite.Linq.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
Expand Down Expand Up @@ -115,12 +119,12 @@
</BootstrapperPackage>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\System.Data.SQLite.Core.1.0.97.0\build\net40\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.97.0\build\net40\System.Data.SQLite.Core.targets')" />
<Import Project="..\packages\System.Data.SQLite.Core.1.0.97.0\build\net451\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.97.0\build\net451\System.Data.SQLite.Core.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.97.0\build\net40\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.97.0\build\net40\System.Data.SQLite.Core.targets'))" />
<Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.97.0\build\net451\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.97.0\build\net451\System.Data.SQLite.Core.targets'))" />
</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.
Expand Down
10 changes: 5 additions & 5 deletions Sample.Console/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Dapper" version="1.22" targetFramework="net4" userInstalled="true" />
<package id="EntityFramework" version="6.0.0" targetFramework="net4" userInstalled="true" />
<package id="Dapper" version="1.22" targetFramework="net461" userInstalled="true" />
<package id="EntityFramework" version="6.0.0" targetFramework="net461" userInstalled="true" />
<package id="System.Data.SQLite" version="1.0.97.0" targetFramework="net4" userInstalled="true" />
<package id="System.Data.SQLite.Core" version="1.0.97.0" targetFramework="net4" userInstalled="true" />
<package id="System.Data.SQLite.EF6" version="1.0.97.0" targetFramework="net4" userInstalled="true" />
<package id="System.Data.SQLite.Linq" version="1.0.97.0" targetFramework="net4" userInstalled="true" />
<package id="System.Data.SQLite.Core" version="1.0.97.0" targetFramework="net461" userInstalled="true" />
<package id="System.Data.SQLite.EF6" version="1.0.97.0" targetFramework="net461" userInstalled="true" />
<package id="System.Data.SQLite.Linq" version="1.0.97.0" targetFramework="net461" userInstalled="true" />
</packages>
15 changes: 11 additions & 4 deletions Sample.Mvc.Mongo/Sample.Mvc.Mongo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.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>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand All @@ -13,7 +13,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SampleWeb</RootNamespace>
<AssemblyName>SampleWeb</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews>
<UseIISExpress>false</UseIISExpress>
<FileUpgradeFlags>
Expand All @@ -26,6 +26,8 @@
<IISExpressAnonymousAuthentication />
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<TargetFrameworkProfile />
<UseGlobalApplicationHostFile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -35,6 +37,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Expand All @@ -43,6 +46,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
Expand All @@ -54,13 +58,16 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\mongocsharpdriver.1.9.1\lib\net35\MongoDB.Driver.dll</HintPath>
</Reference>
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" />
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Core" />
<Reference Include="System.Web" />
<Reference Include="System.Web.ApplicationServices" />
<Reference Include="System.Web.DynamicData" />
<Reference Include="System.Web.Entity" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.Helpers.dll</HintPath>
Expand All @@ -86,6 +93,7 @@
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
</Reference>
<Reference Include="System.Configuration" />
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup>
<Compile Include="Controllers\BaseController.cs">
Expand Down Expand Up @@ -182,7 +190,6 @@
</ItemGroup>
<ItemGroup>
<Folder Include="Helpers\" />
<Folder Include="Models\" />
</ItemGroup>
<ItemGroup />
<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion Sample.Mvc.Mongo/Service References/SampleService/Reference.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.34003
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Expand Down
2 changes: 1 addition & 1 deletion ...le.Mvc.Mongo/Service References/SampleService/SampleWeb.SampleService.RouteHit.datasource
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="RouteHit" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
<TypeInfo>SampleWeb.SampleService.RouteHit</TypeInfo>
<TypeInfo>SampleWeb.SampleService.RouteHit, Service References.SampleService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>
Loading