Skip to content

Commit eae8a70

Browse files
pgrawehrpgrawehr
authored
The call to Dns.GetHostEntry() may fail on MacOS (#1927)
* The call to Dns.GetHostEntry() may fail on MacOS ... only ever seen there. * Build on one CPU only Maybe this avoids the concurrency problems? * Revert "Build on one CPU only" This reverts commit 7ee8124. * Make sure there's only one .csproj per directory Therefore split up sample folders containing multiple projects into subfolders. This fixes the macOS build and also some weird issues on other operating systems (such as the debugger getting confused about which one to execute) * Also update the solution files
1 parent aef8e76 commit eae8a70

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+149
-163
lines changed

‎src/devices/Arduino/Arduino.sln‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Arduino", "Arduino.csproj",
77
EndProject
88
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Device.Gpio", "..\..\System.Device.Gpio\System.Device.Gpio.csproj", "{0B90F9D4-7353-4172-A317-714471A06781}"
99
EndProject
10-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Arduino.sample", "samples\Arduino.sample.csproj", "{2670F7BF-A7C8-49EB-9A99-1719A90D0C67}"
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Arduino.sample", "samples\ApiChecker\Arduino.sample.csproj", "{2670F7BF-A7C8-49EB-9A99-1719A90D0C67}"
1111
EndProject
1212
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bmxx80", "..\Bmxx80\Bmxx80.csproj", "{EEEB0FB8-E1ED-4970-BDF6-DA3D5E2ED074}"
1313
EndProject
@@ -21,7 +21,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CpuTemperature", "..\CpuTem
2121
EndProject
2222
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{9E5A25ED-9839-4C1A-9B27-993437D1CB31}"
2323
EndProject
24-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Arduino.Monitor", "samples\Arduino.Monitor.csproj", "{23B4B60C-9594-42BB-9D25-C54983B0F809}"
24+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Arduino.Monitor", "samples\Monitor\Arduino.Monitor.csproj", "{23B4B60C-9594-42BB-9D25-C54983B0F809}"
2525
EndProject
2626
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{CA26B999-4C0E-4E82-A46E-A68AC1B85C10}"
2727
EndProject

‎src/devices/Arduino/samples/Arduino.sample.cs‎ renamed to ‎src/devices/Arduino/samples/ApiChecker/Arduino.sample.cs‎

File renamed without changes.

‎src/devices/Arduino/samples/Arduino.sample.csproj‎ renamed to ‎src/devices/Arduino/samples/ApiChecker/Arduino.sample.csproj‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@
1616
<Compile Include="TestCases.cs" />
1717
</ItemGroup>
1818
<ItemGroup>
19-
<ProjectReference Include="..\..\Bmxx80\Bmxx80.csproj" />
20-
<ProjectReference Include="..\..\Board\Board.csproj" />
21-
<ProjectReference Include="..\..\Common\Common.csproj" />
22-
<ProjectReference Include="..\..\Mcp3xxx\Mcp3xxx.csproj" />
23-
<ProjectReference Include="..\Arduino.csproj" />
19+
<ProjectReference Include="..\..\..\Bmxx80\Bmxx80.csproj" />
20+
<ProjectReference Include="..\..\..\Board\Board.csproj" />
21+
<ProjectReference Include="..\..\..\Mcp3xxx\Mcp3xxx.csproj" />
22+
<ProjectReference Include="..\..\Arduino.csproj" />
2423
</ItemGroup>
2524
</Project>

‎src/devices/Arduino/samples/ArduinoCompilerSampleMethods.cs‎ renamed to ‎src/devices/Arduino/samples/ApiChecker/ArduinoCompilerSampleMethods.cs‎

File renamed without changes.

‎src/devices/Arduino/samples/DebugLogStream.cs‎ renamed to ‎src/devices/Arduino/samples/ApiChecker/DebugLogStream.cs‎

File renamed without changes.

‎src/devices/Arduino/samples/RgbLedTest.cs‎ renamed to ‎src/devices/Arduino/samples/ApiChecker/RgbLedTest.cs‎

File renamed without changes.

‎src/devices/Arduino/samples/TestCases.cs‎ renamed to ‎src/devices/Arduino/samples/ApiChecker/TestCases.cs‎

File renamed without changes.

‎src/devices/Arduino/samples/Arduino.Monitor.cs‎ renamed to ‎src/devices/Arduino/samples/Monitor/Arduino.Monitor.cs‎

File renamed without changes.

‎src/devices/Arduino/samples/Arduino.Monitor.csproj‎ renamed to ‎src/devices/Arduino/samples/Monitor/Arduino.Monitor.csproj‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
1414
<Compile Include="Arduino.Monitor.cs" />
1515
</ItemGroup>
1616
<ItemGroup>
17-
<!--Cases used when running in VS, with the solution config either Windows-Debug or Linux-Debug (or -Release) -->
18-
<ProjectReference Include="..\..\Bmxx80\Bmxx80.csproj" />
19-
<ProjectReference Include="..\..\Button\Button.csproj" />
20-
<ProjectReference Include="..\..\Board\Board.csproj" />
21-
<ProjectReference Include="..\..\CharacterLcd\CharacterLcd.csproj" />
22-
<ProjectReference Include="..\..\HardwareMonitor\HardwareMonitor.csproj" />
23-
<ProjectReference Include="..\..\Mcp3xxx\Mcp3xxx.csproj" />
24-
<ProjectReference Include="..\Arduino.csproj" />
17+
<ProjectReference Include="..\..\..\Bmxx80\Bmxx80.csproj" />
18+
<ProjectReference Include="..\..\..\Button\Button.csproj" />
19+
<ProjectReference Include="..\..\..\Board\Board.csproj" />
20+
<ProjectReference Include="..\..\..\CharacterLcd\CharacterLcd.csproj" />
21+
<ProjectReference Include="..\..\..\HardwareMonitor\HardwareMonitor.csproj" />
22+
<ProjectReference Include="..\..\..\Mcp3xxx\Mcp3xxx.csproj" />
23+
<ProjectReference Include="..\..\Arduino.csproj" />
2524
</ItemGroup>
2625
</Project>

‎src/devices/Arduino/samples/CharacterDisplay.cs‎ renamed to ‎src/devices/Arduino/samples/Monitor/CharacterDisplay.cs‎

File renamed without changes.

0 commit comments

Comments
 (0)