Skip to content

Commit 618453f

Browse files
authored
Move project to .NET 6 (#98)
***NO_CI***
1 parent e5097fa commit 618453f

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
### Welcome to the .NET **nanoFramework** firmware flasher tool repository
88

99
This repo contains the nano firmware flasher tool.
10-
It's a [.NET Core CLI Global Tool](https://docs.microsoft.com/en-us/dotnet/core/tools/global-tools) that allows flashing a .NET **nanoFramework** target with nanoBooter, nanoCLR, managed application or backup files.
10+
It's a [.NET Core Tool](https://docs.microsoft.com/en-us/dotnet/core/tools/global-tools) that allows flashing a .NET **nanoFramework** target with a firmware image (nanoBooter and nanoCLR), the application deployment (all assemblies required to run a .NET application) and restore previously saved deployment images.
1111
Is part of .NET **nanoFramework** toolbox, along with other various tools that are required in .NET **nanoFramework** development, usage or repository management.
1212

1313
It makes use of several 3rd party tools:
@@ -34,7 +34,7 @@ You can invoke the tool using the following command: nanoff
3434
Tool 'nanoff' (version '9.9.9') was successfully installed.
3535
```
3636

37-
#### Install path issues
37+
### Install path issues
3838

3939
:warning: That are know issues running commands for STM32 devices when `nanoff` is installed in a path that contains diacritic characters. This is caused by a known bug in STM32 Cube Programmer.
4040
If that's the case with your user path, for example, you have to install it in a location that does have those.
@@ -48,7 +48,7 @@ Note that if you're not using `nanoff` with STM32 devices, this limitation does
4848

4949
### MacOS users
5050

51-
You'll need to add nanoff to your path as well, once installed run:
51+
You'll need to add `nanoff` to your path as well, once installed run:
5252

5353
```console
5454
export PATH=$PATH:~/.dotnet/tools
@@ -82,17 +82,17 @@ The tool includes help for all available commands. You can see a list of all ava
8282
nanoff --help
8383
```
8484

85-
## ESP32 usage examples
85+
## ESP32 usage examples
8686

87-
There are multiple ESP32 images available, some are build specifically for a target. Please check out the [list](https://github.com/nanoframework/nf-interpreter#firmware-for-reference-boards).
87+
There are multiple ESP32 images available, some are build specifically for a target. Please check out the [list](https://github.com/nanoframework/nf-interpreter#firmware-for-reference-boards).
8888

8989
The ESP32_PSRAM_REV0 image will just work for any variant of the ESP32 series, with or without PSRAM, and for all silicon revisions.
9090
You can read more about the differences between the various images [here](https://docs.nanoframework.net/content/reference-targets/esp32.html).
9191

9292
The FEATHER_S2 image will just work for pretty much all variants of the ESP32-S2 series that expose the embedded USB CDC pins.
9393
You can read more about the differences between the various images [here](https://docs.nanoframework.net/content/reference-targets/esp32.html).
9494

95-
When using nanoff you can add `--target MY_TARGET_NAME_HERE` to use a specific image. If, instead, you just specify the platform with `--platform esp32` nanoff will choose the most appropriate image depending on the features of the device that's connected. Output similar to this one will show to advise what's the image about to be used:
95+
When using `nanoff` you can add `--target MY_TARGET_NAME_HERE` to use a specific image. If, instead, you just specify the platform with `--platform esp32` `nanoff` will choose the most appropriate image depending on the features of the device that's connected. Output similar to this one will show to advise what's the image about to be used:
9696

9797
```console
9898
No target name was provided! Using 'ESP32_REV0' based on the device characteristics.
@@ -101,7 +101,7 @@ No target name was provided! Using 'ESP32_REV0' based on the device characterist
101101
>Note: Please note that for ESP32-S2 targets is not possible to safely determine what's the best image to use. For this reason it's mandatory providing the appropriate target name with `--target MY_TARGET_NAME_HERE`.
102102
103103
Some ESP32 boards have issues entering bootloader mode. This can be usually overcome by holding down the BOOT/FLASH button in the board.
104-
In case nanoff detects this situation the following warning is shown:
104+
In case `nanoff` detects this situation the following warning is shown:
105105

106106
```console
107107
*** Hold down the BOOT/FLASH button in ESP32 board ***
@@ -155,7 +155,7 @@ This example uses the binary format file that you can find when you are building
155155
nanoff --target ESP32_PSRAM_REV0 --update --serialport COM31 --deploy --image "c:\eps32-backups\my_awesome_app.bin" --address 0x1B000
156156
```
157157

158-
## STMP32 usage examples
158+
## STMP32 usage examples
159159

160160
### Update the firmware of a specific STM32 target
161161

@@ -217,7 +217,7 @@ To install the drivers for STM32 DFU connected targets.
217217
nanoff --installdfudrivers
218218
```
219219

220-
## TI CC13x2 usage examples
220+
## TI CC13x2 usage examples
221221

222222
### Update the firmware of a specific TI CC13x2 target
223223

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ jobs:
156156
displayName: Install .NET SDK
157157
inputs:
158158
packageType: sdk
159-
version: 5.0.300
159+
version: 6.x
160160

161161
- task: DotNetCoreCLI@2
162162
displayName: Restore NuGet packages

nanoFirmwareFlasher/nanoFirmwareFlasher.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@
1919
<Description>.NET nanoFirmwareFlasher tool to flash firmware images to target devices.</Description>
2020
<!-- need this to allow async Main() -->
2121
<LangVersion>latest</LangVersion>
22-
<TargetFrameworks>netcoreapp5;net48</TargetFrameworks>
22+
<TargetFrameworks>netcoreapp6;net48</TargetFrameworks>
2323
<Platforms>x64;x86</Platforms>
2424
<RuntimeIdentifiers>win-x64;win-x86</RuntimeIdentifiers>
2525
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
2626
</PropertyGroup>
2727

2828
<PropertyGroup Condition="'$(PackGlobalTool)' != true">
29-
<TargetFrameworks>netcoreapp5</TargetFrameworks>
29+
<TargetFrameworks>netcoreapp6</TargetFrameworks>
3030
</PropertyGroup>
3131

3232
<PropertyGroup Condition="'$(PackGlobalTool)' == true">
3333
<PackAsTool>true</PackAsTool>
34-
<TargetFrameworks>netcoreapp5</TargetFrameworks>
34+
<TargetFrameworks>netcoreapp6</TargetFrameworks>
3535
<PackageId>nanoff</PackageId>
3636
<PlatformTarget>x64</PlatformTarget>
3737
</PropertyGroup>
@@ -48,11 +48,11 @@
4848
<ItemGroup>
4949
<PackageReference Include="CommandLineParser" Version="2.8.0" />
5050
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
51-
<PackageReference Include="Nerdbank.GitVersioning" Version="3.4.216" PrivateAssets="All" />
51+
<PackageReference Include="Nerdbank.GitVersioning" Version="3.4.244" PrivateAssets="All" />
5252
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
5353
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
54-
<PackageReference Include="System.IO.Ports" Version="5.0.1" />
55-
<PackageReference Include="System.Management" Version="5.0.0" />
54+
<PackageReference Include="System.IO.Ports" Version="6.0.0" />
55+
<PackageReference Include="System.Management" Version="6.0.0" />
5656
<PackageReference Include="System.Net.Http" Version="4.3.4" />
5757
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
5858
</ItemGroup>

version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
3-
"version": "1.29",
3+
"version": "2.0",
44
"assemblyVersion": {
55
"precision": "minor"
66
},

0 commit comments

Comments
 (0)