[2021.2] [ShaderGraph] URP Uber Shader

TestProjects/ShaderGraph/Assets/CommonAssets/Editor/KeywordTests.cs

@@ -195,11 +195,7 @@ public void CanGetKeywordDeclarationForReals()
             var sb =  new ShaderStringBuilder();
             foreach (var keyword in m_Collector.keywords)
             {
-                string declaration = keyword.GetKeywordDeclarationString();
-                if(!string.IsNullOrEmpty(declaration))
-                {
-                    sb.AppendLine(declaration);
-                }
+                keyword.AppendKeywordDeclarationStrings(sb);
             }
 
             Assert.AreEqual(kExpectedForRealsDeclaration.Replace("\r\n", "\n"), sb.ToString(), "Keyword declaration snippet for final shader was invalid");

TestProjects/ShaderGraph/Assets/CommonAssets/Editor/PropertyTests.cs

@@ -154,6 +154,7 @@ public IEnumerator RemoveInputTests()
             var menuItems = m_BlackboardTestController.addBlackboardItemsMenu.GetPrivateProperty<IList>("menuItems");
             Assert.IsNotNull(menuItems, "Could not retrieve reference to the menu items of the Blackboard Add Items menu");
 
+            // invoke all menu items on the "add Blackboard Items Menu" to add all property types
             foreach (var item in menuItems)
             {
                 var menuFunction = item.GetNonPrivateField<GenericMenu.MenuFunction>("func");

TestProjects/ShaderGraph/SaveLoadGraphs/SimpleWithSubGraph.shadergraph

@@ -1124,7 +1124,7 @@
     },
     "m_Name": "A",
     "m_DefaultReferenceName": "Vector1_e29cd19dafd54a1dbd31dcf1d75c21b2",
-    "m_OverrideReferenceName": "a_3_4_d__",
+    "m_OverrideReferenceName": "a_3_4_d_",
     "m_GeneratePropertyBlock": true,
     "m_Precision": 0,
     "m_GPUInstanced": false,