- Update azure pipeline yaml.
- Fix nuspec.
- Update logo for nuget assets.
- Fix typos.

***NO_CI***
This commit is contained in:
José Simões 2021-11-25 12:28:17 +00:00
Родитель b6f272d3d6
Коммит a80242e4ba
7 изменённых файлов: 186 добавлений и 83 удалений

Просмотреть файл

@ -1,11 +1,11 @@
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=nanoframework_nf-debugger&metric=alert_status)](https://sonarcloud.io/dashboard?id=nanoframework_nf-debugger) [![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=nanoframework_nf-debugger&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=nanoframework_nf-debugger) [![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/nanoframework/Home/blob/main/LICENSE) [![#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)](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** debugger libraries repository!
### Welcome to the .NET **nanoFramework** debugger libraries repository
The debugger library provides debugging and communication capabilities to .NET applications and allows debugging and communicate with .NET **nanoFramework** devices.
It's provided as source code and as a NuGet package that can be integrated on any application.
@ -37,7 +37,7 @@ The nanoFramework debugger library is licensed under the [MIT license](LICENSE.m
## 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

Просмотреть файл

@ -49,12 +49,12 @@ namespace Serial_Test_App_WPF
private INFSerialDebugClientService CreateSerialDebugClient()
{
// add here any COM ports to exclude from the search
var devicesToExclude = new List<string>() { "COM15" };
var devicesToExclude = new List<string>() { "COM3", "COM4", "COM14" };
var composite = PortBase.CreateInstanceForComposite(new[]
{
PortBase.CreateInstanceForSerial(devicesToExclude),
PortBase.CreateInstanceForNetwork()
//PortBase.CreateInstanceForNetwork()
});
return new NFSerialDebugClientService(composite);

Просмотреть файл

@ -379,31 +379,38 @@ rUCGwbCUDI0mxadJ3Bz4WxR6fyNpBK2yAinWEsikxqEt
// Blinky v1.0.0.0 (752 bytes)
// assemblies to device...total size in bytes is 47032.
var p1Size = 38448;
var p2Size = 2568;
var p3Size = 3800;
var p4Size = 752;
var p1Size = 644;
var p2Size = 2116;
var p3Size = 3412;
var p4Size = 5684;
assemblies.Add(new byte[p1Size]);
assemblies[0][0] = 0xDE;
assemblies[0][1] = 0xAD;
assemblies[0][2] = 0xBE;
assemblies[0][3] = 0xEF;
for (int i = 0; i < p1Size; i++)
{
assemblies[0][i] = (byte)i;
}
assemblies.Add(new byte[p2Size]);
assemblies[1][0] = 0xDE;
assemblies[1][1] = 0xAD;
assemblies[1][2] = 0xBE;
assemblies[1][3] = 0xEF;
for (int i = 0; i < p2Size; i++)
{
assemblies[1][i] = (byte)i;
}
assemblies.Add(new byte[p3Size]);
assemblies[2][0] = 0xDE;
assemblies[2][1] = 0xAD;
assemblies[2][2] = 0xBE;
assemblies[2][3] = 0xEF;
for (int i = 0; i < p3Size; i++)
{
assemblies[2][i] = (byte)i;
}
assemblies.Add(new byte[p4Size]);
assemblies[3][0] = 0xDE;
assemblies[3][1] = 0xAD;
assemblies[3][0] = 0xBE;
assemblies[3][1] = 0xEF;
for (int i = 0; i < p4Size; i++)
{
assemblies[3][i] = (byte)i;
}
var totalSize = p1Size + p2Size + p3Size + p4Size;
@ -871,7 +878,7 @@ rUCGwbCUDI0mxadJ3Bz4WxR6fyNpBK2yAinWEsikxqEt
};
// write device configuration to device
var returnValue = device.DebugEngine.UpdateDeviceConfiguration(newDeviceNetworkConfiguration, 0);
//var returnValue = device.DebugEngine.UpdateDeviceConfiguration(newDeviceNetworkConfiguration, 0);
//// add new wireless 802.11 configuration
//DeviceConfiguration.Wireless80211ConfigurationProperties newWireless80211Configuration = new DeviceConfiguration.Wireless80211ConfigurationProperties()
@ -894,14 +901,21 @@ rUCGwbCUDI0mxadJ3Bz4WxR6fyNpBK2yAinWEsikxqEt
// NEED TO ADD A TERMINATOR TO THE STRING //
/////////////////////////////////////////////////////////
string caRootBundle = baltimoreCACertificate + letsEncryptCACertificate + "\0";
//string caRootBundle = baltimoreCACertificate + letsEncryptCACertificate + "\0";
byte[] certificateRaw = Encoding.UTF8.GetBytes(caRootBundle);
//byte[] certificateRaw = Encoding.UTF8.GetBytes(caRootBundle);
newX509CertificateBundle.Certificate = certificateRaw;
using (FileStream binFile = new FileStream(@"C:\Users\JoséSimões\Downloads\DigiCertGlobalRootCA.crt", FileMode.Open))
{
newX509CertificateBundle.Certificate = new byte[binFile.Length];
binFile.Read(newX509CertificateBundle.Certificate, 0, (int)binFile.Length);
newX509CertificateBundle.CertificateSize = (uint)binFile.Length;
}
//newX509CertificateBundle.Certificate = certificateRaw;
// write CA certificate to device
returnValue = device.DebugEngine.UpdateDeviceConfiguration(newX509CertificateBundle, 0);
var returnValue = device.DebugEngine.UpdateDeviceConfiguration(newX509CertificateBundle, 0);
Debug.WriteLine("");
Debug.WriteLine("");

Двоичные данные
assets/nf-logo.png

Двоичный файл не отображается.

До

Ширина:  |  Высота:  |  Размер: 4.0 KiB

После

Ширина:  |  Высота:  |  Размер: 9.0 KiB

Просмотреть файл

@ -2,7 +2,7 @@ trigger:
branches:
include: [main, develop, "release-*" ]
paths:
exclude: [README.md, LICENSE.md, CHANGELOG.md, version.json, "*.md", .gitignore]
exclude: [README.md, CHANGELOG.md, CODE_OF_CONDUCT.md, LICENSE.md, NuGet.Config, .github_changelog_generator, .gitignore]
tags:
include: ["v*"]
@ -22,8 +22,8 @@ pool:
vmImage: 'windows-2019'
variables:
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
solution: '**/nanoFramework.Tools.Debugger.sln'
DOTNET_NOLOGO: true
solution: 'nanoFramework.Tools.Debugger.sln'
buildPlatform: 'Any CPU'
buildConfiguration: 'Release'
@ -167,7 +167,13 @@ steps:
# update could build number (only possible if this is not a PR from a fork)
- task: PowerShell@2
condition: and( succeeded(), ne(variables['system.pullrequest.isfork'], true), ne( variables['StartReleaseCandidate'], true ), ne(variables['UPDATE_DEPENDENTS'], 'true') )
condition: >-
and(
succeeded(),
ne(variables['system.pullrequest.isfork'], true),
ne(variables['StartReleaseCandidate'], true),
ne(variables['UPDATE_DEPENDENTS'], 'true')
)
displayName: Update cloud build number
inputs:
targetType: 'inline'
@ -199,7 +205,13 @@ steps:
pollingTimeoutSec: '300'
- task: UseRubyVersion@0
condition: and( succeeded(), ne(variables['Build.Reason'], 'PullRequest'), ne( variables['StartReleaseCandidate'], true ), ne(variables['UPDATE_DEPENDENTS'], 'true') )
condition: >-
and(
succeeded(),
eq(variables['System.PullRequest.PullRequestId'], ''),
ne(variables['StartReleaseCandidate'], true),
ne(variables['UPDATE_DEPENDENTS'], 'true')
)
displayName: Setup Ruby
inputs:
versionSpec: '= 2.7'
@ -210,7 +222,16 @@ steps:
gem install github_changelog_generator --quiet --no-document
# need to call it passing both cache options with full path otherwise it won't work
github_changelog_generator --token $(GitHubToken) --cache-log $env:AGENT_TEMPDIRECTORY\github-changelog-logger.log --cache-file $env:AGENT_TEMPDIRECTORY\github-changelog-http-cache
condition: and( succeeded(), ne(variables['Build.Reason'], 'PullRequest'), not( startsWith(variables['Build.SourceBranch'], 'refs/tags/v') ), not( startsWith(variables['Build.SourceBranchName'], 'main') ), not( contains(variables['Build.SourceBranchName'], 'update-dependencies') ), ne( variables['StartReleaseCandidate'], true ), ne(variables['UPDATE_DEPENDENTS'], 'true') )
condition: >-
and(
succeeded(),
eq(variables['System.PullRequest.PullRequestId'], ''),
not(startsWith(variables['Build.SourceBranch'], 'refs/tags/v')),
not(startsWith(variables['Build.SourceBranchName'], 'main')),
not(contains(variables['Build.SourceBranchName'], 'update-dependencies')),
ne(variables['StartReleaseCandidate'], true ),
ne(variables['UPDATE_DEPENDENTS'], 'true')
)
displayName: Generate change log
# generate change log including future version
@ -218,12 +239,29 @@ steps:
gem install github_changelog_generator --quiet --no-document
# need to call it passing both cache options with full path otherwise it won't work
github_changelog_generator --token $(GitHubToken) --cache-log $env:AGENT_TEMPDIRECTORY\github-changelog-logger.log --cache-file $env:AGENT_TEMPDIRECTORY\github-changelog-http-cache --future-release v$env:MY_NUGET_VERSION
condition: and( succeeded(), and ( ne(variables['Build.Reason'], 'PullRequest'), not( startsWith(variables['Build.SourceBranch'], 'refs/tags/v') ), startsWith(variables['Build.SourceBranchName'], 'main'), not( contains(variables['Build.SourceBranchName'], 'update-dependencies') ) ), ne( variables['StartReleaseCandidate'], true ), ne(variables['UPDATE_DEPENDENTS'], 'true') )
condition: >-
and(
succeeded(),
and(
eq(variables['System.PullRequest.PullRequestId'], ''),
not(startsWith(variables['Build.SourceBranch'], 'refs/tags/v')),
startsWith(variables['Build.SourceBranchName'], 'main'),
not(contains(variables['Build.SourceBranchName'], 'update-dependencies'))
),
ne(variables['StartReleaseCandidate'], true),
ne(variables['UPDATE_DEPENDENTS'], 'true')
)
displayName: Generate change log
# copy change log to artifacts directory
- task: CopyFiles@2
condition: and( succeeded(), ne(variables['Build.Reason'], 'PullRequest'), ne( variables['StartReleaseCandidate'], true ), ne(variables['UPDATE_DEPENDENTS'], 'true') )
condition: >-
and(
succeeded(),
eq(variables['System.PullRequest.PullRequestId'], ''),
ne(variables['StartReleaseCandidate'], true),
ne(variables['UPDATE_DEPENDENTS'], 'true')
)
displayName: Copy Changelog
inputs:
SourceFolder: '$(System.DefaultWorkingDirectory)'
@ -232,7 +270,15 @@ steps:
# push new changelog to GitHub repo
- task: PowerShell@2
condition: and( succeeded(), ne(variables['Build.Reason'], 'PullRequest'), not( startsWith(variables['Build.SourceBranch'], 'refs/tags/v') ), not( contains(variables['Build.SourceBranchName'], 'update-dependencies') ), ne( variables['StartReleaseCandidate'], true ), ne(variables['UPDATE_DEPENDENTS'], 'true') )
condition: >-
and(
succeeded(),
eq(variables['System.PullRequest.PullRequestId'], ''),
not(startsWith(variables['Build.SourceBranch'], 'refs/tags/v')),
not(contains(variables['Build.SourceBranchName'], 'update-dependencies')),
ne(variables['StartReleaseCandidate'], true),
ne(variables['UPDATE_DEPENDENTS'], 'true')
)
displayName: Push changelog to GitHub
inputs:
targetType: 'inline'
@ -285,7 +331,13 @@ steps:
# publish artifacts (only possible if this is not a PR originated on a fork)
- task: PublishBuildArtifacts@1
condition: and( succeeded(), ne(variables['system.pullrequest.isfork'], true), ne( variables['StartReleaseCandidate'], true ), ne(variables['UPDATE_DEPENDENTS'], 'true') )
condition: >-
and(
succeeded(),
ne(variables['system.pullrequest.isfork'], true),
ne(variables['StartReleaseCandidate'], true),
ne(variables['UPDATE_DEPENDENTS'], 'true')
)
displayName: Publish deployables artifacts
inputs:
PathtoPublish: '$(Build.ArtifactStagingDirectory)'
@ -294,7 +346,12 @@ steps:
# push NuGet packages to Azure Artifacts feed (always happens except on PR builds)
- task: NuGetCommand@2
condition: and( succeeded(), ne( variables['StartReleaseCandidate'], true ), ne(variables['UPDATE_DEPENDENTS'], 'true') )
condition: >-
and(
succeeded(),
ne(variables['StartReleaseCandidate'], true),
ne(variables['UPDATE_DEPENDENTS'], 'true')
)
displayName: Push NuGet packages to Azure Artifacts
inputs:
command: push
@ -305,7 +362,13 @@ steps:
# push NuGet class lib package to NuGet (always happens except on PR builds)
- task: NuGetCommand@2
condition: and( succeeded(), ne(variables['Build.Reason'], 'PullRequest'), ne( variables['StartReleaseCandidate'], true ), ne(variables['UPDATE_DEPENDENTS'], 'true') )
condition: >-
and(
succeeded(),
eq(variables['System.PullRequest.PullRequestId'], ''),
ne(variables['StartReleaseCandidate'], true),
ne(variables['UPDATE_DEPENDENTS'], 'true')
)
continueOnError: true
displayName: Push NuGet packages to NuGet
inputs:
@ -317,7 +380,14 @@ steps:
# update dependencies
- task: PowerShell@2
condition: and(or(eq(variables['UPDATE_DEPENDENTS'], 'true'), eq(variables['RUN_UPDATE_DEPENDENTS'], 'true') ), not( startsWith(variables['Build.SourceBranch'], 'refs/tags/v') ) )
condition: >-
and(
or(
eq(variables['UPDATE_DEPENDENTS'], 'true'),
eq(variables['RUN_UPDATE_DEPENDENTS'], 'true')
),
not(startsWith(variables['Build.SourceBranch'], 'refs/tags/v'))
)
displayName: Update dependent tools
inputs:
targetType: filePath
@ -325,45 +395,52 @@ steps:
env:
MY_GITHUB_TOKEN: $(GitHubToken)
# create or update GitHub release ON tags from release or main branches
- task: GitHubReleasePublish@1
condition: and( succeeded(), ne(variables['Build.Reason'], 'PullRequest'), not( startsWith(variables['Build.SourceBranch'], 'refs/tags/v') ), ne( variables['StartReleaseCandidate'], true ), ne(variables['UPDATE_DEPENDENTS'], 'true') )
displayName: Create/Update GitHub PREVIEW release
# create or update GitHub release
- task: GithubRelease@1
condition: >-
and(
succeeded(),
eq(variables['System.PullRequest.PullRequestId'], ''),
not(startsWith(variables['Build.SourceBranch'], 'refs/tags/v')),
ne(variables['StartReleaseCandidate'], true),
ne(variables['UPDATE_DEPENDENTS'], 'true')
)
displayName: Create/Update GitHub PREVIEW release
inputs:
githubEndpoint: 'nanoframework'
githubOwner: 'nanoframework'
githubRepositoryName: 'nf-debugger'
githubTag: v$(MY_NUGET_VERSION)
githubReleaseTitle: 'nanoFramework Debugger Library v$(MY_NUGET_VERSION)'
githubReleaseNotes: 'Check the [changelog]($(Build.Repository.Uri)/blob/$(Build.SourceBranchName)/CHANGELOG.md).<br><br><h4>Install from NuGet</h4><br>The following NuGet packages are available for download from this release:<br>:package: [.NET](https://www.nuget.org/packages/nanoFramework.Tools.Debugger.Net/$(MY_NUGET_VERSION)) v$(MY_NUGET_VERSION) v$(MY_NUGET_VERSION)'
githubTargetCommitsh: $(Build.SourceVersion)
githubReleaseDraft: false
githubReleasePrerelease: true
githubReuseDraftOnly: false
githubReuseRelease: true
githubEditRelease: true
githubDeleteEmptyTag: true
githubReleaseAsset: '$(Build.ArtifactStagingDirectory)/*.nupkg'
gitHubConnection: 'github.com_nano-$(System.TeamProject)'
tagSource: userSpecifiedTag
tag: v$(MY_NUGET_VERSION)
title: 'nanoFramework Debugger Library v$(MY_NUGET_VERSION)'
releaseNotesSource: inline
releaseNotesInline: 'Check the [changelog]($(Build.Repository.Uri)/blob/$(Build.SourceBranchName)/CHANGELOG.md).<br><br><h4>Install from NuGet</h4><br>The following NuGet packages are available for download from this release:<br>:package: [.NET](https://www.nuget.org/packages/nanoFramework.Tools.Debugger.Net/$(MY_NUGET_VERSION)) v$(MY_NUGET_VERSION) v$(MY_NUGET_VERSION)'
assets: '$(Build.ArtifactStagingDirectory)/*.nupkg'
assetUploadMode: replace
isPreRelease: true
addChangeLog: false
# create or update GitHub release ON tags from release or main branches
- task: GitHubReleasePublish@1
condition: and( succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/v'), not(contains(variables['Build.SourceBranch'], 'preview') ), ne( variables['StartReleaseCandidate'], true ), ne(variables['UPDATE_DEPENDENTS'], 'true') )
displayName: Create/Update GitHub release
- task: GithubRelease@1
condition: >-
and(
succeeded(),
startsWith(variables['Build.SourceBranch'], 'refs/tags/v'),
not(contains(variables['Build.SourceBranch'], 'preview')),
ne(variables['StartReleaseCandidate'], true),
ne(variables['UPDATE_DEPENDENTS'], 'true')
)
displayName: Create/Update GitHub stable release
inputs:
githubEndpoint: 'nanoframework'
githubOwner: 'nanoframework'
githubRepositoryName: 'nf-debugger'
githubTag: v$(MY_NUGET_VERSION)
githubReleaseTitle: 'nanoFramework Debugger Library v$(MY_NUGET_VERSION)'
githubReleaseNotes: 'Check the [changelog]($(Build.Repository.Uri)/blob/$(Build.SourceBranchName)/CHANGELOG.md).<br><br><h4>Install from NuGet</h4><br>The following NuGet packages are available for download from this release:<br>:package: [.NET](https://www.nuget.org/packages/nanoFramework.Tools.Debugger.Net/$(MY_NUGET_VERSION)) v$(MY_NUGET_VERSION) v$(MY_NUGET_VERSION)'
githubTargetCommitsh: $(Build.SourceVersion)
githubReleaseDraft: false
githubReleasePrerelease: false
githubReuseDraftOnly: false
githubReuseRelease: false
githubEditRelease: false
githubDeleteEmptyTag: true
githubReleaseAsset: '$(Build.ArtifactStagingDirectory)/*.nupkg'
gitHubConnection: 'github.com_nano-$(System.TeamProject)'
tagSource: userSpecifiedTag
tag: v$(MY_NUGET_VERSION)
title: 'nanoFramework Debugger Library v$(MY_NUGET_VERSION)'
releaseNotesSource: inline
releaseNotesInline: 'Check the [changelog]($(Build.Repository.Uri)/blob/$(Build.SourceBranchName)/CHANGELOG.md).<br><br><h4>Install from NuGet</h4><br>The following NuGet packages are available for download from this release:<br>:package: [.NET](https://www.nuget.org/packages/nanoFramework.Tools.Debugger.Net/$(MY_NUGET_VERSION)) v$(MY_NUGET_VERSION) v$(MY_NUGET_VERSION)'
assets: '$(Build.ArtifactStagingDirectory)/*.nupkg'
assetUploadMode: replace
isPreRelease: false
addChangeLog: false
# step from template @ nf-tools repo
# report error

Просмотреть файл

@ -38,7 +38,18 @@
<LangVersion>default</LangVersion>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x68' ">
<DebugType>portable</DebugType>
<DebugSymbols>true</DebugSymbols>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<LangVersion>default</LangVersion>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
<DebugType>portable</DebugType>
<DebugSymbols>true</DebugSymbols>
<Optimize>true</Optimize>

Просмотреть файл

@ -5,17 +5,17 @@
<version>$version$</version>
<title>.NET nanoFramework debug library (.NET)</title>
<authors>nanoFramework project contributors</authors>
<owners>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>
<projectUrl>https://github.com/nanoframework/nf-debugger</projectUrl>
<icon>images\nf-logo.png</icon>
<iconUrl>https://secure.gravatar.com/avatar/97d0e092247f0716db6d4b47b7d1d1ad</iconUrl>
<repository type="git" url="https://github.com/nanoframework/nf-debugger" commit="$commit$" />
<copyright>Copyright (c) .NET Foundation and Contributors</copyright>
<description>This .NET library provides a debug client for .NET nanoFramework devices using USB or Serial connection to a board.</description>
<releaseNotes>This package provides the .NET version of the debug library.
</releaseNotes>
<tags>nanoFramework C# csharp netmf netnf</tags>
<dependencies>
<dependency id="Polly" version="7.2.1" />
@ -30,5 +30,6 @@
<file src="bin\Release\nanoFramework.Tools.Debugger.Net.pdb" target="lib/net472" />
<file src="..\assets\nf-logo.png" target="images" />
<file src="..\LICENSE.md" target="" />
<file src="..\README.md" target="docs\" />
</files>
</package>