Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bumps nanoFramework.CoreLibrary from 1.0.5-preview024 to 1.0.6-preview-001 #19

Merged
merged 2 commits into from
Nov 8, 2018
Merged

Bumps nanoFramework.CoreLibrary from 1.0.5-preview024 to 1.0.6-preview-001 #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e581e4
Bumps nanoFramework.CoreLibrary from 1.0.5-preview024 to 1.0.6-previe…
nfbot Nov 7, 2018
1017b87
Merge branch 'develop' into v1.0.6-preview-001-nfbot/update-dependenc…
josesimoes Nov 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions source/nanoFramework.Networking.Sntp.DELIVERABLES.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>nanoFramework.Networking.Sntp.DELIVERABLES</id>
Expand All @@ -7,24 +7,26 @@
<authors>nanoFramework project contributors</authors>
<owners>nanoFramework project contributors</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<releaseNotes></releaseNotes>
<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>
<copyright>Copyright (c) 2018 The nanoFramework project contributors</copyright>
<description>** DON'T REFERENCE THIS PACKAGE ** Not meant for development. This package includes the deliverable artifacts of the nanoFramework.Networking.Sntp assembly for nanoFramework. These are for testing purposes and for updating the native code base of the library.</description>
<summary>nanoFramework.Networking.Sntp.DELIVERABLES is not meant for development.</summary>
<tags></tags>
<tags>
</tags>
<dependencies>
<dependency id="nanoFramework.CoreLibrary" version="[1.0.5-preview024]" />
</dependencies>
<dependency id="nanoFramework.CoreLibrary" version="[1.0.6-preview-001]" />
</dependencies>
</metadata>
<files>
<file src="nanoFramework.Networking.Sntp\bin\Release\Stubs\*.*" target="content\Stubs\" />
<file src="nanoFramework.Networking.Sntp\obj\Release\*.txt" target="content\txt\" />
<file src="nanoFramework.Networking.Sntp\obj\Release\*.dump" target="content\dump\" />
<file src="nanoFramework.Networking.Sntp\obj\Release\*.strings" target="content\dump\" />
<file src="nanoFramework.Networking.Sntp\obj\Release\*.resources" target="content\resources\" />
<file src="nanoFramework.Networking.Sntp\obj\Release\*.il" target="content\disasm\" />
<file src="nanoFramework.Networking.Sntp\obj\Release\*.resources" target="content\resources\" />
<file src="nanoFramework.Networking.Sntp\obj\Release\*.il" target="content\disasm\" />
</files>
</package>
</package>
15 changes: 8 additions & 7 deletions source/nanoFramework.Networking.Sntp.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>nanoFramework.Networking.Sntp</id>
Expand All @@ -7,23 +7,24 @@
<authors>nanoFramework project contributors</authors>
<owners>nanoFramework project contributors</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<releaseNotes></releaseNotes>
<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>
<copyright>Copyright (c) 2018 The nanoFramework project contributors</copyright>
<description>This package includes the nanoFramework.Networking.Sntp assembly for nanoFramework C# projects.</description>
<summary>nanoFramework.Networking.Sntp assembly for nanoFramework C# projects</summary>
<tags>nanoFramework C# csharp netmf netnf nanoFramework.Networking.Sntp sntp</tags>
<dependencies>
<dependency id="nanoFramework.CoreLibrary" version="[1.0.5-preview024]" />
</dependencies>
<dependency id="nanoFramework.CoreLibrary" version="[1.0.6-preview-001]" />
</dependencies>
</metadata>
<files>
<file src="nanoFramework.Networking.Sntp\bin\Release\nanoFramework.Networking.Sntp.dll" target="lib\nanoFramework.Networking.Sntp.dll" />
<file src="nanoFramework.Networking.Sntp\bin\Release\nanoFramework.Networking.Sntp.pdb" target="lib\nanoFramework.Networking.Sntp.pdb" />
<file src="nanoFramework.Networking.Sntp\bin\Release\nanoFramework.Networking.Sntp.pdbx" target="lib\nanoFramework.Networking.Sntp.pdbx" />
<file src="nanoFramework.Networking.Sntp\bin\Release\nanoFramework.Networking.Sntp.pe" target="lib\nanoFramework.Networking.Sntp.pe" />
<file src="nanoFramework.Networking.Sntp\bin\Release\nanoFramework.Networking.Sntp.xml" target="lib\nanoFramework.Networking.Sntp.xml" />
<file src="nanoFramework.Networking.Sntp\bin\Release\nanoFramework.Networking.Sntp.xml" target="lib\nanoFramework.Networking.Sntp.xml" />
</files>
</package>
</package>
11 changes: 5 additions & 6 deletions source/nanoFramework.Networking.Sntp/nanoFramework.Networking.Sntp.nfproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<Name>nanoFramework.Networking.Sntp</Name>
</PropertyGroup>
<ItemGroup>
<NFMDP_PE_LoadHints Include="..\packages\nanoFramework.CoreLibrary.1.0.5-preview024\lib\mscorlib.dll">
<NFMDP_PE_LoadHints Include="..\packages\nanoFramework.CoreLibrary.1.0.6-preview-001\lib\mscorlib.dll">
<InProject>false</InProject>
</NFMDP_PE_LoadHints>
</ItemGroup>
Expand All @@ -58,11 +58,10 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Reference Include="mscorlib, Version=1.0.5.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\packages\nanoFramework.CoreLibrary.1.0.5-preview024\lib\mscorlib.dll</HintPath>
<Reference Include="mscorlib, Version=1.0.6.1, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\packages\nanoFramework.CoreLibrary.1.0.6-preview-001\lib\mscorlib.dll</HintPath>
<Private>True</Private>
<SpecificVersion>True</SpecificVersion>
</Reference>
</Reference>
</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" />
Expand All @@ -71,4 +70,4 @@
<ProjectConfigurationsDeclaredAsItems />
</ProjectCapabilities>
</ProjectExtensions>
</Project>
</Project>
2 changes: 1 addition & 1 deletion source/nanoFramework.Networking.Sntp/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="nanoFramework.CoreLibrary" version="1.0.5-preview024" targetFramework="netnanoframework10" />
<package id="nanoFramework.CoreLibrary" version="1.0.6-preview-001" targetFramework="netnanoframework10" />
<package id="Nerdbank.GitVersioning" version="2.2.13" developmentDependency="true" />
</packages>