Update to Sdk 4.0.2

joem-msft · joem-msft · commit 4174ef17d56b · 2026-01-22T15:12:43.000-08:00
diff --git a/global.json b/global.json
@@ -4,6 +4,6 @@
     "rollForward": "latestMinor"
   },
   "msbuild-sdks": {
-    "MSTest.Sdk": "3.11.1"
+    "MSTest.Sdk": "4.0.2"
   }
 }
diff --git a/src/PAModelTests/ChecksumTests.cs b/src/PAModelTests/ChecksumTests.cs
@@ -21,7 +21,7 @@ public void TestChecksum(string filename, string expectedChecksum, int expectedF
         var actualChecksum = ChecksumMaker.GetChecksum(root);
 
         Assert.AreEqual(expectedChecksum, actualChecksum.wholeChecksum);
-        Assert.AreEqual(expectedFileCount, actualChecksum.perFileChecksum.Count);
+        Assert.HasCount(expectedFileCount, actualChecksum.perFileChecksum);
         Assert.IsTrue(actualChecksum.perFileChecksum.TryGetValue(file, out var perFileChecksum));
         Assert.AreEqual(innerExpectedChecksum, perFileChecksum);
 
diff --git a/src/PAModelTests/DataSourceTests.cs b/src/PAModelTests/DataSourceTests.cs
@@ -66,7 +66,7 @@ public void TestTableDefinitionsAreLastEntriesWhenEntropyDeleted(string appName)
                                 {
                                     var dataSourcesFromMsapp = ToObject<DataSourcesJson>(entry);
                                     var last = dataSourcesFromMsapp.DataSources.LastOrDefault();
-                                    Assert.AreEqual(last.TableDefinition != null, true);
+                                    Assert.IsNotNull(last.TableDefinition);
                                     return;
                                 }
                             default:
@@ -95,7 +95,7 @@ public void TestNoLocalDatabaseRefsWhenLocalDatabaseReferencesPropertyWasEmptyJs
         var loadedMsApp = SourceSerializer.LoadFromSource(sourcesTempDirPath, new ErrorContainer());
         Assert.IsTrue(loadedMsApp._entropy.WasLocalDatabaseReferencesEmpty.Value);
         Assert.IsFalse(loadedMsApp._entropy.LocalDatabaseReferencesAsEmpty);
-        Assert.IsTrue(loadedMsApp._dataSourceReferences.Count == 0);
+        Assert.IsEmpty(loadedMsApp._dataSourceReferences);
     }
 
     [TestMethod]
@@ -137,14 +137,14 @@ public void TestUnusedDataSourcesArePreserved(string appName)
         Assert.AreEqual(msApp._dataSourceReferences.First().Key, msApp._dataSourceReferences.First().Key);
         var actualDataSources = msApp1._dataSourceReferences.First().Value.dataSources;
         var expectedDataSources = msApp._dataSourceReferences.First().Value.dataSources;
-        Assert.AreEqual(expectedDataSources.Count, actualDataSources.Count);
+        Assert.HasCount(expectedDataSources.Count, actualDataSources);
         Assert.IsTrue(actualDataSources.ContainsKey("environment_39a902ba"));
         foreach (var kvp in actualDataSources)
         {
             Assert.IsTrue(expectedDataSources.ContainsKey(kvp.Key));
             var expectedDataSource = expectedDataSources[kvp.Key];
             var actualDataSource = kvp.Value;
-            Assert.AreEqual(expectedDataSource.ExtensionData.Count, actualDataSource.ExtensionData.Count);
+            Assert.HasCount(expectedDataSource.ExtensionData.Count, actualDataSource.ExtensionData);
             foreach (var kvpExtension in actualDataSource.ExtensionData)
             {
                 Assert.IsTrue(expectedDataSource.ExtensionData.ContainsKey(kvpExtension.Key));
@@ -173,7 +173,7 @@ public void TestUnusedDataSourcesAreNotPreservedWhenNotTracked(string appName)
         errors1.ThrowOnErrors();
 
         var actualDataSources = msApp1._dataSourceReferences.First().Value.dataSources;
-        Assert.AreEqual(expectedDataSources.Count - actualDataSources.Count, 1);
+        Assert.AreEqual(1, expectedDataSources.Count - actualDataSources.Count);
         foreach (var key in expectedDataSources.Keys)
         {
             if (key == "environment_39a902ba")
@@ -235,7 +235,7 @@ public void TestWhenDataSourcesIsSetToEmptyDictionary(string appName)
         errors = msApp.SaveToSources(sources2.Dir, msAppTemp.FullPath);
         errors.ThrowOnErrors();
 
-        Assert.AreEqual(msApp._dataSourceReferences.First().Value.dataSources.Count, 0);
+        Assert.IsEmpty(msApp._dataSourceReferences.First().Value.dataSources);
     }
 
     [TestMethod]
@@ -255,7 +255,7 @@ public void TestAllUsedDataSourcesArePreserved(string appName)
         var (msApp1, errors1) = CanvasDocument.LoadFromSources(sourcesDir.Dir);
         errors1.ThrowOnErrors();
 
-        Assert.AreEqual(msApp._dataSourceReferences["default.cds"].dataSources.Count, msApp._dataSourceReferences["default.cds"].dataSources.Count);
+        Assert.HasCount(msApp._dataSourceReferences["default.cds"].dataSources.Count, msApp._dataSourceReferences["default.cds"].dataSources);
         foreach (var entry in msApp._dataSourceReferences["default.cds"].dataSources.Keys.OrderBy(key => key).Zip(msApp1._dataSourceReferences["default.cds"].dataSources.Keys.OrderBy(key => key)))
         {
             Assert.AreEqual(entry.First, entry.Second);
diff --git a/src/PAModelTests/DefaultValuesTransformTests.cs b/src/PAModelTests/DefaultValuesTransformTests.cs
@@ -47,7 +47,7 @@ public void TestCaseWithNullDynamicProperties()
         }
 
         // nodeProperties after BeforeWrite() contains only the SomeProp and none of the null dynamic properties
-        Assert.IsTrue(nodeProperties.Count == 1);
+        Assert.HasCount(1, nodeProperties);
     }
 
     private static EditorStateStore getEditorStateStore()
diff --git a/src/PAModelTests/EntropyTests.cs b/src/PAModelTests/EntropyTests.cs
@@ -48,8 +48,8 @@ public void TestControlIdGuidParsing(string filename)
         (var msapp, var errors) = CanvasDocument.LoadFromMsapp(root);
         errors.ThrowOnErrors();
 
-        Assert.IsTrue(msapp._entropy.ControlUniqueGuids.Count > 0);
-        Assert.AreEqual(msapp._entropy.ControlUniqueIds.Count, 0);
+        Assert.IsNotEmpty(msapp._entropy.ControlUniqueGuids);
+        Assert.IsEmpty(msapp._entropy.ControlUniqueIds);
     }
 
     [TestMethod]
@@ -62,8 +62,8 @@ public void TestControlIdIntParsing(string filename)
         (var msapp, var errors) = CanvasDocument.LoadFromMsapp(root);
         errors.ThrowOnErrors();
 
-        Assert.IsTrue(msapp._entropy.ControlUniqueIds.Count > 0);
-        Assert.AreEqual(msapp._entropy.ControlUniqueGuids.Count, 0);
+        Assert.IsNotEmpty(msapp._entropy.ControlUniqueIds);
+        Assert.IsEmpty(msapp._entropy.ControlUniqueGuids);
     }
 
     // Validate that the control template fields OverridaleProperties and PCFDynamicSchemaForIRRetrieval are stored in entropy while unpacking
@@ -78,8 +78,8 @@ public void TestControlInstancesWithSameTemplateDifferentFields(string appName)
         (var msapp, var errors) = CanvasDocument.LoadFromMsapp(root);
         errors.ThrowOnErrors();
 
-        Assert.IsTrue(msapp._entropy.OverridablePropertiesEntry.Count > 0);
-        Assert.IsTrue(msapp._entropy.PCFDynamicSchemaForIRRetrievalEntry.Count > 0);
+        Assert.IsNotEmpty(msapp._entropy.OverridablePropertiesEntry);
+        Assert.IsNotEmpty(msapp._entropy.PCFDynamicSchemaForIRRetrievalEntry);
     }
 
     [TestMethod]
@@ -110,7 +110,7 @@ public void TestPCFControlInstancesWithSameTemplateDifferentFields(string appNam
         (var msapp, var errors) = CanvasDocument.LoadFromMsapp(root);
         errors.ThrowOnErrors();
 
-        Assert.IsTrue(msapp._entropy.PCFTemplateEntry.Count > 0);
+        Assert.IsNotEmpty(msapp._entropy.PCFTemplateEntry);
     }
 
     [TestMethod]
@@ -123,7 +123,7 @@ public void TestAppWithNoPCFControlInstances(string appName)
         (var msapp, var errors) = CanvasDocument.LoadFromMsapp(root);
         errors.ThrowOnErrors();
 
-        Assert.IsTrue(msapp._entropy.PCFTemplateEntry.Count == 0);
+        Assert.IsEmpty(msapp._entropy.PCFTemplateEntry);
     }
 
     // Validate that a PCF control will still resolve its template by falling back to
@@ -138,11 +138,11 @@ public void TestPCFControlWillFallBackToControlTemplate(string appName)
         (var msapp, var errors) = CanvasDocument.LoadFromMsapp(root);
         errors.ThrowOnErrors();
 
-        Assert.IsTrue(msapp._entropy.PCFTemplateEntry.Count > 0);
+        Assert.IsNotEmpty(msapp._entropy.PCFTemplateEntry);
 
         // Clear out the PCF templates in entropy
         msapp._entropy.PCFTemplateEntry.Clear();
-        Assert.IsTrue(msapp._entropy.PCFTemplateEntry.Count == 0);
+        Assert.IsEmpty(msapp._entropy.PCFTemplateEntry);
 
         // Repack the app and validate it matches the initial msapp
         using (var tempFile = new TempFile())
diff --git a/src/PAModelTests/NameCollisionTests.cs b/src/PAModelTests/NameCollisionTests.cs
@@ -111,7 +111,7 @@ public void TestScreenRename(string appName)
             }
 
             // There should be no expected files that were not found
-            Assert.AreEqual(expectedScreens.Count, 0, $"{expectedScreens.Count} screens not found in Src directory.");
+            Assert.IsEmpty(expectedScreens, $"{expectedScreens.Count} screens not found in Src directory.");
         }
     }
 
@@ -167,7 +167,7 @@ public void TestEditorStateRename(string appName)
             }
 
             // There should be no expected files that were not found
-            Assert.AreEqual(expectedControlsWithEditorState.Count, 0, $"{expectedControlsWithEditorState.Count} editor state files not found in EditorState directory.");
+            Assert.IsEmpty(expectedControlsWithEditorState, $"{expectedControlsWithEditorState.Count} editor state files not found in EditorState directory.");
         }
     }
 
@@ -267,6 +267,6 @@ public void TestAssetFileCollision()
         var errorContainer = new ErrorContainer();
         doc.StabilizeAssetFilePaths(errorContainer);
 
-        Assert.AreEqual(doc._assetFiles.Count(), 2);
+        Assert.AreEqual(2, doc._assetFiles.Count());
     }
 }
diff --git a/src/PAModelTests/ReadTransformTests.cs b/src/PAModelTests/ReadTransformTests.cs
@@ -50,6 +50,6 @@ public void TestNullResource()
         var errorContainer = new ErrorContainer();
         doc.StabilizeAssetFilePaths(errorContainer);
 
-        Assert.AreEqual(errorContainer.HasErrors, false);
+        Assert.IsFalse(errorContainer.HasErrors);
     }
 }
diff --git a/src/PAModelTests/SmartMergeTests.cs b/src/PAModelTests/SmartMergeTests.cs
@@ -314,7 +314,7 @@ public void ScreenAddTest()
         {
             resultDoc._screens.TryGetValue("Screen32", out var control);
             Assert.AreEqual(1, control.Properties.Count(item => item.Identifier == "SomeProp"));
-            Assert.IsTrue(resultDoc._screenOrder.Contains("Screen32"));
+            Assert.Contains("Screen32", resultDoc._screenOrder);
         });
     }
 
diff --git a/src/PAModelTests/TemplateParserTests.cs b/src/PAModelTests/TemplateParserTests.cs
@@ -28,7 +28,7 @@ public void TestGalleryNestedTemplateParse()
         var templateStore = new TemplateStore();
         Assert.IsTrue(ControlTemplateParser.TryParseTemplate(templateStore, galleryTemplateContents, AppType.DesktopOrTablet, parsedTemplates, out var topTemplate, out var name));
 
-        Assert.AreEqual(2, parsedTemplates.Count);
+        Assert.HasCount(2, parsedTemplates);
         Assert.AreEqual("gallery", name);
         Assert.AreEqual("http://microsoft.com/appmagic/gallery", topTemplate.Id);
 
diff --git a/src/PAModelTests/UtilityTests.cs b/src/PAModelTests/UtilityTests.cs
@@ -81,6 +81,6 @@ public void Regression153()
     public void TestControlNameTruncation(string originalName, string expectedName)
     {
         var truncatedName = FilePath.TruncateNameIfTooLong(originalName);
-        Assert.AreEqual(truncatedName, expectedName);
+        Assert.AreEqual(expectedName, truncatedName);
     }
 }
diff --git a/src/PAModelTests/YamlTest.cs b/src/PAModelTests/YamlTest.cs
@@ -53,7 +53,7 @@ public void WriteEscapes(string value)
         var text = sw.ToString();
 
         // We use a | escape. 
-        Assert.IsTrue(text.StartsWith("Foo: |"));
+        Assert.StartsWith("Foo: |", text);
     }
 
     // Different ending newlines will have different escapes. 
@@ -458,9 +458,9 @@ public void ReadDict()
         using var reader = new StringReader(expectedYaml);
 
         var props = YamlConverter.Read(reader);
-        Assert.AreEqual(props.Count, 2);
-        Assert.AreEqual(props["P1"], "123");
-        Assert.AreEqual(props["P2"], " \"hello\" & \"world\"");
+        Assert.HasCount(2, props);
+        Assert.AreEqual("123", props["P1"]);
+        Assert.AreEqual(" \"hello\" & \"world\"", props["P2"]);
 
     }
 
@@ -631,7 +631,7 @@ private static void AssertLexErrorMessage(YamlLexer y, string expectedErrorMessa
         {
             if (p.Kind == YamlTokenKind.Error)
             {
-                Assert.AreEqual(p.Value, expectedErrorMessage);
+                Assert.AreEqual(expectedErrorMessage, p.Value);
                 return;
             }
             p = y.ReadNext();
diff --git a/src/YamlValidator.Tests/AssemblyInfo.cs b/src/YamlValidator.Tests/AssemblyInfo.cs
@@ -0,0 +1,4 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+[assembly: Parallelize(Workers = 16, Scope = ExecutionScope.MethodLevel)]

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@`
`4`	`4`	`"rollForward": "latestMinor"`
`5`	`5`	`},`
`6`	`6`	`"msbuild-sdks": {`
`7`		`- "MSTest.Sdk": "3.11.1"`
	`7`	`+ "MSTest.Sdk": "4.0.2"`
`8`	`8`	`}`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public void TestCaseWithNullDynamicProperties()`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`// nodeProperties after BeforeWrite() contains only the SomeProp and none of the null dynamic properties`
`50`		`- Assert.IsTrue(nodeProperties.Count == 1);`
	`50`	`+ Assert.HasCount(1, nodeProperties);`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`private static EditorStateStore getEditorStateStore()`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public void TestScreenRename(string appName)`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`// There should be no expected files that were not found`
`114`		`- Assert.AreEqual(expectedScreens.Count, 0, $"{expectedScreens.Count} screens not found in Src directory.");`
	`114`	`+ Assert.IsEmpty(expectedScreens, $"{expectedScreens.Count} screens not found in Src directory.");`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`
`@@ -167,7 +167,7 @@ public void TestEditorStateRename(string appName)`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`// There should be no expected files that were not found`
`170`		`- Assert.AreEqual(expectedControlsWithEditorState.Count, 0, $"{expectedControlsWithEditorState.Count} editor state files not found in EditorState directory.");`
	`170`	`+ Assert.IsEmpty(expectedControlsWithEditorState, $"{expectedControlsWithEditorState.Count} editor state files not found in EditorState directory.");`
`171`	`171`	`}`
`172`	`172`	`}`
`173`	`173`
`@@ -267,6 +267,6 @@ public void TestAssetFileCollision()`
`267`	`267`	`var errorContainer = new ErrorContainer();`
`268`	`268`	`doc.StabilizeAssetFilePaths(errorContainer);`
`269`	`269`
`270`		`- Assert.AreEqual(doc._assetFiles.Count(), 2);`
	`270`	`+ Assert.AreEqual(2, doc._assetFiles.Count());`
`271`	`271`	`}`
`272`	`272`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,6 @@ public void TestNullResource()`
`50`	`50`	`var errorContainer = new ErrorContainer();`
`51`	`51`	`doc.StabilizeAssetFilePaths(errorContainer);`
`52`	`52`
`53`		`- Assert.AreEqual(errorContainer.HasErrors, false);`
	`53`	`+ Assert.IsFalse(errorContainer.HasErrors);`
`54`	`54`	`}`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -314,7 +314,7 @@ public void ScreenAddTest()`
`314`	`314`	`{`
`315`	`315`	`resultDoc._screens.TryGetValue("Screen32", out var control);`
`316`	`316`	`Assert.AreEqual(1, control.Properties.Count(item => item.Identifier == "SomeProp"));`
`317`		`- Assert.IsTrue(resultDoc._screenOrder.Contains("Screen32"));`
	`317`	`+ Assert.Contains("Screen32", resultDoc._screenOrder);`
`318`	`318`	`});`
`319`	`319`	`}`
`320`	`320`
Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,6 @@ public void Regression153()`
`81`	`81`	`public void TestControlNameTruncation(string originalName, string expectedName)`
`82`	`82`	`{`
`83`	`83`	`var truncatedName = FilePath.TruncateNameIfTooLong(originalName);`
`84`		`- Assert.AreEqual(truncatedName, expectedName);`
	`84`	`+ Assert.AreEqual(expectedName, truncatedName);`
`85`	`85`	`}`
`86`	`86`	`}`