Skip to content

Commit

Permalink
Moved from Dapplo.LogFacade to Dapplo.Log.Facade
Browse files Browse the repository at this point in the history 
[release]
  • Loading branch information
@Lakritzator
Lakritzator committed Jun 24, 2016
1 parent 2c612a8 commit 97f342f
Show file tree
Hide file tree
Showing 11 changed files with 39 additions and 42 deletions.
2 changes: 1 addition & 1 deletion Dapplo.Confluence.PCL/project.json
View file
Expand Up @@ -5,7 +5,7 @@
"dnxcore50.app": {}
},
"dependencies": {
"Dapplo.HttpExtensions": "0.5.18",
"Dapplo.HttpExtensions": "0.5.20",
"Microsoft.NETCore": "5.0.0",
"Microsoft.NETCore.Portable.Compatibility": "1.0.0",
"System.ComponentModel": "4.0.0",
Expand Down
4 changes: 2 additions & 2 deletions Dapplo.Confluence.Tests/ConfluenceTests.cs
View file
Expand Up @@ -22,7 +22,7 @@
#region using

using Dapplo.Log.XUnit;
using Dapplo.LogFacade;
using Dapplo.Log.Facade;
using System;
using System.IO;
using System.Threading.Tasks;
Expand All @@ -45,7 +45,7 @@ public class ConfluenceTests

public ConfluenceTests(ITestOutputHelper testOutputHelper)
{
XUnitLogger.RegisterLogger(testOutputHelper, LogLevels.Verbose);
LogSettings.RegisterDefaultLogger<XUnitLogger>(LogLevels.Verbose, testOutputHelper);
_confluenceApi = new ConfluenceApi(TestConfluenceUri);

var username = Environment.GetEnvironmentVariable("confluence_test_username");
Expand Down
16 changes: 8 additions & 8 deletions Dapplo.Confluence.Tests/Dapplo.Confluence.Tests.csproj
View file
Expand Up @@ -33,20 +33,20 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Dapplo.HttpExtensions, Version=0.5.18.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.5.18\lib\net46\Dapplo.HttpExtensions.dll</HintPath>
<Reference Include="Dapplo.HttpExtensions, Version=0.5.20.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.5.20\lib\net46\Dapplo.HttpExtensions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Dapplo.Log.XUnit, Version=0.3.4.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Log.XUnit.0.3.4\lib\net46\Dapplo.Log.XUnit.dll</HintPath>
<Reference Include="Dapplo.Log.Facade, Version=0.4.4.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Log.Facade.0.4.4\lib\net45\Dapplo.Log.Facade.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Dapplo.LogFacade, Version=0.3.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.LogFacade.0.3.2\lib\net45\Dapplo.LogFacade.dll</HintPath>
<Reference Include="Dapplo.Log.XUnit, Version=0.4.4.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Log.XUnit.0.4.4\lib\net46\Dapplo.Log.XUnit.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Dapplo.Utils, Version=0.1.44.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.0.1.44\lib\net45\Dapplo.Utils.dll</HintPath>
<Reference Include="Dapplo.Utils, Version=0.1.45.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.0.1.45\lib\net45\Dapplo.Utils.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down
4 changes: 2 additions & 2 deletions Dapplo.Confluence.Tests/JsonParseTests.cs
View file
Expand Up @@ -24,7 +24,7 @@
using Dapplo.Confluence.Entities;
using Dapplo.HttpExtensions;
using Dapplo.Log.XUnit;
using Dapplo.LogFacade;
using Dapplo.Log.Facade;
using System.IO;
using Xunit;
using Xunit.Abstractions;
Expand All @@ -37,7 +37,7 @@ public class JsonParseTests
{
public JsonParseTests(ITestOutputHelper testOutputHelper)
{
XUnitLogger.RegisterLogger(testOutputHelper, LogLevels.Verbose);
LogSettings.RegisterDefaultLogger<XUnitLogger>(LogLevels.Verbose, testOutputHelper);
}

[Fact]
Expand Down
8 changes: 4 additions & 4 deletions Dapplo.Confluence.Tests/packages.config
View file
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="coveralls.io" version="1.3.4" targetFramework="net46" />
<package id="Dapplo.HttpExtensions" version="0.5.18" targetFramework="net46" />
<package id="Dapplo.Log.XUnit" version="0.3.4" targetFramework="net46" />
<package id="Dapplo.LogFacade" version="0.3.2" targetFramework="net46" />
<package id="Dapplo.Utils" version="0.1.44" targetFramework="net46" />
<package id="Dapplo.HttpExtensions" version="0.5.20" targetFramework="net46" />
<package id="Dapplo.Log.Facade" version="0.4.4" targetFramework="net46" />
<package id="Dapplo.Log.XUnit" version="0.4.4" targetFramework="net46" />
<package id="Dapplo.Utils" version="0.1.45" targetFramework="net46" />
<package id="OpenCover" version="4.6.519" targetFramework="net46" />
<package id="ReportGenerator" version="2.4.5.0" targetFramework="net46" />
<package id="xunit" version="2.1.0" targetFramework="net46" />
Expand Down
12 changes: 6 additions & 6 deletions Dapplo.Confluence.WpfExample/Dapplo.Confluence.WpfExample.csproj
View file
Expand Up @@ -36,16 +36,16 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Dapplo.HttpExtensions, Version=0.5.18.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.5.18\lib\net46\Dapplo.HttpExtensions.dll</HintPath>
<Reference Include="Dapplo.HttpExtensions, Version=0.5.20.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.5.20\lib\net46\Dapplo.HttpExtensions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Dapplo.LogFacade, Version=0.3.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.LogFacade.0.3.2\lib\net45\Dapplo.LogFacade.dll</HintPath>
<Reference Include="Dapplo.Log.Facade, Version=0.4.4.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Log.Facade.0.4.4\lib\net45\Dapplo.Log.Facade.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Dapplo.Utils, Version=0.1.44.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.0.1.44\lib\net45\Dapplo.Utils.dll</HintPath>
<Reference Include="Dapplo.Utils, Version=0.1.45.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.0.1.45\lib\net45\Dapplo.Utils.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down
3 changes: 0 additions & 3 deletions Dapplo.Confluence.WpfExample/MainWindow.xaml.cs
View file
Expand Up @@ -24,8 +24,6 @@
using System.Collections.ObjectModel;
using System.Threading.Tasks;
using System.Windows;
using Dapplo.LogFacade;
using Dapplo.LogFacade.Loggers;

#endregion

Expand All @@ -39,7 +37,6 @@ public partial class MainWindow
public MainWindow()
{
InitializeComponent();
LogSettings.RegisterDefaultLogger<TraceLogger>();
DataContext = this;

Loaded += MainWindow_Loaded;
Expand Down
6 changes: 3 additions & 3 deletions Dapplo.Confluence.WpfExample/packages.config
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Dapplo.HttpExtensions" version="0.5.18" targetFramework="net46" />
<package id="Dapplo.LogFacade" version="0.3.2" targetFramework="net46" />
<package id="Dapplo.Utils" version="0.1.44" targetFramework="net46" />
<package id="Dapplo.HttpExtensions" version="0.5.20" targetFramework="net46" />
<package id="Dapplo.Log.Facade" version="0.4.4" targetFramework="net46" />
<package id="Dapplo.Utils" version="0.1.45" targetFramework="net46" />
</packages>
8 changes: 4 additions & 4 deletions Dapplo.Confluence.nuspec
View file
Expand Up @@ -15,16 +15,16 @@
<tags>Confluence rest</tags>
<dependencies>
<group targetFramework="net45">
<dependency id="Dapplo.HttpExtensions" version="0.5.19" />
<dependency id="Dapplo.HttpExtensions" version="0.5.20" />
</group>
<group targetFramework="dnxcore50">
<dependency id="Dapplo.HttpExtensions" version="0.5.19" />
<dependency id="Dapplo.HttpExtensions" version="0.5.20" />
</group>
<group targetFramework="uap10.0">
<dependency id="Dapplo.HttpExtensions" version="0.5.19" />
<dependency id="Dapplo.HttpExtensions" version="0.5.20" />
</group>
<group targetFramework="dotnet">
<dependency id="Dapplo.HttpExtensions" version="0.5.19" />
<dependency id="Dapplo.HttpExtensions" version="0.5.20" />
</group>
</dependencies>
</metadata>
Expand Down
12 changes: 6 additions & 6 deletions Dapplo.Confluence/Dapplo.Confluence.csproj
View file
Expand Up @@ -33,16 +33,16 @@
<DocumentationFile>bin\Release\Dapplo.Confluence.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Dapplo.HttpExtensions, Version=0.5.18.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.5.18\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
<Reference Include="Dapplo.HttpExtensions, Version=0.5.20.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.5.20\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Dapplo.LogFacade, Version=0.3.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.LogFacade.0.3.2\lib\net45\Dapplo.LogFacade.dll</HintPath>
<Reference Include="Dapplo.Log.Facade, Version=0.4.4.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Log.Facade.0.4.4\lib\net45\Dapplo.Log.Facade.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Dapplo.Utils, Version=0.1.44.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.0.1.44\lib\net45\Dapplo.Utils.dll</HintPath>
<Reference Include="Dapplo.Utils, Version=0.1.45.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.0.1.45\lib\net45\Dapplo.Utils.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.CSharp" />
Expand Down
6 changes: 3 additions & 3 deletions Dapplo.Confluence/packages.config
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Dapplo.HttpExtensions" version="0.5.18" targetFramework="net452" />
<package id="Dapplo.LogFacade" version="0.3.2" targetFramework="net452" />
<package id="Dapplo.Utils" version="0.1.44" targetFramework="net452" />
<package id="Dapplo.HttpExtensions" version="0.5.20" targetFramework="net45" />
<package id="Dapplo.Log.Facade" version="0.4.4" targetFramework="net45" />
<package id="Dapplo.Utils" version="0.1.45" targetFramework="net45" />
</packages>

0 comments on commit 97f342f

Please sign in to comment.