Skip to content

Commit 54730d2

Browse files
Fix/rid parameter (#248)
* Enhance runtime identification for Windows and Linux in project configuration * Bump version to 0.7.0.4 for CLI and framework
1 parent 728f468 commit 54730d2

File tree

3 files changed

+26
-4
lines changed

3 files changed

+26
-4
lines changed

IO.Astrodynamics.Net/IO.Astrodynamics.CLI/IO.Astrodynamics.CLI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<FileVersion>0.0.1</FileVersion>
1010
<PackAsTool>true</PackAsTool>
1111
<ToolCommandName>astro</ToolCommandName>
12-
<Version>0.7.0.3</Version>
12+
<Version>0.7.0.4</Version>
1313
<Title>Astrodynamics command line interface</Title>
1414
<Authors>Sylvain Guillet</Authors>
1515
<Description>This CLI allows end user to exploit IO.Astrodynamics framework </Description>

IO.Astrodynamics.Net/IO.Astrodynamics/IO.Astrodynamics.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<id>IO.Astrodynamics</id>
55
<authors>Sylvain Guillet</authors>
66
<copyright>Sylvain Guillet</copyright>
7-
<version>7.0.3</version>
7+
<version>7.0.4</version>
88
<title>Astrodynamics framework</title>
99
<icon>images\dragonfly-dark-trans.png</icon>
1010
<readme>docs\README.md</readme>

IO.Astrodynamics.Net/IO.Astrodynamics/IO.Astrodynamics.targets

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0"?>
22
<Project>
3-
<ItemGroup Condition=" '$(OS)' == 'WINDOWS_NT'">
3+
<!-- Windows runtime - when RuntimeIdentifier is explicitly set to Windows -->
4+
<ItemGroup Condition="$(RuntimeIdentifier.StartsWith('win'))">
45
<Content Include="$(MSBuildThisFileDirectory)..\runtimes\windows10-x64\IO.Astrodynamics.dll">
56
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
67
<Link>%(FileName)%(Extension)</Link>
@@ -10,7 +11,28 @@
1011
<Link>%(FileName)%(Extension)</Link>
1112
</Content>
1213
</ItemGroup>
13-
<ItemGroup Condition=" '$(OS)' == 'UNIX'">
14+
15+
<!-- Linux runtime - when RuntimeIdentifier is explicitly set to Linux -->
16+
<ItemGroup Condition="$(RuntimeIdentifier.StartsWith('linux'))">
17+
<Content Include="$(MSBuildThisFileDirectory)..\runtimes\linux-x64\libIO.Astrodynamics.so">
18+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
19+
<Link>%(FileName)%(Extension)</Link>
20+
</Content>
21+
</ItemGroup>
22+
23+
<!-- Fallback for local development - when no RuntimeIdentifier is set, use build machine OS -->
24+
<ItemGroup Condition="'$(RuntimeIdentifier)' == '' AND '$(OS)' == 'Windows_NT'">
25+
<Content Include="$(MSBuildThisFileDirectory)..\runtimes\windows10-x64\IO.Astrodynamics.dll">
26+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
27+
<Link>%(FileName)%(Extension)</Link>
28+
</Content>
29+
<Content Include="$(MSBuildThisFileDirectory)..\runtimes\windows10-x64\IO.Astrodynamics.lib">
30+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
31+
<Link>%(FileName)%(Extension)</Link>
32+
</Content>
33+
</ItemGroup>
34+
35+
<ItemGroup Condition="'$(RuntimeIdentifier)' == '' AND '$(OS)' == 'Unix'">
1436
<Content Include="$(MSBuildThisFileDirectory)..\runtimes\linux-x64\libIO.Astrodynamics.so">
1537
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1638
<Link>%(FileName)%(Extension)</Link>

0 commit comments

Comments
 (0)