diff options
| author | Matt Ward <matt.ward@xamarin.com> | 2015-11-19 12:43:19 +0300 |
|---|---|---|
| committer | Matt Ward <matt.ward@xamarin.com> | 2015-11-19 12:43:19 +0300 |
| commit | 3464fad275c48d7c4ffb3602dfcc66afa467b76a (patch) | |
| tree | 10db040d0a2cf55165ac8d43dd24b60ca297a887 /main/tests/UnitTests/UnitTests.csproj | |
| parent | d94562154c646871e5af85aeb9eca1ece86776f9 (diff) | |
| parent | 203ed0aabb6a60c7bb18f3b7b490588ab09cf38e (diff) | |
Merge branch 'master' into aspnet-project-wizard
Conflicts:
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
main/tests/UnitTests/UnitTests.csproj
Diffstat (limited to 'main/tests/UnitTests/UnitTests.csproj')
| -rw-r--r-- | main/tests/UnitTests/UnitTests.csproj | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/main/tests/UnitTests/UnitTests.csproj b/main/tests/UnitTests/UnitTests.csproj index 6cfca4be61..c2bd614ef3 100644 --- a/main/tests/UnitTests/UnitTests.csproj +++ b/main/tests/UnitTests/UnitTests.csproj @@ -253,6 +253,7 @@ <Compile Include="MonoDevelop.Core\FilePathTests.cs" /> <Compile Include="MonoDevelop.Core\BaseCredentialsProviderTests.cs" /> <Compile Include="MonoDevelop.Ide.Templates\TemplateConditionEvaluatorTests.cs" /> + <Compile Include="MonoDevelop.Core\LoggingServiceTests.cs" /> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="..\..\md.targets" /> |