Skip to content

Commit ff6134d

Browse files
author
Chris Maunder
committed
Nuget corrections for macOS arm64
1 parent f653158 commit ff6134d

File tree

2 files changed

+36
-16
lines changed

2 files changed

+36
-16
lines changed

‎src/SDK/NET/NET.csproj‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,22 +33,33 @@
3333
<DebugSymbols>true</DebugSymbols>
3434
</PropertyGroup>
3535

36-
<ItemGroup>
37-
<PackageReference Include="Hardware.Info" Version="101.0.0" />
36+
<ItemGroup Condition="'$(IsOsx)'=='true' And '$(IsArm64)'=='true'"> <!-- Mac Apple Silicon -->
37+
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.0" />
38+
<PackageReference Include="System.Text.Json" Version="8.0.0" />
39+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
40+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
41+
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
42+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
43+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
44+
</ItemGroup>
45+
46+
<ItemGroup Condition="'$(IsOsx)'!='true' Or '$(IsArm64)'!='true'"> <!-- Everything else -->
47+
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.1" />
48+
<PackageReference Include="System.Text.Json" Version="8.0.5" />
3849
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
3950
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
40-
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
51+
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
4152
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
42-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
53+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
54+
</ItemGroup>
55+
56+
<ItemGroup>
57+
<PackageReference Include="Hardware.Info" Version="101.0.0" />
4358
<PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
4459
<PackageReference Include="SkiaSharp" Version="2.88.8" />
4560
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.8" />
4661
<PackageReference Include="SkiaSharp.Views.Desktop.Common" Version="2.88.8" />
4762
<PackageReference Include="System.Management" Version="8.0.0" />
48-
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.1" />
49-
50-
<PackageReference Include="System.Text.Json" Version="8.0.0" Condition="'$(IsOsx)'=='true' And '$(IsArm64)'=='true'" /> <!-- Mac Apple Silicon -->
51-
<PackageReference Include="System.Text.Json" Version="8.0.5" Condition="'$(IsOsx)'!='true' Or '$(IsArm64)'!='true'" /> <!-- Everything else -->
5263
</ItemGroup>
5364

5465
<ItemGroup>

‎src/server/Server.csproj‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,20 +84,29 @@ https://learn.microsoft.com/en-us/visualstudio/msbuild/property-functions?view=v
8484
-->
8585
</ItemGroup>
8686

87-
<ItemGroup>
88-
<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="8.0.1" />
87+
<ItemGroup Condition="'$(IsOsx)'=='true' And '$(IsArm64)'=='true'"> <!-- Mac Apple Silicon -->
88+
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.0" />
89+
<PackageReference Include="System.Text.Json" Version="8.0.0" />
90+
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
91+
<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="8.0.0" />
92+
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
93+
</ItemGroup>
94+
95+
<ItemGroup Condition="'$(IsOsx)'!='true' Or '$(IsArm64)'!='true'"> <!-- Everything else -->
96+
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.1" />
97+
<PackageReference Include="System.Text.Json" Version="8.0.5" />
98+
<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="8.0.1" />
8999
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.1" />
90-
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
100+
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
101+
</ItemGroup>
102+
103+
<ItemGroup>
91104
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
92105
<!--
93106
Removing for now: This causes errors when building multiplatform:
94107
https://github.com/domaindrivendev/Swashbuckle.WebApi/issues/1358
95108
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
96109
-->
97-
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.1" />
98-
99-
<PackageReference Include="System.Text.Json" Version="8.0.0" Condition="'$(IsOsx)'=='true' And '$(IsArm64)'=='true'" /> <!-- Mac Apple Silicon -->
100-
<PackageReference Include="System.Text.Json" Version="8.0.5" Condition="'$(IsOsx)'!='true' Or '$(IsArm64)'!='true'" /> <!-- Everything else -->
101110
</ItemGroup>
102111

103112
<ItemGroup>
@@ -177,7 +186,7 @@ https://learn.microsoft.com/en-us/visualstudio/msbuild/property-functions?view=v
177186
</ItemGroup>
178187

179188
<!--
180-
Start/End timer scripts use powershell to set a persistant environment variable and this
189+
Start/End timer scripts use powershell to set a persistent environment variable and this
181190
single operation takes seconds. Not worth it.
182191
183192
<Target Name="PreBuild" BeforeTargets="PreBuildEvent" Condition="'$(IsWindows)'=='true'">

0 commit comments

Comments
 (0)