Merge pull request #69 from nanoframework/release-v1.1.2

nanoframework · Apr 23, 2019 · 215ee36 · 215ee36
2 parents e35d6c7 + 99af451
commit 215ee36
Show file tree

Hide file tree

Showing 10 changed files with 78 additions and 80 deletions.
diff --git 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)
 

diff --git 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

diff --git a/source/Nuget.CoreLibrary/Nuget.CoreLibrary.nuproj b/source/Nuget.CoreLibrary/Nuget.CoreLibrary.nuproj
diff --git a/source/nanoFramework.CoreLibrary/CoreLibrary.nfproj b/source/nanoFramework.CoreLibrary/CoreLibrary.nfproj
@@ -313,6 +313,9 @@
     <NFMDP_PE_ExcludeClassByName Include="System.Reflection.AssemblyVersionAttribute">
       <InProject>false</InProject>
     </NFMDP_PE_ExcludeClassByName>
+    <NFMDP_PE_ExcludeClassByName Include="System.Reflection.AssemblyNativeVersionAttribute">
+      <InProject>false</InProject>
+    </NFMDP_PE_ExcludeClassByName>
     <NFMDP_PE_ExcludeClassByName Include="System.Reflection.DefaultMemberAttribute">
       <InProject>false</InProject>
     </NFMDP_PE_ExcludeClassByName>
@@ -373,12 +376,19 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="..\key.snk" />
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <Import Project="..\packages\Nerdbank.GitVersioning.2.3.34\build\Nerdbank.GitVersioning.targets" />
   <ProjectExtensions>
     <ProjectCapabilities>
       <ProjectConfigurationsDeclaredAsItems />
     </ProjectCapabilities>
   </ProjectExtensions>
+  <Import Project="..\packages\Nerdbank.GitVersioning.3.0.6-beta\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.0.6-beta\build\Nerdbank.GitVersioning.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>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}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.0.6-beta\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.0.6-beta\build\Nerdbank.GitVersioning.targets'))" />
+  </Target>
 </Project>
diff --git 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/IO/Stream.cs b/source/nanoFramework.CoreLibrary/System/IO/Stream.cs
@@ -83,10 +83,10 @@ public abstract long Position
         }
 
         /// <summary>
-        /// 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.
         /// </summary>
         /// <value>
-        /// 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.
         /// </value>
         /// <exception cref="System.InvalidOperationException"></exception>
         public virtual int ReadTimeout
@@ -103,10 +103,10 @@ public virtual int ReadTimeout
         }
 
         /// <summary>
-        /// 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.
         /// </summary>
         /// <value>
-        /// 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.
         /// </value>
         /// <exception cref="System.InvalidOperationException"></exception>
         public virtual int WriteTimeout

diff --git 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; }
         }
     }
+
+    /// <summary>
+    /// 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.
+    /// </summary>
+    /// <remarks>
+    /// This attribute is specific of nanoFramework.
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class, Inherited = false)]
+    public sealed class AssemblyNativeVersionAttribute : Attribute
+    {
+        private readonly String _nativeVersion;
+
+        /// <summary>
+        /// Initializes a new instance of the AssemblyNativeVersionAttribute class.
+        /// </summary>
+        /// <param name="version">The native version required for the assembly.</param>
+        public AssemblyNativeVersionAttribute(String version)
+        {
+            _nativeVersion = version;
+        }
+
+        /// <summary>
+        /// Gets the native version required for the assembly.
+        /// </summary>
+        /// <value>
+        /// A string containing the native version.
+        /// </value>
+        public String NativeVersion
+        {
+            get { return _nativeVersion; }
+        }
+    }
 }
diff --git 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);
 
         /// <summary>
-        /// Returns a <see cref="TimeSpan"/> that represents a specified time, where the specification is in units of miliseconds.
+        /// Returns a <see cref="TimeSpan"/> that represents a specified time, where the specification is in units of milliseconds.
         /// </summary>
-        /// <param name="value">A number of miliseconds that represent a time.</param>
+        /// <param name="value">A number of milliseconds that represent a time.</param>
         /// <returns>An object that represents value.</returns>
-        public static TimeSpan FromMiliseconds(long value) => new TimeSpan(TimeSpan.TicksPerMillisecond  * value);
+        public static TimeSpan FromMilliseconds(long value) => new TimeSpan(TimeSpan.TicksPerMillisecond  * value);
 
         /// <summary>
         /// Returns a <see cref="TimeSpan"/> that represents a specified time, where the specification is in units of seconds.

diff --git a/source/nanoFramework.CoreLibrary/packages.config b/source/nanoFramework.CoreLibrary/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Nerdbank.GitVersioning" version="2.3.34" developmentDependency="true" />
+  <package id="Nerdbank.GitVersioning" version="3.0.6-beta" developmentDependency="true" />
 </packages>
diff --git a/source/version.json b/source/version.json
@@ -1,19 +1,20 @@
 {
   "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.1.1",
+  "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"
   }
 }