Skip to content

Bump the nuget group with 2 updates #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Bump the nuget group with 2 updates #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions src/SDK/NET/Common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
<IsOSX>false</IsOSX>
<IsArm64>false</IsArm64>
<IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true</IsWindows>
<IsLinux Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">true</IsLinux>
<IsOSX Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">true</IsOSX>
<IsArm64 Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'Arm64'">true</IsArm64>
<IsLinux Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">true</IsLinux>
<IsOSX Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">true</IsOSX>
<IsArm64 Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'Arm64'">true</IsArm64>
</PropertyGroup>

<!-- Set RuntimeIdentifier, Platform and OS properties -->
Expand All @@ -56,13 +56,13 @@
<IsWindows Condition="'$(RuntimeIdentifier.StartsWith(`win`))'=='true'">true</IsWindows>

<IsLinux>false</IsLinux>
<IsLinux Condition="'$(RuntimeIdentifier.StartsWith(`linux`))'=='true'">true</IsLinux>
<IsLinux Condition="'$(RuntimeIdentifier.StartsWith(`linux`))'=='true'">true</IsLinux>

<IsOSX>false</IsOSX>
<IsOSX Condition="'$(RuntimeIdentifier.StartsWith(`osx`))'=='true'">true</IsOSX>
<IsOSX Condition="'$(RuntimeIdentifier.StartsWith(`osx`))'=='true'">true</IsOSX>

<IsArm64>false</IsArm64>
<IsArm64 Condition="'$(RuntimeIdentifier.EndsWith(`arm64`))'=='true'">true</IsArm64>
<IsArm64 Condition="'$(RuntimeIdentifier.EndsWith(`arm64`))'=='true'">true</IsArm64>
</PropertyGroup>
</Otherwise>
</Choose>
Expand All @@ -75,18 +75,18 @@
<DefineConstants Condition="'$(IsArm64)'=='true'">Arm64</DefineConstants>
<DefineConstants Condition="'$(IsArm64)'!='true'">x64</DefineConstants>

<OSPlatform Condition="'$(IsWindows)'=='true'">Windows</OSPlatform>
<OSPlatform Condition="'$(IsLinux)'=='true'">Linux</OSPlatform>
<OSPlatform Condition="'$(IsOSX)'=='true'">OSX</OSPlatform>
<OSPlatform Condition="'$(IsWindows)'=='true'">Windows</OSPlatform>
<OSPlatform Condition="'$(IsLinux)'=='true'">Linux</OSPlatform>
<OSPlatform Condition="'$(IsOSX)'=='true'">OSX</OSPlatform>

<OSArchitecture Condition="'$(IsArm64)'=='true'">Arm64</OSArchitecture>
<OSArchitecture Condition="'$(IsArm64)'!='true'">x64</OSArchitecture>
<OSArchitecture Condition="'$(IsArm64)'=='true'">Arm64</OSArchitecture>
<OSArchitecture Condition="'$(IsArm64)'!='true'">x64</OSArchitecture>
</PropertyGroup>

<!-- Output the settings based on what we've determined above -->
<Target Name="SettingsCheck" AfterTargets="BeforeBuild" Condition="'$(ShowRuntimeSettings)'=='true'">
<Message Condition="'$(RuntimeIdentifier)'==''" Importance="High" Text=" $(Name): Building for $(OSPlatform) $(OSArchitecture) (no runtime Id) => TargetFramework = $(TargetFramework) " />
<Message Condition="'$(RuntimeIdentifier)'!=''" Importance="High" Text=" $(Name): Building for $(OSPlatform) $(OSArchitecture) ($(RuntimeIdentifier)) => TargetFramework = $(TargetFramework) " />
<Message Condition="'$(RuntimeIdentifier)'==''" Importance="High" Text=" $(Name): Building for $(OSPlatform) $(OSArchitecture) (no runtime Id) =&gt; TargetFramework = $(TargetFramework) " />
<Message Condition="'$(RuntimeIdentifier)'!=''" Importance="High" Text=" $(Name): Building for $(OSPlatform) $(OSArchitecture) ($(RuntimeIdentifier)) =&gt; TargetFramework = $(TargetFramework) " />
</Target>

</Project>
4 changes: 2 additions & 2 deletions src/SDK/NET/NET.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@
<PackageReference Include="System.Management" Version="8.0.0" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.0" />

<PackageReference Include="System.Text.Json" Version="8.0.0" Condition="'$(IsOsx)'=='true' And '$(IsArm64)'=='true'" /> <!-- Mac Apple Silicon -->
<PackageReference Include="System.Text.Json" Version="8.0.4" Condition="'$(IsOsx)'!='true' Or '$(IsArm64)'!='true'" /> <!-- Everything else -->
<PackageReference Include="System.Text.Json" Version="8.0.5" Condition="'$(IsOsx)'=='true' And '$(IsArm64)'=='true'" /> <!-- Mac Apple Silicon -->
<PackageReference Include="System.Text.Json" Version="8.0.5" Condition="'$(IsOsx)'!='true' Or '$(IsArm64)'!='true'" /> <!-- Everything else -->
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 3 additions & 1 deletion src/demos/modules/DotNetSimple/DotNetSimple.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<!-- Common packages required on all GPU types -->
<PackageReference Include="CodeProject.AI.Module.SDK" Version="1.0.1" />
<PackageReference Include="Yolov8.Net" Version="1.1.4" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.11" />
<PackageReference Include="SkiaSharp" Version="2.88.6" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />

Expand Down Expand Up @@ -94,6 +94,8 @@
</ItemGroup>

<ItemGroup>

<PackageReference Include="System.Text.Json" Version="8.0.5" />
<None Update="explore.html">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
Expand Down
4 changes: 2 additions & 2 deletions utils/ParseJSON/ParseJSON.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Text.Json" Version="8.0.0" Condition="'$(IsOsx)'=='true' And '$(IsArm64)'=='true'" /> <!-- Mac Apple Silicon -->
<PackageReference Include="System.Text.Json" Version="8.0.4" Condition="'$(IsOsx)'!='true' Or '$(IsArm64)'!='true'" /> <!-- Everything else -->
<PackageReference Include="System.Text.Json" Version="8.0.5" Condition="'$(IsOsx)'=='true' And '$(IsArm64)'=='true'" /> <!-- Mac Apple Silicon -->
<PackageReference Include="System.Text.Json" Version="8.0.5" Condition="'$(IsOsx)'!='true' Or '$(IsArm64)'!='true'" /> <!-- Everything else -->
</ItemGroup>

<ItemGroup>
Expand Down