Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@BlythMeister
BlythMeister committed Jan 14, 2016
2 parents cb5d1ae + e5e5fe6 commit ef7ef5c
Show file tree
Hide file tree
Showing 16 changed files with 79 additions and 66 deletions.
2 changes: 1 addition & 1 deletion paket.dependencies
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source https://www.nuget.org/api/v2

nuget Atlassian.SDK
nuget Atlassian.SDK @= 2.5.0
nuget Exceptionless.Portable
nuget Exceptionless.Windows
nuget Exceptionless.Wpf
Expand Down
4 changes: 1 addition & 3 deletions paket.lock
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
NUGET
remote: https://www.nuget.org/api/v2
specs:
Atlassian.SDK (5.11.0)
Newtonsoft.Json (>= 7.0.1)
RestSharp (105.1.0)
Atlassian.SDK (2.5.0)
Exceptionless.Portable (3.2.1424)
Exceptionless.Windows (3.2.1424)
Exceptionless.Portable (3.2.1424)
Expand Down
4 changes: 2 additions & 2 deletions src/Gallifrey.Jira/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.0.0.0")]
[assembly: AssemblyFileVersion("3.0.0.0")]
[assembly: AssemblyVersion("3.0.1.0")]
[assembly: AssemblyFileVersion("3.0.1.0")]
18 changes: 9 additions & 9 deletions src/Gallifrey.UI.Classic.Alpha/Gallifrey.UI.Classic.Alpha.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<PublisherName>Gallifrey</PublisherName>
<MinimumRequiredVersion>2.2.0.0</MinimumRequiredVersion>
<ApplicationRevision>1</ApplicationRevision>
<ApplicationVersion>3.0.0.%2a</ApplicationVersion>
<ApplicationVersion>3.0.1.%2a</ApplicationVersion>
<UseApplicationTrust>true</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted>
Expand Down Expand Up @@ -136,42 +136,42 @@
<ItemGroup>
<PublishFile Include="Gallifrey.Jira.pdb">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>File</FileType>
</PublishFile>
<PublishFile Include="Gallifrey.pdb">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>File</FileType>
</PublishFile>
<PublishFile Include="Gallifrey.UI.Classic.Alpha.pdb">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>File</FileType>
</PublishFile>
<PublishFile Include="Gallifrey.UI.Classic.pdb">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>File</FileType>
</PublishFile>
</ItemGroup>
Expand Down
18 changes: 9 additions & 9 deletions src/Gallifrey.UI.Classic.Beta/Gallifrey.UI.Classic.Beta.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<PublisherName>Gallifrey</PublisherName>
<MinimumRequiredVersion>2.2.0.0</MinimumRequiredVersion>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>3.0.0.0</ApplicationVersion>
<ApplicationVersion>3.0.1.0</ApplicationVersion>
<UseApplicationTrust>true</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted>
Expand Down Expand Up @@ -133,42 +133,42 @@
<ItemGroup>
<PublishFile Include="Gallifrey.Jira.pdb">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>File</FileType>
</PublishFile>
<PublishFile Include="Gallifrey.pdb">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>File</FileType>
</PublishFile>
<PublishFile Include="Gallifrey.UI.Classic.Beta.pdb">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>File</FileType>
</PublishFile>
<PublishFile Include="Gallifrey.UI.Classic.pdb">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>File</FileType>
</PublishFile>
</ItemGroup>
Expand Down
7 changes: 7 additions & 0 deletions src/Gallifrey.UI.Classic/ChangeLog.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,4 +214,11 @@
<Other>Adding new ui upgrade links</Other>
</Others>
</Version>
<Version Number="3.0.1">
<Features />
<Bugs>
<Bug>Change the way the SOAP client is created to fix connection issue</Bug>
</Bugs>
<Others/>
</Version>
</Versions>
14 changes: 7 additions & 7 deletions src/Gallifrey.UI.Classic/Gallifrey.UI.Classic.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<PublisherName>Gallifrey</PublisherName>
<MinimumRequiredVersion>2.2.0.0</MinimumRequiredVersion>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>3.0.0.0</ApplicationVersion>
<ApplicationVersion>3.0.1.0</ApplicationVersion>
<UseApplicationTrust>true</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted>
Expand Down Expand Up @@ -266,32 +266,32 @@
<ItemGroup>
<PublishFile Include="Gallifrey.Jira.pdb">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>File</FileType>
</PublishFile>
<PublishFile Include="Gallifrey.pdb">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>File</FileType>
</PublishFile>
<PublishFile Include="Gallifrey.UI.Classic.pdb">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>File</FileType>
</PublishFile>
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Gallifrey.UI.Classic/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.0.0.0")]
[assembly: AssemblyFileVersion("3.0.0.0")]
[assembly: AssemblyVersion("3.0.1.0")]
[assembly: AssemblyFileVersion("3.0.1.0")]
18 changes: 9 additions & 9 deletions src/Gallifrey.UI.Modern.Alpha/Gallifrey.UI.Modern.Alpha.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<PublisherName>Gallifrey</PublisherName>
<MinimumRequiredVersion>2.2.0.0</MinimumRequiredVersion>
<ApplicationRevision>1</ApplicationRevision>
<ApplicationVersion>3.0.0.%2a</ApplicationVersion>
<ApplicationVersion>3.0.1.%2a</ApplicationVersion>
<UseApplicationTrust>true</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted>
Expand Down Expand Up @@ -149,42 +149,42 @@
<ItemGroup>
<PublishFile Include="Gallifrey.Jira.pdb">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>File</FileType>
</PublishFile>
<PublishFile Include="Gallifrey.pdb">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>File</FileType>
</PublishFile>
<PublishFile Include="Gallifrey.UI.Modern.Alpha.pdb">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>File</FileType>
</PublishFile>
<PublishFile Include="Gallifrey.UI.Modern.pdb">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>File</FileType>
</PublishFile>
</ItemGroup>
Expand Down
18 changes: 9 additions & 9 deletions src/Gallifrey.UI.Modern.Beta/Gallifrey.UI.Modern.Beta.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<PublisherName>Gallifrey</PublisherName>
<MinimumRequiredVersion>2.2.0.0</MinimumRequiredVersion>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>3.0.0.0</ApplicationVersion>
<ApplicationVersion>3.0.1.0</ApplicationVersion>
<UseApplicationTrust>true</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted>
Expand Down Expand Up @@ -149,42 +149,42 @@
<ItemGroup>
<PublishFile Include="Gallifrey.Jira.pdb">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>File</FileType>
</PublishFile>
<PublishFile Include="Gallifrey.pdb">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>File</FileType>
</PublishFile>
<PublishFile Include="Gallifrey.UI.Modern.Beta.pdb">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>File</FileType>
</PublishFile>
<PublishFile Include="Gallifrey.UI.Modern.pdb">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>File</FileType>
</PublishFile>
</ItemGroup>
Expand Down
18 changes: 9 additions & 9 deletions src/Gallifrey.UI.Modern.Stable/Gallifrey.UI.Modern.Stable.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<PublisherName>Gallifrey</PublisherName>
<MinimumRequiredVersion>2.2.0.0</MinimumRequiredVersion>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>3.0.0.0</ApplicationVersion>
<ApplicationVersion>3.0.1.0</ApplicationVersion>
<UseApplicationTrust>true</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted>
Expand Down Expand Up @@ -149,42 +149,42 @@
<ItemGroup>
<PublishFile Include="Gallifrey.Jira.pdb">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>File</FileType>
</PublishFile>
<PublishFile Include="Gallifrey.pdb">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>File</FileType>
</PublishFile>
<PublishFile Include="Gallifrey.UI.Modern.pdb">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>File</FileType>
</PublishFile>
<PublishFile Include="Gallifrey.UI.Modern.Stable.pdb">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>File</FileType>
</PublishFile>
</ItemGroup>
Expand Down
Loading

0 comments on commit ef7ef5c

Please sign in to comment.