Skip to content

Commit 7933f93

Browse files
RjvsRjvs
committed
Fix reference to libsa
1 parent 0e57995 commit 7933f93

File tree

7 files changed

+29
-27
lines changed

7 files changed

+29
-27
lines changed

‎.github/workflows/upstream.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -430,12 +430,12 @@ jobs:
430430
echo "Version not set, can't continue."
431431
exit 1
432432
fi
433-
file="${target}/${target}.csproj"
434-
[[ -f "$file" ]] && echo -n "Editing $file ... " || echo -n "Can't find $file ... "
435-
sed -i "s/\(\bStirlingLabs\.MsQuic\.Bindings\.runtime\.\(linux\|osx\|win\).*\.openssl.*Version=\"\)\(.*\)\(\"\)/\1${rawVersion}\4/" "$file" && echo "done." || echo "failed‼️"
436-
file="MsQuicVersionOnly.proj"
433+
# file="${target}/${target}.csproj"
434+
# [[ -f "$file" ]] && echo -n "Editing $file ... " || echo -n "Can't find $file ... "
435+
# sed -i "s/\(\bStirlingLabs\.MsQuic\.Bindings\.runtime\.\(linux\|osx\|win\).*\.openssl.*Version=\"\)\(.*\)\(\"\)/\1${rawVersion}\4/" "$file" && echo "done." || echo "failed‼️"
436+
file="MsQuicBindingsVersionOnly.proj"
437437
[[ -f "$file" ]] && echo -n "Replacing $file ... " || echo -n "Creating $file ... "
438-
echo "<Project><PropertyGroup><Version>${version:1}</Version></PropertyGroup></Project>" > "$file" && echo "done." || echo "failed‼️"
438+
echo "<Project><PropertyGroup><StirlingLabsMsQuicRuntimeVersion>${version:1}</StirlingLabsMsQuicRuntimeVersion></PropertyGroup></Project>" > "$file" && echo "done." || echo "failed‼️"
439439
cat "$file"
440440
441441
- name: Create PR

‎MsQuicBindingsVersionOnly.proj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<Project><PropertyGroup><StirlingLabsMsQuicRuntimeVersion>2.2.2</StirlingLabsMsQuicRuntimeVersion></PropertyGroup></Project>

‎MsQuicVersion.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project>
2-
<Import Project="$(MSBuildThisFileDirectory)MsQuicVersionOnly.proj" />
2+
<Import Project="$(MSBuildThisFileDirectory)MsQuicBindingsVersionOnly.proj" />
33
<PropertyGroup>
44
<RepositoryType>git</RepositoryType>
55
<RepositoryUrl>https://github.com/StirlingLabs/MsQuic.Net.git</RepositoryUrl>

‎MsQuicVersionOnly.proj‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎StirlingLabs.MsQuic.Bindings/StirlingLabs.MsQuic.Bindings.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,20 @@
3030
<PackageReference Include="System.Memory" Version="4.5.4" />
3131
</ItemGroup>
3232

33+
<ImportGroup>
34+
<Import Project="../MsQuicVersion.proj" />
35+
</ImportGroup>
36+
3337
<ItemGroup>
3438
<PackageReference Include="JetBrains.Annotations" Version="2022.1.0" PrivateAssets="All" />
3539
<PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
3640
<PackageReference Include="StirlingLabs.Utilities.NativeLibrary" Version="22.9.1" />
3741
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
38-
<PackageReference Include="StirlingLabs.MsQuic.Bindings.runtime.linux-x64.openssl" Version="2.2.2" />
39-
<PackageReference Include="StirlingLabs.MsQuic.Bindings.runtime.osx.openssl" Version="2.2.2" />
40-
<PackageReference Include="StirlingLabs.MsQuic.Bindings.runtime.win-x64.openssl" Version="2.2.2" />
42+
<PackageReference Include="StirlingLabs.MsQuic.Bindings.runtime.linux-x64.openssl" Version="$(StirlingLabsMsQuicRuntimeVersion)" />
43+
<PackageReference Include="StirlingLabs.MsQuic.Bindings.runtime.osx.openssl" Version="$(StirlingLabsMsQuicRuntimeVersion)" />
44+
<PackageReference Include="StirlingLabs.MsQuic.Bindings.runtime.win-x64.openssl" Version="$(StirlingLabsMsQuicRuntimeVersion)" />
4145
</ItemGroup>
4246

43-
<ImportGroup>
44-
<Import Project="../MsQuicVersion.proj" />
45-
</ImportGroup>
46-
4747
<ItemGroup>
4848
<None Include="StirlingLabs.MsQuic.Bindings.props">
4949
<Pack>true</Pack>

‎StirlingLabs.MsQuic.Bindings/StirlingLabs.MsQuic.Bindings.props‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project>
33
<PropertyGroup>
4+
<StirlingLabsLibsaVersionMin>22.9.0</StirlingLabsLibsaVersionMin>
45
<StirlingLabsMsQuicVersion>@(PackageReference->WithMetadataValue('Identity','StirlingLabs.MsQuic.Bindings')->Metadata('Version'))</StirlingLabsMsQuicVersion>
56
<StirlingLabsMsQuicVersion Condition="'$(StirlingLabsMsQuicVersion)'==''">*</StirlingLabsMsQuicVersion>
67
<StirlingLabsMsQuicSelectRuntimeId Condition="'$(StirlingLabsMsQuicSelectRuntimeId)'==''">$(RuntimeIdentifier)</StirlingLabsMsQuicSelectRuntimeId>
@@ -22,23 +23,23 @@
2223
</PropertyGroup>
2324

2425
<ItemGroup Condition="!$(StirlingLabsMsQuicSelectAllRuntimes) AND !$(StirlingLabsMsQuicSelectRuntimeId.StartsWith('linux'))">
25-
<PackageReference Remove="StirlingLabs.MsQuic.Bindings.runtime.linux-x64.libsa"/>
26+
<PackageReference Remove="StirlingLabs.sockaddr.Net.runtime.linux-x64.libsa"/>
2627
</ItemGroup>
2728
<ItemGroup Condition="$(StirlingLabsMsQuicSelectAllRuntimes) OR $(StirlingLabsMsQuicSelectRuntimeId.StartsWith('linux'))">
28-
<PackageReference Include="StirlingLabs.MsQuic.Bindings.runtime.linux-x64.libsa" Version="$(StirlingLabsMsQuicVersion)"/>
29+
<PackageReference Include="StirlingLabs.sockaddr.Net.runtime.linux-x64.libsa" Version="($(StirlingLabsLibsaVersionMin),$(StirlingLabsMsQuicVersion)]"/>
2930
</ItemGroup>
3031

3132
<ItemGroup Condition="!$(StirlingLabsMsQuicSelectAllRuntimes) AND !$(StirlingLabsMsQuicSelectRuntimeId.StartsWith('osx'))">
32-
<ProjectReference Remove="StirlingLabs.MsQuic.Bindings.runtime.osx.libsa"/>
33+
<ProjectReference Remove="StirlingLabs.sockaddr.Net.runtime.osx.libsa"/>
3334
</ItemGroup>
3435
<ItemGroup Condition="$(StirlingLabsMsQuicSelectAllRuntimes) OR $(StirlingLabsMsQuicSelectRuntimeId.StartsWith('osx'))">
35-
<PackageReference Include="StirlingLabs.MsQuic.Bindings.runtime.osx.libsa" Version="$(StirlingLabsMsQuicVersion)"/>
36+
<PackageReference Include="StirlingLabs.sockaddr.Net.runtime.osx.libsa" Version="($(StirlingLabsLibsaVersionMin),$(StirlingLabsMsQuicVersion)]"/>
3637
</ItemGroup>
3738

3839
<ItemGroup Condition="!$(StirlingLabsMsQuicSelectAllRuntimes) AND !$(StirlingLabsMsQuicSelectRuntimeId.StartsWith('win'))">
39-
<PackageReference Remove="StirlingLabs.MsQuic.Bindings.runtime.win-x64.libsa"/>
40+
<PackageReference Remove="StirlingLabs.sockaddr.Net.runtime.win-x64.libsa"/>
4041
</ItemGroup>
4142
<ItemGroup Condition="$(StirlingLabsMsQuicSelectAllRuntimes) OR $(StirlingLabsMsQuicSelectRuntimeId.StartsWith('win'))">
42-
<PackageReference Include="StirlingLabs.MsQuic.Bindings.runtime.win-x64.libsa" Version="$(StirlingLabsMsQuicVersion)"/>
43+
<PackageReference Include="StirlingLabs.sockaddr.Net.runtime.win-x64.libsa" Version="($(StirlingLabsLibsaVersionMin),$(StirlingLabsMsQuicVersion)]"/>
4344
</ItemGroup>
4445
</Project>

‎StirlingLabs.MsQuic.Bindings/StirlingLabs.MsQuic.Bindings.targets‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@
1414
<Message Importance="high" Text="StirlingLabsMsQuicVersion BEFORE: $(StirlingLabsMsQuicVersion)"/>
1515
-->
1616
<PropertyGroup>
17+
<StirlingLabsLibsaVersionMin>22.9.0</StirlingLabsLibsaVersionMin>
1718
<StirlingLabsMsQuicVersion>@(PackageReference->WithMetadataValue('Identity','StirlingLabs.MsQuic.Bindings')->Metadata('Version'))</StirlingLabsMsQuicVersion>
18-
<StirlingLabsMsQuicVersion Condition="'$(StirlingLabsMsQuicVersion)'=='' AND '%(PackageReference.Identity)' == 'StirlingLabs.MsQuic.Bindings'">%(PackageReference.Version)</StirlingLabsMsQuicVersion>-->
19+
<StirlingLabsMsQuicVersion Condition="'$(StirlingLabsMsQuicVersion)'=='' AND '%(PackageReference.Identity)' == 'StirlingLabs.MsQuic.Bindings'">%(PackageReference.Version)</StirlingLabsMsQuicVersion>
1920
<StirlingLabsMsQuicVersion Condition="'$(StirlingLabsMsQuicVersion)'==''">*</StirlingLabsMsQuicVersion>
2021
<StirlingLabsMsQuicSelectRuntimeId Condition="'$(StirlingLabsMsQuicSelectRuntimeId)'==''">$(RuntimeIdentifier)</StirlingLabsMsQuicSelectRuntimeId>
2122
<StirlingLabsMsQuicSelectRuntimeId Condition="'$(StirlingLabsMsQuicSelectRuntimeId)'==''">$(DefaultAppHostRuntimeIdentifier)</StirlingLabsMsQuicSelectRuntimeId>
@@ -40,28 +41,28 @@
4041

4142
<!-- Linux -->
4243
<ItemGroup Condition="!$(StirlingLabsMsQuicSelectAllRuntimes) AND !$(StirlingLabsMsQuicSelectRuntimeId.StartsWith('linux'))">
43-
<PackageReference Remove="StirlingLabs.MsQuic.Bindings.runtime.linux-x64.libsa"/>
44+
<PackageReference Remove="StirlingLabs.sockaddr.Net.runtime.linux-x64.libsa"/>
4445
</ItemGroup>
4546
<CreateItem Condition="$(StirlingLabsMsQuicSelectAllRuntimes) OR $(StirlingLabsMsQuicSelectRuntimeId.StartsWith('linux'))"
46-
Include="StirlingLabs.MsQuic.Bindings.runtime.linux-x64.libsa" AdditionalMetadata="Version=$(StirlingLabsMsQuicVersion)">
47+
Include="StirlingLabs.sockaddr.Net.runtime.linux-x64.libsa" AdditionalMetadata="Version=($(StirlingLabsLibsaVersionMin),$(StirlingLabsMsQuicVersion)]">
4748
<Output TaskParameter="Include" ItemName="PackageReference"/>
4849
</CreateItem>
4950

5051
<!-- OS X -->
5152
<ItemGroup Condition="!$(StirlingLabsMsQuicSelectAllRuntimes) AND !$(StirlingLabsMsQuicSelectRuntimeId.StartsWith('osx'))">
52-
<PackageReference Remove="StirlingLabs.MsQuic.Bindings.runtime.osx.libsa"/>
53+
<PackageReference Remove="StirlingLabs.sockaddr.Net.runtime.osx.libsa"/>
5354
</ItemGroup>
5455
<CreateItem Condition="$(StirlingLabsMsQuicSelectAllRuntimes) OR $(StirlingLabsMsQuicSelectRuntimeId.StartsWith('osx'))"
55-
Include="StirlingLabs.MsQuic.Bindings.runtime.osx.libsa" AdditionalMetadata="Version=$(StirlingLabsMsQuicVersion)">
56+
Include="StirlingLabs.sockaddr.Net.runtime.osx.libsa" AdditionalMetadata="Version=($(StirlingLabsLibsaVersionMin),$(StirlingLabsMsQuicVersion)]">
5657
<Output TaskParameter="Include" ItemName="PackageReference"/>
5758
</CreateItem>
5859

5960
<!-- Windows -->
6061
<ItemGroup Condition="!$(StirlingLabsMsQuicSelectAllRuntimes) AND !$(StirlingLabsMsQuicSelectRuntimeId.StartsWith('win'))">
61-
<PackageReference Remove="StirlingLabs.MsQuic.Bindings.runtime.win-x64.libsa"/>
62+
<PackageReference Remove="StirlingLabs.sockaddr.Net.runtime.win-x64.libsa"/>
6263
</ItemGroup>
6364
<CreateItem Condition="$(StirlingLabsMsQuicSelectAllRuntimes) OR $(StirlingLabsMsQuicSelectRuntimeId.StartsWith('win'))"
64-
Include="StirlingLabs.MsQuic.Bindings.runtime.win-x64.libsa" AdditionalMetadata="Version=$(StirlingLabsMsQuicVersion)">
65+
Include="StirlingLabs.sockaddr.Nets.runtime.win-x64.libsa" AdditionalMetadata="Version=($(StirlingLabsLibsaVersionMin),$(StirlingLabsMsQuicVersion)]">
6566
<Output TaskParameter="Include" ItemName="PackageReference"/>
6667
</CreateItem>
6768

0 commit comments

Comments
 (0)