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

release-v1.1.2
nanoframework · Dec 2, 2021 · 8d5476d · 8d5476d
2 parents 3d87556 + b746054
commit 8d5476d
Show file tree

Hide file tree

Showing 12 changed files with 59 additions and 40 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,13 +1,36 @@
 # Changelog
 
-## [v1.1.1](https://github.com/nanoframework/System.Text/tree/v1.1.1) (2021-07-15)
+[Full Changelog](https://github.com/nanoframework/System.Text/compare/v1.1.2-preview.12...HEAD)
 
-[Full Changelog](https://github.com/nanoframework/System.Text/compare/v1.1.1-preview.70...v1.1.1)
+**Documentation and other chores:**
+
+- Bumps nanoFramework.CoreLibrary from 1.11.6-preview.2 to 1.11.7 [\#72](https://github.com/nanoframework/System.Text/pull/72)
+
+## [v1.1.2-preview.12](https://github.com/nanoframework/System.Text/tree/v1.1.2-preview.12) (2021-12-02)
+
+[Full Changelog](https://github.com/nanoframework/System.Text/compare/v1.1.2-preview.9...v1.1.2-preview.12)
 
 **Documentation and other chores:**
 
+- Update 1 nuget dependencies [\#71](https://github.com/nanoframework/System.Text/pull/71)
+- Bumps nanoFramework.CoreLibrary from 1.10.5 to 1.11.6-preview.2 [\#69](https://github.com/nanoframework/System.Text/pull/69)
+
+## [v1.1.2-preview.9](https://github.com/nanoframework/System.Text/tree/v1.1.2-preview.9) (2021-12-01)
+
+[Full Changelog](https://github.com/nanoframework/System.Text/compare/v1.1.1...v1.1.2-preview.9)
+
+**Documentation and other chores:**
+
+- Update 2 nuget dependencies [\#70](https://github.com/nanoframework/System.Text/pull/70)
+- Update 1 nuget dependencies [\#68](https://github.com/nanoframework/System.Text/pull/68)
+- Update 1 nuget dependencies [\#65](https://github.com/nanoframework/System.Text/pull/65)
+- Update 1 nuget dependencies [\#64](https://github.com/nanoframework/System.Text/pull/64)
 - Update 1 nuget dependencies [\#62](https://github.com/nanoframework/System.Text/pull/62)
 
+## [v1.1.1](https://github.com/nanoframework/System.Text/tree/v1.1.1) (2021-07-15)
+
+[Full Changelog](https://github.com/nanoframework/System.Text/compare/v1.1.1-preview.70...v1.1.1)
+
 ## [v1.1.1-preview.70](https://github.com/nanoframework/System.Text/tree/v1.1.1-preview.70) (2021-07-14)
 
 [Full Changelog](https://github.com/nanoframework/System.Text/compare/v1.1.1-preview.64...v1.1.1-preview.70)

diff --git a/NuGet.Config b/NuGet.Config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <packageSources>
-        <add key="Azure Artifacts nanoFramework dev" value="https://pkgs.dev.azure.com/nanoframework/feed/_packaging/sandbox/nuget/v3/index.json" protocolVersion="3" />
         <add key="NuGet" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+        <add key="Azure Artifacts nanoFramework dev" value="https://pkgs.dev.azure.com/nanoframework/feed/_packaging/sandbox/nuget/v3/index.json" protocolVersion="3" />
     </packageSources>
 </configuration>
diff --git a/README.md b/README.md
@@ -1,11 +1,11 @@
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=nanoframework_lib-nanoFramework.System.Text&metric=alert_status)](https://sonarcloud.io/dashboard?id=nanoframework_lib-nanoFramework.System.Text) [![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=nanoframework_lib-nanoFramework.System.Text&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=nanoframework_lib-nanoFramework.System.Text) [![License](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE) [![NuGet](https://img.shields.io/nuget/dt/nanoFramework.System.Text.svg?label=NuGet&style=flat&logo=nuget)](https://www.nuget.org/packages/nanoFramework.System.Text/) [![#yourfirstpr](https://img.shields.io/badge/first--timers--only-friendly-blue.svg)](https://github.com/nanoframework/Home/blob/main/CONTRIBUTING.md)
 [![Discord](https://img.shields.io/discord/478725473862549535.svg?logo=discord&logoColor=white&label=Discord&color=7289DA)](https://discord.gg/gCyBu8T)
 
-![nanoFramework logo](https://github.com/nanoframework/Home/blob/main/resources/logo/nanoFramework-repo-logo.png)
+![nanoFramework logo](https://raw.githubusercontent.com/nanoframework/Home/main/resources/logo/nanoFramework-repo-logo.png)
 
 -----
 
-### Welcome to the **nanoFramework** System.Text repository!
+### Welcome to the .NET **nanoFramework** System.Text repository
 
 ## Build status
 
@@ -30,7 +30,7 @@ The **nanoFramework** Class Libraries are licensed under the [MIT license](LICEN
 
 ## Code of Conduct
 
-This project has adopted the code of conduct defined by the Contributor Covenant to clarify expected behavior in our community.
+This project has adopted the code of conduct defined by the Contributor Covenant to clarify expected behaviour in our community.
 For more information see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).
 
 ### .NET Foundation

diff --git a/Tests/NFUnitTestStringBuilder/NFUnitTestStringBuilder.nfproj b/Tests/NFUnitTestStringBuilder/NFUnitTestStringBuilder.nfproj
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildToolsPath)..\..\..\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
+    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
   </PropertyGroup>
   <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
   <ItemGroup>
@@ -32,16 +32,16 @@
     <Compile Include="StringBuilderTests.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="mscorlib, Version=1.10.5.4, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\..\packages\nanoFramework.CoreLibrary.1.10.5\lib\mscorlib.dll</HintPath>
+    <Reference Include="mscorlib, Version=1.11.7.2, Culture=neutral, PublicKeyToken=c07d481e9758c731">
+      <HintPath>..\..\packages\nanoFramework.CoreLibrary.1.11.7\lib\mscorlib.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nanoFramework.TestFramework, Version=1.0.147.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\..\packages\nanoFramework.TestFramework.1.0.147\lib\nanoFramework.TestFramework.dll</HintPath>
+    <Reference Include="nanoFramework.TestFramework, Version=1.0.163.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
+      <HintPath>..\..\packages\nanoFramework.TestFramework.1.0.163\lib\nanoFramework.TestFramework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="nanoFramework.UnitTestLauncher, Version=0.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\..\packages\nanoFramework.TestFramework.1.0.147\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
+      <HintPath>..\..\packages\nanoFramework.TestFramework.1.0.163\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -59,11 +59,11 @@
       <ProjectConfigurationsDeclaredAsItems />
     </ProjectCapabilities>
   </ProjectExtensions>
-  <Import Project="..\..\packages\nanoFramework.TestFramework.1.0.147\build\nanoFramework.TestFramework.targets" Condition="Exists('..\..\packages\nanoFramework.TestFramework.1.0.147\build\nanoFramework.TestFramework.targets')" />
+  <Import Project="..\..\packages\nanoFramework.TestFramework.1.0.163\build\nanoFramework.TestFramework.targets" Condition="Exists('..\..\packages\nanoFramework.TestFramework.1.0.163\build\nanoFramework.TestFramework.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\nanoFramework.TestFramework.1.0.147\build\nanoFramework.TestFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\nanoFramework.TestFramework.1.0.147\build\nanoFramework.TestFramework.targets'))" />
+    <Error Condition="!Exists('..\..\packages\nanoFramework.TestFramework.1.0.163\build\nanoFramework.TestFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\nanoFramework.TestFramework.1.0.163\build\nanoFramework.TestFramework.targets'))" />
   </Target>
-</Project>
+</Project>
diff --git a/Tests/NFUnitTestStringBuilder/packages.config b/Tests/NFUnitTestStringBuilder/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="nanoFramework.CoreLibrary" version="1.10.5" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.TestFramework" version="1.0.147" targetFramework="netnanoframework10" developmentDependency="true" />
+  <package id="nanoFramework.CoreLibrary" version="1.11.7" targetFramework="netnanoframework10" />
+  <package id="nanoFramework.TestFramework" version="1.0.163" targetFramework="netnanoframework10" developmentDependency="true" />
 </packages>
diff --git a/assets/nf-logo.png b/assets/nf-logo.png
diff --git a/assets/readme.txt b/assets/readme.txt
@@ -6,7 +6,7 @@
 
 ===================================================================================
 
-API docs: https://docs.nanoframework.net/api/nanoFramework.System.Text.html
+API docs: https://docs.nanoframework.net/api/System.Text
 
 Browse our samples repository: https://github.com/nanoframework/samples
 

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -2,11 +2,13 @@ trigger:
   branches:
     include: [main, develop, "release-*" ]
   paths:
-    exclude: [README.md, LICENSE.md, NuGet.Config, .github_changelog_generator, .gitignore]
+    exclude: [README.md,  CHANGELOG.md, CODE_OF_CONDUCT.md, LICENSE.md, NuGet.Config, .github_changelog_generator, .gitignore]
   tags:
     include: ["v*"]
 
 # PR always trigger build
+pr:
+  autoCancel: true
 
 # add nf-tools repo to resources (for Azure Pipelines templates)
 resources:
@@ -26,7 +28,7 @@ jobs:
 
   variables:
     DOTNET_NOLOGO: true
-    solution: '**/*.sln'
+    solution: 'nanoFramework.System.Text.sln'
     buildPlatform: 'Any CPU'
     buildConfiguration: 'Release'
     nugetPackageName: 'nanoFramework.System.Text'

diff --git a/nanoFramework.System.Text.nuspec b/nanoFramework.System.Text.nuspec
@@ -5,23 +5,22 @@
     <version>$version$</version>
     <title>nanoFramework.System.Text</title>
     <authors>.NET nanoFramework project contributors</authors>
-    <owners>.NET nanoFramework project contributors,dotnetfoundation</owners>
+    <owners>nanoframework,dotnetfoundation</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <license type="file">LICENSE.md</license>
     <releaseNotes>
     </releaseNotes>
+    <readme>docs\README.md</readme>
     <developmentDependency>false</developmentDependency>
     <projectUrl>https://github.com/nanoframework/System.Text</projectUrl>
-    <iconUrl>https://secure.gravatar.com/avatar/97d0e092247f0716db6d4b47b7d1d1ad</iconUrl>
     <icon>images\nf-logo.png</icon>
     <repository type="git" url="https://github.com/nanoframework/System.Text" commit="$commit$" />
     <copyright>Copyright (c) .NET Foundation and Contributors</copyright>
     <description>This package includes the System.Text assembly for nanoFramework C# projects.
-This package requires a target with System.Text v$nativeVersion$.</description>
-    <summary>System.Text assembly for nanoFramework C# projects</summary>
+This package requires a target with System.Text v$nativeVersion$ (checksum $checksum$).</description>
     <tags>nanoFramework C# csharp netmf netnf nanoFramework.System.Text</tags>
     <dependencies>
-      <dependency id="nanoFramework.CoreLibrary" version="1.10.5" />
+      <dependency id="nanoFramework.CoreLibrary" version="1.11.7" />
     </dependencies>
   </metadata>
   <files>
@@ -31,6 +30,7 @@ This package requires a target with System.Text v$nativeVersion$.</description>
     <file src="nanoFramework.System.Text\bin\Release\nanoFramework.System.Text.pe" target="lib\nanoFramework.System.Text.pe" />
     <file src="nanoFramework.System.Text\bin\Release\nanoFramework.System.Text.xml" target="lib\nanoFramework.System.Text.xml" />
     <file src="assets\readme.txt" target="" />
+    <file src="README.md" target="docs\" />
     <file src="assets\nf-logo.png" target="images" />
     <file src="LICENSE.md" target="" />
   </files>

diff --git a/nanoFramework.System.Text/nanoFramework.System.Text.nfproj b/nanoFramework.System.Text/nanoFramework.System.Text.nfproj
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildToolsPath)..\..\..\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
+    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
   </PropertyGroup>
   <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
   <PropertyGroup>
@@ -39,11 +39,6 @@
       <InProject>false</InProject>
     </NFMDP_PE_ExcludeClassByName>
   </ItemGroup>
-  <ItemGroup>
-    <NFMDP_PE_LoadHints Include="..\packages\nanoFramework.CoreLibrary.1.10.5\lib\mscorlib.dll">
-      <InProject>false</InProject>
-    </NFMDP_PE_LoadHints>
-  </ItemGroup>
   <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -61,8 +56,8 @@
     <AdditionalFiles Include="..\.sonarlint\nanoframework_lib-nanoframework.system.text\CSharp\SonarLint.xml" Link="SonarLint.xml" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="mscorlib, Version=1.10.5.4, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.10.5\lib\mscorlib.dll</HintPath>
+    <Reference Include="mscorlib, Version=1.11.7.2, Culture=neutral, PublicKeyToken=c07d481e9758c731">
+      <HintPath>..\packages\nanoFramework.CoreLibrary.1.11.7\lib\mscorlib.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -79,4 +74,4 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.1.91\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.1.91\build\Nerdbank.GitVersioning.targets'))" />
   </Target>
-</Project>
+</Project>
diff --git a/nanoFramework.System.Text/packages.config b/nanoFramework.System.Text/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="nanoFramework.CoreLibrary" version="1.10.5" targetFramework="netnanoframework10" />
+  <package id="nanoFramework.CoreLibrary" version="1.11.7" targetFramework="netnanoframework10" />
   <package id="Nerdbank.GitVersioning" version="3.1.91" developmentDependency="true" targetFramework="netnanoframework10" />
 </packages>
diff --git a/version.json b/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "assemblyVersion": {
     "precision": "revision"
   },
@@ -14,8 +14,7 @@
     "^refs/heads/v\\d+(?:\\.\\d+)?$"
   ],
   "cloudBuild": {
-    "setAllVariables": true,
-    "buildNumber": null
+    "setAllVariables": true
   },
   "release": {
     "branchName": "release-v{version}",