Merge nanoframework/release-v1.0.4

nanoframework · Jan 21, 2019 · 5a4298a · 5a4298a
2 parents 47a9e82 + e29560b
commit 5a4298a
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,21 @@
 # Change Log
 
-## [v1.0.2-preview-027](https://github.com/nanoframework/lib-nanoFramework.Runtime.Events/tree/v1.0.2-preview-027) (2018-12-14)
-[Full Changelog](https://github.com/nanoframework/lib-nanoFramework.Runtime.Events/compare/v1.0.2-preview-023...v1.0.2-preview-027)
+## [**Changes available only in 'Preview' NuGet packages:**](https://github.com/nanoframework/lib-nanoFramework.Runtime.Events/tree/HEAD)
+
+[Full Changelog](https://github.com/nanoframework/lib-nanoFramework.Runtime.Events/compare/v1.0.2...HEAD)
+
+**Documentation and other chores:**
+
+- Bumps nanoFramework.CoreLibrary from 1.1.0 to 1.1.1 [\#50](https://github.com/nanoframework/lib-nanoFramework.Runtime.Events/pull/50)
+- Merge back from Release v1.0.2 [\#49](https://github.com/nanoframework/lib-nanoFramework.Runtime.Events/pull/49)
+
+## [v1.0.2](https://github.com/nanoframework/lib-nanoFramework.Runtime.Events/tree/v1.0.2) (2018-12-14)
+[Full Changelog](https://github.com/nanoframework/lib-nanoFramework.Runtime.Events/compare/v1.0.2-preview-023...v1.0.2)
 
 ## [v1.0.0](https://github.com/nanoframework/lib-nanoFramework.Runtime.Events/tree/v1.0.0) (2018-10-17)
 **Documentation and other chores:**
 
+- Release v1.0.2 [\#48](https://github.com/nanoframework/lib-nanoFramework.Runtime.Events/pull/48)
 - Bumps nanoFramework.CoreLibrary from 1.0.6-preview-021 to 1.1.0 [\#47](https://github.com/nanoframework/lib-nanoFramework.Runtime.Events/pull/47)
 
 ## [v1.0.2-preview-023](https://github.com/nanoframework/lib-nanoFramework.Runtime.Events/tree/v1.0.2-preview-023) (2018-12-03)

diff --git a/source/nanoFramework.Runtime.Events.DELIVERABLES.nuspec b/source/nanoFramework.Runtime.Events.DELIVERABLES.nuspec
@@ -18,7 +18,7 @@
     <tags>
     </tags>
     <dependencies>
-      <dependency id="nanoFramework.CoreLibrary" version="[1.1.0]" />
+      <dependency id="nanoFramework.CoreLibrary" version="[1.1.1]" />
     </dependencies>
   </metadata>
   <files>

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

diff --git a/source/nanoFramework.Runtime.Events/nanoFramework.Runtime.Events.nfproj b/source/nanoFramework.Runtime.Events/nanoFramework.Runtime.Events.nfproj
@@ -45,7 +45,7 @@
     <Name>nanoFramework.Runtime.Events</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>
   </ItemGroup>
@@ -67,8 +67,8 @@
     <None Include="packages.config" />
   </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>
   </ItemGroup>

diff --git a/source/nanoFramework.Runtime.Events/packages.config b/source/nanoFramework.Runtime.Events/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="nanoFramework.CoreLibrary" version="1.1.0" targetFramework="netnanoframework10" />
+  <package id="nanoFramework.CoreLibrary" version="1.1.1" targetFramework="netnanoframework10" />
   <package id="Nerdbank.GitVersioning" version="3.0.4-beta" developmentDependency="true" targetFramework="netnanoframework10" />
 </packages>
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
   }
-}
+}