Skip to content

Commit

Permalink
Dependency updates, code cleanup
Browse files Browse the repository at this point in the history
[release]
  • Loading branch information
Lakritzator committed Apr 23, 2016
1 parent c992f88 commit ee9c3ee
Show file tree
Hide file tree
Showing 20 changed files with 38 additions and 41 deletions.
2 changes: 1 addition & 1 deletion Dapplo.Jira.PCL/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"dnxcore50.app": {}
},
"dependencies": {
"Dapplo.HttpExtensions": "0.5.3",
"Dapplo.HttpExtensions": "0.5.5",
"Microsoft.NETCore": "5.0.0",
"Microsoft.NETCore.Portable.Compatibility": "1.0.0",
"System.ComponentModel": "4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion Dapplo.Jira.Shared/Entities/ProjectDigest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,6 @@ public class ProjectDigest : BaseProperties<long>
/// All project keys associated with the project
/// </summary>
[DataMember(Name = "projectKeys")]
public IList<string> projectKeys { get; set; }
public IList<string> ProjectKeys { get; set; }
}
}
8 changes: 4 additions & 4 deletions Dapplo.Jira.Tests/Dapplo.Jira.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,16 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Dapplo.HttpExtensions, Version=0.5.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.5.3\lib\net46\Dapplo.HttpExtensions.dll</HintPath>
<Reference Include="Dapplo.HttpExtensions, Version=0.5.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.5.5\lib\net46\Dapplo.HttpExtensions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Dapplo.LogFacade, Version=0.2.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.LogFacade.0.2.40\lib\net45\Dapplo.LogFacade.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Dapplo.Utils, Version=0.1.21.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.0.1.21\lib\net45\Dapplo.Utils.dll</HintPath>
<Reference Include="Dapplo.Utils, Version=0.1.27.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.0.1.27\lib\net45\Dapplo.Utils.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down
2 changes: 1 addition & 1 deletion Dapplo.Jira.Tests/Logger/XUnitLogger.cs
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public override void Write(LogInfo logInfo, string messageTemplate, params objec
testOutputHelper.WriteLine($"{logInfo} - {messageTemplate}", logParameters);
}

public override void Write(LogInfo logInfo, Exception exception, string messageTemplate, params object[] logParameters)
public override void Write(LogInfo logInfo, Exception exception, string messageTemplate = null, params object[] logParameters)
{
var testOutputHelper = TestOutputHelperAsyncLocal.Value;
if (testOutputHelper == null)
Expand Down
4 changes: 2 additions & 2 deletions Dapplo.Jira.Tests/packages.config
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?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.3" targetFramework="net46" />
<package id="Dapplo.HttpExtensions" version="0.5.5" targetFramework="net46" />
<package id="Dapplo.LogFacade" version="0.2.40" targetFramework="net46" />
<package id="Dapplo.Utils" version="0.1.21" targetFramework="net46" />
<package id="Dapplo.Utils" version="0.1.27" 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
1 change: 0 additions & 1 deletion Dapplo.Jira.WpfExample/App.xaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Application x:Class="Dapplo.Jira.WpfExample.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:Dapplo.Jira.WpfExample"
StartupUri="MainWindow.xaml">
<Application.Resources>

Expand Down
4 changes: 2 additions & 2 deletions Dapplo.Jira.WpfExample/App.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#region using

using System.Windows;


#endregion

Expand All @@ -30,7 +30,7 @@ namespace Dapplo.Jira.WpfExample
/// <summary>
/// Interaction logic for App.xaml
/// </summary>
public partial class App : Application
public partial class App
{
}
}
8 changes: 4 additions & 4 deletions Dapplo.Jira.WpfExample/Dapplo.Jira.WpfExample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,16 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Dapplo.HttpExtensions, Version=0.5.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.5.3\lib\net46\Dapplo.HttpExtensions.dll</HintPath>
<Reference Include="Dapplo.HttpExtensions, Version=0.5.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.5.5\lib\net46\Dapplo.HttpExtensions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Dapplo.LogFacade, Version=0.2.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.LogFacade.0.2.40\lib\net45\Dapplo.LogFacade.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Dapplo.Utils, Version=0.1.21.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.0.1.21\lib\net45\Dapplo.Utils.dll</HintPath>
<Reference Include="Dapplo.Utils, Version=0.1.27.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.0.1.27\lib\net45\Dapplo.Utils.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down
1 change: 0 additions & 1 deletion Dapplo.Jira.WpfExample/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Dapplo.Jira.WpfExample"
mc:Ignorable="d"
Title="Jira Projects" SizeToContent="WidthAndHeight">
<ListView ItemsSource="{Binding Projects}">
Expand Down
2 changes: 1 addition & 1 deletion Dapplo.Jira.WpfExample/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ namespace Dapplo.Jira.WpfExample
/// <summary>
/// Interaction logic for MainWindow.xaml
/// </summary>
public partial class MainWindow : Window
public partial class MainWindow
{
public MainWindow()
{
Expand Down
4 changes: 2 additions & 2 deletions Dapplo.Jira.WpfExample/packages.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Dapplo.HttpExtensions" version="0.5.3" targetFramework="net46" />
<package id="Dapplo.HttpExtensions" version="0.5.5" targetFramework="net46" />
<package id="Dapplo.LogFacade" version="0.2.40" targetFramework="net46" />
<package id="Dapplo.Utils" version="0.1.21" targetFramework="net46" />
<package id="Dapplo.Utils" version="0.1.27" targetFramework="net46" />
</packages>
8 changes: 4 additions & 4 deletions Dapplo.Jira.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@
<tags>Jira</tags>
<dependencies>
<group targetFramework="net45">
<dependency id="Dapplo.HttpExtensions" version="0.4.44" />
<dependency id="Dapplo.HttpExtensions" version="0.5.5" />
</group>
<group targetFramework="dnxcore50">
<dependency id="Dapplo.HttpExtensions" version="0.4.44" />
<dependency id="Dapplo.HttpExtensions" version="0.5.5" />
</group>
<group targetFramework="uap10.0">
<dependency id="Dapplo.HttpExtensions" version="0.4.44" />
<dependency id="Dapplo.HttpExtensions" version="0.5.5" />
</group>
<group targetFramework="dotnet">
<dependency id="Dapplo.HttpExtensions" version="0.4.44" />
<dependency id="Dapplo.HttpExtensions" version="0.5.5" />
</group>
</dependencies>
</metadata>
Expand Down
8 changes: 4 additions & 4 deletions Dapplo.Jira/Dapplo.Jira.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,16 @@
<DocumentationFile>bin\Release\Dapplo.Jira.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Dapplo.HttpExtensions, Version=0.5.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.5.3\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
<Reference Include="Dapplo.HttpExtensions, Version=0.5.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.5.5\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Dapplo.LogFacade, Version=0.2.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.LogFacade.0.2.40\lib\net45\Dapplo.LogFacade.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Dapplo.Utils, Version=0.1.21.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.0.1.21\lib\net45\Dapplo.Utils.dll</HintPath>
<Reference Include="Dapplo.Utils, Version=0.1.27.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.0.1.27\lib\net45\Dapplo.Utils.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down
6 changes: 3 additions & 3 deletions Dapplo.Jira/Powershell/AddJiraAttachment.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@

#region using

using System.IO;
using System.Management.Automation;
using System.Threading.Tasks;
using Dapplo.Jira.Entities;
using Dapplo.PowerShell.Jira.Support;
using System.IO;
using Dapplo.Jira.Powershell.Support;

#endregion

namespace Dapplo.PowerShell.Jira
namespace Dapplo.Jira.Powershell
{
/// <summary>
/// A Cmdlet to attach an attachment to a jira issue
Expand Down
4 changes: 2 additions & 2 deletions Dapplo.Jira/Powershell/GetJiraIssue.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
using System.Management.Automation;
using System.Threading.Tasks;
using Dapplo.Jira.Entities;
using Dapplo.PowerShell.Jira.Support;
using Dapplo.Jira.Powershell.Support;

#endregion

namespace Dapplo.PowerShell.Jira
namespace Dapplo.Jira.Powershell
{
/// <summary>
/// A Cmdlet which processes the information of a Jira issue
Expand Down
4 changes: 2 additions & 2 deletions Dapplo.Jira/Powershell/GetJiraProjects.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
using System.Management.Automation;
using System.Threading.Tasks;
using Dapplo.Jira.Entities;
using Dapplo.PowerShell.Jira.Support;
using Dapplo.Jira.Powershell.Support;

#endregion

namespace Dapplo.PowerShell.Jira
namespace Dapplo.Jira.Powershell
{
/// <summary>
/// A Cmdlet which outputs the projects in the specified jira
Expand Down
2 changes: 1 addition & 1 deletion Dapplo.Jira/Powershell/Support/AsyncCmdlet.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

#endregion

namespace Dapplo.PowerShell.Jira.Support
namespace Dapplo.Jira.Powershell.Support
{
/// <summary>
/// The base for Async Cmdlets
Expand Down
2 changes: 1 addition & 1 deletion Dapplo.Jira/Powershell/Support/AsyncPump.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

#endregion

namespace Dapplo.PowerShell.Jira.Support
namespace Dapplo.Jira.Powershell.Support
{
/// <summary>
/// Provides a pump that supports running asynchronous methods on the current thread.
Expand Down
3 changes: 1 addition & 2 deletions Dapplo.Jira/Powershell/Support/JiraAsyncCmdlet.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,11 @@

using System;
using System.Management.Automation;
using Dapplo.Jira;
using System.Threading.Tasks;

#endregion

namespace Dapplo.PowerShell.Jira.Support
namespace Dapplo.Jira.Powershell.Support
{
/// <summary>
/// This is the base class for all (most?) Jira CmdLets
Expand Down
4 changes: 2 additions & 2 deletions Dapplo.Jira/packages.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Dapplo.HttpExtensions" version="0.5.3" targetFramework="net452" />
<package id="Dapplo.HttpExtensions" version="0.5.5" targetFramework="net452" />
<package id="Dapplo.LogFacade" version="0.2.40" targetFramework="net452" />
<package id="Dapplo.Utils" version="0.1.21" targetFramework="net452" />
<package id="Dapplo.Utils" version="0.1.27" targetFramework="net452" />
<package id="System.Management.Automation.dll" version="10.0.10586.0" targetFramework="net452" />
</packages>

0 comments on commit ee9c3ee

Please sign in to comment.