Skip to content

Commit

Permalink
Removes 4.5 special case and generic nuspec
Browse files Browse the repository at this point in the history
  • Loading branch information
@serialseb
serialseb committed Mar 6, 2017
1 parent 62584d1 commit b82aae3
Show file tree
Hide file tree
Showing 3 changed files with 112 additions and 50 deletions.
60 changes: 25 additions & 35 deletions ConsulStructure.nuspec
View file
Original file line number Diff line number Diff line change
@@ -1,38 +1,28 @@
<?xml version="1.0"?>
<package>
<metadata>
<id>ConsulStructure</id>
<version>$version$</version>
<title>ConsulStructure</title>
<authors>serialseb</authors>
<owners>serialseb</owners>
<developmentDependency>true</developmentDependency>
<licenseUrl>https://github.com/serialseb/ConsulStructure/tree/master/LICENSE.md</licenseUrl>
<projectUrl>https://github.com/serialseb/ConsulStructure/</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>No-frill no-dependency Consul Configuration.</description>
<copyright>Copyright 2017 Sebastien Lambla</copyright>
<tags>Consul Configuration</tags>
<releaseNotes>$releaseNotes$</releaseNotes>
<contentFiles>
<files include="contentFiles\cs\**\*.*" buildAction="compile"/>
</contentFiles>
<dependencies>
<group>
<dependency id="System.Net.Http"/>
</group>
<group targetFramework="net45">

</group>
</dependencies>
<frameworkAssemblies>
<frameworkAssembly assemblyName="System.Net.Http" targetFramework="net45" />
</frameworkAssemblies>
</metadata>
<files>
<file src="**/*.cs" exclude="bin/**/*.*;obj/**/*.*;Properties/**/*.*;Tests/**/*"
target="contentFiles/cs/any/App_Packages/ConsulStructure.$version$"/>
<file src="**/*.cs" exclude="bin/**/*.*;obj/**/*.*;Properties/**/*.*;Tests/**/*"
target="content/App_Packages/ConsulStructure.$version$"/>
</files>
<metadata>
<id>ConsulStructure</id>
<version>$version$</version>
<title>ConsulStructure</title>
<authors>$authors$</authors>
<owners>serialseb</owners>
<developmentDependency>true</developmentDependency>
<licenseUrl>$licenseUrl$</licenseUrl>
<projectUrl>$projectUrl$</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>$description</description>
<copyright>Copyright 2017 Sebastien Lambla</copyright>
<tags>Consul Configuration</tags>
<releaseNotes>$releaseNotes$</releaseNotes>
<contentFiles>
<files include="contentFiles\cs\**\*.*" buildAction="compile" />
</contentFiles>
<dependencies>
<dependency id="System.Net.Http" version="4" />
</dependencies>
</metadata>
<files>
<file src="**/*.cs" exclude="bin/**/*.*;obj/**/*.*;Properties/**/*.*;Tests/**/*" target="contentFiles/cs/any/App_Packages/ConsulStructure.$version$" />
<file src="**/*.cs" exclude="bin/**/*.*;obj/**/*.*;Properties/**/*.*;Tests/**/*" target="content/App_Packages/ConsulStructure.$version$" />
</files>
</package>
24 changes: 9 additions & 15 deletions build/funcs/Create-Package.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,19 @@ function Get-GitHubRepo([string]$uri="") {
}

$releaseNotes = 'Pre-release, see https://github.com/serialseb/ConsulStructure/blob/master/CHANGELOG.md for the latest details'

$nuspecPath = "$($env:APPVEYOR_BUILD_FOLDER)\$($env:SEB_PROJECT_NAME).nuspec"
$nuspec = [xml](Get-Content $nuspecPath)
$repoInfo = Get-GitHubRepo

if ($env:APPVEYOR_REPO_TAG -eq $true) {
$releaseNotes = (Get-GitHubRepo "releases/tags/$($env:APPVEYOR_REPO_TAG_NAME)").body.Replace('"','\"').Replace('### ', '')
if ($releaseNotes){
$nuspec.package.metadata.releaseNotes = $releaseNotes
}
}

$authors = (git shortlog -sn | ? { $_ -match '^\s*(?<count>\d+)\s*(?<author>.*)$' } | % {"$($matches["author"]) ($($matches["count"]))" }) -join ', '
$description = $repoInfo.description
$licenseUrl = "https://github.com/$($env:APPVEYOR_REPO_NAME)/tree/$env:APPVEYOR_REPO_COMMIT/LICENSE.md"
$projectUrl = "https://github.com/$($env:APPVEYOR_REPO_NAME)/"
write-host "Release notes: $releaseNotes"
write-host "License: $authors"
write-host "Authors: $licenseUrl"

$repoInfo = Get-GitHubRepo
write-host "Switching license to $env:APPVEYOR_REPO_COMMIT"
if ($repoInfo.description) {
$nuspec.package.metadata.description = $repoInfo.description
}
$nuspec.package.metadata.licenseUrl = "https://github.com/$($env:APPVEYOR_REPO_NAME)/tree/$env:APPVEYOR_REPO_COMMIT/LICENSE.md"
$nuspec.Save($nuspecPath)
write-host "Saved NuSpec at $nuspecPath"
nuget pack $nuspecPath.nuspec -Properties releaseNotes="$releaseNotes" -version $env:NUGET_VERSION -basepath $env:APPVEYOR_BUILD_FOLDER/src/$env:SEB_PROJECT_NAME/
nuget pack $nuspecPath.nuspec -Properties releaseNotes="$releaseNotes";authors="$authors";licenseUrl="$licenseUrl";projectUrl="$projectUrl";description="$description" -version $env:NUGET_VERSION -basepath $env:APPVEYOR_BUILD_FOLDER/src/$env:SEB_PROJECT_NAME/
Push-AppveyorArtifact *.nupkg
78 changes: 78 additions & 0 deletions log.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
"62584d1","Sebastien Lambla","Sun, 5 Mar 2017 21:27:39 +0100","removes wrong push", 2 files changed, 1 insertion(+), 2 deletions(-)
"bb73349","Sebastien Lambla","Sun, 5 Mar 2017 21:14:40 +0100","Supports adding fx asm for .net 4.5 target", 1 file changed, 34 insertions(+), 25 deletions(-)
"a1e0c13","Sebastien Lambla","Sun, 5 Mar 2017 20:52:02 +0100","More line endings", 2 files changed, 4 insertions(+), 2 deletions(-)
"eb0d6d0","Sebastien Lambla","Sun, 5 Mar 2017 20:14:04 +0100","Whitespace handling", 28 files changed, 925 insertions(+), 879 deletions(-)
"f2ee61b","Sebastien Lambla","Sun, 5 Mar 2017 18:37:05 +0100","Build and changelog for release", 3 files changed, 24 insertions(+), 6 deletions(-)
"97c85e0","Sebastien Lambla","Sun, 5 Mar 2017 18:20:48 +0100","Check only if cancellation was requested, not which token", 1 file changed, 2 insertions(+), 2 deletions(-)
"d96d757","Sebastien Lambla","Sun, 5 Mar 2017 18:09:27 +0100","Verifies same index is valid", 5 files changed, 65 insertions(+), 8 deletions(-)
"d1bc570","Sebastien Lambla","Sun, 5 Mar 2017 17:36:33 +0100","pluggable backoff", 8 files changed, 97 insertions(+), 44 deletions(-)
"54c17d2","Sebastien Lambla","Sun, 5 Mar 2017 16:58:46 +0100","Verifies cancellation at various stages", 3 files changed, 28 insertions(+), 20 deletions(-)
"4665340","Sebastien Lambla","Sun, 5 Mar 2017 16:34:21 +0100","Backing off now works", 4 files changed, 82 insertions(+), 53 deletions(-)
"9c4bb05","Sebastien Lambla","Sun, 5 Mar 2017 15:57:40 +0100","Address sonarqube warnings", 4 files changed, 9 insertions(+), 9 deletions(-)
"c47c70b","Sebastien Lambla","Sun, 5 Mar 2017 15:38:50 +0100","branch sent to sonarqube", 1 file changed, 13 insertions(+), 1 deletion(-)
"65386a5","Sebastien Lambla","Sun, 5 Mar 2017 14:59:32 +0100","nuget-specific version", 3 files changed, 15 insertions(+), 7 deletions(-)
"b0760d0","Sebastien Lambla","Sun, 5 Mar 2017 14:31:02 +0100","trying token replacement", 2 files changed, 2 insertions(+), 2 deletions(-)
"03dfc13","Sebastien Lambla","Fri, 3 Mar 2017 10:09:10 +0100","Remove http connection", 1 file changed, 14 insertions(+), 13 deletions(-)
"087eb88","Sebastien Lambla","Wed, 1 Mar 2017 11:49:14 +0100","Adds build version to sonarqube", 2 files changed, 2 insertions(+), 1 deletion(-)
"8a4bbd4","Sebastien Lambla","Wed, 1 Mar 2017 10:23:55 +0100","Adds test results and coverage to sonarqube", 4 files changed, 3 insertions(+), 36 deletions(-)
"393e2ab","Sebastien Lambla","Wed, 1 Mar 2017 10:12:04 +0100","Introduces Test project", 23 files changed, 258 insertions(+), 89 deletions(-)
"dc9ebe9","Sebastien Lambla","Tue, 28 Feb 2017 16:31:16 +0100","SonarQube", 11 files changed, 66 insertions(+), 20 deletions(-)
"b3419fc","Sebastien Lambla","Wed, 1 Mar 2017 01:57:22 +0100","Build fixes", 1 file changed, 10 insertions(+), 9 deletions(-)
"3ab91c6","Sebastien Lambla","Tue, 28 Feb 2017 13:21:43 +0100","Finxing build, again...", 4 files changed, 11 insertions(+), 13 deletions(-)
"94edf71","Sebastien Lambla","Tue, 28 Feb 2017 13:21:43 +0100","Chandler fixes", 2 files changed, 4 insertions(+), 2 deletions(-)
"9df2c82","Sebastien Lambla","Tue, 28 Feb 2017 08:42:12 +0100","Make build files reusable", 16 files changed, 100 insertions(+), 65 deletions(-)
"f450e24","Sebastien Lambla","Mon, 27 Feb 2017 10:44:43 +0100","add nuget packages to build cache", 1 file changed, 1 insertion(+), 1 deletion(-)
"d08b25d","Sebastien Lambla","Mon, 27 Feb 2017 02:30:01 +0100","Rmeove gituhb provider till it works", 1 file changed, 9 deletions(-)
"3872176","Sebastien Lambla","Mon, 27 Feb 2017 02:20:17 +0100","auto release, publish on tag, release notes", 2 files changed, 2 insertions(+), 1 deletion(-)
"adb09fb","Sebastien Lambla","Mon, 27 Feb 2017 02:09:34 +0100","auto release, publish on tag, release notes", 3 files changed, 5 insertions(+), 7 deletions(-)
"afdedc0","Sebastien Lambla","Mon, 27 Feb 2017 02:00:30 +0100","auto release and publish on tag", 1 file changed, 19 insertions(+)
"b6e5bba","Sebastien Lambla","Mon, 27 Feb 2017 01:48:30 +0100","Fix devDependency", 2 files changed, 12 insertions(+), 3 deletions(-)
"6cd265b","Sebastien Lambla","Mon, 27 Feb 2017 01:17:28 +0100","coverity", 4 files changed, 8 insertions(+), 4 deletions(-)
"cd04a2a","Sebastien Lambla","Sun, 26 Feb 2017 23:39:11 +0100","Extracting ps files", 7 files changed, 91 insertions(+), 75 deletions(-)
"b5e3698","Sebastien Lambla","Sun, 26 Feb 2017 23:00:47 +0100","First go at coverity scan", 1 file changed, 45 insertions(+), 31 deletions(-)
"1e54525","Sebastien Lambla","Sun, 26 Feb 2017 22:35:29 +0100","Locks license to sha of the commit", 1 file changed, 6 insertions(+), 4 deletions(-)
"b2733b1","Sebastien Lambla","Sun, 26 Feb 2017 22:31:13 +0100","Coverity, maybe", 2 files changed, 22 insertions(+), 1 deletion(-)
"2e453b9","Mordechai Zuber","Fri, 24 Feb 2017 09:59:56 +0200","Fix markdown in readme", 1 file changed, 1 insertion(+), 1 deletion(-)
"473733d","Sebastien Lambla","Sun, 26 Feb 2017 20:49:34 +0100","Another round of releasenote injection", 2 files changed, 10 insertions(+), 3 deletions(-)
"dbf8fe2","Sebastien Lambla","Sun, 26 Feb 2017 20:33:31 +0100","Fixing wrong repo", 1 file changed, 1 insertion(+), 1 deletion(-)
"b4fb16d","Sebastien Lambla","Sun, 26 Feb 2017 20:27:28 +0100","URI fix maybe", 1 file changed, 4 insertions(+), 2 deletions(-)
"5b956ce","Sebastien Lambla","Sun, 26 Feb 2017 20:17:21 +0100","path fix", 1 file changed, 1 insertion(+), 1 deletion(-)
"2afcc5c","Sebastien Lambla","Sun, 26 Feb 2017 20:05:31 +0100","tags again", 1 file changed, 6 insertions(+), 6 deletions(-)
"0c4c6f9","Sebastien Lambla","Sun, 26 Feb 2017 19:46:46 +0100","Trying tags", 2 files changed, 25 insertions(+), 19 deletions(-)
"eb4a72c","Sebastien Lambla","Sun, 26 Feb 2017 19:07:02 +0100","Trying release note injection", 2 files changed, 7 insertions(+), 1 deletion(-)
"964c031","Sebastien Lambla","Sun, 26 Feb 2017 17:41:28 +0100","Fix test and build", 2 files changed, 2 insertions(+), 2 deletions(-)
"adf5265","Sebastien Lambla","Sun, 26 Feb 2017 17:05:07 +0100","Cleanup", 4 files changed, 28 insertions(+), 16 deletions(-)
"32a9e94","Sebastien Lambla","Sun, 26 Feb 2017 16:52:00 +0100","Use queues and exclude simplejson from coverage", 9 files changed, 90 insertions(+), 80 deletions(-)
"610f54e","Sebastien Lambla","Sun, 26 Feb 2017 16:27:05 +0100","Trying badges again", 1 file changed, 1 insertion(+), 1 deletion(-)
"46cc40d","Sebastien Lambla","Sun, 26 Feb 2017 16:20:47 +0100","Wrong badge", 1 file changed, 1 insertion(+), 1 deletion(-)
"0aa5c01","Sebastien Lambla","Sun, 26 Feb 2017 16:18:54 +0100","Updated readme", 1 file changed, 14 insertions(+), 2 deletions(-)
"d41df54","Sebastien Lambla","Sun, 26 Feb 2017 16:04:37 +0100","args with -", 1 file changed, 1 insertion(+), 1 deletion(-)
"b889f0c","Sebastien Lambla","Sun, 26 Feb 2017 16:01:23 +0100","xunit runner", 2 files changed, 3 insertions(+), 1 deletion(-)
"4d4510a","Sebastien Lambla","Sun, 26 Feb 2017 15:50:01 +0100","PDB for coverage", 1 file changed, 3 insertions(+), 2 deletions(-)
"142ea67","Sebastien Lambla","Sun, 26 Feb 2017 15:42:05 +0100","typo", 1 file changed, 1 insertion(+), 1 deletion(-)
"82472c6","Sebastien Lambla","Sun, 26 Feb 2017 15:40:58 +0100","typo", 2 files changed, 2 insertions(+), 1 deletion(-)
"2c6571d","Sebastien Lambla","Sun, 26 Feb 2017 15:37:07 +0100","typo", 1 file changed, 1 insertion(+), 1 deletion(-)
"3270f9f","Sebastien Lambla","Sun, 26 Feb 2017 15:35:14 +0100","typo", 1 file changed, 1 insertion(+), 1 deletion(-)
"b621327","Sebastien Lambla","Sun, 26 Feb 2017 15:33:23 +0100","fuck knows", 1 file changed, 1 deletion(-)
"cac9b4d","Sebastien Lambla","Sun, 26 Feb 2017 15:30:13 +0100","build", 1 file changed, 1 insertion(+)
"4db59fc","Sebastien Lambla","Sun, 26 Feb 2017 15:28:19 +0100","Unused", 4 files changed, 126 deletions(-)
"dc5b4bd","Sebastien Lambla","Sun, 26 Feb 2017 15:27:23 +0100","yaml", 1 file changed, 5 insertions(+), 2 deletions(-)
"f9bc020","Sebastien Lambla","Sun, 26 Feb 2017 15:21:23 +0100","Specific path", 1 file changed, 1 insertion(+), 1 deletion(-)
"888597f","Sebastien Lambla","Sun, 26 Feb 2017 15:15:57 +0100","Code coverage first run", 2 files changed, 11 insertions(+)
"3ebaf65","Sebastien Lambla","Sun, 26 Feb 2017 14:47:01 +0100","Repeat request exponentially", 6 files changed, 133 insertions(+), 40 deletions(-)
"416e31e","Sebastien Lambla","Sun, 26 Feb 2017 11:51:02 +0100","HTTP events implemented", 4 files changed, 78 insertions(+), 19 deletions(-)
"a1bcd05","Sebastien Lambla","Fri, 24 Feb 2017 19:40:25 +0100","Raise http-related events", 4 files changed, 39 insertions(+), 10 deletions(-)
"3eae083","Sebastien Lambla","Fri, 24 Feb 2017 17:58:03 +0100","Point nuget to correct path", 4 files changed, 7 insertions(+), 7 deletions(-)
"a881415","Sebastien Lambla","Fri, 24 Feb 2017 17:51:53 +0100","Changelog", 2 files changed, 11 insertions(+)
"e26f2db","Sebastien Lambla","Fri, 24 Feb 2017 17:34:57 +0100","appveyor first try", 3 files changed, 69 insertions(+)
"3f00961","Sebastien Lambla","Fri, 24 Feb 2017 14:10:03 +0100","CSharp", 1 file changed, 1 insertion(+), 1 deletion(-)
"a87acfa","Sebastien Lambla","Fri, 24 Feb 2017 14:09:18 +0100","Receive all keys updated in one go", 11 files changed, 73 insertions(+), 37 deletions(-)
"2cdc3fd","Sebastien Lambla","Fri, 24 Feb 2017 13:45:54 +0100","Use a func instead of a type to get kv pairs", 9 files changed, 94 insertions(+), 19 deletions(-)
"782949d","Sebastien Lambla","Fri, 24 Feb 2017 10:43:11 +0100","Consul simulator for accurate HTTP read tests", 13 files changed, 282 insertions(+), 129 deletions(-)
"358525d","Sebastien Lambla","Thu, 23 Feb 2017 23:43:45 +0100","HTTP may well work", 13 files changed, 285 insertions(+), 132 deletions(-)
"f397007","Sebastien Lambla","Thu, 23 Feb 2017 19:33:00 +0100","Simpler JSON parsing", 3 files changed, 8 insertions(+), 15 deletions(-)
"78548b6","Sebastien Lambla","Thu, 23 Feb 2017 19:29:00 +0100","Moving things", 6 files changed, 7 insertions(+), 6 deletions(-)
"b7efde0","Sebastien Lambla","Thu, 23 Feb 2017 19:25:38 +0100","Reorg & nuspec", 23 files changed, 401 insertions(+), 300 deletions(-)
"ef05f2d","Sebastien Lambla","Thu, 23 Feb 2017 12:28:15 +0100","Fix formatting", 1 file changed, 2 insertions(+), 11 deletions(-)
"b542392","Sebastien Lambla","Thu, 23 Feb 2017 12:16:28 +0100","First bits of functionality", 13 files changed, 2884 insertions(+), 3 deletions(-)
"84fa5ea","Sebastien Lambla","Wed, 22 Feb 2017 08:15:06 +0100","Readme", 1 file changed, 19 insertions(+)

0 comments on commit b82aae3

Please sign in to comment.