Skip to content

Commit 3657e24

Browse files
committed
Fixed unit test issues and skipped benchmarks
There appears to be a reference issue with benchmarks (dotnet/BenchmarkDotNet#395)
1 parent ba740c9 commit 3657e24

File tree

11 files changed

+21
-12
lines changed

11 files changed

+21
-12
lines changed

samples/Exceptionless.SampleConsole/Exceptionless.SampleConsole.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<ItemGroup>
1111
<Compile Remove="store\**\*" />
12-
<Compile Include="..\..\tests\Exceptionless.Tests\Utility\RandomEventGenerator.cs" Exclude="store\**\*;bin\**;obj\**;**\*.xproj;packages\**" />
12+
<Compile Include="..\..\test\Exceptionless.Tests\Utility\RandomEventGenerator.cs" Exclude="store\**\*;bin\**;obj\**;**\*.xproj;packages\**" />
1313
<None Include="App.config" />
1414
</ItemGroup>
1515

samples/Exceptionless.SampleMvc/Exceptionless.SampleMvc.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,10 @@
181181
<ItemGroup>
182182
<Folder Include="Properties\" />
183183
</ItemGroup>
184+
<PropertyGroup>
185+
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
186+
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
187+
</PropertyGroup>
184188
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
185189
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
186190
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />

samples/Exceptionless.SampleNancy/Exceptionless.SampleNancy.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@
7373
<ItemGroup>
7474
<Folder Include="Properties\" />
7575
</ItemGroup>
76+
<PropertyGroup>
77+
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
78+
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
79+
</PropertyGroup>
7680
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
7781
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
7882
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />

samples/Exceptionless.SampleWcf/Exceptionless.SampleWcf.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@
9090
<ItemGroup>
9191
<Folder Include="Properties\" />
9292
</ItemGroup>
93+
<PropertyGroup>
94+
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
95+
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
96+
</PropertyGroup>
9397
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
9498
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
9599
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />

samples/Exceptionless.SampleWeb/Exceptionless.SampleWeb.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,10 @@
124124
<ItemGroup>
125125
<Folder Include="Properties\" />
126126
</ItemGroup>
127+
<PropertyGroup>
128+
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
129+
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
130+
</PropertyGroup>
127131
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
128132
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
129133
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />

src/Platforms/Exceptionless.Windows/Exceptionless.Windows.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
</Reference>
5656
</ItemGroup>
5757
<ItemGroup Condition=" '$(SignAssembly)' == 'true' ">
58-
<Reference Include="Exceptionless.Signed">
58+
<Reference Include="Exceptionless">
5959
<HintPath>$(SolutionDir)\src\Exceptionless.Signed\bin\$(Configuration)\$(TargetFrameworkVersionProperty)\Exceptionless.Signed.dll</HintPath>
6060
</Reference>
6161
</ItemGroup>

src/Platforms/Exceptionless.Wpf/Exceptionless.Wpf.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
</Reference>
5858
</ItemGroup>
5959
<ItemGroup Condition=" '$(SignAssembly)' == 'true' ">
60-
<Reference Include="Exceptionless.Signed">
60+
<Reference Include="Exceptionless">
6161
<HintPath>$(SolutionDir)\src\Exceptionless.Signed\bin\$(Configuration)\$(TargetFrameworkVersionProperty)\Exceptionless.Signed.dll</HintPath>
6262
</Reference>
6363
</ItemGroup>

test/Exceptionless.Tests/Exceptionless.Tests.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<None Update="xunit.runner.json">
11-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
12-
</None>
1310
<None Include="App.config" />
1411
</ItemGroup>
1512

test/Exceptionless.Tests/Plugins/PluginTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -880,7 +880,7 @@ private Exception GetNestedSimpleException(string message = "Test") {
880880
}
881881
}
882882

883-
[Fact]
883+
[Fact (Skip = "Skip until https://github.com/dotnet/BenchmarkDotNet/issues/395 is fixed")]
884884
public void RunBenchmark() {
885885
var summary = BenchmarkRunner.Run<DeduplicationBenchmarks>();
886886

test/Exceptionless.Tests/Utility/ErrorDataReader.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ private static Event GetEvent(string fileName) {
2424
}
2525

2626
public static IEnumerable<Event> GetEvents() {
27-
return Directory.EnumerateFiles(@"..\..\..\..\ErrorData", "*.json").Select(GetEvent);
27+
return Directory.EnumerateFiles(@"..\..\..\ErrorData", "*.json").Select(GetEvent);
2828
}
2929
}
3030
}

0 commit comments

Comments
 (0)