Skip to content

Commit 1a17b03

Browse files
committed
Merge branch 'nanoframework:develop' into develop
2 parents 34f9391 + 3bad831 commit 1a17b03

File tree

4 files changed

+19
-23
lines changed

4 files changed

+19
-23
lines changed

NuGet.Config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<packageSources>
4-
<add key="NuGet" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
54
<add key="Azure Artifacts nanoFramework dev" value="https://pkgs.dev.azure.com/nanoframework/feed/_packaging/sandbox/nuget/v3/index.json" protocolVersion="3" />
5+
<add key="NuGet" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
66
</packageSources>
77
</configuration>

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ The .NET **nanoFramework** Base Class Library is provided in two flavours: with
2222

2323
## Unit Test
2424

25-
nanoFramework has a dedicated [Unit Test framework](https://github.com/nanoframework/nanoFramework.TestFramework). This repository has Unit Test and you will find all of them under the `Tests`folder. The main solution embed all all the tests as well. You can run them directly from Visual Studio and create new tests. For more information on the [Unit Test Framework](https://docs.nanoframework.net/content/unit-test/index.html).
25+
nanoFramework has a dedicated [Unit Test framework](https://github.com/nanoframework/nanoFramework.TestFramework). This repository has Unit Test and you will find all of them under the `Tests` folder. The main solution embed all all the tests as well. You can run them directly from Visual Studio and create new tests. For more information on the [Unit Test Framework](https://docs.nanoframework.net/content/unit-test/index.html).
2626

2727
CoreLibrary has specific needs that differ from what you'll find in the documentation:
2828

29-
- You need to have th nanoFramework.TestFramework as a nuget package as it will bring the nanoCLR Win32 emulator
29+
- You need to have the nanoFramework.TestFramework as a nuget package as it will bring the nanoCLR Win32 emulator
3030
- You need to remove the reference to mscorlib, nanoFramework.TestFramework and nanoFramework.UnitTestLauncher
3131
- Use project reference instead for all those 3 elements
3232

azure-pipelines.yml

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ jobs:
7676

7777
- template: azure-pipelines-templates/class-lib-publish.yml@templates
7878

79-
# need to push the other package to NuGet because the template above can only push one package (happens on tag builds for any branch)
79+
# need to push the other package to NuGet because the template above can only push one package (happens on all builds except PRs)
8080
- task: NuGetCommand@2
81-
condition: and( succeeded(), eq( variables['StartReleaseCandidate'], false ) )
81+
condition: and( succeeded(), eq(variables['System.PullRequest.PullRequestId'], ''), eq( variables['StartReleaseCandidate'], false ) )
8282
displayName: Push "NoReflection" variant NuGet package to Azure Artifacts
8383
inputs:
8484
command: push
@@ -152,18 +152,14 @@ jobs:
152152
vmImage: 'windows-2019'
153153

154154
variables:
155-
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
155+
DOTNET_NOLOGO: true
156156

157157
steps:
158158
# need this here in order to persist GitHub credentials
159159
- checkout: self
160160
fetchDepth: 1
161161

162-
- task: NuGetToolInstaller@0
163-
inputs:
164-
versionSpec: '5.9.0'
165-
condition: ne( variables['StartReleaseCandidate'], true )
166-
displayName: 'Install specific version of NuGet'
162+
- template: azure-pipelines-templates/install-nuget.yml@templates
167163

168164
# update dependents
169165
- task: UpdatenFDependencies@1
@@ -172,25 +168,25 @@ jobs:
172168
repositoriesToUpdate: |
173169
nanoFramework.Runtime.Events
174170
nanoFramework.Runtime.Native
175-
nanoFramework.System.Threading
176171
nanoFramework.TestFramework
177172
nanoFramework.Logging
173+
nanoFramework.Devices.OneWire
174+
nanoFramework.Networking.Sntp
175+
nanoFramework.Hardware.Stm32
176+
nanoFramework.TI.EasyLink
177+
nanoFramework.ResourceManager
178+
nanoFramework.Json
178179
Windows.Devices.Adc
179180
Windows.Devices.I2c
180181
Windows.Devices.Pwm
181182
Windows.Devices.Spi
182183
System.Device.Dac
183184
System.Device.I2c
184185
System.Device.Spi
185-
nanoFramework.Devices.OneWire
186-
nanoFramework.Networking.Sntp
187-
nanoFramework.Hardware.Stm32
188-
nanoFramework.System.Math
189-
nanoFramework.TI.EasyLink
190-
nanoFramework.ResourceManager
191-
nanoFramework.System.Collections
192-
nanoFramework.System.Text
193-
nanoFramework.Json
186+
System.Threading
187+
System.Math
188+
System.Collections
189+
System.Text
194190
displayName: Update dependent class libs
195191

196192
##################################

nanoFramework.CoreLibrary.DELIVERABLES.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<releaseNotes></releaseNotes>
1212
<developmentDependency>false</developmentDependency>
1313
<projectUrl>https://github.com/nanoframework/CoreLibrary</projectUrl>
14-
<icon>nf-logo.png</icon>
14+
<icon>images\nf-logo.png</icon>
1515
<copyright>Copyright (c) .NET Foundation and Contributors</copyright>
1616
<description>** DON'T REFERENCE THIS PACKAGE ** Not meant for development. This package includes the deliverable artifacts of the base class library (mscorlib) of nanoFramework. These are for testing purposes and for updating the native code base of the core library.</description>
1717
<tags></tags>
@@ -25,7 +25,7 @@
2525
<file src="nanoFramework.CoreLibrary\obj\Release\*.il" target="content\disasm\" />
2626

2727
<file src="assets\readme.txt" target="" />
28-
<file src="assets\nf-logo.png" target="" />
28+
<file src="assets\nf-logo.png" target="images" />
2929
<file src="LICENSE.md" target="" />
3030
</files>
3131
</package>

0 commit comments

Comments
 (0)