Revise assembly version conflict resolution on .NET to eliminate DOTNET_ADDITIONAL_DEPS/DOTNET_SHARED_STORE requirement

OpenTelemetry.AutoInstrumentation.sln

@@ -95,8 +95,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.AutoInstrumen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApplication.Smoke", "test\test-applications\integrations\TestApplication.Smoke\TestApplication.Smoke.csproj", "{FF665CC4-6643-4614-A1A0-FA182E3AF37C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.AutoInstrumentation.AdditionalDeps", "src\OpenTelemetry.AutoInstrumentation.AdditionalDeps\OpenTelemetry.AutoInstrumentation.AdditionalDeps.csproj", "{E026D9FA-FBD5-4066-AF6A-FB63DE28521F}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.AutoInstrumentation.Tests", "test\OpenTelemetry.AutoInstrumentation.Tests\OpenTelemetry.AutoInstrumentation.Tests.csproj", "{065FEB4E-A99E-4A59-8112-1CB30CF794F9}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApplication.Http", "test\test-applications\integrations\TestApplication.Http\TestApplication.Http.csproj", "{4E17BE29-B227-41D8-97FE-26F674951E26}"
@@ -254,7 +252,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApplication.ProfilerSpa
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApplication.NoCode", "test\test-applications\integrations\TestApplication.NoCode\TestApplication.NoCode.csproj", "{500BF40F-EECB-4F6A-377B-EDBDFFDE09BE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTelemetry.AutoInstrumentation.Assemblies.NetFramework", "src\OpenTelemetry.AutoInstrumentation.Assemblies.NetFramework\OpenTelemetry.AutoInstrumentation.Assemblies.NetFramework.csproj", "{B69564D4-7D5B-7147-6CBA-233BB8A33C50}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTelemetry.AutoInstrumentation.Assemblies", "src\OpenTelemetry.AutoInstrumentation.Assemblies\OpenTelemetry.AutoInstrumentation.Assemblies.csproj", "{B69564D4-7D5B-7147-6CBA-233BB8A33C50}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApplication.Wcf.Core", "test\test-applications\integrations\TestApplication.Wcf.Core\TestApplication.Wcf.Core.csproj", "{0F864722-CE44-4D99-9B67-CF0ED1893FF1}"
 EndProject
@@ -502,22 +500,6 @@ Global
 		{FF665CC4-6643-4614-A1A0-FA182E3AF37C}.Release|x64.Build.0 = Release|x64
 		{FF665CC4-6643-4614-A1A0-FA182E3AF37C}.Release|x86.ActiveCfg = Release|x86
 		{FF665CC4-6643-4614-A1A0-FA182E3AF37C}.Release|x86.Build.0 = Release|x86
-		{E026D9FA-FBD5-4066-AF6A-FB63DE28521F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E026D9FA-FBD5-4066-AF6A-FB63DE28521F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E026D9FA-FBD5-4066-AF6A-FB63DE28521F}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{E026D9FA-FBD5-4066-AF6A-FB63DE28521F}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{E026D9FA-FBD5-4066-AF6A-FB63DE28521F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E026D9FA-FBD5-4066-AF6A-FB63DE28521F}.Debug|x64.Build.0 = Debug|Any CPU
-		{E026D9FA-FBD5-4066-AF6A-FB63DE28521F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E026D9FA-FBD5-4066-AF6A-FB63DE28521F}.Debug|x86.Build.0 = Debug|Any CPU
-		{E026D9FA-FBD5-4066-AF6A-FB63DE28521F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E026D9FA-FBD5-4066-AF6A-FB63DE28521F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E026D9FA-FBD5-4066-AF6A-FB63DE28521F}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{E026D9FA-FBD5-4066-AF6A-FB63DE28521F}.Release|ARM64.Build.0 = Release|Any CPU
-		{E026D9FA-FBD5-4066-AF6A-FB63DE28521F}.Release|x64.ActiveCfg = Release|Any CPU
-		{E026D9FA-FBD5-4066-AF6A-FB63DE28521F}.Release|x64.Build.0 = Release|Any CPU
-		{E026D9FA-FBD5-4066-AF6A-FB63DE28521F}.Release|x86.ActiveCfg = Release|Any CPU
-		{E026D9FA-FBD5-4066-AF6A-FB63DE28521F}.Release|x86.Build.0 = Release|Any CPU
 		{065FEB4E-A99E-4A59-8112-1CB30CF794F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{065FEB4E-A99E-4A59-8112-1CB30CF794F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{065FEB4E-A99E-4A59-8112-1CB30CF794F9}.Debug|ARM64.ActiveCfg = Debug|Any CPU
@@ -1662,7 +1644,6 @@ Global
 		{35AB65D8-D76E-40C6-B10C-501A6D44C9E0} = {5C915382-C886-457D-8641-9E766D8E5A17}
 		{E04DA938-E153-4A0D-9CB0-EAC38210FAF2} = {9E5F0022-0A50-40BF-AC6A-C3078585ECAB}
 		{FF665CC4-6643-4614-A1A0-FA182E3AF37C} = {E409ADD3-9574-465C-AB09-4324D205CC7C}
-		{E026D9FA-FBD5-4066-AF6A-FB63DE28521F} = {9E5F0022-0A50-40BF-AC6A-C3078585ECAB}
 		{065FEB4E-A99E-4A59-8112-1CB30CF794F9} = {5C915382-C886-457D-8641-9E766D8E5A17}
 		{4E17BE29-B227-41D8-97FE-26F674951E26} = {E409ADD3-9574-465C-AB09-4324D205CC7C}
 		{3B77F975-BF66-4218-9982-F48D3271DDFE} = {E409ADD3-9574-465C-AB09-4324D205CC7C}

build/AssemblyRedirectionSourceGenerator.cs

@@ -5,28 +5,31 @@
 
 public static class AssemblyRedirectionSourceGenerator
 {
-    public static void Generate(string assembliesFolderPath, string generatedFilePath)
+    public static void Generate(
+        string assembliesFolderPath,
+        string generatedFilePath,
+        Regex versionRegex,
+        Func<GroupCollection, string> versionNormalizer)
     {
         Log.Debug("Generating assembly redirection file {0}", generatedFilePath);
+
+        var macroName = Path.GetFileNameWithoutExtension(generatedFilePath).ToUpperInvariant();
+
         var assemblies = new SortedDictionary<int, SortedDictionary<string, AssemblyNameDefinition>>();
 
         var folders = new Dictionary<int, string>();
 
-        var frameworkVersionRegEx = new Regex(@"^net(?<version>\d{2,3})$");
+        // Discover framework-specific subfolders
         foreach (var directory in Directory.EnumerateDirectories(assembliesFolderPath))
         {
             var folderName = Path.GetFileName(directory);
-            var framework = frameworkVersionRegEx.Match(folderName).Groups["version"].Value;
+            var framework = versionNormalizer(versionRegex.Match(folderName).Groups);
             if (framework == string.Empty)
             {
                 Log.Error("Unexpected folder name: {0}, will not be processed", framework);
                 continue;
             }
             var frameworkVersion = int.Parse(framework);
-            if (frameworkVersion < 100)
-            {
-                frameworkVersion *= 10;
-            }
 
             if (folders.TryGetValue(frameworkVersion, out var folder))
             {
@@ -49,7 +52,6 @@ void Process(string fileName, int? framework)
                     return;
                 }
 
-
                 foreach (var keys in framework != null ? (IEnumerable<int>)[framework.Value] : assemblies.Keys)
                 {
                     assemblies[keys][assemblyDef.Name] = assemblyDef;
@@ -63,11 +65,13 @@ void Process(string fileName, int? framework)
             }
         }
 
+        // Process common assemblies in root folder
         foreach (var fileName in Directory.EnumerateFiles(assembliesFolderPath))
         {
             Process(fileName, null);
         }
 
+        // Process framework-specific assemblies
         foreach (var fx in folders)
         {
             foreach (var fileName in Directory.EnumerateFiles(fx.Value))
@@ -83,13 +87,13 @@ void Process(string fileName, int? framework)
             }
         }
 
-        var sourceContents = GenerateSourceContents(assemblies);
+        var sourceContents = GenerateSourceContents(assemblies, macroName);
 
         File.WriteAllText(generatedFilePath, sourceContents);
         Log.Information("Assembly redirection source generated {0}", generatedFilePath);
     }
 
-    private static string GenerateSourceContents(SortedDictionary<int, SortedDictionary<string, AssemblyNameDefinition>> assemblies)
+    private static string GenerateSourceContents(SortedDictionary<int, SortedDictionary<string, AssemblyNameDefinition>> assemblies, string macroName)
     {
         #pragma warning disable format
         return
@@ -101,25 +105,16 @@ private static string GenerateSourceContents(SortedDictionary<int, SortedDiction
 
         // Auto-generated file, do not change it - generated by the {{nameof(AssemblyRedirectionSourceGenerator)}} type
 
-        #include "cor_profiler.h"
-
+        // Macro to handle cross-platform UTF-16 string literals
         #ifdef _WIN32
-        #define STR(Z1) #Z1
-        #define AUTO_MAJOR STR(OTEL_AUTO_VERSION_MAJOR) 
-
-        namespace trace
-        {
-        void CorProfiler::InitNetFxAssemblyRedirectsMap()
-        {
-            const USHORT auto_major = atoi(AUTO_MAJOR);
-
-            assembly_version_redirect_map_.insert({
-                {{GenerateEntries(assemblies)}}
-            });
-        }
-        }
+        #define _W(s) L##s
+        #else
+        #define _W(s) u##s
         #endif
 
+        #define {{macroName}} \
+            {{GenerateEntries(assemblies)}}
+
         """;
         #pragma warning restore format
     }
@@ -130,26 +125,26 @@ private static string GenerateEntries(SortedDictionary<int, SortedDictionary<str
 
         foreach (var fx in frameworks)
         {
-            sb.AppendLine($"        {{ {fx.Key}, {{");
+            sb.AppendLine($"    {{ {fx.Key}, {{ \\");
             foreach (var kvp in fx.Value)
             {
                 var v = kvp.Value.Version!;
                 if (kvp.Key != "OpenTelemetry.AutoInstrumentation")
                 {
-                    sb.AppendLine($"            {{ L\"{kvp.Key}\", {{{v.Major}, {v.Minor}, {v.Build}, {v.Revision}}} }},");
+                    sb.AppendLine($"        {{ _W(\"{kvp.Key}\"), {{{v.Major}, {v.Minor}, {v.Build}, {v.Revision}}} }}, \\");
                 }
                 else
                 {
-                    sb.AppendLine($"            {{ L\"{kvp.Key}\", {{auto_major, 0, 0, 0}} }},");
+                    sb.AppendLine($"        {{ _W(\"{kvp.Key}\"), {{auto_major, 0, 0, 0}} }}, \\");
                 }
             }
-            sb.AppendLine("        }},");
+            sb.AppendLine("    }}, \\");
         }
 
         return sb.ToString()
             .AsSpan() // Optimisation for following string manipulations
             .Trim() // Remove whitespaces
-            .TrimEnd(',') // Remove trailing comma
+            .TrimEnd(", \\") // Remove trailing comma
             .ToString();
     }
 }

build/Build.NuGet.Steps.cs

@@ -33,7 +33,7 @@ partial class Build
         .Description("Build the NuGet packages that are generated directly from src/**/*.csproj files")
         .Executes(() =>
         {
-            foreach (var project in Solution.GetManagedSrcProjects().Where(p => !p.Name.EndsWith("AdditionalDeps") && !p.Name.Contains("Assemblies")))
+            foreach (var project in Solution.GetManagedSrcProjects().Where(p => !p.Name.EndsWith("Assemblies")))
             {
                 DotNetPack(x => x
                     .SetProject(project)

build/Build.Steps.Windows.cs

@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
 using Nuke.Common;
 using Nuke.Common.IO;
 using Nuke.Common.ProjectModel;
@@ -19,7 +16,7 @@ partial class Build
     Target CompileNativeSrcWindows => _ => _
         .Unlisted()
         .After(CompileManagedSrc)
-        .After(GenerateNetFxAssemblyRedirectionSource)
+        .After(GenerateAssemblyRedirectionSource)
         .OnlyWhenStatic(() => IsWin)
         .Executes(() =>
         {
@@ -74,7 +71,7 @@ static void SupportVs2026IfAvailable()
     Target CompileNativeDependenciesForManagedTestsWindows => _ => _
         .Unlisted()
         .After(CompileManagedSrc)
-        .After(GenerateNetFxAssemblyRedirectionSource)
+        .After(GenerateAssemblyRedirectionSource)
         .OnlyWhenStatic(() => IsWin)
         .Executes(() =>
         {
@@ -228,31 +225,6 @@ void BuildDockerImage(Project project, params string[] targets)
         }
     }
 
-    Target GenerateNetFxTransientDependencies => _ => _
-        .Unlisted()
-        .After(Restore)
-        .OnlyWhenStatic(() => IsWin)
-        .Executes(() =>
-        {
-            // The target project needs to have its NuGet packages restored prior to running the tool.
-            var targetProject = Solution.GetProjectByName(Projects.AutoInstrumentationNetFxAssemblies);
-            DotNetRestore(s => s.SetProjectFile(targetProject));
-
-            TransientDependenciesGenerator.Run(targetProject);
-        });
-
-    Target GenerateNetFxAssemblyRedirectionSource => _ => _
-        .Unlisted()
-        .After(PublishManagedProfiler)
-        .OnlyWhenStatic(() => IsWin)
-        .Executes(() =>
-        {
-            var netFxAssembliesFolder = TracerHomeDirectory / MapToFolderOutput(TargetFramework.NET462);
-            var generatedSourceFile = SourceDirectory / Projects.AutoInstrumentationNative / "netfx_assembly_redirection.h";
-
-            AssemblyRedirectionSourceGenerator.Generate(netFxAssembliesFolder, generatedSourceFile);
-        });
-
     Target InstallNetFxAssembliesGAC => _ => _
         .Unlisted()
         .After(BuildTracer)
@@ -279,8 +251,9 @@ private void RunNetFxGacOperation(string operation)
         }
 
         // We assume that dev machine running test has .Net Framework not older than TargetFrameworksNetFx.Last()
-        var netFxCommonAssembliesFolder = TracerHomeDirectory / MapToFolderOutput(TargetFrameworksForNetFxPacking.Last());
-        var netFxAssembliesFolder = TracerHomeDirectory / MapToFolderOutputNetFx(TargetFrameworksForNetFxPacking.Last());
+        var lastFramework = TargetFrameworksForNetFxPacking.Last();
+        var netFxCommonAssembliesFolder = TracerHomeDirectory / lastFramework.OutputFolder;
+        var netFxAssembliesFolder = TracerHomeDirectory / lastFramework.OutputFolder / lastFramework;
         var installTool = Solution.GetProjectByName(Projects.Tools.GacInstallTool);
 
         DotNetRun(s => s