From 3603e9e4d5b76739f6a986a11ee61472392413b8 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 2 Jul 2026 08:45:41 +0000
Subject: [PATCH 1/6] ci(msvc): port workflow to conan 2

---
 .github/workflows/aravis-msvc.yml | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/aravis-msvc.yml b/.github/workflows/aravis-msvc.yml
index 93ac2b708..bf8040947 100644
--- a/.github/workflows/aravis-msvc.yml
+++ b/.github/workflows/aravis-msvc.yml
@@ -14,14 +14,14 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - version: 18
+        - version: 195
           arch: x86_64
           build_type_conan: Release
           build_type_meson: release
     steps:
     - name: pip
       run: |
-        pip install "conan<2.0.0" "cmake<4"
+        pip install "conan<3.0.0" "cmake<4"
     - name: disable-perl
       run: |
         rm -r C:\Strawberry\perl
@@ -40,15 +40,14 @@ jobs:
           zlib/1.2.13
           libusb/1.0.26
 
-          [build_requires]
+          [tool_requires]
           meson/0.59.2
           pkgconf/1.9.3
 
           [generators]
-          pkg_config
-          virtualenv
-          virtualbuildenv
-          virtualrunenv
+          PkgConfigDeps
+          VirtualBuildEnv
+          VirtualRunEnv
 
           [options]
           glib:shared=True
@@ -56,12 +55,12 @@ jobs:
           gst-plugins-base:shared=True
       run: |
         $Env:INPUT_CONANFILE | Out-File -FilePath ${{ github.workspace }}\conanfile.txt -Encoding utf8
-        conan install -s os="Windows" -s compiler="Visual Studio" -s compiler.version=${{ matrix.version }} -s arch=${{ matrix.arch }} -s build_type=${{ matrix.build_type_conan }} -b pcre -b missing -b cascade -if build .
+        conan profile detect --force
+        conan install . -of build --build=missing -s os=Windows -s compiler=msvc -s compiler.version=${{ matrix.version }} -s arch=${{ matrix.arch }} -s build_type=${{ matrix.build_type_conan }}
     - name: meson
       run: |
-        .\build\activate.ps1
-        .\build\activate_build.ps1
-        .\build\activate_run.ps1
+        . .\build\conanbuild.ps1
+        . .\build\conanrun.ps1
         echo "::group::configure"
         meson setup --prefix ${{ github.workspace }}\install --buildtype ${{ matrix.build_type_meson }} --pkg-config-path ${{ github.workspace }}\build -Ddocumentation=disabled -Dgst-plugin=disabled -Dintrospection=disabled -Dusb=enabled -Dviewer=disabled -Dgv-n-buffers=1 -Dgentl-producer=true . .\build
         echo "::endgroup::"
@@ -73,9 +72,8 @@ jobs:
         echo "::endgroup::"
     - name: test
       run: |
-        .\build\activate.ps1
-        .\build\activate_build.ps1
-        .\build\activate_run.ps1
+        . .\build\conanbuild.ps1
+        . .\build\conanrun.ps1
         meson test -C .\build
     - name: logs
       uses: actions/upload-artifact@v4

From 428b38561fac8b7707e8b79ce659d69c1503248c Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 2 Jul 2026 08:46:24 +0000
Subject: [PATCH 2/6] ci(msvc): rely on explicit conan settings

---
 .github/workflows/aravis-msvc.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/aravis-msvc.yml b/.github/workflows/aravis-msvc.yml
index bf8040947..b72703970 100644
--- a/.github/workflows/aravis-msvc.yml
+++ b/.github/workflows/aravis-msvc.yml
@@ -55,7 +55,6 @@ jobs:
           gst-plugins-base:shared=True
       run: |
         $Env:INPUT_CONANFILE | Out-File -FilePath ${{ github.workspace }}\conanfile.txt -Encoding utf8
-        conan profile detect --force
         conan install . -of build --build=missing -s os=Windows -s compiler=msvc -s compiler.version=${{ matrix.version }} -s arch=${{ matrix.arch }} -s build_type=${{ matrix.build_type_conan }}
     - name: meson
       run: |

From 7610c118cfaa0880f65631dac6bd4dfd6e2d745e Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 2 Jul 2026 08:46:57 +0000
Subject: [PATCH 3/6] ci(msvc): fix conan output folder flag

---
 .github/workflows/aravis-msvc.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/aravis-msvc.yml b/.github/workflows/aravis-msvc.yml
index b72703970..8b8aa1992 100644
--- a/.github/workflows/aravis-msvc.yml
+++ b/.github/workflows/aravis-msvc.yml
@@ -55,7 +55,7 @@ jobs:
           gst-plugins-base:shared=True
       run: |
         $Env:INPUT_CONANFILE | Out-File -FilePath ${{ github.workspace }}\conanfile.txt -Encoding utf8
-        conan install . -of build --build=missing -s os=Windows -s compiler=msvc -s compiler.version=${{ matrix.version }} -s arch=${{ matrix.arch }} -s build_type=${{ matrix.build_type_conan }}
+        conan install . --output-folder=build --build=missing -s os=Windows -s compiler=msvc -s compiler.version=${{ matrix.version }} -s arch=${{ matrix.arch }} -s build_type=${{ matrix.build_type_conan }}
     - name: meson
       run: |
         . .\build\conanbuild.ps1

From cd99ec7cae579e76c5285031d3336e6c009b105a Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 2 Jul 2026 08:47:36 +0000
Subject: [PATCH 4/6] ci(msvc): restore explicit conan build policies

---
 .github/workflows/aravis-msvc.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/aravis-msvc.yml b/.github/workflows/aravis-msvc.yml
index 8b8aa1992..bbfb709f7 100644
--- a/.github/workflows/aravis-msvc.yml
+++ b/.github/workflows/aravis-msvc.yml
@@ -55,7 +55,7 @@ jobs:
           gst-plugins-base:shared=True
       run: |
         $Env:INPUT_CONANFILE | Out-File -FilePath ${{ github.workspace }}\conanfile.txt -Encoding utf8
-        conan install . --output-folder=build --build=missing -s os=Windows -s compiler=msvc -s compiler.version=${{ matrix.version }} -s arch=${{ matrix.arch }} -s build_type=${{ matrix.build_type_conan }}
+        conan install . --output-folder=build --build=missing --build=pcre --build=cascade -s os=Windows -s compiler=msvc -s compiler.version=${{ matrix.version }} -s arch=${{ matrix.arch }} -s build_type=${{ matrix.build_type_conan }}
     - name: meson
       run: |
         . .\build\conanbuild.ps1

From d9cbd75d30e022e7556c9cb128fde130986d4094 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 2 Jul 2026 08:48:10 +0000
Subject: [PATCH 5/6] ci(msvc): drop unsupported conan cascade flag

---
 .github/workflows/aravis-msvc.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/aravis-msvc.yml b/.github/workflows/aravis-msvc.yml
index bbfb709f7..bafc5fba2 100644
--- a/.github/workflows/aravis-msvc.yml
+++ b/.github/workflows/aravis-msvc.yml
@@ -55,7 +55,7 @@ jobs:
           gst-plugins-base:shared=True
       run: |
         $Env:INPUT_CONANFILE | Out-File -FilePath ${{ github.workspace }}\conanfile.txt -Encoding utf8
-        conan install . --output-folder=build --build=missing --build=pcre --build=cascade -s os=Windows -s compiler=msvc -s compiler.version=${{ matrix.version }} -s arch=${{ matrix.arch }} -s build_type=${{ matrix.build_type_conan }}
+        conan install . --output-folder=build --build=missing --build=pcre -s os=Windows -s compiler=msvc -s compiler.version=${{ matrix.version }} -s arch=${{ matrix.arch }} -s build_type=${{ matrix.build_type_conan }}
     - name: meson
       run: |
         . .\build\conanbuild.ps1

From cde294ba118121f1c166068e09d621abe1285c3e Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 2 Jul 2026 08:48:42 +0000
Subject: [PATCH 6/6] ci(msvc): use conan --build=missing only

---
 .github/workflows/aravis-msvc.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/aravis-msvc.yml b/.github/workflows/aravis-msvc.yml
index bafc5fba2..8b8aa1992 100644
--- a/.github/workflows/aravis-msvc.yml
+++ b/.github/workflows/aravis-msvc.yml
@@ -55,7 +55,7 @@ jobs:
           gst-plugins-base:shared=True
       run: |
         $Env:INPUT_CONANFILE | Out-File -FilePath ${{ github.workspace }}\conanfile.txt -Encoding utf8
-        conan install . --output-folder=build --build=missing --build=pcre -s os=Windows -s compiler=msvc -s compiler.version=${{ matrix.version }} -s arch=${{ matrix.arch }} -s build_type=${{ matrix.build_type_conan }}
+        conan install . --output-folder=build --build=missing -s os=Windows -s compiler=msvc -s compiler.version=${{ matrix.version }} -s arch=${{ matrix.arch }} -s build_type=${{ matrix.build_type_conan }}
     - name: meson
       run: |
         . .\build\conanbuild.ps1