Merge branch 'main' into NetFX-Stack-Capture

Kielek · Kielek · commit 49643db72380 · 2025-12-04T10:41:21.000+01:00
diff --git a/test/IntegrationTests/docker/mysql.Dockerfile b/test/IntegrationTests/docker/mysql.Dockerfile
@@ -1 +1 @@
-FROM mysql:9.5.0@sha256:28540698ce89bd72f985044de942d65bd99c6fadb2db105327db57f3f70564f0
+FROM mysql:9.5.0@sha256:fe036967257bf11aab7184e371920c5b629f0dd36cbefdf4ccd2ae18cc900dbd
diff --git a/test/IntegrationTests/docker/rabbitmq.Dockerfile b/test/IntegrationTests/docker/rabbitmq.Dockerfile
@@ -1 +1 @@
-FROM rabbitmq:4.2.1@sha256:c7543a49815f8f0256ae64f381e4cc7e94045c03625c61151cbb57c282b2a218
+FROM rabbitmq:4.2.1@sha256:9ccaa287bf8457b69b1bb0b138aa05c7313b369e966ab463df57d1d09822be7c
diff --git a/tools/LibraryVersionsGenerator/BuildFileBuilder.cs b/tools/LibraryVersionsGenerator/BuildFileBuilder.cs
@@ -1,6 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+using System.Globalization;
 using System.Text;
 
 namespace LibraryVersionsGenerator;
@@ -29,10 +30,11 @@ public override CSharpFileBuilder EndClass()
 
     public override CSharpFileBuilder BeginTestPackage(string testApplicationName, string integrationName)
     {
-        Builder.AppendLine(
-            @$"        {{
+        var beginTestPackageTemplate = @$"        {{
             ""{testApplicationName}"",
-            [");
+            [";
+
+        Builder.AppendLine(beginTestPackageTemplate);
 
         return this;
     }
@@ -48,7 +50,7 @@ public override CSharpFileBuilder AddVersionWithDependencies(string version, Dic
     {
         AddVersion(version, supportedFrameworks, supportedPlatforms, appendEnd: false);
 
-        Builder.AppendLine($", additionalMetaData: {SerializeDictionary(dependencies)}),");
+        Builder.AppendLine(CultureInfo.InvariantCulture, $", additionalMetaData: {SerializeDictionary(dependencies)}),");
         return this;
     }
 
@@ -68,7 +70,7 @@ private static string SerializeDictionary(Dictionary<string, string> dictionary)
         {
             var dependency = dictionary.ElementAt(i);
 
-            dictionarySb.Append($"{{ \"{dependency.Key}\", \"{dependency.Value}\" }}");
+            dictionarySb.Append(CultureInfo.InvariantCulture, $"{{ \"{dependency.Key}\", \"{dependency.Value}\" }}");
 
             if (i != dictionary.Count - 1)
             {
@@ -93,7 +95,7 @@ private static string SerializeArray(string[] array)
 
         for (var i = 0; i < array.Length; i++)
         {
-            arraySb.Append($"\"{array[i]}\"");
+            arraySb.Append(CultureInfo.InvariantCulture, $"\"{array[i]}\"");
 
             if (i != array.Length - 1)
             {
@@ -106,23 +108,23 @@ private static string SerializeArray(string[] array)
         return arraySb.ToString();
     }
 
-    private CSharpFileBuilder AddVersion(string version, string[] supportedFrameworks, string[] supportedPlatforms, bool appendEnd)
+    private BuildFileBuilder AddVersion(string version, string[] supportedFrameworks, string[] supportedPlatforms, bool appendEnd)
     {
-        Builder.Append($"                new(\"{version}\"");
+        Builder.Append(CultureInfo.InvariantCulture, $"                new(\"{version}\"");
 
         if (supportedFrameworks.Length > 0)
         {
-            Builder.Append($", supportedFrameworks: {SerializeArray(supportedFrameworks)}");
+            Builder.Append(CultureInfo.InvariantCulture, $", supportedFrameworks: {SerializeArray(supportedFrameworks)}");
         }
 
         if (supportedPlatforms.Length > 0)
         {
-            Builder.Append($", supportedPlatforms: {SerializeArray(supportedPlatforms)}");
+            Builder.Append(CultureInfo.InvariantCulture, $", supportedPlatforms: {SerializeArray(supportedPlatforms)}");
         }
 
         if (appendEnd)
         {
-            Builder.AppendLine($"),");
+            Builder.AppendLine("),");
         }
 
         return this;
diff --git a/tools/LibraryVersionsGenerator/CSharpFileBuilder.cs b/tools/LibraryVersionsGenerator/CSharpFileBuilder.cs
@@ -1,13 +1,14 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+using System.Globalization;
 using System.Text;
 
 namespace LibraryVersionsGenerator;
 
 internal abstract class CSharpFileBuilder
 {
-    private bool _hasUsings = false;
+    private bool _hasUsings;
 
     internal StringBuilder Builder { get; } = new();
 
@@ -31,7 +32,7 @@ public virtual CSharpFileBuilder AddUsing(string usingNamespace)
     {
         _hasUsings = true;
 
-        Builder.AppendLine($"using {usingNamespace};");
+        Builder.AppendLine(CultureInfo.InvariantCulture, $"using {usingNamespace};");
 
         return this;
     }
@@ -45,7 +46,7 @@ public virtual CSharpFileBuilder BeginClass(string classNamespace, string classN
 
         if (!string.IsNullOrEmpty(classNamespace))
         {
-            Builder.AppendLine($"namespace {classNamespace};");
+            Builder.AppendLine(CultureInfo.InvariantCulture, $"namespace {classNamespace};");
             Builder.AppendLine();
         }
 
diff --git a/tools/LibraryVersionsGenerator/LibraryVersionsGenerator.csproj b/tools/LibraryVersionsGenerator/LibraryVersionsGenerator.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net10.0</TargetFramework>
+    <AnalysisLevel>latest-All</AnalysisLevel>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tools/LibraryVersionsGenerator/Models/GraphQLVersion.cs b/tools/LibraryVersionsGenerator/Models/GraphQLVersion.cs
@@ -3,7 +3,7 @@
 
 namespace LibraryVersionsGenerator.Models;
 
-internal class GraphQLVersion : PackageVersion
+internal sealed class GraphQLVersion : PackageVersion
 {
     public GraphQLVersion(string version)
         : base(version)
diff --git a/tools/LibraryVersionsGenerator/Models/PackageDependency.cs b/tools/LibraryVersionsGenerator/Models/PackageDependency.cs
@@ -4,15 +4,15 @@
 namespace LibraryVersionsGenerator.Models;
 
 [AttributeUsage(AttributeTargets.Property, AllowMultiple = false)]
-internal class PackageDependency : Attribute
+internal sealed class PackageDependency : Attribute
 {
     public PackageDependency(string packageName, string variableName)
     {
         PackageName = packageName;
         VariableName = variableName;
     }
 
-    public string PackageName { get; set; }
+    public string PackageName { get; }
 
-    public string VariableName { get; set; }
+    public string VariableName { get; }
 }
diff --git a/tools/LibraryVersionsGenerator/PackageVersionDefinitions.cs b/tools/LibraryVersionsGenerator/PackageVersionDefinitions.cs
@@ -291,7 +291,7 @@ all lower versions than 8.15.10 contains references impacted by
         }
     };
 
-    internal record PackageVersionDefinition
+    internal sealed record PackageVersionDefinition
     {
         public required string IntegrationName { get; init; }
 
diff --git a/tools/LibraryVersionsGenerator/Program.cs b/tools/LibraryVersionsGenerator/Program.cs
@@ -9,7 +9,7 @@
 
 namespace LibraryVersionsGenerator;
 
-public class Program
+internal static class Program
 {
     private static Dictionary<string, string> _packageVersions = new Dictionary<string, string>();
 
@@ -49,18 +49,19 @@ public static async Task Main()
                     var isPlatformSpecific = false;
 
                     // Collects versions with platform specific flag
-                    if (version.SupportedPlatforms.Any())
+                    if (version.SupportedPlatforms.Length != 0)
                     {
                         isPlatformSpecific = true;
 
                         foreach (var platform in version.SupportedPlatforms)
                         {
-                            if (!platformVersions.ContainsKey(platform))
+                            if (!platformVersions.TryGetValue(platform, out var value))
                             {
-                                platformVersions.Add(platform, new List<string>());
+                                value = new List<string>();
+                                platformVersions.Add(platform, value);
                             }
 
-                            platformVersions[platform].Add(calculatedVersion);
+                            value.Add(calculatedVersion);
                         }
                     }
 
@@ -91,7 +92,7 @@ public static async Task Main()
             buildFileStringBuilder.EndTestPackage();
 
             // Generates platform specific entry
-            if (platformVersions.Any())
+            if (platformVersions.Count != 0)
             {
                 foreach (var platform in platformVersions)
                 {
@@ -119,8 +120,8 @@ public static async Task Main()
         var xUnitFilePath = Path.Combine(solutionFolder, "test", "IntegrationTests", "LibraryVersions.g.cs");
         var buildFilePath = Path.Combine(solutionFolder, "build", "LibraryVersions.g.cs");
 
-        await File.WriteAllTextAsync(xUnitFilePath, xUnitFileStringBuilder.ToString());
-        await File.WriteAllTextAsync(buildFilePath, buildFileStringBuilder.ToString());
+        await File.WriteAllTextAsync(xUnitFilePath, xUnitFileStringBuilder.ToString()).ConfigureAwait(ConfigureAwaitOptions.None);
+        await File.WriteAllTextAsync(buildFilePath, buildFileStringBuilder.ToString()).ConfigureAwait(ConfigureAwaitOptions.None);
     }
 
     private static string GetSourceFilePathName([CallerFilePath] string? callerFilePath = null)
diff --git a/tools/LibraryVersionsGenerator/XUnitFileBuilder.cs b/tools/LibraryVersionsGenerator/XUnitFileBuilder.cs
@@ -1,22 +1,25 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+using System.Globalization;
+
 namespace LibraryVersionsGenerator;
 
 internal sealed class XUnitFileBuilder : CSharpFileBuilder
 {
     public override CSharpFileBuilder BeginTestPackage(string testApplicationName, string integrationName)
     {
-        Builder.AppendLine(
-            @$"    public static TheoryData<string> {integrationName}
+        var theoryDataTemplate = @$"    public static TheoryData<string> {integrationName}
     {{
         get
         {{
             TheoryData<string> theoryData =
             [
 #if DEFAULT_TEST_PACKAGE_VERSIONS
                 string.Empty,
-#else");
+#else";
+
+        Builder.AppendLine(theoryDataTemplate);
         return this;
     }
 
@@ -30,11 +33,11 @@ public override CSharpFileBuilder AddVersion(string version, string[] supportedF
         var conditionalCompilation = supportedFrameworks.Length > 0;
         if (conditionalCompilation)
         {
-            Builder.AppendFormat("#if {0}", string.Join(" || ", supportedFrameworks.Select(x => x.ToUpperInvariant().Replace('.', '_'))));
+            Builder.AppendFormat(CultureInfo.InvariantCulture, "#if {0}", string.Join(" || ", supportedFrameworks.Select(x => x.ToUpperInvariant().Replace('.', '_'))));
             Builder.AppendLine();
         }
 
-        Builder.AppendLine($"                \"{version}\",");
+        Builder.AppendLine(CultureInfo.InvariantCulture, $"                \"{version}\",");
 
         if (conditionalCompilation)
         {
@@ -69,13 +72,13 @@ internal void BuildLookupMap(IReadOnlyCollection<PackageVersionDefinitions.Packa
 
         foreach (var item in definitions)
         {
-            Builder.AppendLine($"       {{ \"{item.IntegrationName}\", {item.IntegrationName} }},");
+            Builder.AppendLine(CultureInfo.InvariantCulture, $"       {{ \"{item.IntegrationName}\", {item.IntegrationName} }},");
 
-            if (additionalPlatforms.Any(x => x.StartsWith(item.IntegrationName + "_")))
+            if (additionalPlatforms.Any(x => x.StartsWith(item.IntegrationName + "_", StringComparison.Ordinal)))
             {
-                foreach (var platform in additionalPlatforms.Where(x => x.StartsWith(item.IntegrationName)))
+                foreach (var platform in additionalPlatforms.Where(x => x.StartsWith(item.IntegrationName, StringComparison.Ordinal)))
                 {
-                    Builder.AppendLine($"       {{ \"{platform}\", {platform} }},");
+                    Builder.AppendLine(CultureInfo.InvariantCulture, $"       {{ \"{platform}\", {platform} }},");
                 }
             }
         }
diff --git a/tools/SdkVersionAnalyzer/ActionWorkflowAnalyzer.cs b/tools/SdkVersionAnalyzer/ActionWorkflowAnalyzer.cs
@@ -132,7 +132,7 @@ private static IEnumerable<DotnetSdkVersion> ExtractDotnetSdkVersions(string con
             foreach (var step in (YamlSequenceNode)stepsNode)
             {
                 var jobStepNode = (YamlMappingNode)step;
-                if (jobStepNode.Children.TryGetValue(new YamlScalarNode("uses"), out var usesNode) && usesNode.ToString().StartsWith("actions/setup-dotnet"))
+                if (jobStepNode.Children.TryGetValue(new YamlScalarNode("uses"), out var usesNode) && usesNode.ToString().StartsWith("actions/setup-dotnet", StringComparison.Ordinal))
                 {
                     var withNode = (YamlMappingNode)jobStepNode.Children[new YamlScalarNode("with")];
                     var dotnetVersionNode = (YamlScalarNode)withNode.Children[new YamlScalarNode("dotnet-version")];
diff --git a/tools/SdkVersionAnalyzer/DockerfileAnalyzer.cs b/tools/SdkVersionAnalyzer/DockerfileAnalyzer.cs
@@ -168,6 +168,6 @@ private static string[] GetDockerfiles(string root)
 
     private static RunInstruction? GetDotnetInstallingInstruction(Dockerfile dockerfile)
     {
-        return dockerfile.Items.OfType<RunInstruction>().SingleOrDefault(i => i.ToString().Contains("./dotnet-install.sh"));
+        return dockerfile.Items.OfType<RunInstruction>().SingleOrDefault(i => i.ToString().Contains("./dotnet-install.sh", StringComparison.Ordinal));
     }
 }
diff --git a/tools/SdkVersionAnalyzer/DotnetSdkVersion.cs b/tools/SdkVersionAnalyzer/DotnetSdkVersion.cs
@@ -3,4 +3,4 @@
 
 namespace SdkVersionAnalyzer;
 
-internal record DotnetSdkVersion(string? Net8SdkVersion, string? Net9SdkVersion, string? Net10SdkVersion);
+internal sealed record DotnetSdkVersion(string? Net8SdkVersion, string? Net9SdkVersion, string? Net10SdkVersion);
diff --git a/tools/SdkVersionAnalyzer/SdkVersionAnalyzer.csproj b/tools/SdkVersionAnalyzer/SdkVersionAnalyzer.csproj
@@ -1,15 +1,18 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>net10.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-        <OutputType>Exe</OutputType>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <OutputType>Exe</OutputType>
+    <!-- CA1303 Do not pass literals as localized parameters. It is internal tool, so no need to localize Console messages. -->
+    <NoWarn>$(NoWarn);CA1303</NoWarn>
+    <AnalysisLevel>latest-All</AnalysisLevel>
+  </PropertyGroup>
 
-    <ItemGroup>
-      <PackageReference Include="Valleysoft.DockerfileModel" />
-      <PackageReference Include="YamlDotNet" />
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Valleysoft.DockerfileModel" />
+    <PackageReference Include="YamlDotNet" />
+  </ItemGroup>
 
-</Project>
+</Project>
diff --git a/tools/SdkVersionAnalyzer/VersionComparer.cs b/tools/SdkVersionAnalyzer/VersionComparer.cs
@@ -33,7 +33,7 @@ public static bool IsNet9Version(string versionString)
 
     public static bool IsNet10Version(string versionString)
     {
-        return versionString.StartsWith("10");
+        return versionString.StartsWith("10", StringComparison.Ordinal);
     }
 
     private static bool CompareVersion(string expectedVersion, string? extractedVersion)

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-FROM mysql:9.5.0@sha256:28540698ce89bd72f985044de942d65bd99c6fadb2db105327db57f3f70564f0`
	`1`	`+FROM mysql:9.5.0@sha256:fe036967257bf11aab7184e371920c5b629f0dd36cbefdf4ccd2ae18cc900dbd`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-FROM rabbitmq:4.2.1@sha256:c7543a49815f8f0256ae64f381e4cc7e94045c03625c61151cbb57c282b2a218`
	`1`	`+FROM rabbitmq:4.2.1@sha256:9ccaa287bf8457b69b1bb0b138aa05c7313b369e966ab463df57d1d09822be7c`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`// Copyright The OpenTelemetry Authors`
`2`	`2`	`// SPDX-License-Identifier: Apache-2.0`
`3`	`3`
	`4`	`+using System.Globalization;`
`4`	`5`	`using System.Text;`
`5`	`6`
`6`	`7`	`namespace LibraryVersionsGenerator;`
`@@ -29,10 +30,11 @@ public override CSharpFileBuilder EndClass()`
`29`	`30`
`30`	`31`	`public override CSharpFileBuilder BeginTestPackage(string testApplicationName, string integrationName)`
`31`	`32`	`{`
`32`		`- Builder.AppendLine(`
`33`		`- @$" {{`
	`33`	`+ var beginTestPackageTemplate = @$" {{`
`34`	`34`	`""{testApplicationName}"",`
`35`		`- [");`
	`35`	`+ [";`
	`36`	`+`
	`37`	`+ Builder.AppendLine(beginTestPackageTemplate);`
`36`	`38`
`37`	`39`	`return this;`
`38`	`40`	`}`
`@@ -48,7 +50,7 @@ public override CSharpFileBuilder AddVersionWithDependencies(string version, Dic`
`48`	`50`	`{`
`49`	`51`	`AddVersion(version, supportedFrameworks, supportedPlatforms, appendEnd: false);`
`50`	`52`
`51`		`- Builder.AppendLine($", additionalMetaData: {SerializeDictionary(dependencies)}),");`
	`53`	`+ Builder.AppendLine(CultureInfo.InvariantCulture, $", additionalMetaData: {SerializeDictionary(dependencies)}),");`
`52`	`54`	`return this;`
`53`	`55`	`}`
`54`	`56`
`@@ -68,7 +70,7 @@ private static string SerializeDictionary(Dictionary<string, string> dictionary)`
`68`	`70`	`{`
`69`	`71`	`var dependency = dictionary.ElementAt(i);`
`70`	`72`
`71`		`- dictionarySb.Append($"{{ \"{dependency.Key}\", \"{dependency.Value}\" }}");`
	`73`	`+ dictionarySb.Append(CultureInfo.InvariantCulture, $"{{ \"{dependency.Key}\", \"{dependency.Value}\" }}");`
`72`	`74`
`73`	`75`	`if (i != dictionary.Count - 1)`
`74`	`76`	`{`
`@@ -93,7 +95,7 @@ private static string SerializeArray(string[] array)`
`93`	`95`
`94`	`96`	`for (var i = 0; i < array.Length; i++)`
`95`	`97`	`{`
`96`		`- arraySb.Append($"\"{array[i]}\"");`
	`98`	`+ arraySb.Append(CultureInfo.InvariantCulture, $"\"{array[i]}\"");`
`97`	`99`
`98`	`100`	`if (i != array.Length - 1)`
`99`	`101`	`{`
`@@ -106,23 +108,23 @@ private static string SerializeArray(string[] array)`
`106`	`108`	`return arraySb.ToString();`
`107`	`109`	`}`
`108`	`110`
`109`		`- private CSharpFileBuilder AddVersion(string version, string[] supportedFrameworks, string[] supportedPlatforms, bool appendEnd)`
	`111`	`+ private BuildFileBuilder AddVersion(string version, string[] supportedFrameworks, string[] supportedPlatforms, bool appendEnd)`
`110`	`112`	`{`
`111`		`- Builder.Append($" new(\"{version}\"");`
	`113`	`+ Builder.Append(CultureInfo.InvariantCulture, $" new(\"{version}\"");`
`112`	`114`
`113`	`115`	`if (supportedFrameworks.Length > 0)`
`114`	`116`	`{`
`115`		`- Builder.Append($", supportedFrameworks: {SerializeArray(supportedFrameworks)}");`
	`117`	`+ Builder.Append(CultureInfo.InvariantCulture, $", supportedFrameworks: {SerializeArray(supportedFrameworks)}");`
`116`	`118`	`}`
`117`	`119`
`118`	`120`	`if (supportedPlatforms.Length > 0)`
`119`	`121`	`{`
`120`		`- Builder.Append($", supportedPlatforms: {SerializeArray(supportedPlatforms)}");`
	`122`	`+ Builder.Append(CultureInfo.InvariantCulture, $", supportedPlatforms: {SerializeArray(supportedPlatforms)}");`
`121`	`123`	`}`
`122`	`124`
`123`	`125`	`if (appendEnd)`
`124`	`126`	`{`
`125`		`- Builder.AppendLine($"),");`
	`127`	`+ Builder.AppendLine("),");`
`126`	`128`	`}`
`127`	`129`
`128`	`130`	`return this;`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,14 @@`
`1`	`1`	`// Copyright The OpenTelemetry Authors`
`2`	`2`	`// SPDX-License-Identifier: Apache-2.0`
`3`	`3`
	`4`	`+using System.Globalization;`
`4`	`5`	`using System.Text;`
`5`	`6`
`6`	`7`	`namespace LibraryVersionsGenerator;`
`7`	`8`
`8`	`9`	`internal abstract class CSharpFileBuilder`
`9`	`10`	`{`
`10`		`- private bool _hasUsings = false;`
	`11`	`+ private bool _hasUsings;`
`11`	`12`
`12`	`13`	`internal StringBuilder Builder { get; } = new();`
`13`	`14`
`@@ -31,7 +32,7 @@ public virtual CSharpFileBuilder AddUsing(string usingNamespace)`
`31`	`32`	`{`
`32`	`33`	`_hasUsings = true;`
`33`	`34`
`34`		`- Builder.AppendLine($"using {usingNamespace};");`
	`35`	`+ Builder.AppendLine(CultureInfo.InvariantCulture, $"using {usingNamespace};");`
`35`	`36`
`36`	`37`	`return this;`
`37`	`38`	`}`
`@@ -45,7 +46,7 @@ public virtual CSharpFileBuilder BeginClass(string classNamespace, string classN`
`45`	`46`
`46`	`47`	`if (!string.IsNullOrEmpty(classNamespace))`
`47`	`48`	`{`
`48`		`- Builder.AppendLine($"namespace {classNamespace};");`
	`49`	`+ Builder.AppendLine(CultureInfo.InvariantCulture, $"namespace {classNamespace};");`
`49`	`50`	`Builder.AppendLine();`
`50`	`51`	`}`
`51`	`52`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace LibraryVersionsGenerator.Models;`
`5`	`5`
`6`		`-internal class GraphQLVersion : PackageVersion`
	`6`	`+internal sealed class GraphQLVersion : PackageVersion`
`7`	`7`	`{`
`8`	`8`	`public GraphQLVersion(string version)`
`9`	`9`	`: base(version)`
Original file line number	Diff line number	Diff line change
`@@ -4,15 +4,15 @@`
`4`	`4`	`namespace LibraryVersionsGenerator.Models;`
`5`	`5`
`6`	`6`	`[AttributeUsage(AttributeTargets.Property, AllowMultiple = false)]`
`7`		`-internal class PackageDependency : Attribute`
	`7`	`+internal sealed class PackageDependency : Attribute`
`8`	`8`	`{`
`9`	`9`	`public PackageDependency(string packageName, string variableName)`
`10`	`10`	`{`
`11`	`11`	`PackageName = packageName;`
`12`	`12`	`VariableName = variableName;`
`13`	`13`	`}`
`14`	`14`
`15`		`- public string PackageName { get; set; }`
	`15`	`+ public string PackageName { get; }`
`16`	`16`
`17`		`- public string VariableName { get; set; }`
	`17`	`+ public string VariableName { get; }`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,7 @@ all lower versions than 8.15.10 contains references impacted by`
`291`	`291`	`}`
`292`	`292`	`};`
`293`	`293`
`294`		`- internal record PackageVersionDefinition`
	`294`	`+ internal sealed record PackageVersionDefinition`
`295`	`295`	`{`
`296`	`296`	`public required string IntegrationName { get; init; }`
`297`	`297`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`namespace LibraryVersionsGenerator;`
`11`	`11`
`12`		`-public class Program`
	`12`	`+internal static class Program`
`13`	`13`	`{`
`14`	`14`	`private static Dictionary<string, string> _packageVersions = new Dictionary<string, string>();`
`15`	`15`
`@@ -49,18 +49,19 @@ public static async Task Main()`
`49`	`49`	`var isPlatformSpecific = false;`
`50`	`50`
`51`	`51`	`// Collects versions with platform specific flag`
`52`		`- if (version.SupportedPlatforms.Any())`
	`52`	`+ if (version.SupportedPlatforms.Length != 0)`
`53`	`53`	`{`
`54`	`54`	`isPlatformSpecific = true;`
`55`	`55`
`56`	`56`	`foreach (var platform in version.SupportedPlatforms)`
`57`	`57`	`{`
`58`		`- if (!platformVersions.ContainsKey(platform))`
	`58`	`+ if (!platformVersions.TryGetValue(platform, out var value))`
`59`	`59`	`{`
`60`		`- platformVersions.Add(platform, new List<string>());`
	`60`	`+ value = new List<string>();`
	`61`	`+ platformVersions.Add(platform, value);`
`61`	`62`	`}`
`62`	`63`
`63`		`- platformVersions[platform].Add(calculatedVersion);`
	`64`	`+ value.Add(calculatedVersion);`
`64`	`65`	`}`
`65`	`66`	`}`
`66`	`67`
`@@ -91,7 +92,7 @@ public static async Task Main()`
`91`	`92`	`buildFileStringBuilder.EndTestPackage();`
`92`	`93`
`93`	`94`	`// Generates platform specific entry`
`94`		`- if (platformVersions.Any())`
	`95`	`+ if (platformVersions.Count != 0)`
`95`	`96`	`{`
`96`	`97`	`foreach (var platform in platformVersions)`
`97`	`98`	`{`
`@@ -119,8 +120,8 @@ public static async Task Main()`
`119`	`120`	`var xUnitFilePath = Path.Combine(solutionFolder, "test", "IntegrationTests", "LibraryVersions.g.cs");`
`120`	`121`	`var buildFilePath = Path.Combine(solutionFolder, "build", "LibraryVersions.g.cs");`
`121`	`122`
`122`		`- await File.WriteAllTextAsync(xUnitFilePath, xUnitFileStringBuilder.ToString());`
`123`		`- await File.WriteAllTextAsync(buildFilePath, buildFileStringBuilder.ToString());`
	`123`	`+ await File.WriteAllTextAsync(xUnitFilePath, xUnitFileStringBuilder.ToString()).ConfigureAwait(ConfigureAwaitOptions.None);`
	`124`	`+ await File.WriteAllTextAsync(buildFilePath, buildFileStringBuilder.ToString()).ConfigureAwait(ConfigureAwaitOptions.None);`
`124`	`125`	`}`
`125`	`126`
`126`	`127`	`private static string GetSourceFilePathName([CallerFilePath] string? callerFilePath = null)`
Original file line number	Diff line number	Diff line change
`@@ -1,22 +1,25 @@`
`1`	`1`	`// Copyright The OpenTelemetry Authors`
`2`	`2`	`// SPDX-License-Identifier: Apache-2.0`
`3`	`3`
	`4`	`+using System.Globalization;`
	`5`	`+`
`4`	`6`	`namespace LibraryVersionsGenerator;`
`5`	`7`
`6`	`8`	`internal sealed class XUnitFileBuilder : CSharpFileBuilder`
`7`	`9`	`{`
`8`	`10`	`public override CSharpFileBuilder BeginTestPackage(string testApplicationName, string integrationName)`
`9`	`11`	`{`
`10`		`- Builder.AppendLine(`
`11`		`- @$" public static TheoryData<string> {integrationName}`
	`12`	`+ var theoryDataTemplate = @$" public static TheoryData<string> {integrationName}`
`12`	`13`	`{{`
`13`	`14`	`get`
`14`	`15`	`{{`
`15`	`16`	`TheoryData<string> theoryData =`
`16`	`17`	`[`
`17`	`18`	`#if DEFAULT_TEST_PACKAGE_VERSIONS`
`18`	`19`	`string.Empty,`
`19`		`-#else");`
	`20`	`+#else";`
	`21`	`+`
	`22`	`+ Builder.AppendLine(theoryDataTemplate);`
`20`	`23`	`return this;`
`21`	`24`	`}`
`22`	`25`
`@@ -30,11 +33,11 @@ public override CSharpFileBuilder AddVersion(string version, string[] supportedF`
`30`	`33`	`var conditionalCompilation = supportedFrameworks.Length > 0;`
`31`	`34`	`if (conditionalCompilation)`
`32`	`35`	`{`
`33`		`- Builder.AppendFormat("#if {0}", string.Join(" \|\| ", supportedFrameworks.Select(x => x.ToUpperInvariant().Replace('.', '_'))));`
	`36`	`+ Builder.AppendFormat(CultureInfo.InvariantCulture, "#if {0}", string.Join(" \|\| ", supportedFrameworks.Select(x => x.ToUpperInvariant().Replace('.', '_'))));`
`34`	`37`	`Builder.AppendLine();`
`35`	`38`	`}`
`36`	`39`
`37`		`- Builder.AppendLine($" \"{version}\",");`
	`40`	`+ Builder.AppendLine(CultureInfo.InvariantCulture, $" \"{version}\",");`
`38`	`41`
`39`	`42`	`if (conditionalCompilation)`
`40`	`43`	`{`
`@@ -69,13 +72,13 @@ internal void BuildLookupMap(IReadOnlyCollection<PackageVersionDefinitions.Packa`
`69`	`72`
`70`	`73`	`foreach (var item in definitions)`
`71`	`74`	`{`
`72`		`- Builder.AppendLine($" {{ \"{item.IntegrationName}\", {item.IntegrationName} }},");`
	`75`	`+ Builder.AppendLine(CultureInfo.InvariantCulture, $" {{ \"{item.IntegrationName}\", {item.IntegrationName} }},");`
`73`	`76`
`74`		`- if (additionalPlatforms.Any(x => x.StartsWith(item.IntegrationName + "_")))`
	`77`	`+ if (additionalPlatforms.Any(x => x.StartsWith(item.IntegrationName + "_", StringComparison.Ordinal)))`
`75`	`78`	`{`
`76`		`- foreach (var platform in additionalPlatforms.Where(x => x.StartsWith(item.IntegrationName)))`
	`79`	`+ foreach (var platform in additionalPlatforms.Where(x => x.StartsWith(item.IntegrationName, StringComparison.Ordinal)))`
`77`	`80`	`{`
`78`		`- Builder.AppendLine($" {{ \"{platform}\", {platform} }},");`
	`81`	`+ Builder.AppendLine(CultureInfo.InvariantCulture, $" {{ \"{platform}\", {platform} }},");`
`79`	`82`	`}`
`80`	`83`	`}`
`81`	`84`	`}`