Work CD-CI

josesimoes · josesimoes · commit 40e2f1109450 · 2018-11-07T11:48:35.000Z
- Remove nuproj projects and replace with plain nuspec files.
- Update AppVeyor yaml accordingly.
- Replace gitversion with Nerdbank.GitVersioning.

Signed-off-by: José Simões &lt;jose.simoes@eclo.solutions&gt;
diff --git a/GitVersion.yml b/GitVersion.yml
diff --git a/appveyor.yml b/appveyor.yml
@@ -16,6 +16,7 @@ skip_commits:
   - 'LICENSE'
   - dir/*
   - '.gitignore'
+  - 'azure-pipelines.yml'
 
 build:
   verbosity: minimal
@@ -44,13 +45,12 @@ init:
 - ps: "if($env:APPVEYOR_PULL_REQUEST_NUMBER -eq \"\")\n{\n   \n    if($env:APPVEYOR_REPO_COMMIT_AUTHOR -eq \"nfbot\" -and $env:APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED -like \"*[version update]*\")\n    {\n        # commit was from nfbot AND it's taged as a [version update]\n        # OK to skip AppVeyor build \n        \"Version update only. Skipping build.\" | Write-Host -BackgroundColor White -ForegroundColor Blue\n        Exit-AppveyorBuild\n    }\n}"
 
 install:
-  - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
-  - bundle config --local path vendor/bundle
-  - gem install bundler --quiet --no-ri --no-rdoc
-  - gem install github_changelog_generator --quiet --no-ri --no-rdoc
-  # this needs to be replace with the official version and nuget package as soon as it's released
-  - dotnet tool install -g --version 4.0.0-pullrequest1422-1625 --add-source https://ci.appveyor.com/nuget/gitversion-8nigugxjftrw GitVersion.CommandLine.DotNetCore.Tool
-  - ps: .\install-vsix-appveyor.ps1
+- set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
+- bundle config --local path vendor/bundle
+- gem install bundler --quiet --no-ri --no-rdoc
+- gem install github_changelog_generator --quiet --no-ri --no-rdoc
+- dotnet tool install --tool-path . nbgv
+- ps: .\install-vsix-appveyor.ps1
 
 before_build:
 - ps: >-
@@ -59,25 +59,30 @@ before_build:
 
     nuget restore source\nanoFramework.System.Net.Http.sln
 
-    dotnet-gitversion /l console /output buildserver /updateAssemblyInfo "source\nanoFramework.System.Net.Http\Properties\AssemblyInfo.cs"
+    .\nbgv cloud -p source -a -c
 
 build_script:
-- ps: >-
-
-    msbuild source\nanoFramework.System.Net.Http.sln /p:Configuration=Release /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+- ps: msbuild source\nanoFramework.System.Net.Http.sln /p:PublicRelease=true /p:Configuration=Release /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
 
 before_deploy:
+  - ps:  >-
+      .\nbgv cloud --version=$env:NBGV_SemVer1
+
+      $env:MyNuGetVersion = $env:NBGV_NuGetPackageVersion -replace "\-g$env:NBGV_GitCommitIdShort", " "
+    
+      .\generate-change-log.ps1
+
+  - nuget pack source\nanoFramework.System.Net.Http.nuspec -Version %MyNuGetVersion%
   - ps:  >-
       .\commit-assemblyinfo-changes.ps1
       
       .\generate-change-log.ps1
 
-      Push-AppveyorArtifact $env:APPVEYOR_BUILD_FOLDER\source\Nuget.nanoFramework.System.Net.Http\bin\Release\nanoFramework.System.Net.Http.$env:GitVersion_NuGetVersionV2.nupkg
+      Push-AppveyorArtifact $env:APPVEYOR_BUILD_FOLDER\nanoFramework.System.Net.Http.$env:MyNuGetVersion.nupkg
 
 after_deploy:
 # for this environment variable to work here it has to be set in AppVeyor UI
-- nuget push source\Nuget.nanoFramework.System.Net.Http\bin\Release\nanoFramework.System.Net.Http.%GitVersion_NuGetVersionV2%.nupkg %MyGetToken% -Source https://www.myget.org/F/nanoframework-dev/api/v2/package
-- nuget push source\Nuget.nanoFramework.System.Net.Http.DELIVERABLES\bin\Release\nanoFramework.System.Net.Http.DELIVERABLES.%GitVersion_NuGetVersionV2%.nupkg %MyGetToken% -Source https://www.myget.org/F/nanoframework-dev/api/v2/package
+- nuget push nanoFramework.System.Net.Http.%MyNuGetVersion%.nupkg %MyGetToken% -Source https://www.myget.org/F/nanoframework-dev/api/v2/package
 
 # requires APPVEYOR_DISCORD_WEBHOOK_URL enviroment variable set with Discord webhook URL
 on_failure:
@@ -87,8 +92,6 @@ on_failure:
 
 cache:
   - source\packages -> **source\packages.config
-  - C:\ProgramData\chocolatey\bin -> appveyor.yml
-  - C:\ProgramData\chocolatey\lib -> appveyor.yml
 
 ################################################
 # override configuration for specific branches
@@ -98,7 +101,7 @@ for:
   branches:
     only:
       - master
-      - /v.*/
+      - /v\d.*/
 
   deploy:
   - provider: NuGet
@@ -107,9 +110,9 @@ for:
     on:
       appveyor_repo_tag: true
   - provider: GitHub
-    tag: v$(GitVersion_NuGetVersionV2)
-    release: nanoFramework System.Net.Http Library v$(GitVersion_NuGetVersionV2)
-    description: 'Check the [changelog](https://github.com/nanoframework/lib-nanoFramework.System.Net.Http/blob/master/CHANGELOG.md)\n\n## Install from NuGet\n\nThe following NuGet packages are available for download from this release\n\n:package: [.NET](https://www.nuget.org/packages/nanoFramework.System.Net.Http/$(GitVersion_NuGetVersionV2)) v$(GitVersion_NuGetVersionV2)'
+    tag: v$(MyNuGetVersion)
+    release: nanoFramework System.Net.Http Library v$(MyNuGetVersion)
+    description: 'Check the [changelog](https://github.com/nanoframework/lib-nanoFramework.System.Net.Http/blob/master/CHANGELOG.md)\n\n## Install from NuGet\n\nThe following NuGet packages are available for download from this release\n\n:package: [.NET](https://www.nuget.org/packages/nanoFramework.System.Net.Http/$(MyNuGetVersion)) v$(MyNuGetVersion)'
     auth_token:
       secure: DNixoFFE+pGlwyhj7McfZoln42vOmj0iY1iNV9zXEr3y0NpXlOIgL8k5ehzlFM1S
     artifact:
@@ -122,13 +125,13 @@ for:
 -
   branches:
     only:
-      - /dev.*/
+      - /dev(elop)?$/
 
   deploy:
   - provider: GitHub
-    tag: v$(GitVersion_NuGetVersionV2)
-    release: nanoFramework System.Net.Http Library v$(GitVersion_NuGetVersionV2)
-    description: 'Check the [changelog](https://github.com/nanoframework/lib-nanoFramework.System.Net.Http/blob/$(appveyor_repo_branch)/CHANGELOG.md)\n\n## Install from nanoFramework MyGet development feed\n\nThe following NuGet packages are available for download from this release\n\npackage: [.NET](https://www.myget.org/feed/nanoframework-dev/package/nuget/nanoFramework.System.Net.Http/$(GitVersion_NuGetVersionV2)) v$(GitVersion_NuGetVersionV2)'
+    tag: v$(MyNuGetVersion)
+    release: nanoFramework System.Net.Http Library v$(MyNuGetVersion)
+    description: 'Check the [changelog](https://github.com/nanoframework/lib-nanoFramework.System.Net.Http/blob/$(appveyor_repo_branch)/CHANGELOG.md)\n\n## Install from nanoFramework MyGet development feed\n\nThe following NuGet packages are available for download from this release\n\npackage: [.NET](https://www.myget.org/feed/nanoframework-dev/package/nuget/nanoFramework.System.Net.Http/$(MyNuGetVersion)) v$(MyNuGetVersion)'
     auth_token:
       secure: DNixoFFE+pGlwyhj7McfZoln42vOmj0iY1iNV9zXEr3y0NpXlOIgL8k5ehzlFM1S
     artifact: Nuget_Packages
@@ -150,9 +153,9 @@ for:
     on:
       appveyor_repo_tag: true
   - provider: GitHub
-    tag: v$(GitVersion_NuGetVersionV2)
-    release: nanoFramework System.Net.Http Library v$(GitVersion_NuGetVersionV2)
-    description: 'Check the [changelog](https://github.com/nanoframework/lib-nanoFramework.System.Net.Http/blob/$(appveyor_repo_branch)/CHANGELOG.md)\n\n## Install from NuGet\n\nThe following NuGet packages are available for download from this release\n\n:package: [.NET](https://www.nuget.org/packages/nanoFramework.System.Net.Http/$(GitVersion_NuGetVersionV2)) v$(GitVersion_NuGetVersionV2)'
+    tag: v$(MyNuGetVersion)
+    release: nanoFramework System.Net.Http Library v$(MyNuGetVersion)
+    description: 'Check the [changelog](https://github.com/nanoframework/lib-nanoFramework.System.Net.Http/blob/$(appveyor_repo_branch)/CHANGELOG.md)\n\n## Install from NuGet\n\nThe following NuGet packages are available for download from this release\n\n:package: [.NET](https://www.nuget.org/packages/nanoFramework.System.Net.Http/$(MyNuGetVersion)) v$(MyNuGetVersion)'
     auth_token:
       secure: DNixoFFE+pGlwyhj7McfZoln42vOmj0iY1iNV9zXEr3y0NpXlOIgL8k5ehzlFM1S
     artifact:
diff --git a/commit-assemblyinfo-changes.ps1 b/commit-assemblyinfo-changes.ps1
@@ -10,7 +10,7 @@ else
 {
     # updated assembly info files   
     git add "source\nanoFramework.System.Net.Http\Properties\AssemblyInfo.cs"
-    git commit -m "Update assembly info file for v$env:GitVersion_NuGetVersionV2" -m"[version update]"
+    git commit -m "Update assembly info file for v$env:MyNuGetVersion" -m"[version update]"
     git push origin --porcelain -q > $null
     
     'Updated assembly info...' | Write-Host -ForegroundColor White -NoNewline
diff --git a/generate-change-log.ps1 b/generate-change-log.ps1
@@ -14,7 +14,7 @@ else
     if ($env:APPVEYOR_REPO_BRANCH -eq "master" -or $env:APPVEYOR_REPO_BRANCH -match "^release*")
     {
         # generate change log including future version
-        bundle exec github_changelog_generator --token $env:GitHubToken --future-release "v$env:GitVersion_MajorMinorPatch"
+        bundle exec github_changelog_generator --token $env:GitHubToken --future-release "v$env:NBGV_Version"
     }
     else 
     {
@@ -23,8 +23,14 @@ else
         bundle exec github_changelog_generator --token $env:GitHubToken        
     }
 
-    # updated changelog and the updated assembly info files
-    git add CHANGELOG.md
-    git commit -m "Update CHANGELOG for v$env:GitVersion_NuGetVersionV2"
-    git push origin --porcelain -q > $null
+    # updated changelog, if there are any differences
+    $logDif = git diff CHANGELOG.md
+
+    if($logDif -ne $null)
+    {
+        git add CHANGELOG.md
+        git commit -m "Update CHANGELOG for v$env:MyNuGetVersion"
+        # need to wrap the git command bellow so it doesn't throw an error because of redirecting the output to stderr
+        git push origin --porcelain  | Write-Host
+    }
 }
diff --git a/source/nanoFramework.System.Net.Http.nuspec b/source/nanoFramework.System.Net.Http.nuspec
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
+  <metadata>
+    <id>nanoFramework.System.Net.Http</id>
+    <version>$version$</version>
+    <title>nanoFramework.System.Net.Http</title>
+    <authors>nanoFramework project contributors</authors>
+    <owners>nanoFramework project contributors</owners>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <releaseNotes></releaseNotes>
+    <developmentDependency>false</developmentDependency>
+    <projectUrl>https://github.com/nanoframework</projectUrl>
+    <iconUrl>https://secure.gravatar.com/avatar/97d0e092247f0716db6d4b47b7d1d1ad</iconUrl>
+    <copyright>Copyright (c) 2018 The nanoFramework project contributors</copyright>    
+    <description>This package includes the nanoFramework.System.Net.Http assembly for nanoFramework C# projects.</description>
+    <summary>nanoFramework.System.Net.Http assembly for nanoFramework C# projects</summary>
+    <tags>nanoFramework C# csharp netmf netnf nanoFramework.System.Net.Http</tags>
+    <dependencies>
+      <dependency id="nanoFramework.CoreLibrary" version="[1.0.5-preview024]" />
+    </dependencies>    
+  </metadata>
+  <files>
+    <file src="nanoFramework.System.Net.Http\bin\Release\System.Net.Http.dll" target="lib\System.Net.Http.dll" />
+    <file src="nanoFramework.System.Net.Http\bin\Release\System.Net.Http.pdb" target="lib\System.Net.Http.pdb" />
+    <file src="nanoFramework.System.Net.Http\bin\Release\System.Net.Http.pdbx" target="lib\System.Net.Http.pdbx" />
+    <file src="nanoFramework.System.Net.Http\bin\Release\System.Net.Http.pe" target="lib\System.Net.Http.pe" />
+    <file src="nanoFramework.System.Net.Http\bin\Release\System.Net.Http.xml" target="lib\System.Net.Http.xml" /> 
+  </files>
+</package>
diff --git a/source/nanoFramework.System.Net.Http.sln b/source/nanoFramework.System.Net.Http.sln
@@ -5,16 +5,6 @@ VisualStudioVersion = 15.0.28010.2041
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "System.Net.Http", "nanoFramework.System.Net.Http\System.Net.Http.nfproj", "{C3ABA656-9831-4006-A3B3-EA842A3C508E}"
 EndProject
-Project("{FF286327-C783-4F7A-AB73-9BCBAD0D4460}") = "Nuget.nanoFramework.System.Net.Http", "Nuget.nanoFramework.System.Net.Http\Nuget.nanoFramework.System.Net.Http.nuproj", "{DEA3BF64-3B74-473D-B8A4-0232756F5477}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C3ABA656-9831-4006-A3B3-EA842A3C508E} = {C3ABA656-9831-4006-A3B3-EA842A3C508E}
-	EndProjectSection
-EndProject
-Project("{FF286327-C783-4F7A-AB73-9BCBAD0D4460}") = "Nuget.nanoFramework.System.Net.Http.DELIVERABLES", "Nuget.nanoFramework.System.Net.Http.DELIVERABLES\Nuget.nanoFramework.System.Net.Http.DELIVERABLES.nuproj", "{F81B4DAC-449C-48E4-80EA-4360C8F8C2DD}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C3ABA656-9831-4006-A3B3-EA842A3C508E} = {C3ABA656-9831-4006-A3B3-EA842A3C508E}
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -26,14 +16,6 @@ Global
 		{C3ABA656-9831-4006-A3B3-EA842A3C508E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C3ABA656-9831-4006-A3B3-EA842A3C508E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C3ABA656-9831-4006-A3B3-EA842A3C508E}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{DEA3BF64-3B74-473D-B8A4-0232756F5477}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DEA3BF64-3B74-473D-B8A4-0232756F5477}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DEA3BF64-3B74-473D-B8A4-0232756F5477}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DEA3BF64-3B74-473D-B8A4-0232756F5477}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F81B4DAC-449C-48E4-80EA-4360C8F8C2DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F81B4DAC-449C-48E4-80EA-4360C8F8C2DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F81B4DAC-449C-48E4-80EA-4360C8F8C2DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F81B4DAC-449C-48E4-80EA-4360C8F8C2DD}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/source/nanoFramework.System.Net.Http/Properties/AssemblyInfo.cs b/source/nanoFramework.System.Net.Http/Properties/AssemblyInfo.cs
@@ -15,17 +15,3 @@
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: AssemblyInformationalVersion("1.0.0-preview016")]
diff --git a/source/nanoFramework.System.Net.Http/README.md b/source/nanoFramework.System.Net.Http/README.md
diff --git a/source/nanoFramework.System.Net.Http/README.txt b/source/nanoFramework.System.Net.Http/README.txt
diff --git a/source/nanoFramework.System.Net.Http/System.Net.Http.nfproj b/source/nanoFramework.System.Net.Http/System.Net.Http.nfproj
@@ -79,6 +79,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
+  <Import Project="..\packages\Nerdbank.GitVersioning.2.2.13\build\Nerdbank.GitVersioning.targets" />
   <ProjectExtensions>
     <ProjectCapabilities>
       <ProjectConfigurationsDeclaredAsItems />
diff --git a/source/nanoFramework.System.Net.Http/packages.config b/source/nanoFramework.System.Net.Http/packages.config
@@ -3,6 +3,5 @@
   <package id="nanoFramework.CoreLibrary" version="1.0.4" targetFramework="netnanoframework10" />
   <package id="nanoFramework.Runtime.Events" version="1.0.0" targetFramework="netnanoframework10" />
   <package id="nanoFramework.System.Net" version="1.0.0" targetFramework="netnanoframework10" />
-  <package id="NuProj" version="0.20.4-beta" developmentDependency="true" />
-  <package id="NuProj.Common" version="0.20.4-beta" developmentDependency="true" />
+  <package id="Nerdbank.GitVersioning" version="2.2.13" developmentDependency="true" />
 </packages>
diff --git a/source/version.json b/source/version.json
@@ -0,0 +1,26 @@
+{
+  "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+  "version": "1.0.2-preview.{height}",
+  "assemblyVersion": {
+    "precision": "revision"
+  },
+  "semVer1NumericIdentifierPadding": 3,
+  "nugetPackageVersion": {
+    "semVer": 1
+   },
+  "publicReleaseRefSpec": [
+    "^refs/heads/master$",
+    "^refs/heads/v\\d+(?:\\.\\d+)?$"
+  ],
+  "cloudBuild": {
+    "setVersionVariables": true,
+    "setAllVariables": true,
+    "buildNumber": {
+      "enabled": true,
+      "includeCommitId": {
+        "when": "nonPublicReleaseOnly",
+        "where": "buildMetadata"
+      }
+    }
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ else`
`10`	`10`	`{`
`11`	`11`	`# updated assembly info files`
`12`	`12`	`git add "source\nanoFramework.System.Net.Http\Properties\AssemblyInfo.cs"`
`13`		`- git commit -m "Update assembly info file for v$env:GitVersion_NuGetVersionV2" -m"[version update]"`
	`13`	`+ git commit -m "Update assembly info file for v$env:MyNuGetVersion" -m"[version update]"`
`14`	`14`	`git push origin --porcelain -q > $null`
`15`	`15`
`16`	`16`	`'Updated assembly info...' \| Write-Host -ForegroundColor White -NoNewline`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ else`
`14`	`14`	`if ($env:APPVEYOR_REPO_BRANCH -eq "master" -or $env:APPVEYOR_REPO_BRANCH -match "^release*")`
`15`	`15`	`{`
`16`	`16`	`# generate change log including future version`
`17`		`- bundle exec github_changelog_generator --token $env:GitHubToken --future-release "v$env:GitVersion_MajorMinorPatch"`
	`17`	`+ bundle exec github_changelog_generator --token $env:GitHubToken --future-release "v$env:NBGV_Version"`
`18`	`18`	`}`
`19`	`19`	`else`
`20`	`20`	`{`
`@@ -23,8 +23,14 @@ else`
`23`	`23`	`bundle exec github_changelog_generator --token $env:GitHubToken`
`24`	`24`	`}`
`25`	`25`
`26`		`- # updated changelog and the updated assembly info files`
`27`		`- git add CHANGELOG.md`
`28`		`- git commit -m "Update CHANGELOG for v$env:GitVersion_NuGetVersionV2"`
`29`		`- git push origin --porcelain -q > $null`
	`26`	`+ # updated changelog, if there are any differences`
	`27`	`+ $logDif = git diff CHANGELOG.md`
	`28`	`+`
	`29`	`+ if($logDif -ne $null)`
	`30`	`+ {`
	`31`	`+ git add CHANGELOG.md`
	`32`	`+ git commit -m "Update CHANGELOG for v$env:MyNuGetVersion"`
	`33`	`+ # need to wrap the git command bellow so it doesn't throw an error because of redirecting the output to stderr`
	`34`	`+ git push origin --porcelain \| Write-Host`
	`35`	`+ }`
`30`	`36`	`}`