From 0d24e0e973efb1a35a077de51f48d973dc2fab0f Mon Sep 17 00:00:00 2001
From: Thomas Lopez <thomas.lopez@unity3d.com>
Date: Mon, 8 Jun 2026 09:40:25 -0400
Subject: [PATCH 01/11] removing useless meta files

---
 Editor Default Resources/Icons/Scripts.meta         | 8 --------
 Editor Default Resources/Icons/Toolbar/Actions.meta | 8 --------
 2 files changed, 16 deletions(-)
 delete mode 100644 Editor Default Resources/Icons/Scripts.meta
 delete mode 100644 Editor Default Resources/Icons/Toolbar/Actions.meta

diff --git a/Editor Default Resources/Icons/Scripts.meta b/Editor Default Resources/Icons/Scripts.meta
deleted file mode 100644
index 041945534..000000000
--- a/Editor Default Resources/Icons/Scripts.meta	
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 9a8f569ae5f58994da7bf320e27bef77
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Editor Default Resources/Icons/Toolbar/Actions.meta b/Editor Default Resources/Icons/Toolbar/Actions.meta
deleted file mode 100644
index c53b5c209..000000000
--- a/Editor Default Resources/Icons/Toolbar/Actions.meta	
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 810f39d81d94448499c3345c938475c7
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

From 6ad3fb5410d6fb5858f4fd71633b3ee92a920d34 Mon Sep 17 00:00:00 2001
From: Thomas Lopez <thomas.lopez@unity3d.com>
Date: Mon, 8 Jun 2026 09:44:24 -0400
Subject: [PATCH 02/11] (UAC1005) fixes a direct self-reference cycle in
 serialized class

---
 Editor/StateMachines/ShapeState.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Editor/StateMachines/ShapeState.cs b/Editor/StateMachines/ShapeState.cs
index 7208a0d6c..2ec7d5520 100644
--- a/Editor/StateMachines/ShapeState.cs
+++ b/Editor/StateMachines/ShapeState.cs
@@ -7,7 +7,8 @@ namespace UnityEditor.ProBuilder
     abstract class ShapeState
     {
         public static ShapeState s_defaultState;
-        public ShapeState m_nextState = null;
+        // UAC1005: direct self-reference cycle in serialized class
+        [SerializeReference] public ShapeState m_nextState = null;
         public static DrawShapeTool tool;
 
         public static ShapeState StartStateMachine()

From 5081ec3f5fe0d295446c5ef31001337a6c4024f7 Mon Sep 17 00:00:00 2001
From: Thomas Lopez <thomas.lopez@unity3d.com>
Date: Mon, 8 Jun 2026 09:45:47 -0400
Subject: [PATCH 03/11] fixed uss format

---
 Editor/Resources/ActionOverlay.uss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Editor/Resources/ActionOverlay.uss b/Editor/Resources/ActionOverlay.uss
index 4d1498f24..9aa67680f 100644
--- a/Editor/Resources/ActionOverlay.uss
+++ b/Editor/Resources/ActionOverlay.uss
@@ -90,7 +90,7 @@
     max-height: 16px;
     min-height: 16px;
     min-width: 16px;
-    background-position-x: center 0;
+    background-position-x: center;
 }
 
 #ActionName {

From d1f5c2437d49a3574842a91c0c25a6cc671b2270 Mon Sep 17 00:00:00 2001
From: Thomas Lopez <thomas.lopez@unity3d.com>
Date: Mon, 8 Jun 2026 10:02:51 -0400
Subject: [PATCH 04/11] added inherited doc comment on public API

---
 Editor/EditorCore/PolyShapeTool.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Editor/EditorCore/PolyShapeTool.cs b/Editor/EditorCore/PolyShapeTool.cs
index 24b4f296d..088b57a3a 100644
--- a/Editor/EditorCore/PolyShapeTool.cs
+++ b/Editor/EditorCore/PolyShapeTool.cs
@@ -259,6 +259,7 @@ static bool CanCreateNewPolyShape()
     [EditorTool("Edit PolyShape", typeof(PolyShape))]
     public class PolyShapeTool : EditorTool
     {
+        /// <inheritdoc />
         public override bool gridSnapEnabled => true;
 
         [MenuItem("Tools/ProBuilder/Edit/Edit PolyShape", true, PreferenceKeys.menuEditor + 10)]

From 93a44386f661d7384fb3f83238d68d886885c9e3 Mon Sep 17 00:00:00 2001
From: Thomas Lopez <thomas.lopez@unity3d.com>
Date: Mon, 8 Jun 2026 10:33:55 -0400
Subject: [PATCH 05/11] moving resources

---
 Content/Resources/com.unity.probuilder.meta        |  8 ++++++++
 .../Resources/com.unity.probuilder/Materials.meta  |  8 ++++++++
 .../Materials/EdgePicker.mat                       |  0
 .../Materials/EdgePicker.mat.meta                  |  0
 .../Materials/EdgePickerURP.mat                    |  0
 .../Materials/EdgePickerURP.mat.meta               |  0
 .../Materials/FacePicker.mat                       |  0
 .../Materials/FacePicker.mat.meta                  |  0
 .../Materials/FacePickerURP.mat                    |  0
 .../Materials/FacePickerURP.mat.meta               |  0
 .../Materials/VertexPicker.mat                     |  0
 .../Materials/VertexPicker.mat.meta                |  0
 .../Materials/VertexPickerURP.mat                  |  0
 .../Materials/VertexPickerURP.mat.meta             |  0
 Editor/Overlays/ProBuilderActionsOverlay.cs        |  2 +-
 Editor/Resources/com.unity.probuilder.meta         |  8 ++++++++
 .../{ => com.unity.probuilder}/ActionButton.uxml   |  2 +-
 .../ActionButton.uxml.meta                         |  0
 .../{ => com.unity.probuilder}/ActionOverlay.uss   |  0
 .../ActionOverlay.uss.meta                         |  0
 Runtime/Core/BuiltinMaterials.cs                   | 14 +++++++-------
 21 files changed, 33 insertions(+), 9 deletions(-)
 create mode 100644 Content/Resources/com.unity.probuilder.meta
 create mode 100644 Content/Resources/com.unity.probuilder/Materials.meta
 rename Content/Resources/{ => com.unity.probuilder}/Materials/EdgePicker.mat (100%)
 rename Content/Resources/{ => com.unity.probuilder}/Materials/EdgePicker.mat.meta (100%)
 rename Content/Resources/{ => com.unity.probuilder}/Materials/EdgePickerURP.mat (100%)
 rename Content/Resources/{ => com.unity.probuilder}/Materials/EdgePickerURP.mat.meta (100%)
 rename Content/Resources/{ => com.unity.probuilder}/Materials/FacePicker.mat (100%)
 rename Content/Resources/{ => com.unity.probuilder}/Materials/FacePicker.mat.meta (100%)
 rename Content/Resources/{ => com.unity.probuilder}/Materials/FacePickerURP.mat (100%)
 rename Content/Resources/{ => com.unity.probuilder}/Materials/FacePickerURP.mat.meta (100%)
 rename Content/Resources/{ => com.unity.probuilder}/Materials/VertexPicker.mat (100%)
 rename Content/Resources/{ => com.unity.probuilder}/Materials/VertexPicker.mat.meta (100%)
 rename Content/Resources/{ => com.unity.probuilder}/Materials/VertexPickerURP.mat (100%)
 rename Content/Resources/{ => com.unity.probuilder}/Materials/VertexPickerURP.mat.meta (100%)
 create mode 100644 Editor/Resources/com.unity.probuilder.meta
 rename Editor/Resources/{ => com.unity.probuilder}/ActionButton.uxml (83%)
 rename Editor/Resources/{ => com.unity.probuilder}/ActionButton.uxml.meta (100%)
 rename Editor/Resources/{ => com.unity.probuilder}/ActionOverlay.uss (100%)
 rename Editor/Resources/{ => com.unity.probuilder}/ActionOverlay.uss.meta (100%)

diff --git a/Content/Resources/com.unity.probuilder.meta b/Content/Resources/com.unity.probuilder.meta
new file mode 100644
index 000000000..52145ce91
--- /dev/null
+++ b/Content/Resources/com.unity.probuilder.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2fd0621f5ae921e44802d0469d771565
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Content/Resources/com.unity.probuilder/Materials.meta b/Content/Resources/com.unity.probuilder/Materials.meta
new file mode 100644
index 000000000..574cafc44
--- /dev/null
+++ b/Content/Resources/com.unity.probuilder/Materials.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 048578cfc1b66cf489e58d5d269543d3
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Content/Resources/Materials/EdgePicker.mat b/Content/Resources/com.unity.probuilder/Materials/EdgePicker.mat
similarity index 100%
rename from Content/Resources/Materials/EdgePicker.mat
rename to Content/Resources/com.unity.probuilder/Materials/EdgePicker.mat
diff --git a/Content/Resources/Materials/EdgePicker.mat.meta b/Content/Resources/com.unity.probuilder/Materials/EdgePicker.mat.meta
similarity index 100%
rename from Content/Resources/Materials/EdgePicker.mat.meta
rename to Content/Resources/com.unity.probuilder/Materials/EdgePicker.mat.meta
diff --git a/Content/Resources/Materials/EdgePickerURP.mat b/Content/Resources/com.unity.probuilder/Materials/EdgePickerURP.mat
similarity index 100%
rename from Content/Resources/Materials/EdgePickerURP.mat
rename to Content/Resources/com.unity.probuilder/Materials/EdgePickerURP.mat
diff --git a/Content/Resources/Materials/EdgePickerURP.mat.meta b/Content/Resources/com.unity.probuilder/Materials/EdgePickerURP.mat.meta
similarity index 100%
rename from Content/Resources/Materials/EdgePickerURP.mat.meta
rename to Content/Resources/com.unity.probuilder/Materials/EdgePickerURP.mat.meta
diff --git a/Content/Resources/Materials/FacePicker.mat b/Content/Resources/com.unity.probuilder/Materials/FacePicker.mat
similarity index 100%
rename from Content/Resources/Materials/FacePicker.mat
rename to Content/Resources/com.unity.probuilder/Materials/FacePicker.mat
diff --git a/Content/Resources/Materials/FacePicker.mat.meta b/Content/Resources/com.unity.probuilder/Materials/FacePicker.mat.meta
similarity index 100%
rename from Content/Resources/Materials/FacePicker.mat.meta
rename to Content/Resources/com.unity.probuilder/Materials/FacePicker.mat.meta
diff --git a/Content/Resources/Materials/FacePickerURP.mat b/Content/Resources/com.unity.probuilder/Materials/FacePickerURP.mat
similarity index 100%
rename from Content/Resources/Materials/FacePickerURP.mat
rename to Content/Resources/com.unity.probuilder/Materials/FacePickerURP.mat
diff --git a/Content/Resources/Materials/FacePickerURP.mat.meta b/Content/Resources/com.unity.probuilder/Materials/FacePickerURP.mat.meta
similarity index 100%
rename from Content/Resources/Materials/FacePickerURP.mat.meta
rename to Content/Resources/com.unity.probuilder/Materials/FacePickerURP.mat.meta
diff --git a/Content/Resources/Materials/VertexPicker.mat b/Content/Resources/com.unity.probuilder/Materials/VertexPicker.mat
similarity index 100%
rename from Content/Resources/Materials/VertexPicker.mat
rename to Content/Resources/com.unity.probuilder/Materials/VertexPicker.mat
diff --git a/Content/Resources/Materials/VertexPicker.mat.meta b/Content/Resources/com.unity.probuilder/Materials/VertexPicker.mat.meta
similarity index 100%
rename from Content/Resources/Materials/VertexPicker.mat.meta
rename to Content/Resources/com.unity.probuilder/Materials/VertexPicker.mat.meta
diff --git a/Content/Resources/Materials/VertexPickerURP.mat b/Content/Resources/com.unity.probuilder/Materials/VertexPickerURP.mat
similarity index 100%
rename from Content/Resources/Materials/VertexPickerURP.mat
rename to Content/Resources/com.unity.probuilder/Materials/VertexPickerURP.mat
diff --git a/Content/Resources/Materials/VertexPickerURP.mat.meta b/Content/Resources/com.unity.probuilder/Materials/VertexPickerURP.mat.meta
similarity index 100%
rename from Content/Resources/Materials/VertexPickerURP.mat.meta
rename to Content/Resources/com.unity.probuilder/Materials/VertexPickerURP.mat.meta
diff --git a/Editor/Overlays/ProBuilderActionsOverlay.cs b/Editor/Overlays/ProBuilderActionsOverlay.cs
index db221b97a..c5f5c6a5c 100644
--- a/Editor/Overlays/ProBuilderActionsOverlay.cs
+++ b/Editor/Overlays/ProBuilderActionsOverlay.cs
@@ -14,7 +14,7 @@ namespace UnityEditor.ProBuilder
 {
     class ProBuilderActionButton : VisualElement
     {
-        const string k_UxmlPath = "Packages/com.unity.probuilder/Editor/Resources/ActionButton.uxml";
+        const string k_UxmlPath = "Packages/com.unity.probuilder/Editor/Resources/com.unity.probuilder/ActionButton.uxml";
         static VisualTreeAsset s_ButtonAsset;
 
         MenuAction m_Action;
diff --git a/Editor/Resources/com.unity.probuilder.meta b/Editor/Resources/com.unity.probuilder.meta
new file mode 100644
index 000000000..30348381b
--- /dev/null
+++ b/Editor/Resources/com.unity.probuilder.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9e8775346f7b15a49a534d0496d830ec
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/Resources/ActionButton.uxml b/Editor/Resources/com.unity.probuilder/ActionButton.uxml
similarity index 83%
rename from Editor/Resources/ActionButton.uxml
rename to Editor/Resources/com.unity.probuilder/ActionButton.uxml
index e0642bc3c..de82e6a1a 100644
--- a/Editor/Resources/ActionButton.uxml
+++ b/Editor/Resources/com.unity.probuilder/ActionButton.uxml
@@ -1,5 +1,5 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
-    <Style src="project://database/Packages/com.unity.probuilder/Editor/Resources/ActionOverlay.uss?fileID=7433441132597879392&amp;guid=4d2274e209af2ae458928061ab0671a0&amp;type=3#ActionOverlay"/>
+    <Style src="project://database/Packages/com.unity.probuilder/Editor/Resources/com.unity.probuilder/ActionOverlay.uss?fileID=7433441132597879392&amp;guid=4d2274e209af2ae458928061ab0671a0&amp;type=3#ActionOverlay"/>
     <ui:VisualElement name="Root" class="actionButton">
         <ui:Button text="&#10;" name="PanelButton" style="align-items: center; flex-direction: row; background-color: rgb(69, 69, 69); flex-shrink: 0; flex-grow: 1;">
             <ui:VisualElement name="ActionColor" style="flex-grow: 1; width: 4px; max-width: 4px; min-width: 4px; background-color: rgb(200, 0, 0); flex-shrink: 0; height: 22px; margin-left: 2px;"/>
diff --git a/Editor/Resources/ActionButton.uxml.meta b/Editor/Resources/com.unity.probuilder/ActionButton.uxml.meta
similarity index 100%
rename from Editor/Resources/ActionButton.uxml.meta
rename to Editor/Resources/com.unity.probuilder/ActionButton.uxml.meta
diff --git a/Editor/Resources/ActionOverlay.uss b/Editor/Resources/com.unity.probuilder/ActionOverlay.uss
similarity index 100%
rename from Editor/Resources/ActionOverlay.uss
rename to Editor/Resources/com.unity.probuilder/ActionOverlay.uss
diff --git a/Editor/Resources/ActionOverlay.uss.meta b/Editor/Resources/com.unity.probuilder/ActionOverlay.uss.meta
similarity index 100%
rename from Editor/Resources/ActionOverlay.uss.meta
rename to Editor/Resources/com.unity.probuilder/ActionOverlay.uss.meta
diff --git a/Runtime/Core/BuiltinMaterials.cs b/Runtime/Core/BuiltinMaterials.cs
index eca0386a0..ef4ac9d96 100644
--- a/Runtime/Core/BuiltinMaterials.cs
+++ b/Runtime/Core/BuiltinMaterials.cs
@@ -74,9 +74,9 @@ public static class BuiltinMaterials
         static string k_VertexPickerShader = "Hidden/ProBuilder/VertexPickerURP";
         static string k_FacePickerShader = "Hidden/ProBuilder/FacePickerURP";
 
-        static string k_EdgePickerMaterial = "Materials/EdgePickerURP";
-        static string k_FacePickerMaterial = "Materials/FacePickerURP";
-        static string k_VertexPickerMaterial = "Materials/VertexPickerURP";
+        static string k_EdgePickerMaterial = "com.unity.probuilder/Materials/EdgePickerURP";
+        static string k_FacePickerMaterial = "com.unity.probuilder/Materials/FacePickerURP";
+        static string k_VertexPickerMaterial = "com.unity.probuilder/Materials/VertexPickerURP";
 
         const string k_SelectionPickerShader = "Hidden/ProBuilder/SelectionPickerURP";
 #else
@@ -84,13 +84,13 @@ public static class BuiltinMaterials
         static string k_FacePickerShader = "Hidden/ProBuilder/FacePicker";
         static string k_VertexPickerShader = "Hidden/ProBuilder/VertexPicker";
 
-        static string k_EdgePickerMaterial = "Materials/EdgePicker";
-        static string k_FacePickerMaterial = "Materials/FacePicker";
-        static string k_VertexPickerMaterial = "Materials/VertexPicker";
+        static string k_EdgePickerMaterial = "com.unity.probuilder/Materials/EdgePicker";
+        static string k_FacePickerMaterial = "com.unity.probuilder/Materials/FacePicker";
+        static string k_VertexPickerMaterial = "com.unity.probuilder/Materials/VertexPicker";
 
         const string k_SelectionPickerShader = "Hidden/ProBuilder/SelectionPicker";
 #endif
-  
+
 #if UNITY_EDITOR
         [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
         static void ResetStaticsOnLoad()

From abbb6f702825fa5db04e07211452efb1622dc3b2 Mon Sep 17 00:00:00 2001
From: Thomas Lopez <thomas.lopez@unity3d.com>
Date: Mon, 8 Jun 2026 10:34:18 -0400
Subject: [PATCH 06/11] updating editor config with Unity one

---
 .editorconfig | 318 ++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 295 insertions(+), 23 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 8ce84e6ee..cbbdc3f1d 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,46 +1,318 @@
 # see http://editorconfig.org/ for docs on this file
+#
+# !! keep EOL settings in sync with .gitattributes !!
 
 root = true
 
+#                                                        _   _   _
+#                                                       | | | | (_)
+#    ___ ___  _ __ ___  _ __ ___   ___  _ __    ___  ___| |_| |_ _ _ __   __ _ ___
+#   / __/ _ \| '_ ` _ \| '_ ` _ \ / _ \| '_ \  / __|/ _ \ __| __| | '_ \ / _` / __|
+#  | (_| (_) | | | | | | | | | | | (_) | | | | \__ \  __/ |_| |_| | | | | (_| \__ \
+#   \___\___/|_| |_| |_|_| |_| |_|\___/|_| |_| |___/\___|\__|\__|_|_| |_|\__, |___/
+#                                                                         __/ |
+#                                                                        |___/
+
 [*]
+
+# sanity across platforms
+end_of_line = lf
+
+# this is our general standard: exceptions permitted only when a) required by the format or b) strong de facto convention
 indent_style = space
 indent_size = 4
-end_of_line = lf                    ; help with sharing files across os's (i.e. network share or through local vm)
-#charset temporarily disabled due to bug in VS2017 changing to UTF-8 with BOM (https://favro.com/card/c564ede4ed3337f7b17986b6/Uni-17877)
-#charset = utf-8
+
+# prevent files with BOMs on them coming into the repo
+charset = utf-8
+
+# other common settings
 trim_trailing_whitespace = true
 insert_final_newline = true
 
+cpp_space_pointer_reference_alignment = left
+
+#                           _     _
+#                          (_)   | |
+#   _____   _____ _ __ _ __ _  __| | ___  ___
+#  / _ \ \ / / _ \ '__| '__| |/ _` |/ _ \/ __|
+# | (_) \ V /  __/ |  | |  | | (_| |  __/\__ \
+#  \___/ \_/ \___|_|  |_|  |_|\__,_|\___||___/
+#
+#
+
+[{Makefile,makefile}]
+indent_style = tab
+
+[*.{md,markdown,mdx}]
 # trailing whitespace is significant in markdown (bad choice, bad!)
-[*.{md,markdown}]
 trim_trailing_whitespace = false
 
-# keep these and the VS stuff below in sync with .hgeol's CRLF extensions
-[*.{vcproj,bat,cmd,xaml,tt,t4,ttinclude}]
+# crlf because tool expectations (based on experimentation)
+[*.{bat,cmd,xaml,tt,t4,ttinclude}]
 end_of_line = crlf
 
-# this VS-specific stuff is based on experiments to see how VS will modify a file after it has been manually edited.
-# the settings are meant to closely match what VS does to minimize unnecessary diffs. this duplicates some settings in *
-# but let's be explicit here to be safe (in case someone wants to copy-paste this out to another .editorconfig).
-[*.{vcxproj,vcxproj.filters}]
-indent_style = space
+[*.{json,asmdef}]
+indent_size = 2
+
+[*.{yaml,yml}]
+indent_size = 2
+
+# msbuild-related files (these are usually not tool-authored)
+[*.{props,targets,msbuildproj,proj}]
 indent_size = 2
+
+### visual studio
+
+# these settings are based on experiments to see how vs will modify a file after it has been
+# manually edited. the settings are meant to match what vs does to minimize unnecessary diffs.
+
+# related notes from research:
+#
+#   1. rider tends to preserve existing file settings, but we must go with the more strict vs.
+#
+#   2. file-new templates in vs, rider, and `dotnet new` contain bom's (byte order markers) and
+#      crlf. crlf we must preserve because vs, but bom's must be burned with fire. all editors are
+#      fine with this.
+
+[*.sln]
+indent_style = tab
 end_of_line = crlf
-charset = utf-8-bom
-trim_trailing_whitespace = true
 insert_final_newline = false
-# must be broken out because of 51-char bug (https://github.com/editorconfig/editorconfig-visualstudio/issues/21)
-[*.{csproj,pyproj,props,targets}]
-indent_style = space
+
+[*.{vcxproj,vcxproj.filters}]
 indent_size = 2
 end_of_line = crlf
-charset = utf-8-bom
-trim_trailing_whitespace = true
 insert_final_newline = false
-[*.{sln,sln.template}]
+
+[*.vcproj]
 indent_style = tab
-indent_size = 4
 end_of_line = crlf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = false
+
+# csproj is a bit more flexible, in part because VS does some preservation of whitespace. however,
+# lines it adds will get crlf's, and if the rest of the file has lf, we'll get a mixed file. so we
+# must set the whole thing to be crlf.
+[*.csproj]
+indent_size = 2
+end_of_line = crlf
+
+
+#   __                           _                _
+#  / _|                         | |              | |
+# | |_ ___  _ __ _ __ ___   __ _| |_   _ __ _   _| | ___  ___
+# |  _/ _ \| '__| '_ ` _ \ / _` | __| | '__| | | | |/ _ \/ __|
+# | || (_) | |  | | | | | | (_| | |_  | |  | |_| | |  __/\__ \
+# |_| \___/|_|  |_| |_| |_|\__,_|\__| |_|   \__,_|_|\___||___/
+#
+#
+
+# http://go/format
+# https://learn.microsoft.com/en-us/dotnet/core/tools/dotnet-format
+
+
+[*.cs]
+
+# The entire monorepo has a single standard.
+#
+#    if you want to propose changes to the standard, raise it with the people assigned to .editorconfig in
+#    .github/UNITY_CODEOWNERS.
+
+#             ___  ___  __   __        __   ___
+# |  | |__| |  |  |__  /__` |__)  /\  /  ` |__
+# |/\| |  | |  |  |___ .__/ |    /~~\ \__, |___
+
+# whitespace-only format uses options under IDE0055 (https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/style-rules/ide0055)
+#
+# IDE0055 is made up of these formatting options:
+#   - https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/style-rules/csharp-formatting-options
+#   - https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/style-rules/dotnet-formatting-options
+
+# to reformat code with these rules, use `dotnet format whitespace <path> --folder`. the rules are exclusively about
+# code structure and do not require symbol awareness. they can be run on any file without needing a project or compile
+# to be done first.
+
+# newline options
+csharp_new_line_before_open_brace = all
+csharp_new_line_before_else = true
+csharp_new_line_before_catch = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_between_query_expression_clauses = true
+
+# indentation options
+csharp_indent_case_contents = true
+csharp_indent_switch_labels = true
+csharp_indent_labels = one_less_than_current
+csharp_indent_block_contents = true
+csharp_indent_braces = false
+csharp_indent_case_contents_when_block = false
+
+# spacing
+csharp_space_after_cast = false
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_between_parentheses = false
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_around_binary_operators = before_and_after
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_declaration_name_and_open_parenthesis = false
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_after_comma = true
+csharp_space_before_comma = false
+csharp_space_after_dot = false
+csharp_space_before_dot = false
+csharp_space_after_semicolon_in_for_statement = true
+csharp_space_before_semicolon_in_for_statement = false
+csharp_space_around_declaration_statements = false
+csharp_space_before_open_square_brackets = false
+csharp_space_between_empty_square_brackets = false
+csharp_space_between_square_brackets = false
+
+# wrap options
+csharp_preserve_single_line_statements = true
+csharp_preserve_single_line_blocks = true
+max_line_length = 120
+
+# using directives
+dotnet_sort_system_directives_first = true
+dotnet_separate_import_directive_groups = false
+
+#  __  ___           ___
+# /__`  |  \ / |    |__
+# .__/  |   |  |___ |___
+
+# https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/style-rules/
+
+# Code-style naming rules
+# https://docs.microsoft.com/en-us/dotnet/fundamentals/code-analysis/style-rules/naming-rules
+# A. dotnet_naming_symbols: specify a symbol group
+# B. dotnet_naming_style: specify a naming style
+# C. dotnet_naming_rule: specify a rule that applies a naming style to a symbol group
+
+# 1. General symbol rules
+# 1.1 Namespaces, classes, structs, enumerations, methods, and delegates: PascalCase
+dotnet_naming_symbols.majority_of_symbols.applicable_kinds = namespace, class, struct, enum, method, delegate
+dotnet_naming_symbols.majority_of_symbols.applicable_accessibilities = *
+# 1.2 Modifier preferences
+dotnet_style_require_accessibility_modifiers = omit_if_default:suggestion
+dotnet_style_readonly_field = true:suggestion
+
+# NOTE camelCase vs PascalCase for public fields/properties/events is the only different between
+# UnityEngine/UnityEditor and Unity (non-UnityEngine/UnityEditor to be exact) namespace conventions.
+# Search for "NOTE Unity namespace" to find the appropriate places where to do the adjustments.
+dotnet_naming_style.camel_case_style.capitalization = camel_case
+dotnet_naming_style.pascal_case_style.capitalization = pascal_case
+
+dotnet_naming_rule.majority_of_symbols_should_be_pascal_case.symbols = majority_of_symbols # The symbol group that the rule applies to
+dotnet_naming_rule.majority_of_symbols_should_be_pascal_case.style = pascal_case_style # The naming style to associate with the rule
+dotnet_naming_rule.majority_of_symbols_should_be_pascal_case.severity = suggestion # The severity for enforcing the convention
+
+# 1.2 Interfaces: IPascalCase
+dotnet_naming_symbols.interfaces.applicable_kinds = interface
+dotnet_naming_symbols.interfaces.applicable_accessibilities = *
+
+dotnet_naming_style.ipascal_case_style.capitalization = pascal_case
+dotnet_naming_style.ipascal_case_style.required_prefix = I
+
+dotnet_naming_rule.interfaces_should_begin_with_i.symbols = interfaces
+dotnet_naming_rule.interfaces_should_begin_with_i.style = ipascal_case_style
+dotnet_naming_rule.interfaces_should_begin_with_i.severity = suggestion
+
+# 1.3 Type parameters: TPascalCase
+dotnet_naming_symbols.type_parameters.applicable_kinds = type_parameter
+dotnet_naming_symbols.type_parameters.applicable_accessibilities = *
+
+dotnet_naming_style.tpascal_case_style.capitalization = pascal_case
+dotnet_naming_style.tpascal_case_style.required_prefix = T
+
+dotnet_naming_rule.type_parameters_should_beging_with_t.symbols = type_parameters
+dotnet_naming_rule.type_parameters_should_beging_with_t.style = tpascal_case_style
+dotnet_naming_rule.type_parameters_should_beging_with_t.severity = suggestion
+
+# 2. Public fields, including events, all properties:
+
+# Public fields and properties case depends on the namespace and can't be generalized.
+# Public fields and properties in UnityEngine and UnityEditor namespaces should use camelCase,
+# and they should PascalCase in other namespaces.
+
+# To enforce this another .editorconfig file will be needed in the subfolders containing either
+# UnityEngine and UnityEditor code or other namespace code.
+# See /Modules/HierarchyCore/.editorconfig for an example of overriden rules for specific namespaces.
+
+# 2.1 fields
+dotnet_naming_symbols.public_fields.applicable_kinds = field, event
+dotnet_naming_symbols.public_fields.applicable_accessibilities = public
+
+dotnet_naming_rule.public_fields_use_correct_case.symbols = public_fields
+dotnet_naming_rule.public_fields_use_correct_case.style = pascal_case_style
+dotnet_naming_rule.public_fields_use_correct_case.severity = none
+
+# 2.2 properties
+dotnet_naming_symbols.properties.applicable_kinds = property
+dotnet_naming_symbols.properties.applicable_accessibilities = *
+
+dotnet_naming_rule.properties_use_correct_case.symbols = properties
+dotnet_naming_rule.properties_use_correct_case.style = pascal_case_style
+dotnet_naming_rule.properties_use_correct_case.severity = none
+
+# 3. Non-public fields, including events: m_PascalCase
+dotnet_naming_symbols.nonpublic_fields.applicable_kinds = field, event
+dotnet_naming_symbols.nonpublic_fields.applicable_accessibilities = internal, private, protected, protected_internal, private_protected
+
+dotnet_naming_style.m_pascal_case_style.capitalization = pascal_case
+dotnet_naming_style.m_pascal_case_style.required_prefix = m_
+
+dotnet_naming_rule.nonpublic_fields_must_be_prefixed.symbols = nonpublic_fields
+dotnet_naming_rule.nonpublic_fields_must_be_prefixed.style = m_pascal_case_style
+dotnet_naming_rule.nonpublic_fields_must_be_prefixed.severity = suggestion
+
+# 4. Non-public static fields: s_PascalCase
+dotnet_naming_symbols.nonpublic_static_fields.applicable_kinds = field, event
+dotnet_naming_symbols.nonpublic_static_fields.applicable_accessibilities = internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.nonpublic_static_fields.required_modifiers = static
+
+dotnet_naming_style.s_pascal_case_style.capitalization = pascal_case
+dotnet_naming_style.s_pascal_case_style.required_prefix = s_
+
+dotnet_naming_rule.nonpublic_static_fields_must_be_prefixed.symbols = nonpublic_static_fields
+dotnet_naming_rule.nonpublic_static_fields_must_be_prefixed.style = s_pascal_case_style
+dotnet_naming_rule.nonpublic_static_fields_must_be_prefixed.severity = suggestion
+
+# 5. Non-public const fields: k_PascalCase
+dotnet_naming_symbols.nonpublic_const_fields.applicable_kinds = field, event
+dotnet_naming_symbols.nonpublic_const_fields.applicable_accessibilities = internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.nonpublic_const_fields.required_modifiers = const
+
+dotnet_naming_style.k_pascal_case_style.capitalization = pascal_case
+dotnet_naming_style.k_pascal_case_style.required_prefix = k_
+
+dotnet_naming_rule.nonpublic_const_fields_must_be_prefixed.symbols = nonpublic_const_fields
+dotnet_naming_rule.nonpublic_const_fields_must_be_prefixed.style = k_pascal_case_style
+dotnet_naming_rule.nonpublic_const_fields_must_be_prefixed.severity = suggestion
+
+# 6. Non-public static readonly fields: k_PascalCase
+dotnet_naming_symbols.nonpublic_static_readonly_fields.applicable_kinds = field
+dotnet_naming_symbols.nonpublic_static_readonly_fields.applicable_accessibilities = internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.nonpublic_static_readonly_fields.required_modifiers = static, readonly
+
+dotnet_naming_rule.nonpublic_static_readonly_fields_must_be_prefixed.symbols = nonpublic_static_readonly_fields
+dotnet_naming_rule.nonpublic_static_readonly_fields_must_be_prefixed.style = k_pascal_case_style
+dotnet_naming_rule.nonpublic_static_readonly_fields_must_be_prefixed.severity = suggestion
+
+# 7. Parameters and local variables: camelCase
+# 7.1 parameters
+dotnet_naming_symbols.parameters.applicable_kinds = parameter
+
+dotnet_naming_rule.parameters_must_be_camel_case.symbols = parameters
+dotnet_naming_rule.parameters_must_be_camel_case.style = camel_case_style
+dotnet_naming_rule.parameters_must_be_camel_case.severity = suggestion
+
+# 7.2 local variables
+dotnet_naming_symbols.local_variables.applicable_kinds = local
+
+dotnet_naming_rule.local_variables_must_be_camel_case.symbols = local_variables
+dotnet_naming_rule.local_variables_must_be_camel_case.style = camel_case_style
+dotnet_naming_rule.local_variables_must_be_camel_case.severity = suggestion

From ff92d581a4a7fee671bcc607d6c62164cdb268a2 Mon Sep 17 00:00:00 2001
From: Thomas Lopez <thomas.lopez@unity3d.com>
Date: Mon, 8 Jun 2026 14:03:27 -0400
Subject: [PATCH 07/11] tmp removal of failing vm

---
 .../ProBuilder-recipes.sln.DotSettings.user   |  3 +
 .Tools/CI/Settings/ProBuilderSettings.cs      | 10 +++
 .yamato/wrench/promotion-jobs.yml             | 20 ------
 .yamato/wrench/validation-jobs.yml            | 72 -------------------
 4 files changed, 13 insertions(+), 92 deletions(-)
 create mode 100644 .Tools/CI/ProBuilder-recipes.sln.DotSettings.user

diff --git a/.Tools/CI/ProBuilder-recipes.sln.DotSettings.user b/.Tools/CI/ProBuilder-recipes.sln.DotSettings.user
new file mode 100644
index 000000000..23d6acd8d
--- /dev/null
+++ b/.Tools/CI/ProBuilder-recipes.sln.DotSettings.user
@@ -0,0 +1,3 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEditorVersion_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003Fthomaslopez_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F834acaa5bbe14368aac41fb6cd9598082ac00_003Fd8_003F98c9cece_003FEditorVersion_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AUnityEditor_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003Fthomaslopez_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F834acaa5bbe14368aac41fb6cd9598082ac00_003F1c_003F6eb49a4d_003FUnityEditor_002Ecs/@EntryIndexedValue">ForceIncluded</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/.Tools/CI/Settings/ProBuilderSettings.cs b/.Tools/CI/Settings/ProBuilderSettings.cs
index a526b0dc8..c665f299f 100644
--- a/.Tools/CI/Settings/ProBuilderSettings.cs
+++ b/.Tools/CI/Settings/ProBuilderSettings.cs
@@ -1,6 +1,8 @@
 using RecipeEngine.Api.Platforms;
 using RecipeEngine.Api.Settings;
+using RecipeEngine.Modules.Wrench.Helpers;
 using RecipeEngine.Modules.Wrench.Models;
+using RecipeEngine.Modules.Wrench.Platforms;
 using RecipeEngine.Modules.Wrench.Settings;
 using RecipeEngine.Platforms;
 
@@ -55,6 +57,14 @@ public ProBuilderSettings()
         Wrench.Packages[ProBuilderPackageName].CoverageCommands.Enabled = true;
         Wrench.Packages[ProBuilderPackageName].CoverageCommands.Commands = [_excludeAssembliesCodeCovCommand];
 
+        var versionToRemove = new EditorVersion("6000.6");
+        foreach (UnityEditor unityEditor in
+                 Wrench.Packages[ProBuilderPackageName].UnityEditors)
+        {
+            //if (unityEditor.Version >= versionToRemove)
+                unityEditor.EditorPlatforms.Items.Remove(EditorPlatformType.MacOs13Arm);
+        }
+
         // var defaultMacPlatform = WrenchPackage.DefaultEditorPlatforms[SystemType.MacOS];
         // Wrench.Packages["com.unity.probuilder"].EditorPlatforms[SystemType.MacOS] = new Platform(new Agent("package-ci/macos-13-arm64:v4", FlavorType.MacDefault, defaultMacPlatform.Agent.Resource, "M1"), defaultMacPlatform.System);
     }
diff --git a/.yamato/wrench/promotion-jobs.yml b/.yamato/wrench/promotion-jobs.yml
index e0239cb2c..add69d6dc 100644
--- a/.yamato/wrench/promotion-jobs.yml
+++ b/.yamato/wrench/promotion-jobs.yml
@@ -151,16 +151,6 @@ publish_dry_run_probuilder:
       UTR:
         location: results/UTR/validate-probuilder-6000.5-win10
         unzip: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_6_-_macos13arm
-    specific_options:
-      packages:
-        ignore_artifact: true
-      pvp-results:
-        location: results/pvp/validate-probuilder-6000.6-macos13arm
-        unzip: true
-      UTR:
-        location: results/UTR/validate-probuilder-6000.6-macos13arm
-        unzip: true
   - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_6_-_ubuntu2204
     specific_options:
       packages:
@@ -333,16 +323,6 @@ publish_probuilder:
       UTR:
         location: results/UTR/validate-probuilder-6000.5-win10
         unzip: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_6_-_macos13arm
-    specific_options:
-      packages:
-        ignore_artifact: true
-      pvp-results:
-        location: results/pvp/validate-probuilder-6000.6-macos13arm
-        unzip: true
-      UTR:
-        location: results/UTR/validate-probuilder-6000.6-macos13arm
-        unzip: true
   - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_6_-_ubuntu2204
     specific_options:
       packages:
diff --git a/.yamato/wrench/validation-jobs.yml b/.yamato/wrench/validation-jobs.yml
index 7acb2fd04..2114a7e3e 100644
--- a/.yamato/wrench/validation-jobs.yml
+++ b/.yamato/wrench/validation-jobs.yml
@@ -858,78 +858,6 @@ validate_-_probuilder_-_6000_5_-_win10:
   labels:
   - Packages:probuilder
 
-# PVP Editor and Playmode tests for Validate - probuilder - 6000.6 - macos13arm (6000.6 - MacOS).
-validate_-_probuilder_-_6000_6_-_macos13arm:
-  name: Validate - probuilder - 6000.6 - macos13arm
-  agent:
-    image: package-ci/macos-13-arm64:v4
-    type: Unity::VM::osx
-    flavor: m1.mac
-    model: M1
-  commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip
-  - command: 7z x -aoa wrench-localapv.zip
-  - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
-  - command: python PythonScripts/print_machine_info.py
-  - command: unity-downloader-cli -u trunk -c editor --path .Editor --fast --arch arm64
-    timeout: 20
-    retries: 3
-  - command: upm-pvp create-test-project test-probuilder --packages "upm-ci~/packages/*.tgz" --filter "com.unity.probuilder com.unity.probuilder.tests" --unity .Editor
-    timeout: 10
-    retries: 1
-  - command: echo No internal packages to add.
-  - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
-    timeout: 20
-    retries: 0
-  - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
-    timeout: 5
-    retries: 0
-  - command: echo No additional PVP profiles to declared to check.
-  - command: UnifiedTestRunner --testproject=test-probuilder --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_MacOS_6000.6;flags:probuilder_MacOS_6000.6" --fail-on-assert --coverage-pkg-version=1.3.0
-    timeout: 20
-    retries: 1
-  after:
-  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
-  artifacts:
-    Coverage:
-      paths:
-      - upm-ci~/CodeCoverage/**
-    Crash Dumps:
-      paths:
-      - CrashDumps/**
-    packages:
-      paths:
-      - upm-ci~/packages/**/*
-    pvp-results:
-      paths:
-      - upm-ci~/pvp/**/*
-      browsable: onDemand
-    UTR:
-      paths:
-      - '*.log'
-      - '*.xml'
-      - artifacts/**/*
-      - test-probuilder/Logs/**
-      - test-probuilder/Library/*.log
-      - test-probuilder/*.log
-      - test-probuilder/Builds/*.log
-      - build/test-results/**
-      browsable: onDemand
-  dependencies:
-  - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_probuilder
-  variables:
-    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
-    UNITY_LICENSING_SERVER_DELETE_NUL: 0
-    UNITY_LICENSING_SERVER_DELETE_ULF: 0
-    UNITY_LICENSING_SERVER_TOOLSET: pro
-    UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 2.12.0.0
-  metadata:
-    Job Maintainers: '#rm-packageworks'
-    Wrench: 2.12.0.0
-  labels:
-  - Packages:probuilder
-
 # PVP Editor and Playmode tests for Validate - probuilder - 6000.6 - ubuntu2204 (6000.6 - Ubuntu).
 validate_-_probuilder_-_6000_6_-_ubuntu2204:
   name: Validate - probuilder - 6000.6 - ubuntu2204

From 2417f7fd6c2c670bd33ee64c3f483804a62f0c81 Mon Sep 17 00:00:00 2001
From: Thomas Lopez <thomas.lopez@unity3d.com>
Date: Mon, 8 Jun 2026 14:13:46 -0400
Subject: [PATCH 08/11] reverting changes

---
 .Tools/CI/Settings/ProBuilderSettings.cs |  8 ---
 .yamato/wrench/promotion-jobs.yml        | 20 +++++++
 .yamato/wrench/validation-jobs.yml       | 72 ++++++++++++++++++++++++
 3 files changed, 92 insertions(+), 8 deletions(-)

diff --git a/.Tools/CI/Settings/ProBuilderSettings.cs b/.Tools/CI/Settings/ProBuilderSettings.cs
index c665f299f..ee699ef99 100644
--- a/.Tools/CI/Settings/ProBuilderSettings.cs
+++ b/.Tools/CI/Settings/ProBuilderSettings.cs
@@ -57,14 +57,6 @@ public ProBuilderSettings()
         Wrench.Packages[ProBuilderPackageName].CoverageCommands.Enabled = true;
         Wrench.Packages[ProBuilderPackageName].CoverageCommands.Commands = [_excludeAssembliesCodeCovCommand];
 
-        var versionToRemove = new EditorVersion("6000.6");
-        foreach (UnityEditor unityEditor in
-                 Wrench.Packages[ProBuilderPackageName].UnityEditors)
-        {
-            //if (unityEditor.Version >= versionToRemove)
-                unityEditor.EditorPlatforms.Items.Remove(EditorPlatformType.MacOs13Arm);
-        }
-
         // var defaultMacPlatform = WrenchPackage.DefaultEditorPlatforms[SystemType.MacOS];
         // Wrench.Packages["com.unity.probuilder"].EditorPlatforms[SystemType.MacOS] = new Platform(new Agent("package-ci/macos-13-arm64:v4", FlavorType.MacDefault, defaultMacPlatform.Agent.Resource, "M1"), defaultMacPlatform.System);
     }
diff --git a/.yamato/wrench/promotion-jobs.yml b/.yamato/wrench/promotion-jobs.yml
index add69d6dc..e0239cb2c 100644
--- a/.yamato/wrench/promotion-jobs.yml
+++ b/.yamato/wrench/promotion-jobs.yml
@@ -151,6 +151,16 @@ publish_dry_run_probuilder:
       UTR:
         location: results/UTR/validate-probuilder-6000.5-win10
         unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_6_-_macos13arm
+    specific_options:
+      packages:
+        ignore_artifact: true
+      pvp-results:
+        location: results/pvp/validate-probuilder-6000.6-macos13arm
+        unzip: true
+      UTR:
+        location: results/UTR/validate-probuilder-6000.6-macos13arm
+        unzip: true
   - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_6_-_ubuntu2204
     specific_options:
       packages:
@@ -323,6 +333,16 @@ publish_probuilder:
       UTR:
         location: results/UTR/validate-probuilder-6000.5-win10
         unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_6_-_macos13arm
+    specific_options:
+      packages:
+        ignore_artifact: true
+      pvp-results:
+        location: results/pvp/validate-probuilder-6000.6-macos13arm
+        unzip: true
+      UTR:
+        location: results/UTR/validate-probuilder-6000.6-macos13arm
+        unzip: true
   - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_6_-_ubuntu2204
     specific_options:
       packages:
diff --git a/.yamato/wrench/validation-jobs.yml b/.yamato/wrench/validation-jobs.yml
index 2114a7e3e..7acb2fd04 100644
--- a/.yamato/wrench/validation-jobs.yml
+++ b/.yamato/wrench/validation-jobs.yml
@@ -858,6 +858,78 @@ validate_-_probuilder_-_6000_5_-_win10:
   labels:
   - Packages:probuilder
 
+# PVP Editor and Playmode tests for Validate - probuilder - 6000.6 - macos13arm (6000.6 - MacOS).
+validate_-_probuilder_-_6000_6_-_macos13arm:
+  name: Validate - probuilder - 6000.6 - macos13arm
+  agent:
+    image: package-ci/macos-13-arm64:v4
+    type: Unity::VM::osx
+    flavor: m1.mac
+    model: M1
+  commands:
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip
+  - command: 7z x -aoa wrench-localapv.zip
+  - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
+  - command: python PythonScripts/print_machine_info.py
+  - command: unity-downloader-cli -u trunk -c editor --path .Editor --fast --arch arm64
+    timeout: 20
+    retries: 3
+  - command: upm-pvp create-test-project test-probuilder --packages "upm-ci~/packages/*.tgz" --filter "com.unity.probuilder com.unity.probuilder.tests" --unity .Editor
+    timeout: 10
+    retries: 1
+  - command: echo No internal packages to add.
+  - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
+    timeout: 20
+    retries: 0
+  - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
+    timeout: 5
+    retries: 0
+  - command: echo No additional PVP profiles to declared to check.
+  - command: UnifiedTestRunner --testproject=test-probuilder --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_MacOS_6000.6;flags:probuilder_MacOS_6000.6" --fail-on-assert --coverage-pkg-version=1.3.0
+    timeout: 20
+    retries: 1
+  after:
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
+  artifacts:
+    Coverage:
+      paths:
+      - upm-ci~/CodeCoverage/**
+    Crash Dumps:
+      paths:
+      - CrashDumps/**
+    packages:
+      paths:
+      - upm-ci~/packages/**/*
+    pvp-results:
+      paths:
+      - upm-ci~/pvp/**/*
+      browsable: onDemand
+    UTR:
+      paths:
+      - '*.log'
+      - '*.xml'
+      - artifacts/**/*
+      - test-probuilder/Logs/**
+      - test-probuilder/Library/*.log
+      - test-probuilder/*.log
+      - test-probuilder/Builds/*.log
+      - build/test-results/**
+      browsable: onDemand
+  dependencies:
+  - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_probuilder
+  variables:
+    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
+    UNITY_LICENSING_SERVER_DELETE_NUL: 0
+    UNITY_LICENSING_SERVER_DELETE_ULF: 0
+    UNITY_LICENSING_SERVER_TOOLSET: pro
+    UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
+    UPMPVP_CONTEXT_WRENCH: 2.12.0.0
+  metadata:
+    Job Maintainers: '#rm-packageworks'
+    Wrench: 2.12.0.0
+  labels:
+  - Packages:probuilder
+
 # PVP Editor and Playmode tests for Validate - probuilder - 6000.6 - ubuntu2204 (6000.6 - Ubuntu).
 validate_-_probuilder_-_6000_6_-_ubuntu2204:
   name: Validate - probuilder - 6000.6 - ubuntu2204

From d266adf99aeb3ea23fb6035bc76532da6278d9d5 Mon Sep 17 00:00:00 2001
From: Thomas Lopez <thomas.lopez@unity3d.com>
Date: Mon, 8 Jun 2026 15:11:51 -0400
Subject: [PATCH 09/11] tmp removing macos13arm from pull request trigger job
 list

---
 .Tools/CI/Recipes/Triggers.cs            | 2 +-
 .Tools/CI/Settings/ProBuilderSettings.cs | 3 ---
 .yamato/triggers.yml                     | 6 +++++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.Tools/CI/Recipes/Triggers.cs b/.Tools/CI/Recipes/Triggers.cs
index f4f3f6706..1ea441617 100644
--- a/.Tools/CI/Recipes/Triggers.cs
+++ b/.Tools/CI/Recipes/Triggers.cs
@@ -22,7 +22,7 @@ private ISet<IJobBuilder> GetTriggers()
         HashSet<IJobBuilder> builders =
         [
             JobBuilder.Create("Pull Request Trigger")
-                .WithDependencies(allValidationJobs.Where(d => d.JobId.Contains("macos") || d.JobId.Contains("windows")))
+                .WithDependencies(allValidationJobs.Where(d => (d.JobId.Contains("macos") && !d.JobId.Contains("6000.6")) || d.JobId.Contains("win10")))
                 .WithPullRequestTrigger(pr => pr.ExcludeDraft().And().WithTargetBranch("master"),
                     true, cancelLeftoverJobs: CancelLeftoverJobs.Always)
         ];
diff --git a/.Tools/CI/Settings/ProBuilderSettings.cs b/.Tools/CI/Settings/ProBuilderSettings.cs
index ee699ef99..7f908320e 100644
--- a/.Tools/CI/Settings/ProBuilderSettings.cs
+++ b/.Tools/CI/Settings/ProBuilderSettings.cs
@@ -56,9 +56,6 @@ public ProBuilderSettings()
 
         Wrench.Packages[ProBuilderPackageName].CoverageCommands.Enabled = true;
         Wrench.Packages[ProBuilderPackageName].CoverageCommands.Commands = [_excludeAssembliesCodeCovCommand];
-
-        // var defaultMacPlatform = WrenchPackage.DefaultEditorPlatforms[SystemType.MacOS];
-        // Wrench.Packages["com.unity.probuilder"].EditorPlatforms[SystemType.MacOS] = new Platform(new Agent("package-ci/macos-13-arm64:v4", FlavorType.MacDefault, defaultMacPlatform.Agent.Resource, "M1"), defaultMacPlatform.System);
     }
 
     public WrenchSettings Wrench { get; private set; }
diff --git a/.yamato/triggers.yml b/.yamato/triggers.yml
index 067a294d5..bdd1bfffe 100644
--- a/.yamato/triggers.yml
+++ b/.yamato/triggers.yml
@@ -8,10 +8,14 @@ pull_request_trigger:
   name: Pull Request Trigger
   dependencies:
   - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_0_-_macos13
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_0_-_win10
   - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_3_-_macos13
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_3_-_win10
   - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_4_-_macos13
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_4_-_win10
   - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_5_-_macos13
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_6_-_macos13arm
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_5_-_win10
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_6_-_win10
   triggers:
     expression: |-
       NOT pull_request.draft AND

From 4aca7cb773d88293e75a17308d69378ec382b60e Mon Sep 17 00:00:00 2001
From: Thomas Lopez <thomas.lopez@unity3d.com>
Date: Tue, 9 Jun 2026 08:48:49 -0400
Subject: [PATCH 10/11] reverting after fix landed

---
 .Tools/CI/Recipes/Triggers.cs | 2 +-
 .yamato/triggers.yml          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.Tools/CI/Recipes/Triggers.cs b/.Tools/CI/Recipes/Triggers.cs
index 1ea441617..59e4cebdb 100644
--- a/.Tools/CI/Recipes/Triggers.cs
+++ b/.Tools/CI/Recipes/Triggers.cs
@@ -22,7 +22,7 @@ private ISet<IJobBuilder> GetTriggers()
         HashSet<IJobBuilder> builders =
         [
             JobBuilder.Create("Pull Request Trigger")
-                .WithDependencies(allValidationJobs.Where(d => (d.JobId.Contains("macos") && !d.JobId.Contains("6000.6")) || d.JobId.Contains("win10")))
+                .WithDependencies(allValidationJobs.Where(d => d.JobId.Contains("macos") || d.JobId.Contains("win10")))
                 .WithPullRequestTrigger(pr => pr.ExcludeDraft().And().WithTargetBranch("master"),
                     true, cancelLeftoverJobs: CancelLeftoverJobs.Always)
         ];
diff --git a/.yamato/triggers.yml b/.yamato/triggers.yml
index bdd1bfffe..8035bcf4d 100644
--- a/.yamato/triggers.yml
+++ b/.yamato/triggers.yml
@@ -15,6 +15,7 @@ pull_request_trigger:
   - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_4_-_win10
   - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_5_-_macos13
   - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_5_-_win10
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_6_-_macos13arm
   - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_6_-_win10
   triggers:
     expression: |-

From 3307a015ce2c8b9b668fbb2e63249ebc3768192a Mon Sep 17 00:00:00 2001
From: Thomas Lopez <thomas.lopez@unity3d.com>
Date: Tue, 9 Jun 2026 10:06:54 -0400
Subject: [PATCH 11/11] removing failing vm

---
 .Tools/CI/Recipes/Triggers.cs | 2 +-
 .yamato/triggers.yml          | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/.Tools/CI/Recipes/Triggers.cs b/.Tools/CI/Recipes/Triggers.cs
index 59e4cebdb..c921188c1 100644
--- a/.Tools/CI/Recipes/Triggers.cs
+++ b/.Tools/CI/Recipes/Triggers.cs
@@ -22,7 +22,7 @@ private ISet<IJobBuilder> GetTriggers()
         HashSet<IJobBuilder> builders =
         [
             JobBuilder.Create("Pull Request Trigger")
-                .WithDependencies(allValidationJobs.Where(d => d.JobId.Contains("macos") || d.JobId.Contains("win10")))
+                .WithDependencies(allValidationJobs.Where(d => (d.JobId.Contains("macos") && !d.JobId.Contains("6000.6")) ))
                 .WithPullRequestTrigger(pr => pr.ExcludeDraft().And().WithTargetBranch("master"),
                     true, cancelLeftoverJobs: CancelLeftoverJobs.Always)
         ];
diff --git a/.yamato/triggers.yml b/.yamato/triggers.yml
index 8035bcf4d..6d894570c 100644
--- a/.yamato/triggers.yml
+++ b/.yamato/triggers.yml
@@ -8,15 +8,9 @@ pull_request_trigger:
   name: Pull Request Trigger
   dependencies:
   - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_0_-_macos13
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_0_-_win10
   - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_3_-_macos13
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_3_-_win10
   - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_4_-_macos13
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_4_-_win10
   - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_5_-_macos13
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_5_-_win10
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_6_-_macos13arm
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_6_-_win10
   triggers:
     expression: |-
       NOT pull_request.draft AND