Skip to content

Commit 066d613

Browse files
authored
Various fixes with CI-CD (#5)
1 parent d53eb13 commit 066d613

File tree

7 files changed

+31
-24
lines changed

7 files changed

+31
-24
lines changed

LICENSE.md

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,20 @@ MIT License
22

33
Copyright (c) .NET Foundation and Contributors
44

5-
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
611

7-
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
814

9-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

NuGet.Config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
<configuration>
33
<packageSources>
44
<add key="NuGet" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
5-
<add key="Azure Artifacts nanoFramework dev" value="https://pkgs.dev.azure.com/nanoframework/feed/_packaging/sandbox/nuget/v3/index.json" protocolVersion="3" />
65
</packageSources>
76
</configuration>

Tests/DataSetTests/DataSetTests.nfproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
<IsTestProject>true</IsTestProject>
2222
<TestProjectType>UnitTest</TestProjectType>
2323
<TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
24+
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
25+
<RestoreLockedMode Condition="'$(TF_BUILD)' == 'True' or '$(ContinuousIntegrationBuild)' == 'True'">true</RestoreLockedMode>
2426
</PropertyGroup>
2527
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
2628
<PropertyGroup>
@@ -49,4 +51,4 @@
4951
<ProjectReference Include="..\..\nanoFramework.Networking.Thread\nanoFramework.Networking.Thread.nfproj" />
5052
</ItemGroup>
5153
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
52-
</Project>
54+
</Project>

azure-pipelines.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@ trigger:
99
- release-*
1010
paths:
1111
exclude:
12-
- .github_changelog_generator
1312
- .gitignore
1413
- CHANGELOG.md
15-
- CODE_OF_CONDUCT.md
1614
- LICENSE.md
1715
- README.md
1816
- README.zh-cn.md

config/SignClient.json

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

nanoFramework.Networking.Thread.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<icon>images\nf-logo.png</icon>
1616
<repository type="git" url="https://github.com/nanoframework/nanoFramework.Networking.Thread" commit="$commit$" />
1717
<copyright>Copyright (c) .NET Foundation and Contributors</copyright>
18-
<description>This package includes nanoFramework.Networking.Thread, a board package library for MagicBit in .NET nanoFramework C# projects.</description>
19-
<tags>nanoFramework C# csharp netmf netnf nanoframework MagicBit</tags>
18+
<description>This package includes the nanoFramework.Networking.Thread assembly for .NET nanoFramework C# projects running on targets supporting OpenThread.</description>
19+
<tags>nanoFramework C# csharp netmf netnf nanoframework OpenThread</tags>
2020
<dependencies>
2121
<dependency id="nanoFramework.CoreLibrary" version="1.15.5" />
2222
<dependency id="nanoFramework.System.Collections" version="1.5.31" />

nanoFramework.Networking.Thread/nanoFramework.Networking.Thread.nfproj

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
<TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
2020
<NF_IsCoreLibrary>True</NF_IsCoreLibrary>
2121
<DocumentationFile>bin\$(Configuration)\nanoFramework.Networking.Thread.xml</DocumentationFile>
22+
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
23+
<RestoreLockedMode Condition="'$(TF_BUILD)' == 'True' or '$(ContinuousIntegrationBuild)' == 'True'">true</RestoreLockedMode>
2224
</PropertyGroup>
2325
<PropertyGroup>
2426
<SignAssembly>true</SignAssembly>
@@ -92,4 +94,12 @@
9294
<ProjectConfigurationsDeclaredAsItems />
9395
</ProjectCapabilities>
9496
</ProjectExtensions>
95-
</Project>
97+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
98+
<PropertyGroup>
99+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
100+
</PropertyGroup>
101+
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.6.139\build\Nerdbank.GitVersioning.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.6.139\build\Nerdbank.GitVersioning.props'))" />
102+
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.6.139\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.6.139\build\Nerdbank.GitVersioning.targets'))" />
103+
</Target>
104+
<Import Project="..\packages\Nerdbank.GitVersioning.3.6.139\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.6.139\build\Nerdbank.GitVersioning.targets')" />
105+
</Project>

0 commit comments

Comments
 (0)