Skip to content

Commit ba5f522

Browse files
authored
Merge branch 'develop' into add-storage-deploy
2 parents 4beb6d9 + a783f54 commit ba5f522

File tree

5 files changed

+50
-77
lines changed

5 files changed

+50
-77
lines changed

README.md

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,21 @@ This repo contains .NET **nanoFramework** Visual Studio extension and associated
1010

1111
## Build status
1212

13-
| Component | Build Status | Stable version | Preview version |
14-
|:-|---|---|---|
15-
| Visual Studio 2022 extension | [![Build Status](https://dev.azure.com/nanoframework/Visual-Studio-extension/_apis/build/status/nanoframework.nf-Visual-Studio-extension)](https://dev.azure.com/nanoframework/Visual-Studio-extension/_build/latest?definitionId=17) | [![Visual Studio Marketplace](https://img.shields.io/vscode-marketplace/d/nanoframework.nanoFramework-VS2022-Extension.svg)](https://marketplace.visualstudio.com/items?itemName=nanoframework.nanoFramework-VS2022-Extension) | [![Open VSIX Gallery](https://img.shields.io/badge/Open%20VSIX%20Gallery-(preview)-yellow.svg)](http://vsixgallery.com/extension/bf694e17-fa5f-4877-9317-6d3664b2689a) |
16-
| Visual Studio 2019 extension | [![Build Status](https://dev.azure.com/nanoframework/Visual-Studio-extension/_apis/build/status/nanoframework.nf-Visual-Studio-extension)](https://dev.azure.com/nanoframework/Visual-Studio-extension/_build/latest?definitionId=17) | [![Visual Studio Marketplace](https://img.shields.io/vscode-marketplace/d/nanoframework.nanoFramework-VS2019-Extension.svg)](https://marketplace.visualstudio.com/items?itemName=nanoframework.nanoFramework-VS2019-Extension) | [![Open VSIX Gallery](https://img.shields.io/badge/Open%20VSIX%20Gallery-(preview)-yellow.svg)](http://vsixgallery.com/extension/455f2be5-bb07-451e-b351-a9faf3018dc9) |
17-
| Visual Studio 2017 extension | [![Build Status](https://dev.azure.com/nanoframework/Visual-Studio-extension/_apis/build/status/nanoframework.nf-Visual-Studio-extension)](https://dev.azure.com/nanoframework/Visual-Studio-extension/_build/latest?definitionId=17) | [![Visual Studio Marketplace](https://img.shields.io/vscode-marketplace/d/vs-publisher-1470366.nanoFrameworkVS2017Extension.svg)](https://marketplace.visualstudio.com/items?itemName=vs-publisher-1470366.nanoFrameworkVS2017Extension) | [![Open VSIX Gallery](https://img.shields.io/badge/Open%20VSIX%20Gallery-(preview)-yellow.svg)](http://vsixgallery.com/extension/47973986-ed3c-4b64-ba40-a9da73b44ef7) |
13+
| Component | Build Status | Stable version |
14+
|:-|---|---|
15+
| Visual Studio 2022 extension | [![Build Status](https://dev.azure.com/nanoframework/Visual-Studio-extension/_apis/build/status/nanoframework.nf-Visual-Studio-extension)](https://dev.azure.com/nanoframework/Visual-Studio-extension/_build/latest?definitionId=17) | [![Visual Studio Marketplace](https://img.shields.io/vscode-marketplace/d/nanoframework.nanoFramework-VS2022-Extension.svg)](https://marketplace.visualstudio.com/items?itemName=nanoframework.nanoFramework-VS2022-Extension) |
16+
| Visual Studio 2019 extension | [![Build Status](https://dev.azure.com/nanoframework/Visual-Studio-extension/_apis/build/status/nanoframework.nf-Visual-Studio-extension)](https://dev.azure.com/nanoframework/Visual-Studio-extension/_build/latest?definitionId=17) | [![Visual Studio Marketplace](https://img.shields.io/vscode-marketplace/d/nanoframework.nanoFramework-VS2019-Extension.svg)](https://marketplace.visualstudio.com/items?itemName=nanoframework.nanoFramework-VS2019-Extension) |
17+
| Visual Studio 2017 extension (:warning: Deprecated) | [![Build Status](https://dev.azure.com/nanoframework/Visual-Studio-extension/_apis/build/status/nanoframework.nf-Visual-Studio-extension)](https://dev.azure.com/nanoframework/Visual-Studio-extension/_build/latest?definitionId=17) | [![Visual Studio Marketplace](https://img.shields.io/vscode-marketplace/d/vs-publisher-1470366.nanoFrameworkVS2017Extension.svg)](https://marketplace.visualstudio.com/items?itemName=vs-publisher-1470366.nanoFrameworkVS2017Extension) |
1818

1919
## Feedback and documentation
2020

2121
For documentation, providing feedback, issues and finding out how to contribute please refer to the [Home repo](https://github.com/nanoframework/Home).
2222

2323
Join our Discord community [here](https://discord.gg/gCyBu8T).
2424

25-
## Visual Studio extension galleries
25+
## Visual Studio extension distribution
2626

27-
**nanoFramework** Visual Studio extension is distributed through Visual Studio Marketplace. This is for the stable version.
28-
29-
In case you want to be in the bleeding edge of technology and use the new stuff (or interested in trying out preview versions and provide valuable feedback) you can do that by adding the Open VSIX Gallery feed to your Visual Studio configuration. Please follow the instructions [here](http://vsixgallery.com/guide/feed/) on how to add the feed to your Visual Studio instance.
30-
This is the feed URL: `http://vsixgallery.com/feed/author/nanoframework/`.
27+
**nanoFramework** Visual Studio extension is distributed through Visual Studio Marketplace. You can either search it on the marketplace or follow the URLs above for the appropriate version.
3128

3229
This is the experience you'll have when installing the extension:
3330

@@ -43,7 +40,7 @@ If you are working on developing code for **nanoFramework** Visual Studio extens
4340

4441
## Credits
4542

46-
The list of contributors to this project can be found at [CONTRIBUTORS](https://github.com/nanoframework/Home/blob/master/CONTRIBUTORS.md).
43+
The list of contributors to this project can be found at [CONTRIBUTORS](https://github.com/nanoframework/Home/blob/main/CONTRIBUTORS.md).
4744

4845
## Icons
4946

azure-pipelines.yml

Lines changed: 23 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,36 @@ trigger:
77
paths:
88
exclude:
99
- README.md
10-
- LICENSE.md
10+
- REAME-BEFORE-UPDATE-REFS.txt
11+
- LICENSE
1112
- CHANGELOG*.md
1213
- NuGet.Config
13-
- .github_changelog_generator
14+
- docs/*
15+
- .editorconfig
16+
- .gitattributes
1417
- .gitignore
18+
- .gitmodules
19+
- spelling_exclusion.dic
1520

1621
# PR always trigger build
1722
pr:
1823
autoCancel: true
24+
branches:
25+
include:
26+
- '*'
27+
paths:
28+
exclude:
29+
- README.md
30+
- REAME-BEFORE-UPDATE-REFS.txt
31+
- LICENSE
32+
- CHANGELOG*.md
33+
- NuGet.Config
34+
- docs/*
35+
- .editorconfig
36+
- .gitattributes
37+
- .gitignore
38+
- .gitmodules
39+
- spelling_exclusion.dic
1940

2041
# add nf-tools repo to resources (for Azure Pipelines templates)
2142
resources:
@@ -256,31 +277,6 @@ jobs:
256277
condition: and( succeeded(), ne(variables['system.pullrequest.isfork'], true) )
257278
displayName: Publish deployables artifacts
258279

259-
# upload extension to Open VSIX Gallery (only possible if this is not a PR from a fork)
260-
- task: PowerShell@2
261-
displayName: Upload vsix to Open VSIX Gallery
262-
condition: >-
263-
and(
264-
succeeded(),
265-
ne(variables['system.pullrequest.isfork'], true),
266-
eq(variables['System.PullRequest.PullRequestId'], '')
267-
)
268-
continueOnError: true
269-
inputs:
270-
targetType: 'inline'
271-
script: |
272-
273-
$artifactsCollection = @("./*VS2019.Extension.vsix") | %{ Get-ChildItem -File . -Filter $_ -Recurse}
274-
275-
(new-object Net.WebClient).DownloadString("https://raw.github.com/madskristensen/ExtensionScripts/master/AppVeyor/vsix.ps1") | iex
276-
277-
foreach($file in $artifactsCollection)
278-
{
279-
"Uploading VSIX package to Open VSIX Gallery..." | Write-Host
280-
281-
Vsix-PublishToGallery $file
282-
}
283-
284280
# create or update GitHub release
285281
- task: GithubRelease@1
286282
condition: >-
@@ -453,31 +449,6 @@ jobs:
453449
condition: and( succeeded(), ne(variables['system.pullrequest.isfork'], true) )
454450
displayName: Publish deployables artifacts
455451

456-
# upload extension to Open VSIX Gallery (only possible if this is not a PR from a fork)
457-
- task: PowerShell@2
458-
displayName: Upload vsix to Open VSIX Gallery
459-
condition: >-
460-
and(
461-
succeeded(),
462-
ne(variables['system.pullrequest.isfork'], true),
463-
eq(variables['System.PullRequest.PullRequestId'], '')
464-
)
465-
continueOnError: true
466-
inputs:
467-
targetType: 'inline'
468-
script: |
469-
470-
$artifactsCollection = @("./*VS2022.Extension.vsix") | %{ Get-ChildItem -File . -Filter $_ -Recurse}
471-
472-
(new-object Net.WebClient).DownloadString("https://raw.github.com/madskristensen/ExtensionScripts/master/AppVeyor/vsix.ps1") | iex
473-
474-
foreach($file in $artifactsCollection)
475-
{
476-
"Uploading VSIX package to Open VSIX Gallery..." | Write-Host
477-
478-
Vsix-PublishToGallery $file
479-
}
480-
481452
# create or update GitHub release
482453
- task: GithubRelease@1
483454
condition: >-

config/filelist.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

docs/developer-notes.md

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ To launch Visual Studio experimental instance:
1414
In case you need to reset the Visual Studio experimental instance:
1515

1616
1. Open VS developer command prompt.
17-
2. Navigate to `e:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VSSDK\VisualStudioIntegration\Tools\Bin`.
18-
3. Enter `CreateExpInstance /Reset /VSInstance=15.0 /RootSuffix=_d9708c20Exp`.
17+
2. Navigate to `C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VSSDK\VisualStudioIntegration\Tools\Bin`.
18+
3. Enter `CreateExpInstance /Reset /VSInstance=17.0 /RootSuffix=_d9708c20Exp`.
1919

20-
> Mind to adjust the path above to your setup and Visual Studio version (15.0 for VS2017 and 16.0 for VS2019).
20+
> Mind to adjust the path above to your setup and Visual Studio version (16.0 for VS2019 and 17.0 for VS2022).
2121
> The RootSuffix above (**_d9708c20Exp**) will be different for each installation. Please amend the above to match your local one. You can find the suffix by navigating to the following folder in the users folder `C:\Users\johndoe\AppData\Roaming\Microsoft\VisualStudio`.
2222
23-
You'll want to reset VS experimental instance on a number of situations. Usually this is when you need to start fresh because there is too much clutter, a failed deployment that is creeplying your debugging or whenever a new Visual Studio update is installed.
23+
You'll want to reset VS experimental instance on a number of situations. Usually this is when you need to start fresh because there is too much clutter, a failed deployment that is creeplying your debugging or whenever you install a new Visual Studio version.
2424

2525
## Debugging with the **nanoFramework** Debugger library
2626

@@ -35,7 +35,20 @@ In situations where you want to debug something in the **nanoFramework** Debugge
3535

3636
![](images/reloading-debugger-projects.png)
3737

38-
6. Use the [NuGet reference switcher extension](https://marketplace.visualstudio.com/items?itemName=RicoSuter.NuGetReferenceSwitcherforVisualStudio2017) to switch the references to `nanoFramework.Tools.Debugger` from NuGet to project and point it to the appropriate project.
38+
1. Remove the `nf-debugger` Nuget package from the extension projects.
39+
1. Add a reference to the `nf-debugger` project in the extension projects.
40+
1. Build as ususal.
3941
1. Perform whatever debug that you need by placing breakpoint on any source file of the debugger library.
40-
1. When you are done open the NuGet reference switcher extension again, open the Switch to NuGet references tab and revert the debugger library references. Make sure that the "remove projects from solution" is **not** checked.
42+
1. When you are done remove the reference to the `nf-debugger` project and add back the Nuget package.
4143
1. Unload the debugger library projects from the solution.
44+
45+
## Known issue with debugging in the experimental instance
46+
47+
Because of several `CodeBase` entries required for Visual Studio to load the extension assemblies (see [here](https://developercommunity.visualstudio.com/t/Image-icons-from-image-catalog-not-showi/10791720) for the details) you can run into issues for the experimental instance to load the actual assembly of the build you're trying to debug.
48+
If that happens, you're forced to follow these steps:
49+
50+
1. Make a copy of the folder providing the targets and props of the project system. For Visual Studio 2022, this is usually located at `C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\nanoFramework\v1.0`. Delete the DLLs from there. Leave only the targets and props files.
51+
1. Uninstall the official .NET nanoFramework extension from Visual Studio.
52+
1. Load the extension solution and work as usual.
53+
54+
Before installing back the official .NET nanoFramework extension, mind to rename (or remove) the project system folder. Failing to do so will cause the extension install to fail.

switcher.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)