From 58be50d9773aaf541c3d37ea4f6f0aad490e36a2 Mon Sep 17 00:00:00 2001
From: Andrew Arnott <andrew.arnott@microsoft.com>
Date: Thu, 14 May 2026 17:58:25 -0600
Subject: [PATCH 1/2] Backport .gitignore from master

---
 .gitignore | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 7e74065d1..7209c6cbc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,9 @@ bld/
 # Uncomment if you have tasks that create the project's static files in wwwroot
 #wwwroot/
 
+# Jetbrains Rider cache directory
+.idea/
+
 # Visual Studio 2017 auto generated files
 Generated\ Files/
 
@@ -65,7 +68,6 @@ StyleCopReport.xml
 *_p.c
 *_h.h
 *.ilk
-*.meta
 *.obj
 *.iobj
 *.pch
@@ -353,12 +355,21 @@ MigrationBackup/
 # mac-created file to track user view preferences for a directory
 .DS_Store
 
+# Analysis results
+*.sarif
+
 # Unity
 
 src/MessagePack.UnityClient/bin/*
 src/MessagePack.UnityClient/Library/*
 src/MessagePack.UnityClient/obj/*
 src/MessagePack.UnityClient/Temp/*
+src/MessagePack.UnityClient/UserSettings/*
+src/MessagePack.UnityClient/Assets/Packages/
 
 # BenchmarkDotNet results
 BenchmarkDotNet.Artifacts/
+
+src/MessagePack.UnityClient/.vsconfig
+
+*.lscache

From 9e214ba6f5196d3d9cab98c2617ef7773ea86e9a Mon Sep 17 00:00:00 2001
From: Andrew Arnott <andrew.arnott@microsoft.com>
Date: Thu, 14 May 2026 18:33:54 -0600
Subject: [PATCH 2/2] Build on Ubuntu 22

---
 azure-pipelines/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines/build.yml b/azure-pipelines/build.yml
index 4021879d8..c9f5fc170 100644
--- a/azure-pipelines/build.yml
+++ b/azure-pipelines/build.yml
@@ -26,7 +26,7 @@ jobs:
 
 - job: Linux
   pool:
-    vmImage: Ubuntu 20.04
+    vmImage: ubuntu-22.04
   steps:
   - checkout: self
     fetchDepth: 0 # avoid shallow clone so nbgv can do its work.