Merge back changes from Release 1.0.0 (#27)

Author: josesimoes

.github_changelog_generator

@@ -1,5 +1,5 @@
 user=nanoframework
-project=lib-nanoFramework.Hardware.Esp32 
+project=lib-nanoFramework.Hardware.Esp32
 issues=true
 add_issues_wo_labels=false
 add_pr_wo_labels=false

CHANGELOG.md

@@ -1,26 +1,25 @@
 # Change Log
 
-## [**Changes available only in 'Preview' NuGet packages:**](https://github.com/nanoframework/lib-nanoFramework.Runtime.Events/tree/HEAD)
-
+## [v1.0.0](https://github.com/nanoframework/lib-nanoFramework.Hardware.Esp32/tree/v1.0.0) (2018-10-17)
 **Implemented enhancements:**
 
-- Update snk to match mscorlib [\#17](https://github.com/nanoframework/lib-nanoFramework.Runtime.Events/pull/17)
-- Add WiFi event category [\#14](https://github.com/nanoframework/lib-nanoFramework.Runtime.Events/pull/14)
-- Add SerialDevice event type [\#11](https://github.com/nanoframework/lib-nanoFramework.Runtime.Events/pull/11)
-- Update mscorlib reference to 1.0.0-preview049 [\#8](https://github.com/nanoframework/lib-nanoFramework.Runtime.Events/pull/8)
-- Added the Network event in the enum [\#7](https://github.com/nanoframework/lib-nanoFramework.Runtime.Events/pull/7)
-- Update nuget refs [\#5](https://github.com/nanoframework/lib-nanoFramework.Runtime.Events/pull/5)
-- Revert DateTime package \(now it's back in mscorlib\) [\#4](https://github.com/nanoframework/lib-nanoFramework.Runtime.Events/pull/4)
-- Update corlib reference [\#2](https://github.com/nanoframework/lib-nanoFramework.Runtime.Events/pull/2)
-- Update project [\#1](https://github.com/nanoframework/lib-nanoFramework.Runtime.Events/pull/1)
+- Update strong name key to match mscorlib [\#12](https://github.com/nanoframework/lib-nanoFramework.Hardware.Esp32/pull/12)
+
+**Fixed bugs:**
+
+- Fix typo in WakeupByTimer method name [\#4](https://github.com/nanoframework/lib-nanoFramework.Hardware.Esp32/pull/4)
 
 **Documentation and other chores:**
 
-- 📦 Bumps nanoFramework.CoreLibrary from 1.0.1-preview116 to 1.0.1-preview118 [\#25](https://github.com/nanoframework/lib-nanoFramework.Runtime.Events/pull/25)
-- 📦 Bumps nanoFramework.CoreLibrary from 1.0.1-preview103 to 1.0.1-preview116 [\#24](https://github.com/nanoframework/lib-nanoFramework.Runtime.Events/pull/24)
-- Bump nanoFramework.CoreLibrary from 1.0.0-preview073 to 1.0.1-preview094 in /source [\#18](https://github.com/nanoframework/lib-nanoFramework.Runtime.Events/pull/18)
-- Fix nuget version dependency [\#16](https://github.com/nanoframework/lib-nanoFramework.Runtime.Events/pull/16)
-- Bump nanoFramework.CoreLibrary from 1.0.0-preview062 to 1.0.0-preview073 in /source [\#15](https://github.com/nanoframework/lib-nanoFramework.Runtime.Events/pull/15)
+- Update 3 NuGet dependencies [\#25](https://github.com/nanoframework/lib-nanoFramework.Hardware.Esp32/pull/25)
+- Bumps nanoFramework.Windows.Devices.Gpio from 1.0.0-preview226 to 1.0.0-preview228 [\#24](https://github.com/nanoframework/lib-nanoFramework.Hardware.Esp32/pull/24)
+- Update 3 NuGet dependencies [\#23](https://github.com/nanoframework/lib-nanoFramework.Hardware.Esp32/pull/23)
+- Update 3 NuGet dependencies [\#22](https://github.com/nanoframework/lib-nanoFramework.Hardware.Esp32/pull/22)
+- Update 3 NuGet dependencies [\#21](https://github.com/nanoframework/lib-nanoFramework.Hardware.Esp32/pull/21)
+- Add High res timer class [\#15](https://github.com/nanoframework/lib-nanoFramework.Hardware.Esp32/pull/15)
+- Bump nanoFramework.Runtime.Events from 1.0.0-preview188 to 1.0.0-preview191 in /source [\#14](https://github.com/nanoframework/lib-nanoFramework.Hardware.Esp32/pull/14)
+- Bump nanoFramework.Windows.Devices.Gpio from 1.0.0-preview197 to 1.0.0-preview199 in /source [\#13](https://github.com/nanoframework/lib-nanoFramework.Hardware.Esp32/pull/13)
+- Bump nanoFramework.CoreLibrary, Devices.Gpio  and Runtime.Events in /source [\#9](https://github.com/nanoframework/lib-nanoFramework.Hardware.Esp32/pull/9)
 
 
 

appveyor.yml

@@ -1,9 +1,4 @@
-# configuration these branches
-branches:
-  only:
-    - master
-    - /dev.*/
-    - /release.*/
+# configuration for all branches
 
 image: Visual Studio 2017
 
@@ -42,11 +37,13 @@ environment:
     secure: E3bCMe4LtDdAhHSYRcLp0N6DixJe1m8TNxhYeJW/GnqM3WXdRqsgkHSbwootPjJQtOQJrps4twmzTVzofLSVgPgbzU8PxU0AkJV7zwkyVOE=
 
 init:
-  - git config --global core.autocrlf true
-  - git config --global credential.helper store
-  - ps: Add-Content "$env:USERPROFILE\.git-credentials" "https://$($env:GitHubToken):[email protected]`n"
-  - git config --global user.email "%GitHubUserEmail%"
-  - git config --global user.name "%GitHubUserName%"
+- git config --global core.autocrlf true
+- git config --global credential.helper store
+- ps: Add-Content "$env:USERPROFILE\.git-credentials" "https://$($env:GitHubToken):[email protected]`n"
+- git config --global user.email "%GitHubUserEmail%"
+- git config --global user.name "%GitHubUserName%"
+- ps: "$headers = if($env:APPVEYOR_PULL_REQUEST_NUMBER){\n @{\n  \"Authorization\" = \"Basic $env:GitRestAuth\"\n  \"Content-type\" = \"application/json\"\n}\n\n$pr = Invoke-RestMethod -Uri \"https://api.github.com/repos/$env:APPVEYOR_REPO_NAME/pulls/$env:APPVEYOR_PULL_REQUEST_NUMBER\" -Headers $headers  -Method GET\n\nif($pr.user.login -eq \"nfbot\" -and $pr.body -match \"*[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"
+- 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%
@@ -82,6 +79,11 @@ before_deploy:
       
       Push-AppveyorArtifact $env:APPVEYOR_BUILD_FOLDER\source\Nuget.nanoFramework.Hardware.Esp32\bin\Release\nanoFramework.Hardware.Esp32.$env:GitVersion_NuGetVersionV2.nupkg 
 
+after_deploy:
+# for this environment variable to work here it has to be set in AppVeyor UI
+- nuget push source\Nuget.nanoFramework.Hardware.Esp32\bin\Release\nanoFramework.Hardware.Esp32.%GitVersion_NuGetVersionV2%.nupkg %MyGetToken% -Source https://www.myget.org/F/nanoframework-dev/api/v2/package
+- nuget push source\Nuget.nanoFramework.Hardware.Esp32.DELIVERABLES\bin\Release\nanoFramework.Hardware.Esp32.DELIVERABLES.%GitVersion_NuGetVersionV2%.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:
   - ps: |
@@ -101,6 +103,7 @@ for:
   branches:
     only:
       - master
+      - /v.*/
 
   deploy:
   - provider: NuGet
@@ -118,6 +121,8 @@ for:
     draft: true
     prerelease: false
     force_update: true
+    on:
+      appveyor_repo_tag: false
 
 -
   branches:
@@ -135,11 +140,8 @@ for:
     draft: true
     prerelease: true
     force_update: true
-
-  after_deploy:
-  # for this environment variable to work here it has to be set in AppVeyor UI
-  - nuget push source\Nuget.nanoFramework.Hardware.Esp32\bin\Release\nanoFramework.Hardware.Esp32.%GitVersion_NuGetVersionV2%.nupkg %MyGetToken% -Source https://www.myget.org/F/nanoframework-dev/api/v2/package
-  - nuget push source\Nuget.nanoFramework.Hardware.Esp32.DELIVERABLES\bin\Release\nanoFramework.Hardware.Esp32.DELIVERABLES.%GitVersion_NuGetVersionV2%.nupkg %MyGetToken% -Source https://www.myget.org/F/nanoframework-dev/api/v2/package
+    on:
+      appveyor_repo_tag: false
 
 -
   branches:
@@ -162,3 +164,5 @@ for:
     draft: true
     prerelease: true
     force_update: true
+    on:
+      appveyor_repo_tag: false

commit-assemblyinfo-changes.ps1

@@ -1,17 +1,29 @@
-# only need to commit assembly info changes when build is NOT for a pull-request
-if ($env:appveyor_pull_request_number)
+# Copyright (c) 2018 The nanoFramework project contributors
+# See LICENSE file in the project root for full license information.
+
+# skip updating assembly info changes if build is a pull-request or not a tag (master OR release)
+if ($env:appveyor_pull_request_number -or
+    ($env:APPVEYOR_REPO_BRANCH -eq "master" -and $env:APPVEYOR_REPO_TAG -eq 'true') -or
+    ($env:APPVEYOR_REPO_BRANCH -match "^release*" -and $env:APPVEYOR_REPO_TAG -eq 'true') -or
+    $env:APPVEYOR_REPO_TAG -eq "true")
 {
-    'Skip committing assembly info changes as this is a PR build...' | Write-Host -ForegroundColor White
+    'Skip committing assembly info changes...' | Write-Host -ForegroundColor White
 }
 else
 {
     # updated assembly info files   
     git add "source\nanoFramework.Hardware.Esp32\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:GitVersion_NuGetVersionV2 [skip ci]" -m"[version update]"
     git push origin --porcelain -q > $null
 
     'Updated assembly info...' | Write-Host -ForegroundColor White -NoNewline
     'OK' | Write-Host -ForegroundColor Green
+}
+
+# update assembly info in nf-interpreter if we are in development branch or if this is tag (master OR release)
+if ($env:APPVEYOR_REPO_BRANCH -match "^dev*" -or $env:APPVEYOR_REPO_TAG -eq "true")
+{
+    'Updating assembly version in nf-interpreter...' | Write-Host -ForegroundColor White -NoNewline
 
     # clone nf-interpreter repo (only a shallow clone with last commit)
     git clone https://github.com/nanoframework/nf-interpreter -b develop --depth 1 -q
@@ -51,7 +63,7 @@ else
 
         # commit changes
         git add -A 2>&1
-        git commit -m"$commitMessage" -m"[version update]" -q
+        git commit -m"$commitMessage [skip ci]" -m"[version update]" -q
         git push --set-upstream origin "$newBranch" --porcelain -q > $null
 
         # start PR

generate-change-log.ps1

@@ -1,20 +1,33 @@
-# generate change log when build is NOT for a pull-request
-if ($env:appveyor_pull_request_number)
+# Copyright (c) 2018 The nanoFramework project contributors
+# See LICENSE file in the project root for full license information.
+
+# generate change log when build is NOT a pull-request or not a tag (master OR release)
+if ($env:appveyor_pull_request_number -or 
+    ($env:APPVEYOR_REPO_BRANCH -eq "master" -and $env:APPVEYOR_REPO_TAG -eq 'true') -or
+    ($env:APPVEYOR_REPO_BRANCH -match "^release*" -and $env:APPVEYOR_REPO_TAG -eq 'true') -or
+    $env:APPVEYOR_REPO_TAG -eq "true")
 {
-    'Skip change log processing as this is a PR build...' | Write-Host -ForegroundColor White
+    'Skip change log processing...' | Write-Host -ForegroundColor White
 }
 else
 {
     # need this to keep ruby happy
     md c:\tmp
 
-    # generate change log
-    # version includes commits
-    bundle exec github_changelog_generator --token $env:GitHubToken
+    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"
+    }
+    else 
+    {
+        # generate change log
+        # version includes commits
+        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"
-    # 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
+    git push origin --porcelain -q > $null
 }

source/Nuget.nanoFramework.Hardware.Esp32.DELIVERABLES/Nuget.nanoFramework.Hardware.Esp32.DELIVERABLES.nuproj

@@ -38,17 +38,17 @@
   </ItemGroup>
   <ItemGroup>
     <Dependency Include="nanoFramework.CoreLibrary">
-      <Version>[1.0.1-preview134]</Version>
+      <Version>[1.0.4]</Version>
     </Dependency>
   </ItemGroup>
   <ItemGroup>
     <Dependency Include="nanoFramework.Runtime.Events">
-      <Version>[1.0.0-preview234]</Version>
+      <Version>[1.0.0]</Version>
     </Dependency>
   </ItemGroup>
   <ItemGroup>
     <Dependency Include="nanoFramework.Windows.Devices.Gpio">
-      <Version>[1.0.0-preview228]</Version>
+      <Version>[1.0.0]</Version>
     </Dependency>
   </ItemGroup>
   <PropertyGroup Label="Globals">

source/Nuget.nanoFramework.Hardware.Esp32/Nuget.nanoFramework.Hardware.Esp32.nuproj

@@ -35,17 +35,17 @@
   </ItemGroup>
   <ItemGroup>
     <Dependency Include="nanoFramework.CoreLibrary">
-      <Version>[1.0.1-preview134]</Version>
+      <Version>[1.0.4]</Version>
     </Dependency>
   </ItemGroup>
   <ItemGroup>
     <Dependency Include="nanoFramework.Runtime.Events">
-      <Version>[1.0.0-preview234]</Version>
+      <Version>[1.0.0]</Version>
     </Dependency>
   </ItemGroup>
   <ItemGroup>
     <Dependency Include="nanoFramework.Windows.Devices.Gpio">
-      <Version>[1.0.0-preview228]</Version>
+      <Version>[1.0.0]</Version>
     </Dependency>
   </ItemGroup>
   <PropertyGroup Label="Globals">

source/nanoFramework.Hardware.Esp32/Properties/AssemblyInfo.cs

@@ -27,4 +27,4 @@
 // [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: AssemblyInformationalVersion("1.0.0-preview042")]
+[assembly: AssemblyInformationalVersion("1.0.0-rc001")]

source/nanoFramework.Hardware.Esp32/nanoFramework.Hardware.Esp32.nfproj

@@ -45,13 +45,13 @@
     <Name>nanoFramework.Hardware.Esp32</Name>
   </PropertyGroup>
   <ItemGroup>
-    <NFMDP_PE_LoadHints Include="..\packages\nanoFramework.CoreLibrary.1.0.1-preview134\lib\mscorlib.dll">
+    <NFMDP_PE_LoadHints Include="..\packages\nanoFramework.CoreLibrary.1.0.4\lib\mscorlib.dll">
       <InProject>false</InProject>
     </NFMDP_PE_LoadHints>
-    <NFMDP_PE_LoadHints Include="..\packages\nanoFramework.Runtime.Events.1.0.0-preview234\lib\nanoFramework.Runtime.Events.dll">
+    <NFMDP_PE_LoadHints Include="..\packages\nanoFramework.Runtime.Events.1.0.0\lib\nanoFramework.Runtime.Events.dll">
       <InProject>false</InProject>
     </NFMDP_PE_LoadHints>
-    <NFMDP_PE_LoadHints Include="..\packages\nanoFramework.Windows.Devices.Gpio.1.0.0-preview228\lib\nanoFramework.Windows.Devices.Gpio.dll">
+    <NFMDP_PE_LoadHints Include="..\packages\nanoFramework.Windows.Devices.Gpio.1.0.0\lib\nanoFramework.Windows.Devices.Gpio.dll">
       <InProject>false</InProject>
     </NFMDP_PE_LoadHints>
   </ItemGroup>
@@ -73,16 +73,16 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="mscorlib, Version=1.0.1.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.0.1-preview134\lib\mscorlib.dll</HintPath>
+    <Reference Include="mscorlib, Version=1.0.4.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
+      <HintPath>..\packages\nanoFramework.CoreLibrary.1.0.4\lib\mscorlib.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="nanoFramework.Runtime.Events, Version=1.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.0.0-preview234\lib\nanoFramework.Runtime.Events.dll</HintPath>
+      <HintPath>..\packages\nanoFramework.Runtime.Events.1.0.0\lib\nanoFramework.Runtime.Events.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Windows.Devices.Gpio, Version=1.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Windows.Devices.Gpio.1.0.0-preview228\lib\Windows.Devices.Gpio.dll</HintPath>
+      <HintPath>..\packages\nanoFramework.Windows.Devices.Gpio.1.0.0\lib\Windows.Devices.Gpio.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>

source/nanoFramework.Hardware.Esp32/packages.config

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="nanoFramework.CoreLibrary" version="1.0.1-preview134" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.Runtime.Events" version="1.0.0-preview234" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.Windows.Devices.Gpio" version="1.0.0-preview228" targetFramework="netnanoframework10" />
+  <package id="nanoFramework.CoreLibrary" version="1.0.4" targetFramework="netnanoframework10" />
+  <package id="nanoFramework.Runtime.Events" version="1.0.0" targetFramework="netnanoframework10" />
+  <package id="nanoFramework.Windows.Devices.Gpio" 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" />
 </packages>