Skip to content

Commit f03f902

Browse files
gep13gep13
committed
Merge branch 'pr123' into develop
* pr123: (build) Change casing of NuGet Id (build) Switch to jsdeliver icon URLs (GH-116) Added the global tool project
2 parents beca26e + 26257ff commit f03f902

File tree

10 files changed

+87
-24
lines changed

10 files changed

+87
-24
lines changed

‎Source/GitReleaseManager.Cli/Directory.Build.props

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<Project>
2+
<PropertyGroup>
3+
<BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
4+
</PropertyGroup>
5+
</Project>

‎Source/GitReleaseManager.Cli/FodyWeavers.xml

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

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
44
<AssemblyName>GitReleaseManager</AssemblyName>
5-
<TargetFramework>net451</TargetFramework>
5+
<TargetFrameworks>netcoreapp2.0;net451</TargetFrameworks>
66
<BuildToolsFxCopVersion>1.0.1</BuildToolsFxCopVersion>
77
<IsWebBootstrapper>false</IsWebBootstrapper>
88
<PublishUrl>publish\</PublishUrl>
@@ -24,6 +24,7 @@
2424
<RunCodeAnalysis>False</RunCodeAnalysis>
2525
<CodeAnalysisTreatWarningsAsErrors>True</CodeAnalysisTreatWarningsAsErrors>
2626
<CodeAnalysisRuleSet>..\GitReleaseManager.ruleset</CodeAnalysisRuleSet>
27+
<IsPackable>false</IsPackable>
2728
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
2829
</PropertyGroup>
2930
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

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

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<AssemblyName>GitReleaseManager</AssemblyName>
6+
7+
<PackAsTool>true</PackAsTool>
8+
<TargetFrameworks>netcoreapp2.1</TargetFrameworks>
9+
<ToolCommandName>dotnet-gitreleasemanager</ToolCommandName>
10+
<PackageId>GitReleaseManager.Tool</PackageId>
11+
12+
<Title>GitReleaseManager Tool</Title>
13+
<Authors>GitTools Contributors</Authors>
14+
<PackageProjectUrl>https://github.com/GitTools/GitReleaseManager</PackageProjectUrl>
15+
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
16+
<PackageTags>github release notes create export</PackageTags>
17+
<Description>Tool for creating and exporting releases for software applications hosted on GitHub.</Description>
18+
<Copyright>Copyright (c) 2015 - Present - GitTools Contributors</Copyright>
19+
<PackageLicenseUrl>http://www.opensource.org/licenses/mit-license.php</PackageLicenseUrl>
20+
<PackageIconUrl>https://cdn.jsdelivr.net/gh/GitTools/GitReleaseManager@9c547452a10afaf83fce1b5833f4762487b017b7/Icons/package_icon.svg</PackageIconUrl>
21+
<PackageReleaseNotes>https://github.com/GitTools/GitReleaseManager/releases</PackageReleaseNotes>
22+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
23+
</PropertyGroup>
24+
25+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
26+
<RunCodeAnalysisRestore>False</RunCodeAnalysisRestore>
27+
</PropertyGroup>
28+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
29+
<RunCodeAnalysisRestore>True</RunCodeAnalysisRestore>
30+
</PropertyGroup>
31+
<Import Project="..\..\BuildScripts\CodeAnalysis.props" Condition="Exists('..\..\BuildScripts\CodeAnalysis.props')" />
32+
<Import Project="..\..\BuildScripts\StyleCop.props" Condition="Exists('..\..\BuildScripts\StyleCop.props')" />
33+
<ItemGroup>
34+
<Reference Include="System.Net.Http" />
35+
<Reference Include="System.Data.DataSetExtensions" />
36+
<Reference Include="Microsoft.CSharp" />
37+
</ItemGroup>
38+
<ItemGroup>
39+
<Compile Include="..\SolutionInfo.cs" Link="SolutionInfo.cs" />
40+
</ItemGroup>
41+
<ItemGroup>
42+
<CodeAnalysisDictionary Include="..\CustomDictionary.xml">
43+
<Link>CustomDictionary.xml</Link>
44+
<SubType>Designer</SubType>
45+
</CodeAnalysisDictionary>
46+
</ItemGroup>
47+
<ItemGroup>
48+
<ProjectReference Include="..\GitReleaseManager\GitReleaseManager.Core.csproj" />
49+
</ItemGroup>
50+
<ItemGroup>
51+
<PackageReference Include="CommandLineParser" Version="2.3.0" />
52+
<PackageReference Include="Octokit" Version="0.32.0" />
53+
</ItemGroup>
54+
</Project>

‎Source/GitReleaseManager.sln

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25123.0
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.28307.168
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuSpecs", "NuSpecs", "{87E2E61F-5F5D-45F1-8C4A-98E0BF8CA01D}"
77
ProjectSection(SolutionItems) = preProject
@@ -16,17 +16,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AppVeyor", "AppVeyor", "{EF
1616
..\appveyor.yml = ..\appveyor.yml
1717
EndProjectSection
1818
EndProject
19-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitReleaseManager.Tests", "GitReleaseManager.Tests\GitReleaseManager.Tests.csproj", "{FAD045A3-CF63-48CA-BA49-8F4D79E3EF4F}"
19+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitReleaseManager.Tests", "GitReleaseManager.Tests\GitReleaseManager.Tests.csproj", "{FAD045A3-CF63-48CA-BA49-8F4D79E3EF4F}"
2020
EndProject
21-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitReleaseManager.Cli", "GitReleaseManager.Cli\GitReleaseManager.Cli.csproj", "{F1163F09-3D4E-4F95-AF46-24C15AB297FB}"
21+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitReleaseManager.Cli", "GitReleaseManager.Cli\GitReleaseManager.Cli.csproj", "{F1163F09-3D4E-4F95-AF46-24C15AB297FB}"
2222
EndProject
23-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitReleaseManager.Core", "GitReleaseManager\GitReleaseManager.Core.csproj", "{B02A026E-CA3A-48F4-BBA9-EB337B0A2035}"
23+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitReleaseManager.Core", "GitReleaseManager\GitReleaseManager.Core.csproj", "{B02A026E-CA3A-48F4-BBA9-EB337B0A2035}"
2424
EndProject
2525
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{38C8B147-E382-4176-95D4-42B83E560A1A}"
2626
ProjectSection(SolutionItems) = preProject
2727
.nuget\packages.config = .nuget\packages.config
2828
EndProjectSection
2929
EndProject
30+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitReleaseManager.Tool", "GitReleaseManager.Cli\GitReleaseManager.Tool.csproj", "{56F96DA7-E286-46C7-88DB-068F4BE96538}"
31+
EndProject
3032
Global
3133
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3234
Debug|Any CPU = Debug|Any CPU
@@ -45,11 +47,18 @@ Global
4547
{B02A026E-CA3A-48F4-BBA9-EB337B0A2035}.Debug|Any CPU.Build.0 = Debug|Any CPU
4648
{B02A026E-CA3A-48F4-BBA9-EB337B0A2035}.Release|Any CPU.ActiveCfg = Release|Any CPU
4749
{B02A026E-CA3A-48F4-BBA9-EB337B0A2035}.Release|Any CPU.Build.0 = Release|Any CPU
50+
{56F96DA7-E286-46C7-88DB-068F4BE96538}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
51+
{56F96DA7-E286-46C7-88DB-068F4BE96538}.Debug|Any CPU.Build.0 = Debug|Any CPU
52+
{56F96DA7-E286-46C7-88DB-068F4BE96538}.Release|Any CPU.ActiveCfg = Release|Any CPU
53+
{56F96DA7-E286-46C7-88DB-068F4BE96538}.Release|Any CPU.Build.0 = Release|Any CPU
4854
EndGlobalSection
4955
GlobalSection(SolutionProperties) = preSolution
5056
HideSolutionNode = FALSE
5157
EndGlobalSection
5258
GlobalSection(NestedProjects) = preSolution
5359
{EF94B2A3-E548-43B3-8A63-C7B28B5779D4} = {38C8B147-E382-4176-95D4-42B83E560A1A}
5460
EndGlobalSection
61+
GlobalSection(ExtensibilityGlobals) = postSolution
62+
SolutionGuid = {DBDED135-9696-4CB2-9D4D-EACFF30B4A99}
63+
EndGlobalSection
5564
EndGlobal

‎Source/GitReleaseManager/GitReleaseManager.Core.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<RootNamespace>GitSReleaseManager.Core</RootNamespace>
4-
<TargetFramework>net451</TargetFramework>
3+
<TargetFrameworks>netstandard2.0;net451</TargetFrameworks>
54
<BuildToolsFxCopVersion>1.0.1</BuildToolsFxCopVersion>
65
<Title>GitReleaseManager.Core</Title>
76
<Description>Create release notes in markdown given a GitHub milestone</Description>
@@ -10,6 +9,7 @@
109
<CodeAnalysisRuleSet>..\GitReleaseManager.ruleset</CodeAnalysisRuleSet>
1110
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1211
<DebugType>full</DebugType>
12+
<IsPackable>false</IsPackable>
1313
</PropertyGroup>
1414
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
1515
<RunCodeAnalysisRestore>False</RunCodeAnalysisRestore>

‎nuspec/chocolatey/GitReleaseManager.Portable.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<owners>gep13</owners>
99
<licenseUrl>https://github.com/GitTools/GitReleaseManager/blob/develop/LICENSE</licenseUrl>
1010
<projectUrl>https://github.com/GitTools/GitReleaseManager</projectUrl>
11-
<iconUrl>http://cdn.rawgit.com/GitTools/GitReleaseManager/9c547452a10afaf83fce1b5833f4762487b017b7/Icons/package_icon.svg</iconUrl>
11+
<iconUrl>https://cdn.jsdelivr.net/gh/GitTools/GitReleaseManager@9c547452a10afaf83fce1b5833f4762487b017b7/Icons/package_icon.svg</iconUrl>
1212
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1313
<description>Tool for creating and exporting releases for software applications hosted on GitHub</description>
1414
<summary>Tool for creating and exporting releases for software applications hosted on GitHub</summary>

‎nuspec/nuget/GitReleaseManager.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
4-
<id>gitreleasemanager</id>
4+
<id>GitReleaseManager</id>
55
<title>GitReleaseManager</title>
66
<version>$version$</version>
77
<authors>GitTools Contributors</authors>
88
<owners>gep13</owners>
99
<licenseUrl>https://github.com/GitTools/GitReleaseManager/blob/develop/LICENSE</licenseUrl>
1010
<projectUrl>https://github.com/GitTools/GitReleaseManager</projectUrl>
11-
<iconUrl>http://cdn.rawgit.com/GitTools/GitReleaseManager/9c547452a10afaf83fce1b5833f4762487b017b7/Icons/package_icon.svg</iconUrl>
11+
<iconUrl>https://cdn.jsdelivr.net/gh/GitTools/GitReleaseManager@9c547452a10afaf83fce1b5833f4762487b017b7/Icons/package_icon.svg</iconUrl>
1212
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1313
<description>Tool for creating and exporting releases for software applications hosted on GitHub</description>
1414
<summary>Tool for creating and exporting releases for software applications hosted on GitHub</summary>

‎recipe.cake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ BuildParameters.SetParameters(context: Context,
1010
repositoryOwner: "GitTools",
1111
repositoryName: "GitReleaseManager",
1212
appVeyorAccountName: "GitTools",
13-
shouldRunGitVersion: true);
13+
shouldRunGitVersion: true,
14+
shouldRunDotNetCorePack: true);
1415

1516
BuildParameters.PrintParameters(Context);
1617

‎tools/packages.config

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<packages>
3-
<package id="Cake" version="0.30.0" />
4-
</packages>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Cake" version="0.31.0" />
4+
</packages>

0 commit comments

Comments
 (0)