Skip to content

Commit cbe119e

Browse files
gep13gep13
committed
Merge branch 'release/0.4.0'
2 parents 10e7be5 + 61c187a commit cbe119e

Some content is hidden

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

52 files changed

+776
-230
lines changed

‎BuildScripts/default.ps1

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ properties {
99
$nugetExe = "..\Tools\NuGet\NuGet.exe";
1010
$projectName = "GitReleaseManager";
1111
$openCoverExe = "..\Source\packages\OpenCover.4.5.3723\OpenCover.Console.exe";
12-
$nunitConsoleExe = "..\Source\packages\NUnit.Runners.2.6.4\tools\nunit-console.exe";
12+
$nunitConsoleExe = "..\Source\packages\NUnit.Console.3.0.1\tools\nunit3-console.exe";
1313
$reportGeneratorExe = "..\Source\packages\ReportGenerator.2.1.8.0\tools\ReportGenerator.exe";
1414
$coverallsExe = "..\Source\packages\coveralls.io.1.3.4\tools\coveralls.net.exe";
1515
$publishCoverityExe = "..\Source\packages\PublishCoverity.0.10.0\PublishCoverity.exe";
@@ -299,7 +299,7 @@ Task -Name __InstallReSharperCommandLineTools -Depends __InstallChocolatey -Desc
299299

300300
if (-not (Test-Path $inspectCodeExe)) {
301301
exec {
302-
Invoke-Expression "$script:chocolateyCommand install resharper-clt -y";
302+
Invoke-Expression "$script:chocolateyCommand install JetBrains.ReSharper.CommandLineTools -source https://www.nuget.org/api/v2/ -y";
303303
}
304304
} else {
305305
Write-Output "resharper-clt already installed";
@@ -337,7 +337,7 @@ Task -Name __InstallPSBuild -Description $private -Action {
337337
# This test works locally, but not on AppVeyor
338338
# if (-not (test-CommandExists Invoke-MSBuild)) {
339339
# Write-Output "PSBuild is not already installed";
340-
(new-object Net.WebClient).DownloadString("https://raw.github.com/ligershark/psbuild/master/src/GetPSBuild.ps1") | Invoke-Expression;
340+
(new-object Net.WebClient).DownloadString("https://raw.githubusercontent.com/ligershark/psbuild/master/src/GetPSBuild.ps1") | Invoke-Expression;
341341
# } else {
342342
# Write-Output "PSBuild is already installed";
343343
# }
@@ -415,7 +415,7 @@ Task -Name RunGitVersion -Depends __InstallGitVersion -Description "Execute the
415415
exec {
416416
if(isAppVeyor) {
417417
Write-Output "Running on AppVeyor, so UpdateAssemblyInfo will be called."
418-
& $gitVersionExe /output buildserver /UpdateAssemblyInfo true
418+
& $gitVersionExe $rootDirectory /output buildserver /UpdateAssemblyInfo true
419419
$script:version = $env:GitVersion_LegacySemVerPadded
420420
} else {
421421
$output = & $gitVersionExe
@@ -593,7 +593,7 @@ Task -Name RunCodeCoverage -Description "Use OpenCover, NUnit and Coveralls to a
593593

594594
exec {
595595
Write-Output "Running OpenCover...";
596-
& $openCoverExe -target:$nunitConsoleExe -targetargs:`"$buildArtifactsDirectory\GitReleaseManager.Tests.dll /noshadow /nologo`" -filter:`"+[GitReleaseManager]GitReleaseManager*`" -excludebyattribute:`"System.CodeDom.Compiler.GeneratedCodeAttribute`" -register:user -output:`"$buildArtifactsDirectory\coverage.xml`";
596+
& $openCoverExe -target:$nunitConsoleExe -targetargs:`"$buildArtifactsDirectory\GitReleaseManager.Tests.dll`" -filter:`"+[GitReleaseManager]GitReleaseManager*`" -excludebyattribute:`"System.CodeDom.Compiler.GeneratedCodeAttribute`" -register:user -output:`"$buildArtifactsDirectory\coverage.xml`";
597597
Write-Output "OpenCover Complete";
598598

599599
Write-Output "Running ReportGenerator...";

‎README.md

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,24 @@ GitReleaseManager allows you to:
2222

2323
You can install GitReleaseManager via Chocolatey by executing:
2424

25-
`choco install gitreleasemanager`
25+
`choco install gitreleasemanager.portable`
26+
27+
**NOTE:**
28+
Depending on which version of Chocolatey you are using, you may be required to confirm the installation of the application. You can avoid this prompt using the following command:
29+
30+
`choco install gitreleasemanager.portable -y`
2631

2732
If you are interested in trying out the latest pre-release version of GitReleaseManager then you can use the following installation command:
2833

29-
`choco install gitreleasemanager -source https://www.myget.org/F/grm_develop/ -pre`
34+
`choco install gitreleasemanager.portable -source https://www.myget.org/F/grm_develop/ -pre`
3035

3136
This uses the public GitReleaseManager feed which is hosted on [MyGet.org](https://www.myget.org/)
3237

3338
## Build Status
3439

3540
AppVeyor
3641
-------------
37-
[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/20hvqfnv6dlwqld7/branch/develop?svg=true)](https://ci.appveyor.com/project/GaryEwanPark/gitreleasemanager)
42+
[![AppVeyor Build status](https://ci.appveyor.com/api/projects/status/hfad7hkscfx4423p/branch/develop?svg=true)](https://ci.appveyor.com/project/GitTools/gitreleasemanager/branch/develop)
3843

3944
## Chat Room
4045

@@ -50,6 +55,10 @@ If you would like to contribute code or help squash a bug or two, that's awesome
5055

5156
Committers, you should be very familiar with [COMMITTERS](https://github.com/GitTools/GitReleaseManager/blob/develop/COMMITTERS.md).
5257

58+
## Documentation
59+
60+
The documentation for GitReleaseManager can be found on [ReadTheDocs](http://gitreleasemanager.readthedocs.org/en/develop/).
61+
5362
## Credits
5463

5564
GitReleaseManager is brought to you by quite a few people and frameworks. See [CREDITS](https://github.com/GitTools/GitReleaseManager/blob/develop/Documentation/legal/CREDITS.md) for full information.

‎Source/.nuget/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="coveralls.io" version="1.3.4" />
4-
<package id="NUnit.Runners" version="2.6.4" />
4+
<package id="NUnit.Console" version="3.0.1" />
55
<package id="OpenCover" version="4.5.3723" />
66
<package id="PublishCoverity" version="0.10.0" />
77
<package id="ReportGenerator" version="2.1.8.0" />

‎Source/GitReleaseManager.Cli/GitReleaseManager.Cli.csproj

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@
1111
<AssemblyName>GitReleaseManager</AssemblyName>
1212
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14-
<NuGetPackageImportStamp>02f0b04c</NuGetPackageImportStamp>
14+
<NuGetPackageImportStamp>
15+
</NuGetPackageImportStamp>
1516
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1617
<RestorePackages>true</RestorePackages>
1718
<BuildToolsFxCopVersion>1.0.1</BuildToolsFxCopVersion>
1819
<TargetFrameworkProfile />
20+
<IsWebBootstrapper>false</IsWebBootstrapper>
1921
<PublishUrl>publish\</PublishUrl>
2022
<Install>true</Install>
2123
<InstallFrom>Disk</InstallFrom>
@@ -28,7 +30,6 @@
2830
<MapFileExtensions>true</MapFileExtensions>
2931
<ApplicationRevision>0</ApplicationRevision>
3032
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
31-
<IsWebBootstrapper>false</IsWebBootstrapper>
3233
<UseApplicationTrust>false</UseApplicationTrust>
3334
<BootstrapperEnabled>true</BootstrapperEnabled>
3435
</PropertyGroup>
@@ -58,11 +59,13 @@
5859
<CodeAnalysisTreatWarningsAsErrors>True</CodeAnalysisTreatWarningsAsErrors>
5960
</PropertyGroup>
6061
<ItemGroup>
61-
<Reference Include="CommandLine">
62-
<HintPath>..\packages\CommandLineParser.1.9.71\lib\net45\CommandLine.dll</HintPath>
62+
<Reference Include="CommandLine, Version=2.0.275.0, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">
63+
<HintPath>..\packages\CommandLineParser.2.0.275-beta\lib\net45\CommandLine.dll</HintPath>
64+
<Private>True</Private>
6365
</Reference>
64-
<Reference Include="Octokit">
65-
<HintPath>..\packages\Octokit.0.4.1\lib\net45\Octokit.dll</HintPath>
66+
<Reference Include="Octokit, Version=0.17.0.0, Culture=neutral, processorArchitecture=MSIL">
67+
<HintPath>..\packages\Octokit.0.17.0\lib\net45\Octokit.dll</HintPath>
68+
<Private>True</Private>
6669
</Reference>
6770
<Reference Include="System" />
6871
<Reference Include="System.Core" />
@@ -133,11 +136,11 @@
133136
</PropertyGroup>
134137
<Error Condition="!Exists('..\packages\StyleCop.MSBuild.4.7.49.1\build\StyleCop.MSBuild.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\StyleCop.MSBuild.4.7.49.1\build\StyleCop.MSBuild.Targets'))" />
135138
<Error Condition="!Exists('..\packages\StyleCop.Error.MSBuild.1.0.0\build\StyleCop.Error.MSBuild.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\StyleCop.Error.MSBuild.1.0.0\build\StyleCop.Error.MSBuild.Targets'))" />
136-
<Error Condition="!Exists('..\packages\Fody.1.28.3\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.28.3\build\Fody.targets'))" />
139+
<Error Condition="!Exists('..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.4\build\dotnet\Fody.targets'))" />
137140
</Target>
138141
<Import Project="..\..\BuildScripts\CodeAnalysis.props" Condition="Exists('..\..\BuildScripts\CodeAnalysis.props')" />
139142
<Import Project="..\..\BuildScripts\StyleCop.props" Condition="Exists('..\..\BuildScripts\StyleCop.props')" />
140143
<Import Project="..\packages\StyleCop.MSBuild.4.7.49.1\build\StyleCop.MSBuild.Targets" Condition="Exists('..\packages\StyleCop.MSBuild.4.7.49.1\build\StyleCop.MSBuild.Targets')" />
141144
<Import Project="..\packages\StyleCop.Error.MSBuild.1.0.0\build\StyleCop.Error.MSBuild.Targets" Condition="Exists('..\packages\StyleCop.Error.MSBuild.1.0.0\build\StyleCop.Error.MSBuild.Targets')" />
142-
<Import Project="..\packages\Fody.1.28.3\build\Fody.targets" Condition="Exists('..\packages\Fody.1.28.3\build\Fody.targets')" />
145+
<Import Project="..\packages\Fody.1.29.4\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" />
143146
</Project>

‎Source/GitReleaseManager.Cli/Options/AddAssetSubOptions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
namespace GitReleaseManager.Cli.Options
88
{
99
using System.Collections.Generic;
10-
1110
using CommandLine;
1211

12+
[Verb("addasset", HelpText = "Adds an asset to an existing release.")]
1313
public class AddAssetSubOptions : BaseGitHubSubOptions
1414
{
15-
[OptionList('a', "assets", Separator = ',', HelpText = "Paths to the files to include in the release.", Required = true)]
15+
[Option('a', "assets", Separator = ',', HelpText = "Paths to the files to include in the release.", Required = true)]
1616
public IList<string> AssetPaths { get; set; }
1717

1818
[Option('t', "tagName", HelpText = "The name of the release (Typically this is the generated SemVer Version Number).", Required = true)]

‎Source/GitReleaseManager.Cli/Options/CloseSubOptions.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ namespace GitReleaseManager.Cli.Options
88
{
99
using CommandLine;
1010

11+
[Verb("close", HelpText = "Closes the milestone.")]
1112
public class CloseSubOptions : BaseGitHubSubOptions
1213
{
1314
[Option('m', "milestone", HelpText = "The milestone to use.", Required = true)]

‎Source/GitReleaseManager.Cli/Options/CreateSubOptions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
namespace GitReleaseManager.Cli.Options
88
{
99
using System.Collections.Generic;
10-
1110
using CommandLine;
1211

12+
[Verb("create", HelpText = "Creates a draft release notes from a milestone.")]
1313
public class CreateSubOptions : BaseGitHubSubOptions
1414
{
15-
[OptionList('a', "assets", Separator = ',', HelpText = "Paths to the files to include in the release.", Required = false)]
15+
[Option('a', "assets", Separator = ',', HelpText = "Paths to the files to include in the release.", Required = false)]
1616
public IList<string> AssetPaths { get; set; }
1717

1818
[Option('c', "targetcommitish", HelpText = "The commit to tag. Can be a branch or SHA. Defaults to repository's default branch.", Required = false)]

‎Source/GitReleaseManager.Cli/Options/ExportSubOptions.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ namespace GitReleaseManager.Cli.Options
88
{
99
using CommandLine;
1010

11+
[Verb("export", HelpText = "Exports all the Release Notes in markdown format.")]
1112
public class ExportSubOptions : BaseGitHubSubOptions
1213
{
1314
[Option('f', "fileOutputPath", HelpText = "Path to the file export releases.", Required = true)]

‎Source/GitReleaseManager.Cli/Options/InitSubOptions.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66

77
namespace GitReleaseManager.Cli.Options
88
{
9+
using CommandLine;
10+
11+
[Verb("init", HelpText = "Creates a sample Yaml Configuration file in root directory")]
912
public class InitSubOptions : BaseSubOptions
1013
{
1114
}

‎Source/GitReleaseManager.Cli/Options/MainOptions.cs

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,36 +6,26 @@
66

77
namespace GitReleaseManager.Cli.Options
88
{
9-
using CommandLine;
10-
using CommandLine.Text;
11-
129
public class MainOptions
1310
{
14-
[VerbOption("create", HelpText = "Creates a draft release notes from a milestone.")]
1511
public CreateSubOptions CreateVerb { get; set; }
1612

17-
[VerbOption("addasset", HelpText = "Adds an asset to an existing release.")]
1813
public AddAssetSubOptions AddAssetVerb { get; set; }
1914

20-
[VerbOption("close", HelpText = "Closes the milestone.")]
2115
public CloseSubOptions CloseVerb { get; set; }
2216

23-
[VerbOption("publish", HelpText = "Publishes the release notes and closes the milestone.")]
2417
public PublishSubOptions PublishVerb { get; set; }
2518

26-
[VerbOption("export", HelpText = "Exports all the Release Notes in markdown format.")]
2719
public ExportSubOptions ExportVerb { get; set; }
2820

29-
[VerbOption("init", HelpText = "Creates a sample Yaml Configuration file in root directory")]
3021
public InitSubOptions InitVerb { get; set; }
3122

32-
[VerbOption("showconfig", HelpText = "Shows the current configuration")]
3323
public ShowConfigSubOptions ShowConfigVerb { get; set; }
3424

35-
[HelpVerbOption]
36-
public string DoHelpForVerb(string verbName)
37-
{
38-
return HelpText.AutoBuild(this, verbName);
39-
}
25+
////[HelpVerbOption]
26+
////public string DoHelpForVerb(string verbName)
27+
////{
28+
//// return HelpText.AutoBuild(this, verbName);
29+
////}
4030
}
4131
}

‎Source/GitReleaseManager.Cli/Options/PublishSubOptions.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ namespace GitReleaseManager.Cli.Options
88
{
99
using CommandLine;
1010

11+
[Verb("publish", HelpText = "Publishes the release notes and closes the milestone.")]
1112
public class PublishSubOptions : BaseGitHubSubOptions
1213
{
1314
[Option('t', "tagName", HelpText = "The name of the release (Typically this is the generated SemVer Version Number).", Required = true)]

‎Source/GitReleaseManager.Cli/Options/ShowConfigSubOptions.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66

77
namespace GitReleaseManager.Cli.Options
88
{
9+
using CommandLine;
10+
11+
[Verb("showconfig", HelpText = "Shows the current configuration")]
912
public class ShowConfigSubOptions : BaseSubOptions
1013
{
1114
}

0 commit comments

Comments
 (0)