Skip to content

Commit c6b0758

Browse files
committed
Work CI-CD
- Replace NuGet installer with template. - Various fixes in nuspecs. - Swap feed order in NuGet config. ***NO_CI***
1 parent 46477db commit c6b0758

File tree

4 files changed

+10
-14
lines changed

4 files changed

+10
-14
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>

azure-pipelines.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,11 @@ jobs:
2626
vmImage: 'windows-2019'
2727

2828
variables:
29-
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
29+
DOTNET_NOLOGO: true
3030
solution: '**/*.sln'
3131
buildPlatform: 'Any CPU'
3232
buildConfiguration: 'Release'
3333
nugetPackageName: 'nanoFramework.System.Net'
34-
repoName: 'nanoFramework.System.Net'
3534

3635
steps:
3736

@@ -58,31 +57,29 @@ jobs:
5857

5958
- checkout: none
6059

61-
- task: NuGetToolInstaller@0
62-
inputs:
63-
versionSpec: '5.4.0'
64-
displayName: 'Install specific version of NuGet'
60+
- template: install-nuget.yml
6561

6662
# update dependencies
6763
- task: UpdatenFDependencies@1
64+
displayName: Update dependent class libs
6865
inputs:
6966
gitHubToken: $(GitHubToken)
7067
repositoriesToUpdate: |
7168
System.Net.Http
7269
paho.mqtt.m2mqtt
73-
displayName: Update dependent class libs
7470
7571
##################################
7672
# report build failure to Discord
7773
- job: Report_Build_Failure
74+
condition: or( failed('Build_Library'), failed('Update_Dependents'))
7875

7976
dependsOn:
8077
- Build_Library
8178
- Update_Dependents
82-
condition: or( failed('Build_Library'), failed('Update_Dependents'))
8379

8480
pool:
8581
vmImage: 'windows-2019'
82+
8683
steps:
8784

8885
- checkout: self

nanoFramework.System.Net.DELIVERABLES.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<releaseNotes>
1212
</releaseNotes>
1313
<developmentDependency>false</developmentDependency>
14-
<projectUrl>https://github.com/nanoframework/nanoFramework.System.Net</projectUrl>
14+
<projectUrl>https://github.com/nanoframework/System.Net</projectUrl>
1515
<iconUrl>https://secure.gravatar.com/avatar/97d0e092247f0716db6d4b47b7d1d1ad</iconUrl>
1616
<icon>images\nf-logo.png</icon>
1717
<copyright>Copyright (c) .NET Foundation and Contributors</copyright>

nanoFramework.System.Net.nuspec

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,11 @@
1111
<releaseNotes>
1212
</releaseNotes>
1313
<developmentDependency>false</developmentDependency>
14-
<projectUrl>https://github.com/nanoframework/nanoFramework.System.Net</projectUrl>
14+
<projectUrl>https://github.com/nanoframework/System.Net</projectUrl>
1515
<icon>images\nf-logo.png</icon>
16-
<repository type="git" url="https://github.com/nanoframework/nanoFramework.System.Net" commit="$commit$" />
16+
<repository type="git" url="https://github.com/nanoframework/System.Net" commit="$commit$" />
1717
<copyright>Copyright (c) .NET Foundation and Contributors</copyright>
18-
<description>This package includes the .NET nanoFramework System.Net assembly for nanoFramework C# projects.
19-
This package requires a target with nanoFramework.System.Net v$nativeVersion$ (checksum $checksum$).</description>
18+
<description>This package includes the .NET nanoFramework System.Net assembly for nanoFramework C# projects.&#10;This package requires a target with System.Net v$nativeVersion$ (checksum $checksum$).</description>
2019
<tags>nanoFramework C# csharp netmf netnf nanoFramework.System.Net</tags>
2120
<dependencies>
2221
<dependency id="nanoFramework.CoreLibrary" version="1.10.5-preview.4" />

0 commit comments

Comments
 (0)