From 875c8d68c9359992042f3cc7a4a9c1950a22d3a6 Mon Sep 17 00:00:00 2001 From: "Richie Gomez (he/him)" Date: Thu, 17 Sep 2026 15:37:11 -0700 Subject: [PATCH 1/3] Disable ReadyToRun in sample CI Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 8ecac9d9-7be8-4ea3-a69c-5ae32e36fd23 --- .github/workflows/windows.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index d3e5b9a..5a472e8 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -37,16 +37,20 @@ jobs: shell: pwsh run: | dotnet restore .\samples\ControllerApp\MatterControllerApp.csproj ` - -p:Platform=x64 --configfile .\NuGet.config --force --no-cache + -p:Platform=x64 -p:PublishReadyToRun=false ` + --configfile .\NuGet.config --force --no-cache if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } dotnet build .\samples\ControllerApp\MatterControllerApp.csproj ` - -c Release -p:Platform=x64 --no-restore --nologo + -c Release -p:Platform=x64 -p:PublishReadyToRun=false ` + --no-restore --nologo if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } dotnet restore .\samples\ControllerApp\MatterControllerApp.csproj ` - -p:Platform=ARM64 --configfile .\NuGet.config --force --no-cache + -p:Platform=ARM64 -p:PublishReadyToRun=false ` + --configfile .\NuGet.config --force --no-cache if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } dotnet build .\samples\ControllerApp\MatterControllerApp.csproj ` - -c Release -p:Platform=ARM64 --no-restore --nologo + -c Release -p:Platform=ARM64 -p:PublishReadyToRun=false ` + --no-restore --nologo if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } - name: Download compatibility baseline From 1ae1f67ba51f0bc69e44b9c6c0888933ee0e6a6d Mon Sep 17 00:00:00 2001 From: "Richie Gomez (he/him)" Date: Thu, 17 Sep 2026 15:42:22 -0700 Subject: [PATCH 2/3] Restore sample Release assets in CI Keep ReadyToRun enabled while disabling unsupported trimming for the framework-dependent sample. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 8ecac9d9-7be8-4ea3-a69c-5ae32e36fd23 --- .github/workflows/windows.yml | 10 ++++------ samples/ControllerApp/MatterControllerApp.csproj | 3 +-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 5a472e8..30b3887 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -37,20 +37,18 @@ jobs: shell: pwsh run: | dotnet restore .\samples\ControllerApp\MatterControllerApp.csproj ` - -p:Platform=x64 -p:PublishReadyToRun=false ` + -p:Platform=x64 -p:Configuration=Release ` --configfile .\NuGet.config --force --no-cache if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } dotnet build .\samples\ControllerApp\MatterControllerApp.csproj ` - -c Release -p:Platform=x64 -p:PublishReadyToRun=false ` - --no-restore --nologo + -c Release -p:Platform=x64 --no-restore --nologo if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } dotnet restore .\samples\ControllerApp\MatterControllerApp.csproj ` - -p:Platform=ARM64 -p:PublishReadyToRun=false ` + -p:Platform=ARM64 -p:Configuration=Release ` --configfile .\NuGet.config --force --no-cache if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } dotnet build .\samples\ControllerApp\MatterControllerApp.csproj ` - -c Release -p:Platform=ARM64 -p:PublishReadyToRun=false ` - --no-restore --nologo + -c Release -p:Platform=ARM64 --no-restore --nologo if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } - name: Download compatibility baseline diff --git a/samples/ControllerApp/MatterControllerApp.csproj b/samples/ControllerApp/MatterControllerApp.csproj index 0ae3e7d..3dccdc6 100644 --- a/samples/ControllerApp/MatterControllerApp.csproj +++ b/samples/ControllerApp/MatterControllerApp.csproj @@ -76,7 +76,6 @@ False True - False - True + False From ec48b506dbc2639b24f83b22b445523d72c6c03b Mon Sep 17 00:00:00 2001 From: "Richie Gomez (he/him)" Date: Thu, 17 Sep 2026 16:08:59 -0700 Subject: [PATCH 3/3] Fix ABI workflow invocation Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 8ecac9d9-7be8-4ea3-a69c-5ae32e36fd23 --- .github/workflows/windows.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 30b3887..3deb586 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -74,14 +74,15 @@ jobs: shell: pwsh run: | . .\matterforwindows\scripts\setup\windows.ps1 -Architecture x64 + $nativeDlls = @( + '.\out\win-winrt-x64\Matter.Windows.Controller.dll' + '.\out\win-winrt-arm64\Matter.Windows.Controller.dll' + ) .\tools\verify-abi.ps1 ` -BaselineWinmd $env:BASELINE_WINMD ` -CurrentWinmd .\out\win-winrt-x64\Matter.Windows.Controller.winmd ` -EquivalentWinmd .\out\win-winrt-arm64\Matter.Windows.Controller.winmd ` - -NativeDll @( ` - .\out\win-winrt-x64\Matter.Windows.Controller.dll, ` - .\out\win-winrt-arm64\Matter.Windows.Controller.dll ` - ) + -NativeDll $nativeDlls - name: Upload package uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.0