Skip to content

Commit 616e044

Browse files
authored
Merge nanoframework/release-v1.0.4
2 parents c162472 + 1bfd2a8 commit 616e044

File tree

6 files changed

+20
-10
lines changed

6 files changed

+20
-10
lines changed

CHANGELOG.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,21 @@
11
# Change Log
22

3-
## [v1.0.2-preview-056](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/tree/v1.0.2-preview-056) (2018-12-14)
4-
[Full Changelog](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/compare/v1.0.2-preview-049...v1.0.2-preview-056)
3+
## [**Changes available only in 'Preview' NuGet packages:**](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/tree/HEAD)
4+
5+
[Full Changelog](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/compare/v1.0.2...HEAD)
6+
7+
**Documentation and other chores:**
8+
9+
- Bumps nanoFramework.CoreLibrary from 1.1.0 to 1.1.1 [\#30](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/pull/30)
10+
- Merge back from Release v1.0.2 [\#29](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/pull/29)
11+
12+
## [v1.0.2](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/tree/v1.0.2) (2018-12-15)
13+
[Full Changelog](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/compare/v1.0.2-preview-049...v1.0.2)
514

615
## [v1.0.0](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/tree/v1.0.0) (2018-10-17)
716
**Documentation and other chores:**
817

18+
- Release v1.0.2 [\#28](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/pull/28)
919
- Bumps nanoFramework.CoreLibrary from 1.0.6-preview-021 to 1.1.0 [\#27](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/pull/27)
1020
- Bumps nanoFramework.CoreLibrary from 1.0.6-preview-010 to 1.0.6-preview-021 [\#26](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/pull/26)
1121

source/nanoFramework.Networking.Sntp.DELIVERABLES.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<tags>
1919
</tags>
2020
<dependencies>
21-
<dependency id="nanoFramework.CoreLibrary" version="[1.1.0]" />
21+
<dependency id="nanoFramework.CoreLibrary" version="[1.1.1]" />
2222
</dependencies>
2323
</metadata>
2424
<files>

source/nanoFramework.Networking.Sntp.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<summary>nanoFramework.Networking.Sntp assembly for nanoFramework C# projects</summary>
1818
<tags>nanoFramework C# csharp netmf netnf nanoFramework.Networking.Sntp sntp</tags>
1919
<dependencies>
20-
<dependency id="nanoFramework.CoreLibrary" version="[1.1.0]" />
20+
<dependency id="nanoFramework.CoreLibrary" version="[1.1.1]" />
2121
</dependencies>
2222
</metadata>
2323
<files>

source/nanoFramework.Networking.Sntp/nanoFramework.Networking.Sntp.nfproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<Name>nanoFramework.Networking.Sntp</Name>
4545
</PropertyGroup>
4646
<ItemGroup>
47-
<NFMDP_PE_LoadHints Include="..\packages\nanoFramework.CoreLibrary.1.1.0\lib\mscorlib.dll">
47+
<NFMDP_PE_LoadHints Include="..\packages\nanoFramework.CoreLibrary.1.1.1\lib\mscorlib.dll">
4848
<InProject>false</InProject>
4949
</NFMDP_PE_LoadHints>
5050
</ItemGroup>
@@ -58,8 +58,8 @@
5858
<None Include="packages.config" />
5959
</ItemGroup>
6060
<ItemGroup>
61-
<Reference Include="mscorlib, Version=1.1.0.4, Culture=neutral, PublicKeyToken=c07d481e9758c731">
62-
<HintPath>..\packages\nanoFramework.CoreLibrary.1.1.0\lib\mscorlib.dll</HintPath>
61+
<Reference Include="mscorlib, Version=1.1.1.7, Culture=neutral, PublicKeyToken=c07d481e9758c731">
62+
<HintPath>..\packages\nanoFramework.CoreLibrary.1.1.1\lib\mscorlib.dll</HintPath>
6363
<Private>True</Private>
6464
</Reference>
6565
</ItemGroup>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="nanoFramework.CoreLibrary" version="1.1.0" targetFramework="netnanoframework10" />
3+
<package id="nanoFramework.CoreLibrary" version="1.1.1" targetFramework="netnanoframework10" />
44
<package id="Nerdbank.GitVersioning" version="3.0.4-beta" developmentDependency="true" targetFramework="netnanoframework10" />
55
</packages>

source/version.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
3-
"version": "1.0.2",
3+
"version": "1.0.4",
44
"assemblyVersion": {
55
"precision": "revision"
66
},
@@ -16,4 +16,4 @@
1616
"setVersionVariables": true,
1717
"setAllVariables": true
1818
}
19-
}
19+
}

0 commit comments

Comments
 (0)