Skip to content
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

Jump to bottom

Dotnet 3.5 support #9

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

Dotnet 3.5 support #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1feee40
Working on making a v3.5 configuration
akmad Nov 23, 2011
93e666c
Completed initial implementation of 3.5 MvcMiniProfiler project. Sti…
akmad Nov 24, 2011
968cab4
Fixed the references to load properly based on the config. VS doesn'…
akmad Nov 24, 2011
e28dba7
Removed EF from 3.5 support. If you're using EF go ahead and updated…
akmad Nov 24, 2011
35e6cc2
Created simple implementation of MiniConcurrentDictionary for SqlProf…
akmad Nov 24, 2011
e263e46
Finished initial implementation for 3.5. All tests pass but EntityFr…
akmad Nov 24, 2011
ca2086b
Fixed casting bug when trying to get MvcHandler.
akmad Nov 30, 2011
7edc439
Minor whitespace edits to the project file.
akmad Nov 30, 2011
1e17641
Fixed potential bug with the MiniConcurrentDictionary.Values
kppullin Jan 10, 2012
c0e5f28
Merge pull request #1 from kppullin/dotnet_3_5_support
akmad Jan 10, 2012
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
5 changes: 3 additions & 2 deletions MvcMiniProfiler.EntityFramework/MvcMiniProfiler.EntityFramework.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand All @@ -10,10 +10,10 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MvcMiniProfiler.EntityFramework</RootNamespace>
<AssemblyName>MvcMiniProfiler.EntityFramework</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
Expand All @@ -23,6 +23,7 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
Expand Down
3 changes: 2 additions & 1 deletion MvcMiniProfiler.Tests/Data/IDbProfilerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ public void Errors()
}
}

#if !CSHARP30
[Test]
public void DataAdapter()
{
Expand All @@ -165,6 +166,6 @@ public void DataAdapter()
Assert.That(mp.ExecutedScalars == 0);
Assert.That(mp.ExecutedNonQueries == 0);
}

#endif
}
}
40 changes: 38 additions & 2 deletions MvcMiniProfiler.Tests/MvcMiniProfiler.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand All @@ -11,11 +11,11 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MvcMiniProfiler.Tests</RootNamespace>
<AssemblyName>MvcMiniProfiler.Tests</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
Expand All @@ -25,6 +25,7 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
Expand All @@ -38,6 +39,41 @@
<PropertyGroup>
<AssemblyOriginatorKeyFile>Properties\MiniProfiler.Tests.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'NET35-Debug|AnyCPU'">
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\NET35-Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;CSHARP30</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<CodeAnalysisLogFile>bin\Debug\MvcMiniProfiler.Tests.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
<CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
<CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
<CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
<CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'NET35-Release|AnyCPU'">
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<OutputPath>bin\NET35-Release\</OutputPath>
<DefineConstants>TRACE;CSHARP30</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<CodeAnalysisLogFile>bin\Release\MvcMiniProfiler.Tests.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
<CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
<CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
<CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
<CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="nunit.framework">
Expand Down
3 changes: 2 additions & 1 deletion MvcMiniProfiler.Tests/Storage/SqlServerStorageTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
using System.Data.SqlServerCe;
using MvcMiniProfiler.Helpers.Dapper;
using MvcMiniProfiler.Data;
using MvcMiniProfiler.Helpers;

namespace MvcMiniProfiler.Tests.Storage
{
Expand All @@ -18,7 +19,7 @@ public class SqlServerStorageTest : BaseTest
[TestFixtureSetUp]
public void TestFixtureSetUp()
{
var sqlToExecute = SqlServerStorage.TableCreationScript.Replace("nvarchar(max)", "ntext").Split(';').Where(s => !string.IsNullOrWhiteSpace(s));
var sqlToExecute = SqlServerStorage.TableCreationScript.Replace("nvarchar(max)", "ntext").Split(';').Where(s => !ExtensionMethods.IsNullOrWhiteSpace(s));
var connStr = CreateSqlCeDatabase<SqlServerStorageTest>(sqlToExecute: sqlToExecute);

MiniProfiler.Settings.Storage = new SqlCeStorage(connStr);
Expand Down
31 changes: 31 additions & 0 deletions MvcMiniProfiler.Wcf/MvcMiniProfiler.Wcf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,37 @@
<PropertyGroup>
<AssemblyOriginatorKeyFile>miniprofiler.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'NET35-Debug|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\NET35-Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<CodeAnalysisLogFile>bin\Debug\MvcMiniProfiler.Wcf.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
<CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
<CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
<CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
<CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'NET35-Release|AnyCPU'">
<OutputPath>bin\NET35-Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<CodeAnalysisLogFile>bin\Release\MvcMiniProfiler.Wcf.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
<CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
<CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
<CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
<CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Configuration" />
Expand Down
22 changes: 22 additions & 0 deletions MvcMiniProfiler.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,35 +38,57 @@ Global
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
NET35-Debug|Any CPU = NET35-Debug|Any CPU
NET35-Release|Any CPU = NET35-Release|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{386222BD-6B6E-480F-A342-8DE1AB516E2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{386222BD-6B6E-480F-A342-8DE1AB516E2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{386222BD-6B6E-480F-A342-8DE1AB516E2C}.NET35-Debug|Any CPU.ActiveCfg = NET35-Debug|Any CPU
{386222BD-6B6E-480F-A342-8DE1AB516E2C}.NET35-Debug|Any CPU.Build.0 = NET35-Debug|Any CPU
{386222BD-6B6E-480F-A342-8DE1AB516E2C}.NET35-Release|Any CPU.ActiveCfg = NET35-Release|Any CPU
{386222BD-6B6E-480F-A342-8DE1AB516E2C}.NET35-Release|Any CPU.Build.0 = NET35-Release|Any CPU
{386222BD-6B6E-480F-A342-8DE1AB516E2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{386222BD-6B6E-480F-A342-8DE1AB516E2C}.Release|Any CPU.Build.0 = Release|Any CPU
{50A89C9B-7335-4626-B552-272CE56DC72E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{50A89C9B-7335-4626-B552-272CE56DC72E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{50A89C9B-7335-4626-B552-272CE56DC72E}.NET35-Debug|Any CPU.ActiveCfg = Debug|Any CPU
{50A89C9B-7335-4626-B552-272CE56DC72E}.NET35-Release|Any CPU.ActiveCfg = Release|Any CPU
{50A89C9B-7335-4626-B552-272CE56DC72E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{50A89C9B-7335-4626-B552-272CE56DC72E}.Release|Any CPU.Build.0 = Release|Any CPU
{5D54F88D-4C79-4EAB-B7B7-C8DE78F5DDA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5D54F88D-4C79-4EAB-B7B7-C8DE78F5DDA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5D54F88D-4C79-4EAB-B7B7-C8DE78F5DDA7}.NET35-Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5D54F88D-4C79-4EAB-B7B7-C8DE78F5DDA7}.NET35-Release|Any CPU.ActiveCfg = Release|Any CPU
{5D54F88D-4C79-4EAB-B7B7-C8DE78F5DDA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5D54F88D-4C79-4EAB-B7B7-C8DE78F5DDA7}.Release|Any CPU.Build.0 = Release|Any CPU
{B4CA8022-257B-4893-97D8-76E05EBBAAB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B4CA8022-257B-4893-97D8-76E05EBBAAB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B4CA8022-257B-4893-97D8-76E05EBBAAB0}.NET35-Debug|Any CPU.ActiveCfg = NET35-Debug|Any CPU
{B4CA8022-257B-4893-97D8-76E05EBBAAB0}.NET35-Debug|Any CPU.Build.0 = NET35-Debug|Any CPU
{B4CA8022-257B-4893-97D8-76E05EBBAAB0}.NET35-Release|Any CPU.ActiveCfg = NET35-Release|Any CPU
{B4CA8022-257B-4893-97D8-76E05EBBAAB0}.NET35-Release|Any CPU.Build.0 = NET35-Release|Any CPU
{B4CA8022-257B-4893-97D8-76E05EBBAAB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B4CA8022-257B-4893-97D8-76E05EBBAAB0}.Release|Any CPU.Build.0 = Release|Any CPU
{7F18DC76-61A2-4E7D-BA5A-FE159E789362}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7F18DC76-61A2-4E7D-BA5A-FE159E789362}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7F18DC76-61A2-4E7D-BA5A-FE159E789362}.NET35-Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7F18DC76-61A2-4E7D-BA5A-FE159E789362}.NET35-Release|Any CPU.ActiveCfg = Release|Any CPU
{7F18DC76-61A2-4E7D-BA5A-FE159E789362}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7F18DC76-61A2-4E7D-BA5A-FE159E789362}.Release|Any CPU.Build.0 = Release|Any CPU
{C471B0E5-0AE4-48E0-A938-02AEDA030C5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C471B0E5-0AE4-48E0-A938-02AEDA030C5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C471B0E5-0AE4-48E0-A938-02AEDA030C5E}.NET35-Debug|Any CPU.ActiveCfg = NET35-Debug|Any CPU
{C471B0E5-0AE4-48E0-A938-02AEDA030C5E}.NET35-Debug|Any CPU.Build.0 = NET35-Debug|Any CPU
{C471B0E5-0AE4-48E0-A938-02AEDA030C5E}.NET35-Release|Any CPU.ActiveCfg = NET35-Release|Any CPU
{C471B0E5-0AE4-48E0-A938-02AEDA030C5E}.NET35-Release|Any CPU.Build.0 = NET35-Release|Any CPU
{C471B0E5-0AE4-48E0-A938-02AEDA030C5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C471B0E5-0AE4-48E0-A938-02AEDA030C5E}.Release|Any CPU.Build.0 = Release|Any CPU
{2DD1E352-3FFE-49F8-ADAB-65F3FECE75E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2DD1E352-3FFE-49F8-ADAB-65F3FECE75E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2DD1E352-3FFE-49F8-ADAB-65F3FECE75E6}.NET35-Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2DD1E352-3FFE-49F8-ADAB-65F3FECE75E6}.NET35-Release|Any CPU.ActiveCfg = Release|Any CPU
{2DD1E352-3FFE-49F8-ADAB-65F3FECE75E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2DD1E352-3FFE-49F8-ADAB-65F3FECE75E6}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
Expand Down
Loading