More git eol (Azure#52040)

* add more formats

* fix tests

Author: JoshLove-msft

.gitattributes

@@ -16,6 +16,8 @@
 *.csproj text eol=lf
 *.sln    text eol=lf
 *.sh     text eol=lf
+*.json   text eol=lf
+*.bicep  text eol=lf
 
 # Automatically collapse Track 2 test recordings in github PRs
 **/SessionRecords/**/*.json linguist-generated=true

sdk/cloudmachine/Azure.Projects.Provisioning/tests/BicepGenerationTests.cs

@@ -27,7 +27,7 @@ public void MinimalProject()
         //File.WriteAllText(Path.Combine(Path.GetTempPath(), "minimal.bicep"), actualBicep);
 
         string expectedBicep = LoadTestFile("minimal.bicep");
-        Assert.AreEqual(expectedBicep, actualBicep);
+        AssertEqual(expectedBicep, actualBicep);
     }
 
     [Test]
@@ -44,7 +44,7 @@ public void MinimalProjectWithDeveloperAppConfig()
         //File.WriteAllText(Path.Combine(Path.GetTempPath(), "developer.bicep"), actualBicep);
 
         string expectedBicep = LoadTestFile("developer.bicep");
-        Assert.AreEqual(expectedBicep, actualBicep);
+        AssertEqual(expectedBicep, actualBicep);
     }
 
     [Test]
@@ -58,7 +58,7 @@ public void KeyVault()
         //File.WriteAllText(Path.Combine(Path.GetTempPath(), "kv.bicep"), actualBicep);
 
         string expectedBicep = LoadTestFile("kv.bicep");
-        Assert.AreEqual(expectedBicep, actualBicep);
+        AssertEqual(expectedBicep, actualBicep);
     }
 
     [Test]
@@ -72,7 +72,7 @@ public void Blobs()
         //File.WriteAllText(Path.Combine(Path.GetTempPath(), "blobs.bicep"), actualBicep);
 
         string expectedBicep = LoadTestFile("blobs.bicep");
-        Assert.AreEqual(expectedBicep, actualBicep);
+        AssertEqual(expectedBicep, actualBicep);
     }
 
     [Test]
@@ -87,7 +87,7 @@ public void BlobsTwoContainers()
         //File.WriteAllText(Path.Combine(Path.GetTempPath(), "blobs2Containers.bicep"), actualBicep);
 
         string expectedBicep = LoadTestFile("blobs2Containers.bicep");
-        Assert.AreEqual(expectedBicep, actualBicep);
+        AssertEqual(expectedBicep, actualBicep);
     }
 
     [Test]
@@ -101,7 +101,7 @@ public void BlobsObservableContainer()
         //File.WriteAllText(Path.Combine(Path.GetTempPath(), "blobsObservable.bicep"), actualBicep);
 
         string expectedBicep = LoadTestFile("blobsObservable.bicep");
-        Assert.AreEqual(expectedBicep, actualBicep);
+        AssertEqual(expectedBicep, actualBicep);
     }
 
     [Test]
@@ -116,7 +116,7 @@ public void OpenAI()
         //File.WriteAllText(Path.Combine(Path.GetTempPath(), "openai.bicep"), actualBicep);
 
         string expectedBicep = LoadTestFile("openai.bicep");
-        Assert.AreEqual(expectedBicep, actualBicep);
+        AssertEqual(expectedBicep, actualBicep);
     }
 
     [Test]
@@ -131,7 +131,7 @@ public void MaaS()
         //File.WriteAllText(path, actualBicep);
 
         string expectedBicep = LoadTestFile("maas.bicep");
-        Assert.AreEqual(expectedBicep, actualBicep);
+        AssertEqual(expectedBicep, actualBicep);
     }
 
     [Test]
@@ -145,7 +145,7 @@ public void ServiceBus()
         //File.WriteAllText(Path.Combine(Path.GetTempPath(), "sb.bicep"), actualBicep);
 
         string expectedBicep = LoadTestFile("sb.bicep");
-        Assert.AreEqual(expectedBicep, actualBicep);
+        AssertEqual(expectedBicep, actualBicep);
     }
 
     [Test]
@@ -159,7 +159,7 @@ public void Ofx()
         //File.WriteAllText(Path.Combine(Path.GetTempPath(), "cm.bicep"), actualBicep);
 
         string expectedBicep = LoadTestFile("cm.bicep");
-        Assert.AreEqual(expectedBicep, actualBicep);
+        AssertEqual(expectedBicep, actualBicep);
     }
 
     [Test]
@@ -176,7 +176,7 @@ public void AppService()
         //File.WriteAllText(Path.Combine(Path.GetTempPath(), "app.bicep"), actualBicep);
 
         string expectedBicep = LoadTestFile("app.bicep");
-        Assert.AreEqual(expectedBicep, actualBicep);
+        AssertEqual(expectedBicep, actualBicep);
     }
 
     private static string LoadTestFile(string filename)
@@ -188,4 +188,9 @@ private static string LoadTestFile(string filename)
         }
         return contents;
     }
+
+    private static void AssertEqual(string expectedBicep, string actualBicep)
+    {
+        Assert.AreEqual(expectedBicep, actualBicep.Replace("\r\n", "\n"));
+    }
 }

sdk/cloudmachine/Azure.Projects.Provisioning/tests/Data/developer.bicep

@@ -45,4 +45,4 @@ resource projectConnection 'Microsoft.AppConfiguration/configurationStores/keyVa
   parent: appConfiguration
 }
 
-output project_identity_id string = projectIdentity.id
+output project_identity_id string = projectIdentity.id

sdk/cloudmachine/Azure.Projects.Provisioning/tests/Data/maas.bicep

@@ -108,4 +108,4 @@ resource projectConnection2 'Microsoft.AppConfiguration/configurationStores/keyV
   parent: appConfiguration
 }
 
-output project_identity_id string = projectIdentity.id
+output project_identity_id string = projectIdentity.id

sdk/core/System.ClientModel/tests/ModelReaderWriterTests/Models/ResourceProviderDataTests.cs

@@ -66,7 +66,7 @@ public void ValidatePrettyPrintWithStj()
 
             var modelFromStj = JsonSerializer.Deserialize<ResourceProviderData>(WirePayload, stjOptions);
             var stjResult = JsonSerializer.Serialize(modelFromStj, stjOptions);
-            Assert.AreEqual(File.ReadAllText(TestData.GetLocation("ResourceProviderData/ResourceProviderData-TwoSpaces.json")).TrimEnd(), stjResult);
+            Assert.AreEqual(File.ReadAllText(TestData.GetLocation("ResourceProviderData/ResourceProviderData-TwoSpaces.json")).TrimEnd(), NormalizeLF(stjResult));
         }
 
         [Test]
@@ -82,8 +82,11 @@ public void ValidateCapitalizationIsIgnored()
 
             var modelFromStj = JsonSerializer.Deserialize<ResourceProviderData>(WirePayload, stjOptions);
             var stjResult = JsonSerializer.Serialize(modelFromStj, stjOptions);
-            Assert.AreEqual(File.ReadAllText(TestData.GetLocation("ResourceProviderData/ResourceProviderData-TwoSpaces.json")).TrimEnd(), stjResult);
+            Assert.AreEqual(File.ReadAllText(TestData.GetLocation("ResourceProviderData/ResourceProviderData-TwoSpaces.json")).TrimEnd(), NormalizeLF(stjResult));
 #endif
         }
+
+        private static string NormalizeLF(string s)
+            => s.Replace("\r\n", "\n");
     }
 }