Merge nanoframework/release-v1.0.4

nanoframework · Jan 22, 2019 · c3e9a5c · c3e9a5c
2 parents d1e98c9 + 8661a11
commit c3e9a5c
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Change Log
 
+## [**Changes available only in 'Preview' NuGet packages:**](https://github.com/nanoframework/lib-Windows.Devices.Gpio/tree/HEAD)
+
+[Full Changelog](https://github.com/nanoframework/lib-Windows.Devices.Gpio/compare/v1.0.2...HEAD)
+
+**Documentation and other chores:**
+
+- Update 2 NuGet dependencies [\#69](https://github.com/nanoframework/lib-Windows.Devices.Gpio/pull/69)
+- Merge back from Release v1.0.2 [\#68](https://github.com/nanoframework/lib-Windows.Devices.Gpio/pull/68)
+
+## [v1.0.2](https://github.com/nanoframework/lib-Windows.Devices.Gpio/tree/v1.0.2) (2018-12-15)
+[Full Changelog](https://github.com/nanoframework/lib-Windows.Devices.Gpio/compare/v1.0.2-preview-025...v1.0.2)
+
+**Documentation and other chores:**
+
+- Release v1.0.2 [\#67](https://github.com/nanoframework/lib-Windows.Devices.Gpio/pull/67)
+- Update 2 NuGet dependencies [\#66](https://github.com/nanoframework/lib-Windows.Devices.Gpio/pull/66)
+
 ## [v1.0.2-preview-025](https://github.com/nanoframework/lib-Windows.Devices.Gpio/tree/v1.0.2-preview-025) (2018-12-03)
 [Full Changelog](https://github.com/nanoframework/lib-Windows.Devices.Gpio/compare/v1.0.2-preview-023...v1.0.2-preview-025)
 

diff --git a/source/Windows.Devices.Gpio/Windows.Devices.Gpio.nfproj b/source/Windows.Devices.Gpio/Windows.Devices.Gpio.nfproj
@@ -45,10 +45,10 @@
     <Name>Windows.Devices.Gpio</Name>
   </PropertyGroup>
   <ItemGroup>
-    <NFMDP_PE_LoadHints Include="..\packages\nanoFramework.CoreLibrary.1.1.0\lib\mscorlib.dll">
+    <NFMDP_PE_LoadHints Include="..\packages\nanoFramework.CoreLibrary.1.1.1\lib\mscorlib.dll">
       <InProject>false</InProject>
     </NFMDP_PE_LoadHints>
-    <NFMDP_PE_LoadHints Include="..\packages\nanoFramework.Runtime.Events.1.0.2\lib\nanoFramework.Runtime.Events.dll">
+    <NFMDP_PE_LoadHints Include="..\packages\nanoFramework.Runtime.Events.1.0.4\lib\nanoFramework.Runtime.Events.dll">
       <InProject>false</InProject>
     </NFMDP_PE_LoadHints>
   </ItemGroup>
@@ -77,12 +77,12 @@
     <Content Include="README.txt" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="mscorlib, Version=1.1.0.4, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.1.0\lib\mscorlib.dll</HintPath>
+    <Reference Include="mscorlib, Version=1.1.1.7, Culture=neutral, PublicKeyToken=c07d481e9758c731">
+      <HintPath>..\packages\nanoFramework.CoreLibrary.1.1.1\lib\mscorlib.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.0.2.2, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.0.2\lib\nanoFramework.Runtime.Events.dll</HintPath>
+    <Reference Include="nanoFramework.Runtime.Events, Version=1.0.4.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
+      <HintPath>..\packages\nanoFramework.Runtime.Events.1.0.4\lib\nanoFramework.Runtime.Events.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>

diff --git a/source/Windows.Devices.Gpio/packages.config b/source/Windows.Devices.Gpio/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="nanoFramework.CoreLibrary" version="1.1.0" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.Runtime.Events" version="1.0.2" targetFramework="netnanoframework10" />
+  <package id="nanoFramework.CoreLibrary" version="1.1.1" targetFramework="netnanoframework10" />
+  <package id="nanoFramework.Runtime.Events" version="1.0.4" targetFramework="netnanoframework10" />
   <package id="Nerdbank.GitVersioning" version="3.0.4-beta" developmentDependency="true" targetFramework="netnanoframework10" />
 </packages>
diff --git a/source/nanoFramework.Windows.Devices.Gpio.DELIVERABLES.nuspec b/source/nanoFramework.Windows.Devices.Gpio.DELIVERABLES.nuspec
@@ -18,8 +18,8 @@
     <tags>
     </tags>
     <dependencies>
-      <dependency id="nanoFramework.CoreLibrary" version="[1.1.0]" />
-      <dependency id="nanoFramework.Runtime.Events" version="[1.0.2]" />
+      <dependency id="nanoFramework.CoreLibrary" version="[1.1.1]" />
+      <dependency id="nanoFramework.Runtime.Events" version="[1.0.4]" />
     </dependencies>
   </metadata>
   <files>

diff --git a/source/nanoFramework.Windows.Devices.Gpio.nuspec b/source/nanoFramework.Windows.Devices.Gpio.nuspec
@@ -17,8 +17,8 @@
     <summary>Windows.Devices.Gpio assembly for nanoFramework C# projects</summary>
     <tags>nanoFramework C# csharp netmf netnf Windows.Devices.Gpio</tags>
     <dependencies>
-      <dependency id="nanoFramework.CoreLibrary" version="[1.1.0]" />
-      <dependency id="nanoFramework.Runtime.Events" version="[1.0.2]" />
+      <dependency id="nanoFramework.CoreLibrary" version="[1.1.1]" />
+      <dependency id="nanoFramework.Runtime.Events" version="[1.0.4]" />
     </dependencies>
   </metadata>
   <files>

diff --git a/source/version.json b/source/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "assemblyVersion": {
     "precision": "revision"
   },
@@ -16,4 +16,4 @@
     "setVersionVariables": true,
     "setAllVariables": true
   }
-}
+}