Skip to content

Commit e03eb3f

Browse files
authored
Work CI-CD (#161)
***NO_CI***
1 parent f439af1 commit e03eb3f

File tree

11 files changed

+72
-26
lines changed

11 files changed

+72
-26
lines changed

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=nanoframework_lib-CoreLibrary&metric=alert_status)](https://sonarcloud.io/dashboard?id=nanoframework_lib-CoreLibrary) [![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=nanoframework_lib-CoreLibrary&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=nanoframework_lib-CoreLibrary) [![License](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE) [![NuGet](https://img.shields.io/nuget/dt/nanoFramework.CoreLibrary.svg?label=NuGet&style=flat&logo=nuget)](https://www.nuget.org/packages/nanoFramework.CoreLibrary/) [![#yourfirstpr](https://img.shields.io/badge/first--timers--only-friendly-blue.svg)](https://github.com/nanoframework/Home/blob/main/CONTRIBUTING.md)
22
[![Discord](https://img.shields.io/discord/478725473862549535.svg?logo=discord&logoColor=white&label=Discord&color=7289DA)](https://discord.gg/gCyBu8T)
33

4-
![nanoFramework logo](https://github.com/nanoframework/Home/blob/main/resources/logo/nanoFramework-repo-logo.png)
4+
![nanoFramework logo](https://raw.githubusercontent.com/nanoframework/Home/main/resources/logo/nanoFramework-repo-logo.png)
55

66
-----
77

8-
# Welcome to the **nanoFramework** Base Class Library repository!
8+
# Welcome to the .NET **nanoFramework** Base Class Library repository
99

1010
## Build status
1111

@@ -26,7 +26,7 @@ nanoFramework has a dedicated [Unit Test framework](https://github.com/nanoframe
2626

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

29-
- You need to have the 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

@@ -51,7 +51,7 @@ vstest.console.exe .\Tests\NFUnitTestBitConverter\bin\Release\NFUnitTest.dll /S
5151

5252
*Notes*:
5353

54-
- You have to build the TestAdapter from the source in this case. You can use the path to the nuget as well, this will have the same effect.
54+
- You have to build the TestAdapter from the source in this case. You can use the path to the NuGet as well, this will have the same effect.
5555
- you have full diagnostic enabled in this case.
5656

5757
## Feedback and documentation
@@ -70,7 +70,7 @@ The **nanoFramework** Class Libraries are licensed under the [MIT license](LICEN
7070

7171
## Code of Conduct
7272

73-
This project has adopted the code of conduct defined by the Contributor Covenant to clarify expected behavior in our community.
73+
This project has adopted the code of conduct defined by the Contributor Covenant to clarify expected behaviour in our community.
7474
For more information see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).
7575

7676
### .NET Foundation

Tests/NFUnitTest_DummyAdapter/NFUnitTest_DummyAdapter.nfproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@
4040
<Private>True</Private>
4141
<SpecificVersion>True</SpecificVersion>
4242
</Reference>
43-
<Reference Include="nanoFramework.TestFramework, Version=1.0.132.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
44-
<HintPath>..\..\packages\nanoFramework.TestFramework.1.0.132\lib\nanoFramework.TestFramework.dll</HintPath>
43+
<Reference Include="nanoFramework.TestFramework, Version=1.0.157.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
44+
<HintPath>..\..\packages\nanoFramework.TestFramework.1.0.157\lib\nanoFramework.TestFramework.dll</HintPath>
4545
<Private>True</Private>
4646
<SpecificVersion>True</SpecificVersion>
4747
</Reference>
4848
<Reference Include="nanoFramework.UnitTestLauncher, Version=0.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
49-
<HintPath>..\..\packages\nanoFramework.TestFramework.1.0.132\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
49+
<HintPath>..\..\packages\nanoFramework.TestFramework.1.0.157\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
5050
<Private>True</Private>
5151
<SpecificVersion>True</SpecificVersion>
5252
</Reference>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="nanoFramework.CoreLibrary" version="1.10.5-preview.10" targetFramework="netnanoframework10" />
4-
<package id="nanoFramework.TestFramework" version="1.0.132" targetFramework="netnanoframework10" developmentDependency="true" />
4+
<package id="nanoFramework.TestFramework" version="1.0.157" targetFramework="netnanoframework10" developmentDependency="true" />
55
</packages>

azure-pipelines.yml

Lines changed: 50 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@ trigger:
22
branches:
33
include: [main, develop, "release-*" ]
44
paths:
5-
exclude: [README.md, LICENSE.md, NuGet.Config, .github_changelog_generator, .gitignore]
5+
exclude: [README.md, LICENSE.md, CHANGELOG.md, CODE_OF_CONDUCT.md, NuGet.Config, .github_changelog_generator, .gitignore]
66
tags:
77
include: ["v*"]
88

99
# PR always trigger build
10+
pr:
11+
autoCancel: true
1012

1113
# add nf-tools repo to resources (for Azure Pipelines templates)
1214
resources:
@@ -26,7 +28,7 @@ jobs:
2628

2729
variables:
2830
DOTNET_NOLOGO: true
29-
solution: '**/*.sln'
31+
solution: 'nanoFramework.CoreLibrary.sln'
3032
buildPlatform: 'Any CPU'
3133
buildConfiguration: 'Release'
3234
nugetPackageName: 'nanoFramework.CoreLibrary'
@@ -76,7 +78,12 @@ jobs:
7678

7779
# need to push the other package to NuGet because the template above can only push one package (happens on all builds except PRs)
7880
- task: NuGetCommand@2
79-
condition: and( succeeded(), eq(variables['System.PullRequest.PullRequestId'], ''), eq( variables['StartReleaseCandidate'], false ) )
81+
condition: >-
82+
and(
83+
succeeded(),
84+
eq(variables['System.PullRequest.PullRequestId'], ''),
85+
eq(variables['StartReleaseCandidate'], false)
86+
)
8087
displayName: Push "NoReflection" variant NuGet package to Azure Artifacts
8188
inputs:
8289
command: push
@@ -88,7 +95,12 @@ jobs:
8895
continueOnError: true
8996

9097
- task: NuGetCommand@2
91-
condition: and( succeeded(), eq(variables['System.PullRequest.PullRequestId'], ''), eq( variables['StartReleaseCandidate'], false ) )
98+
condition: >-
99+
and(
100+
succeeded(),
101+
eq(variables['System.PullRequest.PullRequestId'], ''),
102+
eq(variables['StartReleaseCandidate'], false)
103+
)
92104
displayName: Push "NoReflection" variant NuGet package to Azure Artifacts
93105
inputs:
94106
command: push
@@ -101,7 +113,13 @@ jobs:
101113

102114
# create or update GitHub release
103115
- task: GithubRelease@1
104-
condition: and( succeeded(), eq(variables['System.PullRequest.PullRequestId'], ''), not( startsWith(variables['Build.SourceBranch'], 'refs/tags/v') ), ne( variables['StartReleaseCandidate'], true ) )
116+
condition: >-
117+
and(
118+
succeeded(),
119+
eq(variables['System.PullRequest.PullRequestId'], ''),
120+
not(startsWith(variables['Build.SourceBranch'], 'refs/tags/v')),
121+
ne(variables['StartReleaseCandidate'], true)
122+
)
105123
displayName: Create/Update GitHub PREVIEW release
106124
inputs:
107125
gitHubConnection: 'github.com_nano-$(System.TeamProject)'
@@ -117,7 +135,13 @@ jobs:
117135

118136
# create or update GitHub release ON tags from release or master branches
119137
- task: GithubRelease@1
120-
condition: and( succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/v'), not(contains(variables['Build.SourceBranch'], 'preview') ), ne( variables['StartReleaseCandidate'], true ) )
138+
condition: >-
139+
and(
140+
succeeded(),
141+
startsWith(variables['Build.SourceBranch'], 'refs/tags/v'),
142+
not(contains(variables['Build.SourceBranch'], 'preview')),
143+
ne(variables['StartReleaseCandidate'], true)
144+
)
121145
displayName: Create/Update GitHub stable release
122146
inputs:
123147
gitHubConnection: 'github.com_nano-$(System.TeamProject)'
@@ -133,7 +157,20 @@ jobs:
133157

134158
##############################
135159
- job: Update_Dependents
136-
condition: or( and( succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/v'), eq(variables['StartReleaseCandidate'], 'false') ), and( succeeded(), contains(variables['getCommitMessage.COMMIT_MESSAGE'], '***UPDATE_DEPENDENTS***'), eq(variables['StartReleaseCandidate'], 'false') ), eq(variables['UPDATE_DEPENDENTS'], 'true') )
160+
condition: >-
161+
or(
162+
and(
163+
succeeded(),
164+
startsWith(variables['Build.SourceBranch'], 'refs/tags/v'),
165+
eq(variables['StartReleaseCandidate'], 'false')
166+
),
167+
and(
168+
succeeded(),
169+
contains(variables['getCommitMessage.COMMIT_MESSAGE'], '***UPDATE_DEPENDENTS***'),
170+
eq(variables['StartReleaseCandidate'], 'false')
171+
),
172+
eq(variables['UPDATE_DEPENDENTS'], 'true')
173+
)
137174
138175
dependsOn:
139176
- Build_mscorlib
@@ -190,7 +227,12 @@ jobs:
190227
dependsOn:
191228
- Build_mscorlib
192229
- Update_Dependents
193-
condition: or( failed('Build_mscorlib'), failed('Build_mscorlib_no_reflection'), failed('Update_Dependents'))
230+
condition: >-
231+
or(
232+
failed('Build_mscorlib'),
233+
failed('Build_mscorlib_no_reflection'),
234+
failed('Update_Dependents')
235+
)
194236
195237
pool:
196238
vmImage: 'windows-2019'

nanoFramework.CoreLibrary.NoReflection.nuspec

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
<version>$version$</version>
66
<title>nanoFramework.CoreLibrary.NoReflection</title>
77
<authors>nanoFramework project contributors</authors>
8-
<owners>nanoFramework project contributors,dotnetfoundation</owners>
8+
<owners>nanoFramework,dotnetfoundation</owners>
99
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1010
<license type="file">LICENSE.md</license>
1111
<releaseNotes></releaseNotes>
12+
<readme>docs\README.md</readme>
1213
<developmentDependency>false</developmentDependency>
1314
<projectUrl>https://github.com/nanoframework/CoreLibrary</projectUrl>
1415
<icon>images\nf-logo.png</icon>
@@ -25,6 +26,7 @@
2526
<file src="nanoFramework.CoreLibrary.NoReflection\bin\Release\mscorlib.xml" target="lib\mscorlib.xml" />
2627

2728
<file src="assets\readme.txt" target="" />
29+
<file src="README.md" target="docs\" />
2830
<file src="assets\nf-logo.png" target="images" />
2931
<file src="LICENSE.md" target="" />
3032
</files>

nanoFramework.CoreLibrary.NoReflection/CoreLibrary.NoReflection.nfproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -406,11 +406,11 @@
406406
<ProjectConfigurationsDeclaredAsItems />
407407
</ProjectCapabilities>
408408
</ProjectExtensions>
409-
<Import Project="..\packages\Nerdbank.GitVersioning.3.4.205\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.4.205\build\Nerdbank.GitVersioning.targets')" />
409+
<Import Project="..\packages\Nerdbank.GitVersioning.3.4.244\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.4.244\build\Nerdbank.GitVersioning.targets')" />
410410
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
411411
<PropertyGroup>
412412
<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>
413413
</PropertyGroup>
414-
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.4.205\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.4.205\build\Nerdbank.GitVersioning.targets'))" />
414+
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.4.244\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.4.244\build\Nerdbank.GitVersioning.targets'))" />
415415
</Target>
416416
</Project>

nanoFramework.CoreLibrary.NoReflection/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
<package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="netnanoframework10" developmentDependency="true" />
44
<package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="netnanoframework10" developmentDependency="true" />
55
<package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="netnanoframework10" developmentDependency="true" />
6-
<package id="Nerdbank.GitVersioning" version="3.4.205" developmentDependency="true" targetFramework="netnanoframework10" />
6+
<package id="Nerdbank.GitVersioning" version="3.4.244" developmentDependency="true" targetFramework="netnanoframework10" />
77
</packages>

nanoFramework.CoreLibrary.nuspec

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
<version>$version$</version>
66
<title>nanoFramework.CoreLibrary</title>
77
<authors>nanoFramework project contributors</authors>
8-
<owners>nanoFramework project contributors,dotnetfoundation</owners>
8+
<owners>nanoFramework,dotnetfoundation</owners>
99
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1010
<license type="file">LICENSE.md</license>
1111
<releaseNotes></releaseNotes>
12+
<readme>docs\README.md</readme>
1213
<developmentDependency>false</developmentDependency>
1314
<projectUrl>https://github.com/nanoframework/CoreLibrary</projectUrl>
1415
<icon>images\nf-logo.png</icon>
@@ -25,6 +26,7 @@
2526
<file src="nanoFramework.CoreLibrary\bin\Release\mscorlib.xml" target="lib\mscorlib.xml" />
2627

2728
<file src="assets\readme.txt" target="" />
29+
<file src="README.md" target="docs\" />
2830
<file src="assets\nf-logo.png" target="images" />
2931
<file src="LICENSE.md" target="" />
3032
</files>

nanoFramework.CoreLibrary/CoreLibrary.nfproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,11 +398,11 @@
398398
<ProjectConfigurationsDeclaredAsItems />
399399
</ProjectCapabilities>
400400
</ProjectExtensions>
401-
<Import Project="..\packages\Nerdbank.GitVersioning.3.4.205\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.4.205\build\Nerdbank.GitVersioning.targets')" />
401+
<Import Project="..\packages\Nerdbank.GitVersioning.3.4.244\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.4.244\build\Nerdbank.GitVersioning.targets')" />
402402
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
403403
<PropertyGroup>
404404
<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>
405405
</PropertyGroup>
406-
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.4.205\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.4.205\build\Nerdbank.GitVersioning.targets'))" />
406+
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.4.244\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.4.244\build\Nerdbank.GitVersioning.targets'))" />
407407
</Target>
408408
</Project>

nanoFramework.CoreLibrary/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
<package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="netnanoframework10" developmentDependency="true" />
44
<package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="netnanoframework10" developmentDependency="true" />
55
<package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="netnanoframework10" developmentDependency="true" />
6-
<package id="Nerdbank.GitVersioning" version="3.4.205" developmentDependency="true" targetFramework="netnanoframework10" />
6+
<package id="Nerdbank.GitVersioning" version="3.4.244" developmentDependency="true" targetFramework="netnanoframework10" />
77
</packages>

0 commit comments

Comments
 (0)