From 1d9ad74c49333d908bb8283b97957e01fa64e41c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Mon, 4 Feb 2019 10:42:27 +0000 Subject: [PATCH 01/10] Remove unused nuproj file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: José Simões --- .../Nuget.CoreLibrary.nuproj | 62 ------------------- 1 file changed, 62 deletions(-) delete mode 100644 source/Nuget.CoreLibrary/Nuget.CoreLibrary.nuproj diff --git a/source/Nuget.CoreLibrary/Nuget.CoreLibrary.nuproj b/source/Nuget.CoreLibrary/Nuget.CoreLibrary.nuproj deleted file mode 100644 index 9bda5b88..00000000 --- a/source/Nuget.CoreLibrary/Nuget.CoreLibrary.nuproj +++ /dev/null @@ -1,62 +0,0 @@ - - - - - Debug - AnyCPU - - - Release - AnyCPU - - - - 1.0.0-preview001 - - - - lib\mscorlib.dll - - - lib\mscorlib.pdb - - - lib\mscorlib.pdbx - - - lib\mscorlib.pe - - - lib\mscorlib.xml - - - - - - - dd773430-fe47-443c-b2eb-4f1dc0b7e52d - - - ..\packages\NuProj.0.20.4-beta\tools\ - - - - nanoFramework.CoreLibrary - 1.0.5-preview024 - nanoFramework.CoreLibrary - nanoFramework project contributors - nanoFramework project contributors - nanoFramework.CoreLibrary is the base class library (mscorlib) for nanoFramework C# projects. - This package includes the base class library (mscorlib) for nanoFramework C# projects - - - https://github.com/nanoframework/lib-CoreLibrary - - - Copyright (c) 2017 The nanoFramework project contributors - nanoFramework C# csharp netmf netnf mscorlib - https://secure.gravatar.com/avatar/97d0e092247f0716db6d4b47b7d1d1ad - false - - - From 58877d61d6c9246005ba059ce37850c8e4095177 Mon Sep 17 00:00:00 2001 From: nfbot Date: Mon, 4 Feb 2019 10:45:15 +0000 Subject: [PATCH 02/10] Update CHANGELOG for v1.1.0.5 ***NO_CI*** --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a2ebf611..1c2e07e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,7 @@ # Change Log -## [**Changes available only in 'Preview' NuGet packages:**](https://github.com/nanoframework/lib-CoreLibrary/tree/HEAD) - -[Full Changelog](https://github.com/nanoframework/lib-CoreLibrary/compare/v1.1.0...HEAD) +## [v1.1.1](https://github.com/nanoframework/lib-CoreLibrary/tree/v1.1.1) (2019-01-21) +[Full Changelog](https://github.com/nanoframework/lib-CoreLibrary/compare/v1.1.0...v1.1.1) **Fixed bugs:** @@ -10,6 +9,7 @@ **Documentation and other chores:** +- Release v1.1.1.0 [\#65](https://github.com/nanoframework/lib-CoreLibrary/pull/65) - Merge back from Release v1.1.0 [\#63](https://github.com/nanoframework/lib-CoreLibrary/pull/63) ## [v1.1.0](https://github.com/nanoframework/lib-CoreLibrary/tree/v1.1.0) (2018-12-14) From ae7be894321023b2e1f38ce071a81694abd5b366 Mon Sep 17 00:00:00 2001 From: Hassmann Date: Thu, 18 Apr 2019 13:41:36 +0200 Subject: [PATCH 03/10] Fix typo in TimeSpan #66 ***NO_CI*** --- source/nanoFramework.CoreLibrary/System/IO/Stream.cs | 8 ++++---- source/nanoFramework.CoreLibrary/System/TimeSpan.cs | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/source/nanoFramework.CoreLibrary/System/IO/Stream.cs b/source/nanoFramework.CoreLibrary/System/IO/Stream.cs index 0d0a8f9d..15932a46 100644 --- a/source/nanoFramework.CoreLibrary/System/IO/Stream.cs +++ b/source/nanoFramework.CoreLibrary/System/IO/Stream.cs @@ -83,10 +83,10 @@ public abstract long Position } /// - /// Gets or sets a value, in miliseconds, that determines how long the stream will attempt to read before timing out. + /// Gets or sets a value, in milliseconds, that determines how long the stream will attempt to read before timing out. /// /// - /// A value, in miliseconds, that determines how long the stream will attempt to read before timing out. + /// A value, in milliseconds, that determines how long the stream will attempt to read before timing out. /// /// public virtual int ReadTimeout @@ -103,10 +103,10 @@ public virtual int ReadTimeout } /// - /// Gets or sets a value, in miliseconds, that determines how long the stream will attempt to write before timing out. + /// Gets or sets a value, in milliseconds, that determines how long the stream will attempt to write before timing out. /// /// - /// A value, in miliseconds, that determines how long the stream will attempt to write before timing out. + /// A value, in milliseconds, that determines how long the stream will attempt to write before timing out. /// /// public virtual int WriteTimeout diff --git a/source/nanoFramework.CoreLibrary/System/TimeSpan.cs b/source/nanoFramework.CoreLibrary/System/TimeSpan.cs index 0cb8b553..4ce1c464 100644 --- a/source/nanoFramework.CoreLibrary/System/TimeSpan.cs +++ b/source/nanoFramework.CoreLibrary/System/TimeSpan.cs @@ -260,11 +260,11 @@ public double TotalMilliseconds public static TimeSpan FromTicks(long value) => new TimeSpan(value); /// - /// Returns a that represents a specified time, where the specification is in units of miliseconds. + /// Returns a that represents a specified time, where the specification is in units of milliseconds. /// - /// A number of miliseconds that represent a time. + /// A number of milliseconds that represent a time. /// An object that represents value. - public static TimeSpan FromMiliseconds(long value) => new TimeSpan(TimeSpan.TicksPerMillisecond * value); + public static TimeSpan FromMilliseconds(long value) => new TimeSpan(TimeSpan.TicksPerMillisecond * value); /// /// Returns a that represents a specified time, where the specification is in units of seconds. From a677482b7b2a3d8d97039b2bfc0157c943d80dba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Tue, 23 Apr 2019 09:18:40 +0100 Subject: [PATCH 04/10] Add AssemblyNativeVersionAttribute (#67) ***NO_CI*** --- .../CoreLibrary.nfproj | 3 ++ .../System/AssemblyInfo2.cs | 3 ++ .../System/Reflection/AssemblyAttributes.cs | 33 +++++++++++++++++++ 3 files changed, 39 insertions(+) diff --git a/source/nanoFramework.CoreLibrary/CoreLibrary.nfproj b/source/nanoFramework.CoreLibrary/CoreLibrary.nfproj index 4b945850..f32172ef 100644 --- a/source/nanoFramework.CoreLibrary/CoreLibrary.nfproj +++ b/source/nanoFramework.CoreLibrary/CoreLibrary.nfproj @@ -313,6 +313,9 @@ false + + false + false diff --git a/source/nanoFramework.CoreLibrary/System/AssemblyInfo2.cs b/source/nanoFramework.CoreLibrary/System/AssemblyInfo2.cs index e1a1bda9..009f1b41 100644 --- a/source/nanoFramework.CoreLibrary/System/AssemblyInfo2.cs +++ b/source/nanoFramework.CoreLibrary/System/AssemblyInfo2.cs @@ -6,9 +6,12 @@ using System; using System.Reflection; +using System.Runtime.CompilerServices; [assembly: CLSCompliant(true)] [assembly: AssemblyTitle("mscorlib")] [assembly: AssemblyCompany("nanoFramework Contributors")] [assembly: AssemblyProduct("nanoFramework mscorlib")] [assembly: AssemblyCopyright("Copyright © nanoFramework Contributors 2017")] + +[assembly: AssemblyNativeVersion("1.1.1.")] diff --git a/source/nanoFramework.CoreLibrary/System/Reflection/AssemblyAttributes.cs b/source/nanoFramework.CoreLibrary/System/Reflection/AssemblyAttributes.cs index a6ffadf8..1186bdb6 100644 --- a/source/nanoFramework.CoreLibrary/System/Reflection/AssemblyAttributes.cs +++ b/source/nanoFramework.CoreLibrary/System/Reflection/AssemblyAttributes.cs @@ -226,4 +226,37 @@ public String Version get { return _version; } } } + + /// + /// Defines the required native version required for an assembly. + /// At deploy time this is used to check if the target device has the correct native version to support this assembly. + /// + /// + /// This attribute is specific of nanoFramework. + /// + [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class, Inherited = false)] + public sealed class AssemblyNativeVersionAttribute : Attribute + { + private readonly String _nativeVersion; + + /// + /// Initializes a new instance of the AssemblyNativeVersionAttribute class. + /// + /// The native version required for the assembly. + public AssemblyNativeVersionAttribute(String version) + { + _nativeVersion = version; + } + + /// + /// Gets the native version required for the assembly. + /// + /// + /// A string containing the native version. + /// + public String NativeVersion + { + get { return _nativeVersion; } + } + } } From 50e1fd3b19001a41fe7fd859f0de3b558552dd88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Tue, 23 Apr 2019 09:56:15 +0100 Subject: [PATCH 05/10] Update GitVersioning NuGet (#68) ***NO_CI*** --- source/nanoFramework.CoreLibrary/CoreLibrary.nfproj | 9 ++++++++- source/nanoFramework.CoreLibrary/packages.config | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/source/nanoFramework.CoreLibrary/CoreLibrary.nfproj b/source/nanoFramework.CoreLibrary/CoreLibrary.nfproj index f32172ef..d9d2013b 100644 --- a/source/nanoFramework.CoreLibrary/CoreLibrary.nfproj +++ b/source/nanoFramework.CoreLibrary/CoreLibrary.nfproj @@ -376,12 +376,19 @@ + - + + + + This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}. + + + \ No newline at end of file diff --git a/source/nanoFramework.CoreLibrary/packages.config b/source/nanoFramework.CoreLibrary/packages.config index 96e35ee3..dd608141 100644 --- a/source/nanoFramework.CoreLibrary/packages.config +++ b/source/nanoFramework.CoreLibrary/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file From 81e8a2c09bd44794cb778e56948cbcfb34e35c58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Tue, 23 Apr 2019 09:57:35 +0100 Subject: [PATCH 06/10] Work CD-CI - Remove unused parameters. ***NO_CI*** --- azure-pipelines.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1277852d..2363d549 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -39,9 +39,6 @@ steps: # step from template @ nf-tools repo # all build, update and publish steps - template: azure-pipelines-templates/class-lib-build.yml@templates - parameters: - sourceFileName: 'corlib_native.cpp' - classLibName: 'CoreLibrary' # update dependencies - task: UpdatenFDependencies@1 From f37bc8992da0f10828f40ec9673796ec3311e1d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Tue, 23 Apr 2019 10:00:46 +0100 Subject: [PATCH 07/10] Fix version number ***NO_CI*** --- source/version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/version.json b/source/version.json index 51a7e9dc..f1054fac 100644 --- 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.1.0", + "version": "1.1.1-preview.{height}", "assemblyVersion": { "precision": "revision" }, From 9264e9500d2cdc8ed0cc64a1554c961caae6aa31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Tue, 23 Apr 2019 10:06:15 +0100 Subject: [PATCH 08/10] Work CD-CI - Add config for release. ***NO_CI*** --- source/version.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/source/version.json b/source/version.json index f1054fac..36a35fa6 100644 --- a/source/version.json +++ b/source/version.json @@ -1,6 +1,11 @@ { "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", "version": "1.1.1-preview.{height}", + "release": { + "branchName" : "release-v{version}", + "versionIncrement" : "minor", + "firstUnstableTag" : "preview" + }, "assemblyVersion": { "precision": "revision" }, From 750d4c45cfb1c03590d1f1322c671623d24afadc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Tue, 23 Apr 2019 10:06:47 +0100 Subject: [PATCH 09/10] Set version to '1.1.2' --- source/version.json | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/source/version.json b/source/version.json index 36a35fa6..1cda3341 100644 --- a/source/version.json +++ b/source/version.json @@ -1,24 +1,20 @@ { "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "1.1.1-preview.{height}", - "release": { - "branchName" : "release-v{version}", - "versionIncrement" : "minor", - "firstUnstableTag" : "preview" - }, + "version": "1.1.2", "assemblyVersion": { "precision": "revision" }, "semVer1NumericIdentifierPadding": 3, - "nugetPackageVersion": { - "semVer": 1 - }, "publicReleaseRefSpec": [ "^refs/heads/master$", "^refs/heads/v\\d+(?:\\.\\d+)?$" ], "cloudBuild": { - "setVersionVariables": true, - "setAllVariables": true + "setAllVariables": true, + "buildNumber": null + }, + "release": { + "branchName": "release-v{version}", + "firstUnstableTag": "preview" } } \ No newline at end of file From 85761a1e651581575ee334df0bf5712a1d24f18c Mon Sep 17 00:00:00 2001 From: nfbot Date: Tue, 23 Apr 2019 09:21:36 +0000 Subject: [PATCH 10/10] Update CHANGELOG for v1.1.2.1 ***NO_CI*** --- CHANGELOG.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c2e07e2..1afb87ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,21 @@ # Change Log +## [**Changes available only in 'Preview' NuGet packages:**](https://github.com/nanoframework/lib-CoreLibrary/tree/HEAD) + +[Full Changelog](https://github.com/nanoframework/lib-CoreLibrary/compare/v1.1.1...HEAD) + +**Implemented enhancements:** + +- Add AssemblyNativeVersionAttribute [\#67](https://github.com/nanoframework/lib-CoreLibrary/pull/67) [[Breaking-Change](https://github.com/nanoframework/lib-CoreLibrary/labels/Breaking-Change)] + +**Fixed bugs:** + +- Fix typo in TimeSpan [\#66](https://github.com/nanoframework/lib-CoreLibrary/pull/66) + +**Documentation and other chores:** + +- Update GitVersioning NuGet [\#68](https://github.com/nanoframework/lib-CoreLibrary/pull/68) + ## [v1.1.1](https://github.com/nanoframework/lib-CoreLibrary/tree/v1.1.1) (2019-01-21) [Full Changelog](https://github.com/nanoframework/lib-CoreLibrary/compare/v1.1.0...v1.1.1)