Skip to content

Commit bd6b68e

Browse files
committed
Updated nuget package
1 parent 676b0ac commit bd6b68e

6 files changed

+25
-43
lines changed

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*.suo
66
*.user
77
*.sln.docstates
8+
.vs/
89

910
# Build results
1011
[Dd]ebug/
@@ -125,7 +126,7 @@ publish/
125126
# Publish Web Output
126127
*.[Pp]ublish.xml
127128
*.azurePubxml
128-
# TODO: Comment the next line if you want to checkin your web deploy settings
129+
# TODO: Comment the next line if you want to checkin your web deploy settings
129130
# but database connection strings (with potential passwords) will be unencrypted
130131
*.pubxml
131132
*.publishproj

build.tasks.ps1

+4-12
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ properties {
22
# build variables
33
$framework = "4.5.1" # .net framework version
44
$configuration = "Release" # build configuration
5-
$script:version = "1.0.0"
6-
$script:nugetVersion = "1.0.0"
5+
$script:version = "0.0.1"
6+
$script:nugetVersion = "0.0.1"
77
$script:runCoverity = $false
88

99
# directories
@@ -156,19 +156,11 @@ task pack -depends build, pack-only
156156

157157
task pack-only -depends SetChocolateyPath {
158158

159-
mkdir $nuget_pack_dir
160-
cp "$nuspec_filename" "$nuget_pack_dir"
161-
162-
cp "$build_output_dir\*.*" "$nuget_pack_dir"
163-
164-
$Spec = [xml](get-content "$nuget_pack_dir\$nuspec_filename")
165-
$Spec.package.metadata.version = ([string]$Spec.package.metadata.version).Replace("{Version}", $script:nugetVersion)
166-
$Spec.Save("$nuget_pack_dir\$nuspec_filename")
167-
168159
$chocolateyBinDir = Join-Path $script:chocolateyDir -ChildPath "bin";
160+
169161
$NuGetExe = Join-Path $chocolateyBinDir -ChildPath "NuGet.exe";
170162

171-
exec { & $NuGetExe pack "$nuget_pack_dir\$nuspec_filename" }
163+
exec { & $NuGetExe pack .\src\csmacnz.CoverityPublisher\csmacnz.CoverityPublisher.nuspec -Version $script:nugetVersion -Properties Configuration=Release }
172164
}
173165

174166
task postbuild -depends pack, archive, coverage-only, coveralls

src/csmacnz.CoverityPublisher.sln

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1414
..\build.tasks.ps1 = ..\build.tasks.ps1
1515
..\CodeCoverage.runsettings = ..\CodeCoverage.runsettings
1616
..\GitVersionConfig.yaml = ..\GitVersionConfig.yaml
17-
..\PublishCoverity.nuspec = ..\PublishCoverity.nuspec
1817
..\README.md = ..\README.md
1918
EndProjectSection
2019
EndProject
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,19 @@
11
using System.Reflection;
22
using System.Runtime.InteropServices;
33

4-
// General Information about an assembly is controlled through the following
5-
// set of attributes. Change these attribute values to modify the information
6-
// associated with an assembly.
74
[assembly: AssemblyTitle("csmacnz.CoverityPublisher")]
8-
[assembly: AssemblyDescription("")]
5+
[assembly: AssemblyDescription("A simple command-line publishing tool for Coverity Scan Static Analysis results.")]
96
[assembly: AssemblyConfiguration("")]
10-
[assembly: AssemblyCompany("csmacnz")]
7+
[assembly: AssemblyCompany("csMACnz")]
118
[assembly: AssemblyProduct("csmacnz.CoverityPublisher")]
129
[assembly: AssemblyCopyright("Copyright © csMACnz 2015")]
1310
[assembly: AssemblyTrademark("")]
1411
[assembly: AssemblyCulture("")]
1512

16-
// Setting ComVisible to false makes the types in this assembly not visible
17-
// to COM components. If you need to access a type in this assembly from
18-
// COM, set the ComVisible attribute to true on that type.
1913
[assembly: ComVisible(false)]
2014

21-
// The following GUID is for the ID of the typelib if this project is exposed to COM
2215
[assembly: Guid("84408af8-246e-4e3c-a2cc-52142bbf5703")]
2316

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("0.1.0.0")]
35-
[assembly: AssemblyFileVersion("0.1.0.0")]
36-
[assembly: AssemblyInformationalVersion("0.1.0.0")]
17+
[assembly: AssemblyVersion("0.0.1.0")]
18+
[assembly: AssemblyFileVersion("0.0.1.0")]
19+
[assembly: AssemblyInformationalVersion("0.0.1.0-gamma")]

src/csmacnz.CoverityPublisher/csmacnz.CoverityPublisher.csproj

+3-2
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
</ItemGroup>
9494
<ItemGroup>
9595
<None Include="App.config" />
96+
<None Include="csmacnz.CoverityPublisher.nuspec" />
9697
<None Include="packages.config">
9798
<SubType>Designer</SubType>
9899
</None>
@@ -103,8 +104,8 @@
103104
<None Include="T4DocoptNet.tt.hooks.t4" />
104105
</ItemGroup>
105106
<ItemGroup>
106-
<Content Include="Main.usage.txt" />
107-
<Content Include="Properties\PublishCoverity.ico" />
107+
<None Include="Main.usage.txt" />
108+
<None Include="Properties\PublishCoverity.ico" />
108109
<None Include="T4DocoptNet.tt.settings.xml" />
109110
</ItemGroup>
110111
<ItemGroup>
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,25 @@
11
<?xml version="1.0"?>
2-
<package >
2+
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>PublishCoverity</id>
5-
<version>{Version}</version>
5+
<version>$version$</version>
66
<title>PublishCoverity</title>
7-
<authors>csmacnz</authors>
8-
<owners>csmacnz</owners>
7+
<authors>csMACnz</authors>
8+
<owners>csMACnz</owners>
99
<licenseUrl>https://github.com/csMACnz/coveritypublisher/blob/master/LICENSE</licenseUrl>
1010
<projectUrl>https://github.com/csMACnz/coveritypublisher</projectUrl>
11-
<iconUrl>http://img.csmac.nz/PublishCoverity-32.png</iconUrl>
11+
<iconUrl>http://img.csmac.nz/PublishCoverity-256.png</iconUrl>
1212
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1313
<description>A simple command-line publishing tool for Coverity Scan Static Analysis results.</description>
1414
<summary>A simple command-line publishing tool for Coverity Scan Static Analysis results.</summary>
1515
<language>en-US</language>
1616
<copyright>Copyright 2015</copyright>
1717
<tags>coverity scan static analysis upload utility</tags>
18+
<developmentDependency>true</developmentDependency>
1819
</metadata>
20+
<files>
21+
<file src="bin\$configuration$\*.exe" target="tools\" exclude="bin\$configuration$\*.vshost.exe"/>
22+
<file src="bin\$configuration$\*.exe.config" target="tools\" exclude="bin\$configuration$\*.vshost.exe.config" />
23+
<file src="bin\$configuration$\*.dll" target="tools\" />
24+
</files>
1925
</package>

0 commit comments

Comments
 (0)