Skip to content

Commit 329445a

Browse files
gep13gep13
committed
Merge branch 'pr114' into develop
* pr114: (doc) Updated copyright (build) Renamed setup.cake to recipe.cake (build) Renamed AppVeyor yml file (build) Added header for AppVeyor section (build) Remove pinning of specific version of Cake.Recipe (build) Switch to AppVeyor feed (build) Ensure CodeCoverage report is generated (build) Removed Outputpath migrated to sdk project format packages.config to PackageReference nuget update test and cli project
2 parents e8ce137 + eddefce commit 329445a

21 files changed

+425
-695
lines changed

‎appveyor.yml renamed to ‎.appveyor.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
#---------------------------------#
2+
# Build Image #
3+
#---------------------------------#
4+
image: Visual Studio 2017
5+
16
#---------------------------------#
27
# Build Script #
38
#---------------------------------#

‎Source/GitReleaseManager.Cli/AssemblyInfo.cs

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

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

Lines changed: 16 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,9 @@
1-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
32
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProjectGuid>{F1163F09-3D4E-4F95-AF46-24C15AB297FB}</ProjectGuid>
73
<OutputType>Exe</OutputType>
8-
<AppDesignerFolder>Properties</AppDesignerFolder>
9-
<RootNamespace>GitReleaseManager.Cli</RootNamespace>
104
<AssemblyName>GitReleaseManager</AssemblyName>
11-
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
12-
<FileAlignment>512</FileAlignment>
13-
<NuGetPackageImportStamp>
14-
</NuGetPackageImportStamp>
15-
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
16-
<RestorePackages>true</RestorePackages>
5+
<TargetFramework>net451</TargetFramework>
176
<BuildToolsFxCopVersion>1.0.1</BuildToolsFxCopVersion>
18-
<TargetFrameworkProfile />
197
<IsWebBootstrapper>false</IsWebBootstrapper>
208
<PublishUrl>publish\</PublishUrl>
219
<Install>true</Install>
@@ -31,73 +19,28 @@
3119
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
3220
<UseApplicationTrust>false</UseApplicationTrust>
3321
<BootstrapperEnabled>true</BootstrapperEnabled>
34-
</PropertyGroup>
35-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
36-
<PlatformTarget>AnyCPU</PlatformTarget>
37-
<DebugSymbols>true</DebugSymbols>
38-
<DebugType>full</DebugType>
39-
<Optimize>false</Optimize>
40-
<OutputPath>..\..\BuildArtifacts\</OutputPath>
41-
<DefineConstants>DEBUG;TRACE</DefineConstants>
42-
<ErrorReport>prompt</ErrorReport>
43-
<WarningLevel>4</WarningLevel>
22+
<Title>GitReleaseManager.Cli</Title>
23+
<Description>Create release notes in markdown given a GitHub milestone</Description>
4424
<RunCodeAnalysis>False</RunCodeAnalysis>
45-
<CodeAnalysisRuleSet>..\GitReleaseManager.ruleset</CodeAnalysisRuleSet>
4625
<CodeAnalysisTreatWarningsAsErrors>True</CodeAnalysisTreatWarningsAsErrors>
26+
<CodeAnalysisRuleSet>..\GitReleaseManager.ruleset</CodeAnalysisRuleSet>
27+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
28+
</PropertyGroup>
29+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
4730
<RunCodeAnalysisRestore>False</RunCodeAnalysisRestore>
4831
</PropertyGroup>
49-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
50-
<PlatformTarget>AnyCPU</PlatformTarget>
51-
<DebugType>pdbonly</DebugType>
52-
<Optimize>true</Optimize>
53-
<OutputPath>..\..\BuildArtifacts\</OutputPath>
54-
<DefineConstants>TRACE;</DefineConstants>
55-
<ErrorReport>prompt</ErrorReport>
56-
<WarningLevel>4</WarningLevel>
57-
<RunCodeAnalysis>False</RunCodeAnalysis>
58-
<CodeAnalysisRuleSet>..\GitReleaseManager.ruleset</CodeAnalysisRuleSet>
59-
<CodeAnalysisTreatWarningsAsErrors>True</CodeAnalysisTreatWarningsAsErrors>
60-
<RunCodeAnalysisRestore>true</RunCodeAnalysisRestore>
32+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
33+
<RunCodeAnalysisRestore>True</RunCodeAnalysisRestore>
6134
</PropertyGroup>
35+
<Import Project="..\..\BuildScripts\CodeAnalysis.props" Condition="Exists('..\..\BuildScripts\CodeAnalysis.props')" />
36+
<Import Project="..\..\BuildScripts\StyleCop.props" Condition="Exists('..\..\BuildScripts\StyleCop.props')" />
6237
<ItemGroup>
63-
<Reference Include="CommandLine, Version=2.2.1.0, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">
64-
<HintPath>..\packages\CommandLineParser.2.2.1\lib\net45\CommandLine.dll</HintPath>
65-
</Reference>
66-
<Reference Include="Octokit, Version=0.29.0.0, Culture=neutral, processorArchitecture=MSIL">
67-
<HintPath>..\packages\Octokit.0.29.0\lib\net45\Octokit.dll</HintPath>
68-
</Reference>
69-
<Reference Include="System" />
70-
<Reference Include="System.Core" />
7138
<Reference Include="System.Net.Http" />
72-
<Reference Include="System.Xml.Linq" />
7339
<Reference Include="System.Data.DataSetExtensions" />
7440
<Reference Include="Microsoft.CSharp" />
75-
<Reference Include="System.Data" />
76-
<Reference Include="System.Xml" />
7741
</ItemGroup>
7842
<ItemGroup>
79-
<Compile Include="AssemblyInfo.cs" />
80-
<Compile Include="GlobalSuppressions.cs" />
81-
<Compile Include="Options\AddAssetSubOptions.cs" />
82-
<Compile Include="Options\BaseGitHubSubOptions.cs" />
83-
<Compile Include="Options\BaseSubOptions.cs" />
84-
<Compile Include="Options\CloseSubOptions.cs" />
85-
<Compile Include="Options\CreateSubOptions.cs" />
86-
<Compile Include="Options\ExportSubOptions.cs" />
87-
<Compile Include="Options\InitSubOptions.cs" />
88-
<Compile Include="Options\MainOptions.cs" />
89-
<Compile Include="Options\PublishSubOptions.cs" />
90-
<Compile Include="Options\ShowConfigSubOptions.cs" />
91-
<Compile Include="..\SolutionInfo.cs">
92-
<Link>SolutionInfo.cs</Link>
93-
</Compile>
94-
</ItemGroup>
95-
<ItemGroup>
96-
<None Include="app.config" />
97-
<None Include="packages.config">
98-
<SubType>Designer</SubType>
99-
</None>
100-
<Compile Include="Program.cs" />
43+
<Compile Include="..\SolutionInfo.cs" Link="SolutionInfo.cs" />
10144
</ItemGroup>
10245
<ItemGroup>
10346
<CodeAnalysisDictionary Include="..\CustomDictionary.xml">
@@ -106,29 +49,10 @@
10649
</CodeAnalysisDictionary>
10750
</ItemGroup>
10851
<ItemGroup>
109-
<BootstrapperPackage Include=".NETFramework,Version=v4.5.1">
110-
<Visible>False</Visible>
111-
<ProductName>Microsoft .NET Framework 4.5.1 %28x86 and x64%29</ProductName>
112-
<Install>true</Install>
113-
</BootstrapperPackage>
114-
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
115-
<Visible>False</Visible>
116-
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
117-
<Install>false</Install>
118-
</BootstrapperPackage>
119-
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
120-
<Visible>False</Visible>
121-
<ProductName>.NET Framework 3.5 SP1</ProductName>
122-
<Install>false</Install>
123-
</BootstrapperPackage>
52+
<ProjectReference Include="..\GitReleaseManager\GitReleaseManager.Core.csproj" />
12453
</ItemGroup>
12554
<ItemGroup>
126-
<ProjectReference Include="..\GitReleaseManager\GitReleaseManager.Core.csproj">
127-
<Project>{b02a026e-ca3a-48f4-bba9-eb337b0a2035}</Project>
128-
<Name>GitReleaseManager.Core</Name>
129-
</ProjectReference>
55+
<PackageReference Include="CommandLineParser" Version="2.3.0" />
56+
<PackageReference Include="Octokit" Version="0.32.0" />
13057
</ItemGroup>
131-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
132-
<Import Project="..\..\BuildScripts\CodeAnalysis.props" Condition="Exists('..\..\BuildScripts\CodeAnalysis.props')" />
133-
<Import Project="..\..\BuildScripts\StyleCop.props" Condition="Exists('..\..\BuildScripts\StyleCop.props')" />
13458
</Project>

‎Source/GitReleaseManager.Cli/app.config

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

‎Source/GitReleaseManager.Cli/packages.config

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

‎Source/GitReleaseManager.Tests/AssemblyInfo.cs

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

‎Source/GitReleaseManager.Tests/GitReleaseManager.Tests.csproj

Lines changed: 13 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -1,108 +1,32 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
42
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{FAD045A3-CF63-48CA-BA49-8F4D79E3EF4F}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>GitReleaseManager.Tests</RootNamespace>
11-
<AssemblyName>GitReleaseManager.Tests</AssemblyName>
12-
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
15-
<RestorePackages>true</RestorePackages>
16-
<TargetFrameworkProfile />
17-
<NuGetPackageImportStamp>
18-
</NuGetPackageImportStamp>
19-
</PropertyGroup>
20-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
21-
<DebugSymbols>true</DebugSymbols>
3+
<TargetFramework>net472</TargetFramework>
4+
<Title>GitReleaseManager.Tests</Title>
5+
<Description>Test Project for GitReleaseManager</Description>
226
<DebugType>full</DebugType>
23-
<Optimize>false</Optimize>
24-
<OutputPath>..\..\BuildArtifacts\</OutputPath>
25-
<DefineConstants>DEBUG;TRACE</DefineConstants>
26-
<ErrorReport>prompt</ErrorReport>
27-
<WarningLevel>4</WarningLevel>
7+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
288
</PropertyGroup>
29-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
30-
<DebugType>full</DebugType>
9+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
3110
<Optimize>false</Optimize>
32-
<OutputPath>..\..\BuildArtifacts\</OutputPath>
33-
<DefineConstants>TRACE</DefineConstants>
34-
<ErrorReport>prompt</ErrorReport>
35-
<WarningLevel>4</WarningLevel>
3611
<DebugSymbols>true</DebugSymbols>
3712
</PropertyGroup>
3813
<ItemGroup>
39-
<Reference Include="AlphaFS, Version=2.1.0.0, Culture=neutral, PublicKeyToken=4d31a58f7d7ad5c9, processorArchitecture=MSIL">
40-
<HintPath>..\packages\AlphaFS.2.1.3\lib\net451\AlphaFS.dll</HintPath>
41-
</Reference>
42-
<Reference Include="ApprovalTests, Version=3.0.0.0, Culture=neutral, PublicKeyToken=11bd7d124fc62e0f, processorArchitecture=MSIL">
43-
<HintPath>..\packages\ApprovalTests.3.0.14\lib\net45\ApprovalTests.dll</HintPath>
44-
</Reference>
45-
<Reference Include="ApprovalUtilities, Version=3.0.0.0, Culture=neutral, PublicKeyToken=11bd7d124fc62e0f, processorArchitecture=MSIL">
46-
<HintPath>..\packages\ApprovalUtilities.3.0.14\lib\net45\ApprovalUtilities.dll</HintPath>
47-
</Reference>
48-
<Reference Include="nunit.framework, Version=3.9.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
49-
<HintPath>..\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll</HintPath>
50-
</Reference>
51-
<Reference Include="Octokit, Version=0.29.0.0, Culture=neutral, processorArchitecture=MSIL">
52-
<HintPath>..\packages\Octokit.0.29.0\lib\net45\Octokit.dll</HintPath>
53-
</Reference>
54-
<Reference Include="System" />
55-
<Reference Include="System.Core" />
5614
<Reference Include="System.Net.Http" />
57-
<Reference Include="System.Transactions" />
5815
<Reference Include="System.Windows.Forms" />
59-
<Reference Include="System.Xml.Linq" />
6016
<Reference Include="System.Data.DataSetExtensions" />
6117
<Reference Include="Microsoft.CSharp" />
62-
<Reference Include="System.Data" />
63-
<Reference Include="System.Xml" />
64-
</ItemGroup>
65-
<ItemGroup>
66-
<Compile Include="ApprovalTestConfig.cs" />
67-
<Compile Include="AssemblyInfo.cs" />
68-
<Compile Include="ClipBoardHelper.cs" />
69-
<Compile Include="ConfigurationTests.cs" />
70-
<Compile Include="FakeGitHubClient.cs" />
71-
<Compile Include="Helper.cs" />
72-
<Compile Include="ReleaseNotesBuilderIntegrationTests.cs" />
73-
<Compile Include="ClientBuilder.cs" />
74-
<Compile Include="ReleaseNotesBuilderTests.cs" />
75-
<Compile Include="ReleaseNotesExporterTests.cs" />
76-
<Compile Include="Resources.Designer.cs">
77-
<AutoGen>True</AutoGen>
78-
<DesignTime>True</DesignTime>
79-
<DependentUpon>Resources.resx</DependentUpon>
80-
</Compile>
81-
<Compile Include="..\SolutionInfo.cs">
82-
<Link>SolutionInfo.cs</Link>
83-
</Compile>
8418
</ItemGroup>
8519
<ItemGroup>
86-
<None Include="packages.config">
87-
<SubType>Designer</SubType>
88-
</None>
20+
<Compile Include="..\SolutionInfo.cs" Link="SolutionInfo.cs" />
8921
</ItemGroup>
9022
<ItemGroup>
91-
<ProjectReference Include="..\GitReleaseManager\GitReleaseManager.Core.csproj">
92-
<Project>{b02a026e-ca3a-48f4-bba9-eb337b0a2035}</Project>
93-
<Name>GitReleaseManager.Core</Name>
94-
</ProjectReference>
23+
<ProjectReference Include="..\GitReleaseManager\GitReleaseManager.Core.csproj" />
9524
</ItemGroup>
9625
<ItemGroup>
97-
<EmbeddedResource Include="Resources.resx">
98-
<Generator>ResXFileCodeGenerator</Generator>
99-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
100-
</EmbeddedResource>
26+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
27+
<PackageReference Include="ApprovalTests" Version="3.0.18" />
28+
<PackageReference Include="NUnit" Version="3.11.0" />
29+
<PackageReference Include="NUnit3TestAdapter" Version="3.11.2" />
30+
<PackageReference Include="Octokit" Version="0.32.0" />
10131
</ItemGroup>
102-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
103-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
104-
<PropertyGroup>
105-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
106-
</PropertyGroup>
107-
</Target>
10832
</Project>

‎Source/GitReleaseManager.Tests/ReleaseNotesBuilderTests.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,12 @@ private static void AcceptTest(int commits, Config config, params Issue[] issues
151151

152152
private static Milestone CreateMilestone(string version)
153153
{
154-
return new Milestone(null, "https://github.com/gep13/FakeRepository/issues?q=milestone%3A" + version, 0, ItemState.Open, version, String.Empty, null, 0, 0, DateTimeOffset.Now, null, null, null);
154+
return new Milestone(null, "https://github.com/gep13/FakeRepository/issues?q=milestone%3A" + version, 0, null, ItemState.Open, version, String.Empty, null, 0, 0, DateTimeOffset.Now, null, null, null);
155155
}
156156

157157
private static Issue CreateIssue(int number, params string[] labels)
158158
{
159-
var user = new User(null, null, null, 0, null, DateTimeOffset.Now, DateTimeOffset.Now, 0, null, 0, 0, null, null, 0, 0, null, "gep13", "gep31", 0, null, 0, 0, 0, null, null, false, null, null);
159+
var user = new User(null, null, null, 0, null, DateTimeOffset.Now, DateTimeOffset.Now, 0, null, 0, 0, null, null, 0, 0, null, null, "gep13", "gep31", 0, null, 0, 0, 0, null, null, false, null, null);
160160

161161
return new Issue(
162162
null,
@@ -168,9 +168,9 @@ private static Issue CreateIssue(int number, params string[] labels)
168168
"Issue " + number,
169169
"Some issue",
170170
null,
171-
null,
172-
labels.Select(x => new Label(null, x, null)).ToArray(),
173171
user,
172+
labels.Select(x => new Label(null, x, null, null, null, false)).ToArray(),
173+
null,
174174
null,
175175
null,
176176
0,
@@ -179,7 +179,9 @@ private static Issue CreateIssue(int number, params string[] labels)
179179
DateTimeOffset.Now,
180180
null,
181181
0,
182+
null,
182183
false,
184+
null,
183185
null);
184186
}
185187
}

‎Source/GitReleaseManager.Tests/ReleaseNotesExporterTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ private static Release CreateRelease(int id, DateTime createdDateTime, string mi
8686
stringBuilder.AppendLine();
8787
stringBuilder.AppendLine("- [__#3__](http://example.com/3) Issue 3");
8888

89-
return new Release(null, null, null, null, id, milestone, "master", milestone, stringBuilder.ToString(), false, false, createdDateTime, null, null, null, null, null);
89+
return new Release(null, null, null, null, id, null, milestone, "master", milestone, stringBuilder.ToString(), false, false, createdDateTime, null, null, null, null, null);
9090
}
9191
}
9292
}

‎Source/GitReleaseManager.Tests/packages.config

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

0 commit comments

Comments
 (0)