Skip to content

Commit 61ff69b

Browse files
josesimoesjosesimoes
committed
Remove nuproj projects
- Replace with plain nuspec files - Update AppVeyor yaml accordingly - Update version config to to use semVer 1 for NuGet Signed-off-by: José Simões <[email protected]>
1 parent 4e996aa commit 61ff69b

10 files changed

+107
-203
lines changed

‎appveyor.yml

+23-23
Original file line numberDiff line numberDiff line change
@@ -59,32 +59,32 @@ before_build:
5959
6060
nuget restore source\nanoFramework.Networking.Sntp.sln
6161
62-
.\nbgv cloud -p "source" -a -c
62+
.\nbgv cloud -p source -a -c
6363
6464
build_script:
65-
- ps: >-
66-
67-
if ($env:APPVEYOR_REPO_TAG -eq "true")
68-
{
69-
msbuild source\nanoFramework.Networking.Sntp.sln /p:PublicRelease=true /p:Configuration=Release /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
70-
}
71-
else
72-
{
73-
msbuild source\nanoFramework.Networking.Sntp.sln /p:Configuration=Release /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
74-
}
65+
- ps: msbuild source\nanoFramework.Networking.Sntp.sln /p:PublicRelease=true /p:Configuration=Release /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
7566

7667
before_deploy:
68+
- ps: >-
69+
.\nbgv cloud --version=$env:NBGV_SemVer1
70+
71+
$env:MyNuGetVersion = $env:NBGV_NuGetPackageVersion -replace "\-g$env:NBGV_GitCommitIdShort", " "
72+
73+
.\generate-change-log.ps1
74+
75+
- nuget pack source\nanoFramework.Networking.Sntp.nuspec -Version %MyNuGetVersion%
76+
- nuget pack source\nanoFramework.Networking.Sntp.DELIVERABLES.nuspec -Version %MyNuGetVersion%
7777
- ps: >-
7878
.\commit-assemblyinfo-changes.ps1
7979
8080
.\generate-change-log.ps1
8181
82-
Push-AppveyorArtifact $env:APPVEYOR_BUILD_FOLDER\source\Nuget.nanoFramework.Networking.Sntp\bin\Release\nanoFramework.Networking.Sntp.$env:NBGV_NuGetPackageVersion.nupkg
82+
Push-AppveyorArtifact $env:APPVEYOR_BUILD_FOLDER\nanoFramework.Networking.Sntp.$env:MyNuGetVersion.nupkg
8383
8484
after_deploy:
8585
# for this environment variable to work here it has to be set in AppVeyor UI
86-
- nuget push source\Nuget.nanoFramework.Networking.Sntp\bin\Release\nanoFramework.Networking.Sntp.%NBGV_NuGetPackageVersion%.nupkg %MyGetToken% -Source https://www.myget.org/F/nanoframework-dev/api/v2/package
87-
- nuget push source\Nuget.nanoFramework.Networking.Sntp.DELIVERABLES\bin\Release\nanoFramework.Networking.Sntp.DELIVERABLES.%NBGV_NuGetPackageVersion%.nupkg %MyGetToken% -Source https://www.myget.org/F/nanoframework-dev/api/v2/package
86+
- nuget push nanoFramework.Networking.Sntp.%MyNuGetVersion%.nupkg %MyGetToken% -Source https://www.myget.org/F/nanoframework-dev/api/v2/package
87+
- nuget push nanoFramework.Networking.Sntp.DELIVERABLES.%MyNuGetVersion%.nupkg %MyGetToken% -Source https://www.myget.org/F/nanoframework-dev/api/v2/package
8888

8989
# requires APPVEYOR_DISCORD_WEBHOOK_URL enviroment variable set with Discord webhook URL
9090
on_failure:
@@ -112,9 +112,9 @@ for:
112112
on:
113113
appveyor_repo_tag: true
114114
- provider: GitHub
115-
tag: v$(NBGV_NuGetPackageVersion)
116-
release: nanoFramework.Networking.Sntp Library v$(NBGV_NuGetPackageVersion)
117-
description: 'Check the [changelog](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/blob/master/CHANGELOG.md)\n\n## Install from NuGet\n\nThe following NuGet packages are available for download from this release\n\n:package: [.NET](https://www.nuget.org/packages/nanoFramework.Networking.Sntp/$(NBGV_NuGetPackageVersion)) v$(NBGV_NuGetPackageVersion)'
115+
tag: v$(MyNuGetVersion)
116+
release: nanoFramework.Networking.Sntp Library v$(MyNuGetVersion)
117+
description: 'Check the [changelog](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/blob/master/CHANGELOG.md)\n\n## Install from NuGet\n\nThe following NuGet packages are available for download from this release\n\n:package: [.NET](https://www.nuget.org/packages/nanoFramework.Networking.Sntp/$(MyNuGetVersion)) v$(MyNuGetVersion)'
118118
auth_token:
119119
secure: DNixoFFE+pGlwyhj7McfZoln42vOmj0iY1iNV9zXEr3y0NpXlOIgL8k5ehzlFM1S
120120
artifact:
@@ -130,9 +130,9 @@ for:
130130

131131
deploy:
132132
- provider: GitHub
133-
tag: v$(NBGV_NuGetPackageVersion)
134-
release: nanoFramework.Networking.Sntp Library v$(NBGV_NuGetPackageVersion)
135-
description: 'Check the [changelog](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/blob/$(appveyor_repo_branch)/CHANGELOG.md)\n\n## Install from nanoFramework MyGet development feed\n\nThe following NuGet packages are available for download from this release\n\npackage: [.NET](https://www.myget.org/feed/nanoframework-dev/package/nuget/nanoFramework.Networking.Sntp/$(NBGV_NuGetPackageVersion)) v$(NBGV_NuGetPackageVersion)'
133+
tag: v$(MyNuGetVersion)
134+
release: nanoFramework.Networking.Sntp Library v$(MyNuGetVersion)
135+
description: 'Check the [changelog](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/blob/$(appveyor_repo_branch)/CHANGELOG.md)\n\n## Install from nanoFramework MyGet development feed\n\nThe following NuGet packages are available for download from this release\n\npackage: [.NET](https://www.myget.org/feed/nanoframework-dev/package/nuget/nanoFramework.Networking.Sntp/$(MyNuGetVersion)) v$(MyNuGetVersion)'
136136
auth_token:
137137
secure: DNixoFFE+pGlwyhj7McfZoln42vOmj0iY1iNV9zXEr3y0NpXlOIgL8k5ehzlFM1S
138138
artifact:
@@ -154,9 +154,9 @@ for:
154154
on:
155155
appveyor_repo_tag: true
156156
- provider: GitHub
157-
tag: v$(NBGV_NuGetPackageVersion)
158-
release: nanoFramework.Networking.Sntp Library v$(NBGV_NuGetPackageVersion)
159-
description: 'Check the [changelog](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/blob/$(appveyor_repo_branch)/CHANGELOG.md)\n\n## Install from NuGet\n\nThe following NuGet packages are available for download from this release\n\n:package: [.NET](https://www.nuget.org/packages/nanoFramework.Networking.Sntp/$(NBGV_NuGetPackageVersion)) v$(NBGV_NuGetPackageVersion)'
157+
tag: v$(MyNuGetVersion)
158+
release: nanoFramework.Networking.Sntp Library v$(MyNuGetVersion)
159+
description: 'Check the [changelog](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/blob/$(appveyor_repo_branch)/CHANGELOG.md)\n\n## Install from NuGet\n\nThe following NuGet packages are available for download from this release\n\n:package: [.NET](https://www.nuget.org/packages/nanoFramework.Networking.Sntp/$(MyNuGetVersion)) v$(MyNuGetVersion)'
160160
auth_token:
161161
secure: DNixoFFE+pGlwyhj7McfZoln42vOmj0iY1iNV9zXEr3y0NpXlOIgL8k5ehzlFM1S
162162
artifact:

‎commit-assemblyinfo-changes.ps1

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ if ($env:APPVEYOR_REPO_TAG -eq "true")
1111
cd nf-interpreter > $null
1212

1313
# new branch name
14-
$newBranch = "$env:APPVEYOR_REPO_BRANCH-nfbot/update-version/nanoFramework.Networking.Sntp/$env:NBGV_NuGetPackageVersion"
14+
$newBranch = "$env:APPVEYOR_REPO_BRANCH-nfbot/update-version/nanoFramework.Networking.Sntp/$env:MyNuGetVersion"
1515

1616
# create branch to perform updates
1717
git checkout -b "$newBranch" develop -q
1818

1919
# replace version in assembly declaration
20-
$newVersion = $env:NBGV_GitBuildVersion -replace "\." , ", "
20+
$newVersion = $env:NBGV_Version -replace "\." , ", "
2121
$newVersion = "{ $newVersion }"
2222

2323
$versionRegex = "\{\s*\d+\,\s*\d+\,\s*\d+\,\s*\d+\s*}"
@@ -40,7 +40,7 @@ if ($env:APPVEYOR_REPO_TAG -eq "true")
4040
}
4141
else
4242
{
43-
$commitMessage = "Update nanoFramework.Networking.Sntp version to $env:NBGV_NuGetPackageVersion"
43+
$commitMessage = "Update nanoFramework.Networking.Sntp version to $env:MyNuGetVersion"
4444

4545
# commit changes
4646
git add -A 2>&1

‎generate-change-log.ps1

+10-5
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,14 @@ else
2323
bundle exec github_changelog_generator --token $env:GitHubToken
2424
}
2525

26-
# updated changelog and the updated assembly info files
27-
git add CHANGELOG.md
28-
git commit -m "Update CHANGELOG for v$env:NBGV_NuGetPackageVersion"
29-
# need to wrap the git command bellow so it doesn't throw an error because of redirecting the output to stderr
30-
git push origin --porcelain | Write-Host
26+
# updated changelog, if there are any differences
27+
$logDif = git diff CHANGELOG.md
28+
29+
if($logDif -ne $null)
30+
{
31+
git add CHANGELOG.md
32+
git commit -m "Update CHANGELOG for v$env:NBGV_NuGetPackageVersion"
33+
# need to wrap the git command bellow so it doesn't throw an error because of redirecting the output to stderr
34+
git push origin --porcelain | Write-Host
35+
}
3136
}

‎source/Nuget.nanoFramework.Networking.Sntp.DELIVERABLES/Nuget.nanoFramework.Networking.Sntp.DELIVERABLES.nuproj

-76
This file was deleted.

‎source/Nuget.nanoFramework.Networking.Sntp/Nuget.nanoFramework.Networking.Sntp.nuproj

-72
This file was deleted.

‎source/nanoFramework.Networking.Sntp.DELIVERABLES.nuspec

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
3+
<metadata>
4+
<id>nanoFramework.Networking.Sntp.DELIVERABLES</id>
5+
<version>$version$</version>
6+
<title>nanoFramework.Networking.Sntp.DELIVERABLES</title>
7+
<authors>nanoFramework project contributors</authors>
8+
<owners>nanoFramework project contributors</owners>
9+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
10+
<releaseNotes></releaseNotes>
11+
<developmentDependency>false</developmentDependency>
12+
<projectUrl>https://github.com/nanoframework</projectUrl>
13+
<iconUrl>https://secure.gravatar.com/avatar/97d0e092247f0716db6d4b47b7d1d1ad</iconUrl>
14+
<copyright>Copyright (c) 2018 The nanoFramework project contributors</copyright>
15+
<description>** DON'T REFERENCE THIS PACKAGE ** Not meant for development. This package includes the deliverable artifacts of the nanoFramework.Networking.Sntp assembly for nanoFramework. These are for testing purposes and for updating the native code base of the library.</description>
16+
<summary>nanoFramework.Networking.Sntp.DELIVERABLES is not meant for development.</summary>
17+
<tags></tags>
18+
<dependencies>
19+
<dependency id="nanoFramework.CoreLibrary" version="[1.0.5-preview024]" />
20+
</dependencies>
21+
</metadata>
22+
<files>
23+
<file src="nanoFramework.Networking.Sntp\bin\Release\Stubs\*.*" target="content\Stubs\" />
24+
<file src="nanoFramework.Networking.Sntp\obj\Release\*.txt" target="content\txt\" />
25+
<file src="nanoFramework.Networking.Sntp\obj\Release\*.dump" target="content\dump\" />
26+
<file src="nanoFramework.Networking.Sntp\obj\Release\*.strings" target="content\dump\" />
27+
<file src="nanoFramework.Networking.Sntp\obj\Release\*.resources" target="content\resources\" />
28+
<file src="nanoFramework.Networking.Sntp\obj\Release\*.il" target="content\disasm\" />
29+
</files>
30+
</package>

‎source/nanoFramework.Networking.Sntp.nuspec

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
3+
<metadata>
4+
<id>nanoFramework.Networking.Sntp</id>
5+
<version>$version$</version>
6+
<title>nanoFramework.Networking.Sntp</title>
7+
<authors>nanoFramework project contributors</authors>
8+
<owners>nanoFramework project contributors</owners>
9+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
10+
<releaseNotes></releaseNotes>
11+
<developmentDependency>false</developmentDependency>
12+
<projectUrl>https://github.com/nanoframework</projectUrl>
13+
<iconUrl>https://secure.gravatar.com/avatar/97d0e092247f0716db6d4b47b7d1d1ad</iconUrl>
14+
<copyright>Copyright (c) 2018 The nanoFramework project contributors</copyright>
15+
<description>This package includes the nanoFramework.Networking.Sntp assembly for nanoFramework C# projects.</description>
16+
<summary>nanoFramework.Networking.Sntp assembly for nanoFramework C# projects</summary>
17+
<tags>nanoFramework C# csharp netmf netnf nanoFramework.Networking.Sntp sntp</tags>
18+
<dependencies>
19+
<dependency id="nanoFramework.CoreLibrary" version="[1.0.5-preview024]" />
20+
</dependencies>
21+
</metadata>
22+
<files>
23+
<file src="nanoFramework.Networking.Sntp\bin\Release\nanoFramework.Networking.Sntp.dll" target="lib\nanoFramework.Networking.Sntp.dll" />
24+
<file src="nanoFramework.Networking.Sntp\bin\Release\nanoFramework.Networking.Sntp.pdb" target="lib\nanoFramework.Networking.Sntp.pdb" />
25+
<file src="nanoFramework.Networking.Sntp\bin\Release\nanoFramework.Networking.Sntp.pdbx" target="lib\nanoFramework.Networking.Sntp.pdbx" />
26+
<file src="nanoFramework.Networking.Sntp\bin\Release\nanoFramework.Networking.Sntp.pe" target="lib\nanoFramework.Networking.Sntp.pe" />
27+
<file src="nanoFramework.Networking.Sntp\bin\Release\nanoFramework.Networking.Sntp.xml" target="lib\nanoFramework.Networking.Sntp.xml" />
28+
</files>
29+
</package>

0 commit comments

Comments
 (0)