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

Solution update #15

Merged
merged 19 commits into from
Sep 12, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
install:
- choco install gitversion.portable -pre -y

platform:
- Any CPU

configuration:
- Release

assembly_info:
patch: false

before_build:
- nuget restore src\
- ps: gitversion /l console /output buildserver /updateAssemblyInfo src\SolutionAssemblyInfo.cs

build:
project: src\GitTools.Core.sln

after_build:
- cmd: nuget pack src\GitTools.Core\GitTools.Core.nuspec -BasePath output\%CONFIGURATION%\GitTools.Core\ -version "%GitVersion_NuGetVersion%"
- cmd: nuget pack src\GitTools.IssueTrackers\GitTools.IssueTrackers.nuspec -BasePath output\%CONFIGURATION%\GitTools.IssueTrackers\ -version "%GitVersion_NuGetVersion%"
- cmd: appveyor PushArtifact "GitTools.Core.%GitVersion_NuGetVersion%.nupkg"
- cmd: appveyor PushArtifact "GitTools.IssueTrackers.%GitVersion_NuGetVersion%.nupkg"

cache:
- 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.
30 changes: 0 additions & 30 deletions deployment/NuGet/template/GitTools.Core/GitTools.Core.nuspec

This file was deleted.

This file was deleted.

5 changes: 0 additions & 5 deletions lib/repositories.config

This file was deleted.

2 changes: 1 addition & 1 deletion src/GitTools.Core.Tests/FodyWeavers.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Weavers>
<ModuleInit/>
</Weavers>
34 changes: 18 additions & 16 deletions src/GitTools.Core.Tests/GitTools.Core.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\output\debug\NET45\GitTools.Core.Tests\</OutputPath>
<DefineConstants>TRACE;DEBUG;NET;NET45</DefineConstants>
<OutputPath>..\..\output\Debug\GitTools.Core.Tests\net45\</OutputPath>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand All @@ -28,8 +28,8 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\..\output\release\NET45\GitTools.Core.Tests\</OutputPath>
<DefineConstants>TRACE;NET;NET45</DefineConstants>
<OutputPath>..\..\output\Release\GitTools.Core.Tests\net45\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand All @@ -38,18 +38,18 @@
<ItemGroup>
<Reference Include="Atlassian.Jira, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\Atlassian.SDK.2.5.0\lib\Atlassian.Jira.dll</HintPath>
<HintPath>..\packages\Atlassian.SDK.2.5.0\lib\Atlassian.Jira.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<HintPath>..\..\lib\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Octokit, Version=0.12.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\Octokit.0.12.0\lib\net45\Octokit.dll</HintPath>
<Reference Include="Octokit, Version=0.15.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Octokit.0.15.0\lib\net45\Octokit.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Shouldly, Version=2.5.0.0, Culture=neutral, PublicKeyToken=6042cbcb05cbc941, processorArchitecture=MSIL">
<HintPath>..\..\lib\Shouldly.2.5.0\lib\net40\Shouldly.dll</HintPath>
<Reference Include="Shouldly, Version=2.6.0.0, Culture=neutral, PublicKeyToken=6042cbcb05cbc941, processorArchitecture=MSIL">
<HintPath>..\packages\Shouldly.2.6.0\lib\net40\Shouldly.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand All @@ -75,9 +75,9 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\GitTools.Core\GitTools.Core.csproj">
<Project>{c11252f9-0eca-44dc-860b-e029c04fbd10}</Project>
<Name>GitTools.Core</Name>
<ProjectReference Include="..\GitTools.Core\GitTools.Core.NET40\GitTools.Core.NET40.csproj">
<Project>{C11252F9-0ECA-44DC-860B-E029C04FBD10}</Project>
<Name>GitTools.Core.NET40</Name>
</ProjectReference>
<ProjectReference Include="..\GitTools.IssueTrackers\GitTools.IssueTrackers.csproj">
<Project>{ac5f41ea-962e-491b-8557-a2a10dc757e4}</Project>
Expand All @@ -92,13 +92,15 @@
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\..\lib\Fody.1.29.0-beta01\build\Fody.targets" Condition="Exists('..\..\lib\Fody.1.29.0-beta01\build\Fody.targets')" />
<Import Project="..\packages\Fody.1.29.3\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.1.29.3\build\dotnet\Fody.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<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>
</PropertyGroup>
<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'))" />
<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'))" />
<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'))" />
</Target>
<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')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
10 changes: 1 addition & 9 deletions src/GitTools.Core.Tests/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="AssemblyInfo.cs" company="GitTools">
// Copyright (c) 2014 - 2015 GitTools. All rights reserved.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------


using System.Reflection;
using System.Reflection;
using System.Runtime.InteropServices;

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

[assembly: AssemblyTitle("GitTools.Core.Tests")]
[assembly: AssemblyProduct("GitTools.Core.Tests")]
[assembly: AssemblyDescription("GitTools.Core.Tests library")]

// Setting ComVisible to false makes the types in this assembly not visible
Expand Down
8 changes: 4 additions & 4 deletions src/GitTools.Core.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="Atlassian.SDK" version="2.5.0" targetFramework="net45" />
<package id="Fody" version="1.29.0-beta01" targetFramework="net45" />
<package id="ModuleInit.Fody" version="1.5.6.0" targetFramework="net45" developmentDependency="true" />
<package id="Fody" version="1.29.3" targetFramework="net45" developmentDependency="true" />
<package id="ModuleInit.Fody" version="1.5.8.0" targetFramework="net45" developmentDependency="true" />
<package id="NUnit" version="2.6.4" targetFramework="net45" />
<package id="Octokit" version="0.12.0" targetFramework="net45" />
<package id="Shouldly" version="2.5.0" targetFramework="net45" />
<package id="Octokit" version="0.15.0" targetFramework="net45" />
<package id="Shouldly" version="2.6.0" targetFramework="net45" />
</packages>
48 changes: 21 additions & 27 deletions src/GitTools.Core.sln
Original file line number Diff line number Diff line change
@@ -1,45 +1,35 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.22823.1
VisualStudioVersion = 14.0.23107.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitTools.Core", "GitTools.Core\GitTools.Core.csproj", "{C11252F9-0ECA-44DC-860B-E029C04FBD10}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{17E77AE6-5E23-4898-BCAB-7AF62BB0DFBA}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{1E56230A-4CDE-4142-A7F0-BE0625746DA0}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{377F4B45-0F5E-4F78-8A7B-27725DC79197}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{72ECAB81-A674-4AC8-8795-7AD71C3E1A5A}"
ProjectSection(SolutionItems) = preProject
..\appveyor.yml = ..\appveyor.yml
GitTools.Core.sln.DotSettings = GitTools.Core.sln.DotSettings
nuget.config = nuget.config
Settings.StyleCop = Settings.StyleCop
SolutionAssemblyInfo.cs = SolutionAssemblyInfo.cs
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lib", "lib", "{532E0393-2C1F-4F04-A6A7-F194A578DAEB}"
ProjectSection(SolutionItems) = preProject
..\lib\repositories.config = ..\lib\repositories.config
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitTools.Core.Tests", "GitTools.Core.Tests\GitTools.Core.Tests.csproj", "{0834BE9B-5CDE-4CAB-A683-C70A7D91450B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core.IssueTrackers", "Core.IssueTrackers", "{5E7A6723-E488-4CFF-B838-B5ABA6B38479}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitTools.IssueTrackers", "GitTools.IssueTrackers\GitTools.IssueTrackers.csproj", "{AC5F41EA-962E-491B-8557-A2A10DC757E4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitTools.Core.NET40", "GitTools.Core\GitTools.Core.NET40\GitTools.Core.NET40.csproj", "{C11252F9-0ECA-44DC-860B-E029C04FBD10}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitTools.Core", "GitTools.Core", "{753DD689-12ED-42D8-8AF7-936336D65FA0}"
ProjectSection(SolutionItems) = preProject
GitTools.Core\GitTools.Core.nuspec = GitTools.Core\GitTools.Core.nuspec
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitTools.Core.NET45", "GitTools.Core\GitTools.Core.NET45\GitTools.Core.NET45.csproj", "{66295D7C-58FD-4641-AEAB-3DF7EA8FA4D2}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{C11252F9-0ECA-44DC-860B-E029C04FBD10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C11252F9-0ECA-44DC-860B-E029C04FBD10}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C11252F9-0ECA-44DC-860B-E029C04FBD10}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C11252F9-0ECA-44DC-860B-E029C04FBD10}.Release|Any CPU.Build.0 = Release|Any CPU
{0834BE9B-5CDE-4CAB-A683-C70A7D91450B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0834BE9B-5CDE-4CAB-A683-C70A7D91450B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0834BE9B-5CDE-4CAB-A683-C70A7D91450B}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -48,16 +38,20 @@ Global
{AC5F41EA-962E-491B-8557-A2A10DC757E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AC5F41EA-962E-491B-8557-A2A10DC757E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AC5F41EA-962E-491B-8557-A2A10DC757E4}.Release|Any CPU.Build.0 = Release|Any CPU
{C11252F9-0ECA-44DC-860B-E029C04FBD10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C11252F9-0ECA-44DC-860B-E029C04FBD10}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C11252F9-0ECA-44DC-860B-E029C04FBD10}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C11252F9-0ECA-44DC-860B-E029C04FBD10}.Release|Any CPU.Build.0 = Release|Any CPU
{66295D7C-58FD-4641-AEAB-3DF7EA8FA4D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{66295D7C-58FD-4641-AEAB-3DF7EA8FA4D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{66295D7C-58FD-4641-AEAB-3DF7EA8FA4D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{66295D7C-58FD-4641-AEAB-3DF7EA8FA4D2}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{C11252F9-0ECA-44DC-860B-E029C04FBD10} = {1E56230A-4CDE-4142-A7F0-BE0625746DA0}
{1E56230A-4CDE-4142-A7F0-BE0625746DA0} = {17E77AE6-5E23-4898-BCAB-7AF62BB0DFBA}
{377F4B45-0F5E-4F78-8A7B-27725DC79197} = {17E77AE6-5E23-4898-BCAB-7AF62BB0DFBA}
{0834BE9B-5CDE-4CAB-A683-C70A7D91450B} = {377F4B45-0F5E-4F78-8A7B-27725DC79197}
{5E7A6723-E488-4CFF-B838-B5ABA6B38479} = {17E77AE6-5E23-4898-BCAB-7AF62BB0DFBA}
{AC5F41EA-962E-491B-8557-A2A10DC757E4} = {5E7A6723-E488-4CFF-B838-B5ABA6B38479}
{C11252F9-0ECA-44DC-860B-E029C04FBD10} = {753DD689-12ED-42D8-8AF7-936336D65FA0}
{66295D7C-58FD-4641-AEAB-3DF7EA8FA4D2} = {753DD689-12ED-42D8-8AF7-936336D65FA0}
EndGlobalSection
EndGlobal
1 change: 1 addition & 0 deletions src/GitTools.Core.sln.DotSettings
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,7 @@ II.2.12 &lt;HandlesEvent /&gt;&#xD;
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpFileLayoutPatternsUpgrade/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
<s:String x:Key="/Default/Environment/UserInterface/ShortcutSchemeName/@EntryValue">None</s:String>
Expand Down
11 changes: 0 additions & 11 deletions src/GitTools.Core/FodyWeavers.xml

This file was deleted.

4 changes: 4 additions & 0 deletions src/GitTools.Core/GitTools.Core.NET40/FodyWeavers.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Weavers>
<MethodTimer />
</Weavers>
Loading