Skip to content

Commit 39fb446

Browse files
committed
Add Nerdbank.Gitversioning
- Remove appveyor builds
1 parent 2ee6ebf commit 39fb446

File tree

10 files changed

+56
-58
lines changed

10 files changed

+56
-58
lines changed

.github/release-drafter.yml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
template: |
2+
## What’s Changed
3+
4+
$CHANGES

.github/workflows/dotnet-desktop.yml

+18-4
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,19 @@ jobs:
2222
with:
2323
fetch-depth: 0
2424

25-
- name: env
26-
run: |
27-
get-childitem env:
28-
whoami /all
25+
- name: Nerdbank.GitVersioning
26+
uses: dotnet/[email protected]
27+
with:
28+
# Defines ALL version variables as environment variables, with a "NBGV_" prefix.
29+
setAllVars: true
30+
# Defines a few common version variables as environment variables, with a "Git" prefix (e.g. GitBuildVersion, GitBuildVersionSimple, GitAssemblyInformationalVersion).
31+
setCommonVars: true
2932

3033
- name: Setup MSBuild.exe
3134
uses: microsoft/[email protected]
35+
36+
- name: NuGet Restore
37+
run: nuget restore
3238

3339
- name: Build
3440
run: msbuild $env:Solution_Name
@@ -54,3 +60,11 @@ jobs:
5460
with:
5561
name: test logs
5662
path: ${{ github.workspace }}\**\*.log
63+
64+
- name: Pack
65+
run: nuget pack .\PowerShellWixExtension.nuspec -Version "$env:NBGV_NuGetPackageVersion" -Properties "Configuration=$env:Configuration"
66+
67+
- uses: actions/upload-artifact@v2
68+
with:
69+
name: nupkg
70+
path: ${{ github.workspace }}\PowerShellWixExtension.${{ env.NBGV_NuGetPackageVersion }}.nupkg

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -158,3 +158,4 @@ $RECYCLE.BIN/
158158
/NuGet/tools/lib
159159
/NuGet/*.nupkg
160160
/.vs/
161+
/*.nupkg

Directory.Build.props

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<PackageReference Include="Nerdbank.GitVersioning">
5+
<Version>3.3.37</Version>
6+
<PrivateAssets>all</PrivateAssets>
7+
</PackageReference>
8+
</ItemGroup>
9+
</Project>
+1-15
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System.Reflection;
2-
using System.Runtime.CompilerServices;
32
using System.Runtime.InteropServices;
43

54
// General Information about an assembly is controlled through the following
@@ -9,7 +8,7 @@
98
[assembly: AssemblyDescription("")]
109
[assembly: AssemblyCompany("")]
1110
[assembly: AssemblyProduct("PowerShellActions")]
12-
[assembly: AssemblyCopyright("Copyright © 2014")]
11+
[assembly: AssemblyCopyright("Copyright © David Gardiner 2014-2021")]
1312
[assembly: AssemblyTrademark("")]
1413
[assembly: AssemblyCulture("")]
1514

@@ -20,16 +19,3 @@
2019

2120
// The following GUID is for the ID of the typelib if this project is exposed to COM
2221
[assembly: Guid("e9c2a5aa-6c22-41f0-bf56-6a62b83d0001")]
23-
24-
// Version information for an assembly consists of the following four values:
25-
//
26-
// Major Version
27-
// Minor Version
28-
// Build Number
29-
// Revision
30-
//
31-
// You can specify all the values or you can default the Build and Revision Numbers
32-
// by using the '*' as shown below:
33-
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("1.0.0.0")]
35-
[assembly: AssemblyFileVersion("1.0.0.0")]

PowerShellWixExtension.nuspec

+4-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
<authors>David Gardiner</authors>
1010
<owners>David Gardiner</owners>
1111
<projectUrl>https://github.com/flcdrg/PowerShellWixExtension/</projectUrl>
12-
<licenseUrl>https://github.com/flcdrg/PowerShellWixExtension/blob/master/LICENSE.txt</licenseUrl>
12+
<license type="file">LICENSE.txt</license>
13+
<repository type="git" url="https://github.com/flcdrg/PowerShellWixExtension" />
1314
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1415
<tags>WiX PowerShell MSI Installer WixToolset XML</tags>
1516
<releaseNotes>
@@ -20,6 +21,8 @@
2021
<files>
2122
<file src="NuGet\content\*.*" target="content" />
2223
<file src="NuGet\tools\**\*.*" target="tools" />
24+
<file src="LICENSE.txt" />
25+
<file src="MSRL-LICENSE.txt" />
2326
</files>
2427

2528
</package>
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System.Reflection;
2-
using System.Runtime.CompilerServices;
32
using System.Runtime.InteropServices;
43
using Microsoft.Tools.WindowsInstallerXml;
54

@@ -11,7 +10,7 @@
1110
[assembly: AssemblyConfiguration("")]
1211
[assembly: AssemblyCompany("")]
1312
[assembly: AssemblyProduct("PowerShellWixExtension")]
14-
[assembly: AssemblyCopyright("Copyright © David Gardiner 2014-2016")]
13+
[assembly: AssemblyCopyright("Copyright © David Gardiner 2014-2021")]
1514
[assembly: AssemblyTrademark("")]
1615
[assembly: AssemblyCulture("")]
1716

@@ -23,17 +22,4 @@
2322
// The following GUID is for the ID of the typelib if this project is exposed to COM
2423
[assembly: Guid("7abfedd7-d0f1-489a-a1f4-fb5e3e0bd038")]
2524

26-
// Version information for an assembly consists of the following four values:
27-
//
28-
// Major Version
29-
// Minor Version
30-
// Build Number
31-
// Revision
32-
//
33-
// You can specify all the values or you can default the Build and Revision Numbers
34-
// by using the '*' as shown below:
35-
// [assembly: AssemblyVersion("1.0.*")]
36-
[assembly: AssemblyVersion("3.0.0.0")]
37-
[assembly: AssemblyFileVersion("3.0.0.0")]
38-
3925
[assembly: AssemblyDefaultWixExtension(typeof(PowerShellWixExtension.PowerShellWixExtension))]

appveyor.yml

-23
This file was deleted.

nuget.exe

-3.77 MB
Binary file not shown.

version.json

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
3+
"version": "3.0",
4+
"publicReleaseRefSpec": [
5+
"^refs/heads/master$",
6+
"^refs/heads/v\\d+(?:\\.\\d+)?$"
7+
],
8+
"cloudBuild": {
9+
"setAllVariables": true,
10+
"buildNumber": {
11+
"enabled": true,
12+
"includeCommitId": {
13+
"when": "always",
14+
"where": "buildMetadata"
15+
}
16+
}
17+
}
18+
}

0 commit comments

Comments
 (0)