Skip to content
This repository was archived by the owner on Jun 27, 2019. It is now read-only.

Commit c863850

Browse files
committed
Merge pull request #15 from JakeGinnivan/SolutionUpdate
Solution update
2 parents d5cce61 + 8f53e5a commit c863850

File tree

68 files changed

+5273
-289
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+5273
-289
lines changed

appveyor.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
install:
2+
- choco install gitversion.portable -pre -y
3+
4+
platform:
5+
- Any CPU
6+
7+
configuration:
8+
- Release
9+
10+
assembly_info:
11+
patch: false
12+
13+
before_build:
14+
- nuget restore src\
15+
- ps: gitversion /l console /output buildserver /updateAssemblyInfo src\SolutionAssemblyInfo.cs
16+
17+
build:
18+
project: src\GitTools.Core.sln
19+
20+
after_build:
21+
- cmd: nuget pack src\GitTools.Core\GitTools.Core.nuspec -BasePath output\%CONFIGURATION%\GitTools.Core\ -version "%GitVersion_NuGetVersion%"
22+
- cmd: nuget pack src\GitTools.IssueTrackers\GitTools.IssueTrackers.nuspec -BasePath output\%CONFIGURATION%\GitTools.IssueTrackers\ -version "%GitVersion_NuGetVersion%"
23+
- cmd: appveyor PushArtifact "GitTools.Core.%GitVersion_NuGetVersion%.nupkg"
24+
- cmd: appveyor PushArtifact "GitTools.IssueTrackers.%GitVersion_NuGetVersion%.nupkg"
25+
26+
cache:
27+
- src\packages -> **\packages.config # preserve "packages" directory in the root of build folder but will reset it if packages.config is modified
Binary file not shown.

deployment/NuGet/template/GitTools.Core/GitTools.Core.nuspec

Lines changed: 0 additions & 30 deletions
This file was deleted.

deployment/NuGet/template/GitTools.IssueTrackers/GitTools.IssueTrackers.nuspec

Lines changed: 0 additions & 32 deletions
This file was deleted.

lib/repositories.config

Lines changed: 0 additions & 5 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Weavers>
33
<ModuleInit/>
44
</Weavers>

src/GitTools.Core.Tests/GitTools.Core.Tests.csproj

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
<DebugSymbols>true</DebugSymbols>
1919
<DebugType>full</DebugType>
2020
<Optimize>false</Optimize>
21-
<OutputPath>..\..\output\debug\NET45\GitTools.Core.Tests\</OutputPath>
22-
<DefineConstants>TRACE;DEBUG;NET;NET45</DefineConstants>
21+
<OutputPath>..\..\output\Debug\GitTools.Core.Tests\net45\</OutputPath>
22+
<DefineConstants>TRACE;DEBUG</DefineConstants>
2323
<ErrorReport>prompt</ErrorReport>
2424
<WarningLevel>4</WarningLevel>
2525
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -28,8 +28,8 @@
2828
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2929
<DebugType>pdbonly</DebugType>
3030
<Optimize>true</Optimize>
31-
<OutputPath>..\..\output\release\NET45\GitTools.Core.Tests\</OutputPath>
32-
<DefineConstants>TRACE;NET;NET45</DefineConstants>
31+
<OutputPath>..\..\output\Release\GitTools.Core.Tests\net45\</OutputPath>
32+
<DefineConstants>TRACE</DefineConstants>
3333
<ErrorReport>prompt</ErrorReport>
3434
<WarningLevel>4</WarningLevel>
3535
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -38,18 +38,18 @@
3838
<ItemGroup>
3939
<Reference Include="Atlassian.Jira, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
4040
<SpecificVersion>False</SpecificVersion>
41-
<HintPath>..\..\lib\Atlassian.SDK.2.5.0\lib\Atlassian.Jira.dll</HintPath>
41+
<HintPath>..\packages\Atlassian.SDK.2.5.0\lib\Atlassian.Jira.dll</HintPath>
4242
</Reference>
4343
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
44-
<HintPath>..\..\lib\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
44+
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
4545
<Private>True</Private>
4646
</Reference>
47-
<Reference Include="Octokit, Version=0.12.0.0, Culture=neutral, processorArchitecture=MSIL">
48-
<SpecificVersion>False</SpecificVersion>
49-
<HintPath>..\..\lib\Octokit.0.12.0\lib\net45\Octokit.dll</HintPath>
47+
<Reference Include="Octokit, Version=0.15.0.0, Culture=neutral, processorArchitecture=MSIL">
48+
<HintPath>..\packages\Octokit.0.15.0\lib\net45\Octokit.dll</HintPath>
49+
<Private>True</Private>
5050
</Reference>
51-
<Reference Include="Shouldly, Version=2.5.0.0, Culture=neutral, PublicKeyToken=6042cbcb05cbc941, processorArchitecture=MSIL">
52-
<HintPath>..\..\lib\Shouldly.2.5.0\lib\net40\Shouldly.dll</HintPath>
51+
<Reference Include="Shouldly, Version=2.6.0.0, Culture=neutral, PublicKeyToken=6042cbcb05cbc941, processorArchitecture=MSIL">
52+
<HintPath>..\packages\Shouldly.2.6.0\lib\net40\Shouldly.dll</HintPath>
5353
<Private>True</Private>
5454
</Reference>
5555
<Reference Include="System" />
@@ -75,9 +75,9 @@
7575
<Compile Include="Properties\AssemblyInfo.cs" />
7676
</ItemGroup>
7777
<ItemGroup>
78-
<ProjectReference Include="..\GitTools.Core\GitTools.Core.csproj">
79-
<Project>{c11252f9-0eca-44dc-860b-e029c04fbd10}</Project>
80-
<Name>GitTools.Core</Name>
78+
<ProjectReference Include="..\GitTools.Core\GitTools.Core.NET40\GitTools.Core.NET40.csproj">
79+
<Project>{C11252F9-0ECA-44DC-860B-E029C04FBD10}</Project>
80+
<Name>GitTools.Core.NET40</Name>
8181
</ProjectReference>
8282
<ProjectReference Include="..\GitTools.IssueTrackers\GitTools.IssueTrackers.csproj">
8383
<Project>{ac5f41ea-962e-491b-8557-a2a10dc757e4}</Project>
@@ -92,13 +92,15 @@
9292
</ItemGroup>
9393
<ItemGroup />
9494
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
95-
<Import Project="..\..\lib\Fody.1.29.0-beta01\build\Fody.targets" Condition="Exists('..\..\lib\Fody.1.29.0-beta01\build\Fody.targets')" />
95+
<Import Project="..\packages\Fody.1.29.3\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.1.29.3\build\dotnet\Fody.targets')" />
9696
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
9797
<PropertyGroup>
9898
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
9999
</PropertyGroup>
100-
<Error Condition="!Exists('..\..\lib\Fody.1.29.0-beta01\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\lib\Fody.1.29.0-beta01\build\Fody.targets'))" />
100+
<Error Condition="!Exists('..\packages\Fody.1.29.3\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.3\build\dotnet\Fody.targets'))" />
101+
<Error Condition="!Exists('..\packages\ModuleInit.Fody.1.5.8.0\build\dotnet\ModuleInit.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ModuleInit.Fody.1.5.8.0\build\dotnet\ModuleInit.Fody.targets'))" />
101102
</Target>
103+
<Import Project="..\packages\ModuleInit.Fody.1.5.8.0\build\dotnet\ModuleInit.Fody.targets" Condition="Exists('..\packages\ModuleInit.Fody.1.5.8.0\build\dotnet\ModuleInit.Fody.targets')" />
102104
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
103105
Other similar extension points exist, see Microsoft.Common.targets.
104106
<Target Name="BeforeBuild">

src/GitTools.Core.Tests/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
1-
// --------------------------------------------------------------------------------------------------------------------
2-
// <copyright file="AssemblyInfo.cs" company="GitTools">
3-
// Copyright (c) 2014 - 2015 GitTools. All rights reserved.
4-
// </copyright>
5-
// --------------------------------------------------------------------------------------------------------------------
6-
7-
8-
using System.Reflection;
1+
using System.Reflection;
92
using System.Runtime.InteropServices;
103

114
// All other assembly info is defined in SharedAssembly.cs
125

136
[assembly: AssemblyTitle("GitTools.Core.Tests")]
14-
[assembly: AssemblyProduct("GitTools.Core.Tests")]
157
[assembly: AssemblyDescription("GitTools.Core.Tests library")]
168

179
// Setting ComVisible to false makes the types in this assembly not visible
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Atlassian.SDK" version="2.5.0" targetFramework="net45" />
4-
<package id="Fody" version="1.29.0-beta01" targetFramework="net45" />
5-
<package id="ModuleInit.Fody" version="1.5.6.0" targetFramework="net45" developmentDependency="true" />
4+
<package id="Fody" version="1.29.3" targetFramework="net45" developmentDependency="true" />
5+
<package id="ModuleInit.Fody" version="1.5.8.0" targetFramework="net45" developmentDependency="true" />
66
<package id="NUnit" version="2.6.4" targetFramework="net45" />
7-
<package id="Octokit" version="0.12.0" targetFramework="net45" />
8-
<package id="Shouldly" version="2.5.0" targetFramework="net45" />
7+
<package id="Octokit" version="0.15.0" targetFramework="net45" />
8+
<package id="Shouldly" version="2.6.0" targetFramework="net45" />
99
</packages>

src/GitTools.Core.sln

Lines changed: 21 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,35 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
4-
VisualStudioVersion = 14.0.22823.1
4+
VisualStudioVersion = 14.0.23107.0
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitTools.Core", "GitTools.Core\GitTools.Core.csproj", "{C11252F9-0ECA-44DC-860B-E029C04FBD10}"
7-
EndProject
8-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{17E77AE6-5E23-4898-BCAB-7AF62BB0DFBA}"
9-
EndProject
10-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{1E56230A-4CDE-4142-A7F0-BE0625746DA0}"
11-
EndProject
12-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{377F4B45-0F5E-4F78-8A7B-27725DC79197}"
13-
EndProject
146
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{72ECAB81-A674-4AC8-8795-7AD71C3E1A5A}"
157
ProjectSection(SolutionItems) = preProject
8+
..\appveyor.yml = ..\appveyor.yml
169
GitTools.Core.sln.DotSettings = GitTools.Core.sln.DotSettings
17-
nuget.config = nuget.config
1810
Settings.StyleCop = Settings.StyleCop
1911
SolutionAssemblyInfo.cs = SolutionAssemblyInfo.cs
2012
EndProjectSection
2113
EndProject
22-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lib", "lib", "{532E0393-2C1F-4F04-A6A7-F194A578DAEB}"
23-
ProjectSection(SolutionItems) = preProject
24-
..\lib\repositories.config = ..\lib\repositories.config
25-
EndProjectSection
26-
EndProject
2714
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitTools.Core.Tests", "GitTools.Core.Tests\GitTools.Core.Tests.csproj", "{0834BE9B-5CDE-4CAB-A683-C70A7D91450B}"
2815
EndProject
29-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core.IssueTrackers", "Core.IssueTrackers", "{5E7A6723-E488-4CFF-B838-B5ABA6B38479}"
30-
EndProject
3116
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitTools.IssueTrackers", "GitTools.IssueTrackers\GitTools.IssueTrackers.csproj", "{AC5F41EA-962E-491B-8557-A2A10DC757E4}"
3217
EndProject
18+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitTools.Core.NET40", "GitTools.Core\GitTools.Core.NET40\GitTools.Core.NET40.csproj", "{C11252F9-0ECA-44DC-860B-E029C04FBD10}"
19+
EndProject
20+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitTools.Core", "GitTools.Core", "{753DD689-12ED-42D8-8AF7-936336D65FA0}"
21+
ProjectSection(SolutionItems) = preProject
22+
GitTools.Core\GitTools.Core.nuspec = GitTools.Core\GitTools.Core.nuspec
23+
EndProjectSection
24+
EndProject
25+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitTools.Core.NET45", "GitTools.Core\GitTools.Core.NET45\GitTools.Core.NET45.csproj", "{66295D7C-58FD-4641-AEAB-3DF7EA8FA4D2}"
26+
EndProject
3327
Global
3428
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3529
Debug|Any CPU = Debug|Any CPU
3630
Release|Any CPU = Release|Any CPU
3731
EndGlobalSection
3832
GlobalSection(ProjectConfigurationPlatforms) = postSolution
39-
{C11252F9-0ECA-44DC-860B-E029C04FBD10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
40-
{C11252F9-0ECA-44DC-860B-E029C04FBD10}.Debug|Any CPU.Build.0 = Debug|Any CPU
41-
{C11252F9-0ECA-44DC-860B-E029C04FBD10}.Release|Any CPU.ActiveCfg = Release|Any CPU
42-
{C11252F9-0ECA-44DC-860B-E029C04FBD10}.Release|Any CPU.Build.0 = Release|Any CPU
4333
{0834BE9B-5CDE-4CAB-A683-C70A7D91450B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4434
{0834BE9B-5CDE-4CAB-A683-C70A7D91450B}.Debug|Any CPU.Build.0 = Debug|Any CPU
4535
{0834BE9B-5CDE-4CAB-A683-C70A7D91450B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -48,16 +38,20 @@ Global
4838
{AC5F41EA-962E-491B-8557-A2A10DC757E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
4939
{AC5F41EA-962E-491B-8557-A2A10DC757E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
5040
{AC5F41EA-962E-491B-8557-A2A10DC757E4}.Release|Any CPU.Build.0 = Release|Any CPU
41+
{C11252F9-0ECA-44DC-860B-E029C04FBD10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
42+
{C11252F9-0ECA-44DC-860B-E029C04FBD10}.Debug|Any CPU.Build.0 = Debug|Any CPU
43+
{C11252F9-0ECA-44DC-860B-E029C04FBD10}.Release|Any CPU.ActiveCfg = Release|Any CPU
44+
{C11252F9-0ECA-44DC-860B-E029C04FBD10}.Release|Any CPU.Build.0 = Release|Any CPU
45+
{66295D7C-58FD-4641-AEAB-3DF7EA8FA4D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
46+
{66295D7C-58FD-4641-AEAB-3DF7EA8FA4D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
47+
{66295D7C-58FD-4641-AEAB-3DF7EA8FA4D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
48+
{66295D7C-58FD-4641-AEAB-3DF7EA8FA4D2}.Release|Any CPU.Build.0 = Release|Any CPU
5149
EndGlobalSection
5250
GlobalSection(SolutionProperties) = preSolution
5351
HideSolutionNode = FALSE
5452
EndGlobalSection
5553
GlobalSection(NestedProjects) = preSolution
56-
{C11252F9-0ECA-44DC-860B-E029C04FBD10} = {1E56230A-4CDE-4142-A7F0-BE0625746DA0}
57-
{1E56230A-4CDE-4142-A7F0-BE0625746DA0} = {17E77AE6-5E23-4898-BCAB-7AF62BB0DFBA}
58-
{377F4B45-0F5E-4F78-8A7B-27725DC79197} = {17E77AE6-5E23-4898-BCAB-7AF62BB0DFBA}
59-
{0834BE9B-5CDE-4CAB-A683-C70A7D91450B} = {377F4B45-0F5E-4F78-8A7B-27725DC79197}
60-
{5E7A6723-E488-4CFF-B838-B5ABA6B38479} = {17E77AE6-5E23-4898-BCAB-7AF62BB0DFBA}
61-
{AC5F41EA-962E-491B-8557-A2A10DC757E4} = {5E7A6723-E488-4CFF-B838-B5ABA6B38479}
54+
{C11252F9-0ECA-44DC-860B-E029C04FBD10} = {753DD689-12ED-42D8-8AF7-936336D65FA0}
55+
{66295D7C-58FD-4641-AEAB-3DF7EA8FA4D2} = {753DD689-12ED-42D8-8AF7-936336D65FA0}
6256
EndGlobalSection
6357
EndGlobal

src/GitTools.Core.sln.DotSettings

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,7 @@ II.2.12 &lt;HandlesEvent /&gt;&#xD;
444444
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
445445
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpFileLayoutPatternsUpgrade/@EntryIndexedValue">True</s:Boolean>
446446
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
447+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
447448
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
448449
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
449450
<s:String x:Key="/Default/Environment/UserInterface/ShortcutSchemeName/@EntryValue">None</s:String>

src/GitTools.Core/FodyWeavers.xml

Lines changed: 0 additions & 11 deletions
This file was deleted.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Weavers>
3+
<MethodTimer />
4+
</Weavers>

0 commit comments

Comments
 (0)