Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ jobs:
conan profile detect
conan profile list

conan graph explain --requires=c-api/0.48.0 --update -o c-api/*:shared=True -s compiler.cppstd=20
conan install --requires=c-api/0.48.0 --update -o c-api/*:shared=True -s compiler.cppstd=20 --build=missing
conan graph explain --requires=c-api/0.52.0 --update -o c-api/*:shared=True -s compiler.cppstd=23
conan install --requires=c-api/0.52.0 --update -o c-api/*:shared=True -s compiler.cppstd=23 --build=missing
shell: bash

- name: Compile
Expand Down
6 changes: 3 additions & 3 deletions kth-bch/build/Common.targets
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<PropertyGroup>
<VersionString>$([System.String]::Copy('0.48.0').Replace('.','_'))</VersionString>
<VersionString>$([System.String]::Copy('0.52.0').Replace('.','_'))</VersionString>
</PropertyGroup>

<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
Expand Down Expand Up @@ -64,7 +64,7 @@
<Message Text="LibDestinationName2: $(LibDestinationName2)" Importance="high"/>
<Message Text="LibDestinationPath: $(LibDestinationPath)" Importance="high"/>
<Message Text="LibDestinationPath2: $(LibDestinationPath2)" Importance="high"/>
<Message Text="Knuth Version: 0.48.0" Importance="high"/>
<Message Text="Knuth Version: 0.52.0" Importance="high"/>
<Message Text="Knuth Currency: BCH" Importance="high"/>
<Message Text="Knuth March ID: ZLm9Pjh" Importance="high"/>
<Message Text="DirectDeployDirExists: $(DirectDeployDirExists)" Importance="high"/>
Expand All @@ -75,7 +75,7 @@
Condition="'$(HaveToExecConan)'=='True'" />

<WriteLinesToFile
File="conanfile.txt" Lines="[requires];c-api/0.48.0;[options];c-api/*:shared=True;c-api/*:currency=BCH;c-api/*:march_id=ZLm9Pjh;[imports];bin, *.dll -> .;lib, *.so -> .;lib, *.dylib -> ."
File="conanfile.txt" Lines="[requires];c-api/0.52.0;[options];c-api/*:shared=True;c-api/*:currency=BCH;c-api/*:march_id=ZLm9Pjh;[imports];bin, *.dll -> .;lib, *.so -> .;lib, *.dylib -> ."
Overwrite="true" Condition="'$(HaveToExecConan)'=='True'"/>

<Exec Command="conan install . --deployer=direct_deploy --deployer-folder=. $(ConanSettings) --update --build=missing"
Expand Down
2 changes: 1 addition & 1 deletion kth/conan/conan_version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.48.0
0.52.0
1 change: 0 additions & 1 deletion versions.txt

This file was deleted.