Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Fix elmah reference #128

Merged
merged 3 commits into from

2 participants

@stevenlauwers22

Hey guys,

I fixed the reference to the elmah dll. Sorry for the inconvenience.

Cheers,

Steven

@stevenlauwers22

Hey guys,

Just pulled the latest changes so you should be able to bring it in without any conflicts.

Cheers,

Steven

@avanderhoorn avanderhoorn merged commit eb66369 into Glimpse:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
View
1  packages/repositories.config
@@ -4,4 +4,5 @@
<repository path="..\source\Glimpse.Test.Core\packages.config" />
<repository path="..\source\Glimpse.Site\packages.config" />
<repository path="..\source\Glimpse.Sample.WebForms\packages.config" />
+ <repository path="..\source\Glimpse.Elmah\packages.config" />
</repositories>
View
151 source/Glimpse.Elmah/Glimpse.Elmah.csproj
@@ -1,80 +1,73 @@
-<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.30703</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{3EF29139-06EC-4497-9EC6-A4C340E064EB}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Glimpse.Elmah</RootNamespace>
- <AssemblyName>Glimpse.Elmah</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <ItemGroup>
- <Compile Include="Plugin\Elmah.cs" />
- <Compile Include="Plumbing\ConfigurationReaderFactory.cs" />
- <Compile Include="Plumbing\ConfigurationReaderForClassicMode.cs" />
- <Compile Include="Plumbing\ConfigurationReaderForIntegratedPipelineMode.cs" />
- <Compile Include="Plumbing\IConfigurationReader.cs" />
- <Compile Include="Plumbing\IConfigurationReaderFactory.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- </ItemGroup>
- <ItemGroup>
- <Folder Include="NuSpec\lib\net40\" />
- </ItemGroup>
- <ItemGroup>
- <None Include="NuSpec\Glimpse.Elmah.nuspec">
- <SubType>Designer</SubType>
- </None>
- <None Include="NuSpec\tools\install.ps1" />
- <None Include="packages.config" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="NuSpec\content\glimpse.elmah.readme.txt" />
- </ItemGroup>
- <ItemGroup>
- <Reference Include="Elmah">
- <HintPath>..\..\packages\elmah.corelibrary.1.2\lib\Elmah.dll</HintPath>
- </Reference>
- <Reference Include="System" />
- <Reference Include="System.ComponentModel.Composition" />
- <Reference Include="System.Configuration" />
- <Reference Include="System.Web" />
- <Reference Include="System.Xml" />
- <Reference Include="System.Xml.Linq" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\Glimpse.Core\Glimpse.Core.csproj">
- <Project>{21F99168-7D7B-49F2-A97C-5A983E0CA16F}</Project>
- <Name>Glimpse.Core</Name>
- </ProjectReference>
- </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.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- -->
+<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>8.0.30703</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{3EF29139-06EC-4497-9EC6-A4C340E064EB}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>Glimpse.Elmah</RootNamespace>
+ <AssemblyName>Glimpse.Elmah</AssemblyName>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <ItemGroup>
+ <Compile Include="Plugin\Elmah.cs" />
+ <Compile Include="Plumbing\ConfigurationReaderFactory.cs" />
+ <Compile Include="Plumbing\ConfigurationReaderForClassicMode.cs" />
+ <Compile Include="Plumbing\ConfigurationReaderForIntegratedPipelineMode.cs" />
+ <Compile Include="Plumbing\IConfigurationReader.cs" />
+ <Compile Include="Plumbing\IConfigurationReaderFactory.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <Folder Include="NuSpec\lib\net40\" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="NuSpec\Glimpse.Elmah.nuspec">
+ <SubType>Designer</SubType>
+ </None>
+ <None Include="NuSpec\tools\install.ps1" />
+ <None Include="packages.config" />
+ </ItemGroup>
+ <ItemGroup>
+ <Content Include="NuSpec\content\glimpse.elmah.readme.txt" />
+ </ItemGroup>
+ <ItemGroup>
+ <Reference Include="Elmah">
+ <HintPath>..\..\packages\elmah.corelibrary.1.2\lib\Elmah.dll</HintPath>
+ </Reference>
+ <Reference Include="System" />
+ <Reference Include="System.ComponentModel.Composition" />
+ <Reference Include="System.Configuration" />
+ <Reference Include="System.Web" />
+ <Reference Include="System.Xml" />
+ <Reference Include="System.Xml.Linq" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\Glimpse.Core\Glimpse.Core.csproj">
+ <Project>{21F99168-7D7B-49F2-A97C-5A983E0CA16F}</Project>
+ <Name>Glimpse.Core</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
View
4 source/Glimpse.Sample.WebForms/Glimpse.Sample.WebForms.csproj
@@ -150,6 +150,10 @@
<Project>{21F99168-7D7B-49F2-A97C-5A983E0CA16F}</Project>
<Name>Glimpse.Core</Name>
</ProjectReference>
+ <ProjectReference Include="..\Glimpse.Elmah\Glimpse.Elmah.csproj">
+ <Project>{3EF29139-06EC-4497-9EC6-A4C340E064EB}</Project>
+ <Name>Glimpse.Elmah</Name>
+ </ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="packages.config" />
Something went wrong with that request. Please try again.