Skip to content

Commit f0e3742

Browse files
authored
Fix Pipeline to build NFC readers (#162)
***NO_CI***
1 parent 689adbd commit f0e3742

File tree

4 files changed

+17
-9
lines changed

4 files changed

+17
-9
lines changed

azure-pipelines.yml

+8
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,14 @@ steps:
198198
nuget restore $solutionFile
199199
if (-not $?) { throw "Error restoring '$solutionFile'" }
200200
201+
# for NFC solutions the projects on Card solution needs to be restored too
202+
if ($solutionFile.Name -eq "Mfrc522.sln" -or
203+
$solutionFile.Name -eq "Pn5180.sln" -or
204+
$solutionFile.Name -eq "Pn532.sln")
205+
{
206+
nuget restore devices\Card\Card.sln
207+
}
208+
201209
# build solution
202210
& "$msbuild" "$solutionFile" /verbosity:normal /p:Configuration=Release
203211
if (-not $?) { throw "Error building '$solutionFile'" }

devices/Mfrc522/Mfrc522.sln

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@ Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio Version 16
33
VisualStudioVersion = 16.0.30804.86
44
MinimumVisualStudioVersion = 10.0.40219.1
5-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mfrc522", "Mfrc522.nfproj", "{4BA8E406-DEF9-921A-8AC2-DBFDC60132D1}"
5+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CardRfid", "..\Card\Card.nfproj", "{7E99A789-283C-AFEF-CCEF-50A40E38813F}"
66
EndProject
77
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mifare", "..\Card\Mifare\Mifare.nfproj", "{D1F84C93-3A17-46FA-9761-CF4AAC3EF2D7}"
88
EndProject
9-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CardRfid", "..\Card\Card.nfproj", "{7E99A789-283C-AFEF-CCEF-50A40E38813F}"
10-
EndProject
119
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ultralight", "..\Card\Ultralight\Ultralight.nfproj", "{DC2A68E1-21C5-4C4E-BA99-222F116EC4B2}"
1210
EndProject
1311
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ndef", "..\Card\Ndef\Ndef.nfproj", "{150CED27-7CF0-4671-9370-B330D2D49066}"
1412
EndProject
1513
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Card Projects", "Card Projects", "{E039A720-3B6F-405D-A6E3-256E21501AA0}"
1614
EndProject
15+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mfrc522", "Mfrc522.nfproj", "{4BA8E406-DEF9-921A-8AC2-DBFDC60132D1}"
16+
EndProject
1717
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared Projects", "Shared Projects", "{4B393DB9-C4B6-424C-B985-82A2FEA51513}"
1818
EndProject
1919
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Stopwatch", "..\..\src\Stopwatch\Stopwatch.shproj", "{875D133B-033B-4D11-B1A2-DEF898349AD5}"

devices/Pn5180/Pn5180.sln

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ VisualStudioVersion = 16.0.31410.357
44
MinimumVisualStudioVersion = 15.0.26124.0
55
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{30DD3C9B-D513-4B55-A6FF-B034687BCE9C}"
66
EndProject
7-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pn5180", "Pn5180.nfproj", "{8092E07C-4965-0F38-F578-CD82F4124BBC}"
8-
EndProject
97
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Card Projects", "Card Projects", "{7DE389DF-FE19-440A-A172-1D7B8D601303}"
108
EndProject
119
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CardRfid", "..\Card\Card.nfproj", "{7E99A789-283C-AFEF-CCEF-50A40E38813F}"
@@ -18,6 +16,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ultralight", "..\Card\Ultra
1816
EndProject
1917
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared Projects", "Shared Projects", "{83C919C4-91F2-46C4-9769-C85C7DB61975}"
2018
EndProject
19+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pn5180", "Pn5180.nfproj", "{8092E07C-4965-0F38-F578-CD82F4124BBC}"
20+
EndProject
2121
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "BinaryPrimitives", "..\..\src\BinaryPrimitives\BinaryPrimitives.shproj", "{3F28B003-6318-4E21-A9B6-6C0DBD0BDBFD}"
2222
EndProject
2323
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Stopwatch", "..\..\src\Stopwatch\Stopwatch.shproj", "{875D133B-033B-4D11-B1A2-DEF898349AD5}"

devices/Pn532/Pn532.sln

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio Version 16
33
VisualStudioVersion = 16.0.31410.357
44
MinimumVisualStudioVersion = 15.0.26124.0
5-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{EB7F3487-80F6-4406-956D-9EA1067C88EF}"
6-
EndProject
7-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pn532", "Pn532.nfproj", "{49C8EE42-C9C3-9DB8-45C7-3FC2A8454FC7}"
8-
EndProject
95
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Card Projects", "Card Projects", "{6F2CD363-FCFC-430C-806B-82DE583E5D61}"
106
EndProject
117
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CardRfid", "..\Card\Card.nfproj", "{7E99A789-283C-AFEF-CCEF-50A40E38813F}"
@@ -18,6 +14,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ndef", "..\Card\Ndef\Ndef.n
1814
EndProject
1915
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared Projects", "Shared Projects", "{0B3F0D4C-B399-4C22-9BA0-C2BF8029E4B8}"
2016
EndProject
17+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{EB7F3487-80F6-4406-956D-9EA1067C88EF}"
18+
EndProject
19+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pn532", "Pn532.nfproj", "{49C8EE42-C9C3-9DB8-45C7-3FC2A8454FC7}"
20+
EndProject
2121
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "BinaryPrimitives", "..\..\src\BinaryPrimitives\BinaryPrimitives.shproj", "{3F28B003-6318-4E21-A9B6-6C0DBD0BDBFD}"
2222
EndProject
2323
Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Pn532.sample", "samples\Pn532.sample.nfproj", "{8E0F4C9B-1AAD-4FD1-82DF-8BD877322C4E}"

0 commit comments

Comments
 (0)