diff --git a/build/Build.Steps.cs b/build/Build.Steps.cs index 82846ea773..86b1c47139 100644 --- a/build/Build.Steps.cs +++ b/build/Build.Steps.cs @@ -551,15 +551,6 @@ DotNetBuildSettings BuildTestApplication(DotNetBuildSettings x) => { WriteIndented = true })); - - // workaround for rc version - if (file!.Parent!.Name.Contains("8.0.0")) - { - var newDirectory = file.Parent.Parent / "8.0.0-rc.2.23479.6"; - newDirectory.CreateOrCleanDirectory(); - file.Move(newDirectory / file.Name); - file.Parent.DeleteDirectory(); - } }); // Cleanup Additional Deps Directory diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt index 03e19cb024..817f8d2b5e 100644 --- a/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt +++ b/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt @@ -1,7 +1,7 @@ [ /AdditionalDeps/shared/Microsoft.NETCore.App/6.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json, /AdditionalDeps/shared/Microsoft.NETCore.App/7.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json, - /AdditionalDeps/shared/Microsoft.NETCore.App/8.0.0-rc.2.23479.6/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json, + /AdditionalDeps/shared/Microsoft.NETCore.App/8.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json, /LICENSE, /instrument.sh, /linux-musl-x64/OpenTelemetry.AutoInstrumentation.Native.so, diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt index 3e8a218de3..6750878fa5 100644 --- a/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt +++ b/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt @@ -1,7 +1,7 @@ [ /AdditionalDeps/shared/Microsoft.NETCore.App/6.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json, /AdditionalDeps/shared/Microsoft.NETCore.App/7.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json, - /AdditionalDeps/shared/Microsoft.NETCore.App/8.0.0-rc.2.23479.6/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json, + /AdditionalDeps/shared/Microsoft.NETCore.App/8.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json, /LICENSE, /instrument.sh, /linux-x64/OpenTelemetry.AutoInstrumentation.Native.so, diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt index b58034a879..de05ffc2ba 100644 --- a/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt +++ b/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt @@ -1,7 +1,7 @@ [ /AdditionalDeps/shared/Microsoft.NETCore.App/6.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json, /AdditionalDeps/shared/Microsoft.NETCore.App/7.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json, - /AdditionalDeps/shared/Microsoft.NETCore.App/8.0.0-rc.2.23479.6/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json, + /AdditionalDeps/shared/Microsoft.NETCore.App/8.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json, /LICENSE, /instrument.sh, /net/Google.Protobuf.dll, diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt index c297165f10..9347c3ed52 100644 --- a/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt +++ b/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt @@ -1,7 +1,7 @@ [ \AdditionalDeps\shared\Microsoft.NETCore.App\6.0.0\OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json, \AdditionalDeps\shared\Microsoft.NETCore.App\7.0.0\OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json, - \AdditionalDeps\shared\Microsoft.NETCore.App\8.0.0-rc.2.23479.6\OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json, + \AdditionalDeps\shared\Microsoft.NETCore.App\8.0.0\OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json, \LICENSE, \instrument.sh, \net\Google.Protobuf.dll,