Skip to content

Commit

Permalink
Merge pull request #320 from microsoft/release/v0.4.0
Browse files Browse the repository at this point in the history
Merge v0.4.0 release back to develop
  • Loading branch information
abeltrano authored Jul 22, 2024
2 parents b4de133 + f8a69e7 commit 18230aa
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .docker/netremote-dev/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"name": "netremote",
"version-string": "0.3.0",
"version-string": "0.4.0",
"dependencies": [
{
"name": "sdbus-cpp",
Expand Down
2 changes: 1 addition & 1 deletion cmake/version.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

# Default version values in case we can't get them from git.
set(VERSION_MAJOR 0)
set(VERSION_MINOR 3)
set(VERSION_MINOR 4)
set(VERSION_PATCH 0)

if (NOT GIT_EXECUTABLE)
Expand Down
2 changes: 1 addition & 1 deletion packaging/vcpkg/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set(VCPKG_PORT_FILE_OUT ${CMAKE_CURRENT_LIST_DIR}/ports/netremote/portfile.cmake
set(VCPKG_PORT_FILE_IN ${VCPKG_PORT_FILE_OUT}.in)

# Configure variables to be substituted in the vcpkg portfile.
set(GIT_REF_HEAD main)
set(GIT_REF_HEAD master)
set(GIT_REF v${CMAKE_PROJECT_VERSION})
set(GIT_REF_URL ${CMAKE_PROJECT_HOMEPAGE_URL}/archive/refs/tags/${GIT_REF}.tar.gz)

Expand Down
2 changes: 1 addition & 1 deletion vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"name": "netremote",
"version-string": "0.3.0",
"version-string": "0.4.0",
"dependencies": [
{
"name": "sdbus-cpp",
Expand Down

0 comments on commit 18230aa

Please sign in to comment.