From 3cc798265d9888e67a1c81ce36f293084fbb4060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Mon, 12 Mar 2018 03:07:27 +0000 Subject: [PATCH 1/3] Update comment on Random class - This is to clarify that some targets can have a pseudo-random software generator or a hardware random generator - Add pragma to remove warning about non used field - Fix Nuget solutions (see)[https://github.com/nuproj/nuproj/issues/298] --- appveyor.yml | 5 ++--- ...j => Nuget.CoreLibrary.DELIVERABLES.nuproj} | 18 ++---------------- ...Library.nuproj => Nuget.CoreLibrary.nuproj} | 5 +++-- source/System/Random.cs | 13 +++++++++++-- source/nanoFramework.CoreLibrary.Nuget.sln | 17 ++++++----------- source/nanoFramework.CoreLibrary.sln | 5 +++++ 6 files changed, 29 insertions(+), 34 deletions(-) rename source/Nuget.CoreLibrary.DELIVERABLES/{nanoFramework.CoreLibrary.DELIVERABLES.nuproj => Nuget.CoreLibrary.DELIVERABLES.nuproj} (81%) rename source/Nuget.CoreLibrary/{nanoFramework.CoreLibrary.nuproj => Nuget.CoreLibrary.nuproj} (92%) diff --git a/appveyor.yml b/appveyor.yml index ed2b9fdc..ba9c6c86 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -43,7 +43,6 @@ install: - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH% - bundle config --local path vendor/bundle - - gem install bundler --quiet --no-ri --no-rdoc - gem install github_changelog_generator --quiet --no-ri --no-rdoc # - bundle install - choco install gitversion.portable -pre -y @@ -147,7 +146,7 @@ before_build: - ps: >- - nuget restore source\nanoFramework.CoreLibrary.Nuget.sln + nuget restore source\nanoFramework.CoreLibrary.sln gitversion /l console /output buildserver /updateAssemblyInfo AssemblyInfo2.cs /ensureassemblyinfo @@ -256,7 +255,7 @@ before_build: - ps: >- - nuget restore source\nanoFramework.CoreLibrary.Nuget.sln + nuget restore source\nanoFramework.CoreLibrarysln gitversion /l console /output buildserver /updateAssemblyInfo AssemblyInfo2.cs /ensureassemblyinfo diff --git a/source/Nuget.CoreLibrary.DELIVERABLES/nanoFramework.CoreLibrary.DELIVERABLES.nuproj b/source/Nuget.CoreLibrary.DELIVERABLES/Nuget.CoreLibrary.DELIVERABLES.nuproj similarity index 81% rename from source/Nuget.CoreLibrary.DELIVERABLES/nanoFramework.CoreLibrary.DELIVERABLES.nuproj rename to source/Nuget.CoreLibrary.DELIVERABLES/Nuget.CoreLibrary.DELIVERABLES.nuproj index 3bc0c1b3..f2328fb8 100644 --- a/source/Nuget.CoreLibrary.DELIVERABLES/nanoFramework.CoreLibrary.DELIVERABLES.nuproj +++ b/source/Nuget.CoreLibrary.DELIVERABLES/Nuget.CoreLibrary.DELIVERABLES.nuproj @@ -14,21 +14,6 @@ - - content\mscorlib.dll - - - content\mscorlib.pdb - - - content\mscorlib.pdbx - - - content\mscorlib.pe - - - content\mscorlib.xml - content\Stubs\%(RecursiveDir)%(Filename)%(Extension) @@ -49,6 +34,7 @@ + v4.6.1 8FD36AD6-387C-48F0-A695-52D9149216FB @@ -65,7 +51,7 @@ ** DON'T REFERENCE THIS PACKAGE ** Not meant for development. This package includes the deliverable artifacts of the base class library (mscorlib) of nanoFramework. These are for testing purposes and for updating the native code base of the core library. - https://github.com/nanoframework/nf-class-libraries + https://github.com/nanoframework/lib-CoreLibrary Copyright (c) 2017 The nanoFramework project contributors diff --git a/source/Nuget.CoreLibrary/nanoFramework.CoreLibrary.nuproj b/source/Nuget.CoreLibrary/Nuget.CoreLibrary.nuproj similarity index 92% rename from source/Nuget.CoreLibrary/nanoFramework.CoreLibrary.nuproj rename to source/Nuget.CoreLibrary/Nuget.CoreLibrary.nuproj index 9261feae..03b6b693 100644 --- a/source/Nuget.CoreLibrary/nanoFramework.CoreLibrary.nuproj +++ b/source/Nuget.CoreLibrary/Nuget.CoreLibrary.nuproj @@ -31,7 +31,8 @@ - 96eaba11-6a33-454d-a7b2-b96ca5617e8c + v4.6.1 + dd773430-fe47-443c-b2eb-4f1dc0b7e52d ..\packages\NuProj.0.20.4-beta\tools\ @@ -47,7 +48,7 @@ This package includes the base class library (mscorlib) for nanoFramework C# projects - https://github.com/nanoframework/nf-class-libraries + https://github.com/nanoframework/lib-CoreLibrary Copyright (c) 2017 The nanoFramework project contributors diff --git a/source/System/Random.cs b/source/System/Random.cs index aef1341c..8101afd2 100644 --- a/source/System/Random.cs +++ b/source/System/Random.cs @@ -9,16 +9,25 @@ namespace System { /// - /// Represents a pseudo-random number generator, a device that produces a + /// Represents a random number generator, a device that produces a /// sequence of numbers that meet certain statistical requirements for /// randomness. /// + /// + /// Depending on the platform it can be a software dependent pseudo-random generator algorithm + /// or a hardware random generator providing true random numbers. + /// public class Random { + // this field needs to be here because it's required for the native implementation +#pragma warning disable 0169 private object _random; +#pragma warning restore 0169 + /// - /// Initializes a new instance of the Random class, using a time- + /// Initializes a new instance of the Random class. + /// If the provider is algorithm based the initialisation is performed using a time- /// dependent default seed value. /// [MethodImpl(MethodImplOptions.InternalCall)] diff --git a/source/nanoFramework.CoreLibrary.Nuget.sln b/source/nanoFramework.CoreLibrary.Nuget.sln index 1b498c7e..9912d083 100644 --- a/source/nanoFramework.CoreLibrary.Nuget.sln +++ b/source/nanoFramework.CoreLibrary.Nuget.sln @@ -3,14 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27130.2010 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FF286327-C783-4F7A-AB73-9BCBAD0D4460}") = "nanoFramework.CoreLibrary", "Nuget.CoreLibrary\nanoFramework.CoreLibrary.nuproj", "{96EABA11-6A33-454D-A7B2-B96CA5617E8C}" +Project("{FF286327-C783-4F7A-AB73-9BCBAD0D4460}") = "Nuget.CoreLibrary", "Nuget.CoreLibrary\Nuget.CoreLibrary.nuproj", "{DD773430-FE47-443C-B2EB-4F1DC0B7E52D}" EndProject -Project("{FF286327-C783-4F7A-AB73-9BCBAD0D4460}") = "nanoFramework.CoreLibrary.DELIVERABLES", "Nuget.CoreLibrary.DELIVERABLES\nanoFramework.CoreLibrary.DELIVERABLES.nuproj", "{8FD36AD6-387C-48F0-A695-52D9149216FB}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{7A280E23-EB14-4791-B9E7-4ECB6C84D7B8}" - ProjectSection(SolutionItems) = preProject - packages.config = packages.config - EndProjectSection +Project("{FF286327-C783-4F7A-AB73-9BCBAD0D4460}") = "Nuget.CoreLibrary.DELIVERABLES", "Nuget.CoreLibrary.DELIVERABLES\Nuget.CoreLibrary.DELIVERABLES.nuproj", "{8FD36AD6-387C-48F0-A695-52D9149216FB}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -18,10 +13,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {96EABA11-6A33-454D-A7B2-B96CA5617E8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {96EABA11-6A33-454D-A7B2-B96CA5617E8C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {96EABA11-6A33-454D-A7B2-B96CA5617E8C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {96EABA11-6A33-454D-A7B2-B96CA5617E8C}.Release|Any CPU.Build.0 = Release|Any CPU + {DD773430-FE47-443C-B2EB-4F1DC0B7E52D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DD773430-FE47-443C-B2EB-4F1DC0B7E52D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DD773430-FE47-443C-B2EB-4F1DC0B7E52D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DD773430-FE47-443C-B2EB-4F1DC0B7E52D}.Release|Any CPU.Build.0 = Release|Any CPU {8FD36AD6-387C-48F0-A695-52D9149216FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8FD36AD6-387C-48F0-A695-52D9149216FB}.Debug|Any CPU.Build.0 = Debug|Any CPU {8FD36AD6-387C-48F0-A695-52D9149216FB}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/source/nanoFramework.CoreLibrary.sln b/source/nanoFramework.CoreLibrary.sln index e488d8ae..c0d27c69 100644 --- a/source/nanoFramework.CoreLibrary.sln +++ b/source/nanoFramework.CoreLibrary.sln @@ -5,6 +5,11 @@ VisualStudioVersion = 15.0.27130.2010 MinimumVisualStudioVersion = 10.0.40219.1 Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "CoreLibrary", "CoreLibrary.nfproj", "{BE7B95D5-087C-45F8-8197-4B438BEDFE11}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{7A280E23-EB14-4791-B9E7-4ECB6C84D7B8}" + ProjectSection(SolutionItems) = preProject + packages.config = packages.config + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU From c0ba8b67041e56d974694a4d1f1dd33824994071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Fri, 16 Mar 2018 12:55:37 +0000 Subject: [PATCH 2/3] Update Slack workspace URL --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ea8d4f83..763911ff 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ For documentation, providing feedback, issues and finding out how to contribute please refer to the [Home repo](https://github.com/nanoframework/Home). -Join our Slack community by filling in this [invite form](https://nanoframework.wordpress.com/slack-invite-form/). +Join our Slack community [here](https://join.slack.com/t/nanoframework/shared_invite/enQtMzI3OTg4MTk0NTgwLWQ0ODQ3ZWIwZjgxZWFmNjU3MDIwN2E2YzM2OTdhMWRiY2Q3M2NlOTk2N2IwNTM3MmRlMmQ2NTRlNjZlYzJlMmY). ## Credits From 77a0ae43bf96d8a6c3cb57081a8ffccdb351d8f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Mon, 2 Apr 2018 13:14:58 +0100 Subject: [PATCH 3/3] Correct project URL --- source/Nuget.CoreLibrary/Nuget.CoreLibrary.nuproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/Nuget.CoreLibrary/Nuget.CoreLibrary.nuproj b/source/Nuget.CoreLibrary/Nuget.CoreLibrary.nuproj index 03b6b693..5441e433 100644 --- a/source/Nuget.CoreLibrary/Nuget.CoreLibrary.nuproj +++ b/source/Nuget.CoreLibrary/Nuget.CoreLibrary.nuproj @@ -57,4 +57,4 @@ false - \ No newline at end of file +