Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove workaround for .NET8 rc version
Browse files Browse the repository at this point in the history
Kielek committed Nov 15, 2023

Verified

This commit was signed with the committer’s verified signature.
Kielek Piotr Kiełkowicz
1 parent e63278d commit 2ba83ab
Showing 5 changed files with 4 additions and 13 deletions.
9 changes: 0 additions & 9 deletions build/Build.Steps.cs
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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,
Original file line number Diff line number Diff line change
@@ -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,
Original file line number Diff line number Diff line change
@@ -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,
Original file line number Diff line number Diff line change
@@ -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,

0 comments on commit 2ba83ab

Please sign in to comment.