-
Notifications
You must be signed in to change notification settings - Fork 145
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "Add workaround for dotnet/sdk#43339"
This reverts commit fa5202f.
- Loading branch information
1 parent
45b2a08
commit f663077
Showing
10 changed files
with
0 additions
and
297 deletions.
There are no files selected for viewing
26 changes: 0 additions & 26 deletions
26
tracer/src/Datadog.Trace.SourceGenerators/Directory.Build.props
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,30 +1,4 @@ | ||
| <Project> | ||
| <!-- Deliberately skipping parent directory props, note the "../../" --> | ||
| <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../../'))" /> | ||
|
|
||
| <!-- I HAVE NO WORDS --> | ||
| <!-- BEGIN workaround for https://github.com/dotnet/sdk/issues/43339; remove after updated to VS 17.12 or a future 17.11 patch --> | ||
| <Target Name="WorkaroundDotnetSdk43339" BeforeTargets="ResolvePackageAssets" Condition=" '$(MSBuildRuntimeType)' == 'Full' and $([MSBuild]::VersionLessThan($(MSBuildVersion), 17.12.0))"> | ||
| <PrimeSystemTextJson804 /> | ||
| </Target> | ||
| <UsingTask | ||
| TaskName="PrimeSystemTextJson804" | ||
| TaskFactory="RoslynCodeTaskFactory" | ||
| AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll" > | ||
| <Task> | ||
| <Code Type="Fragment" Language="cs"> | ||
| <![CDATA[ | ||
| try | ||
| { | ||
| System.Reflection.Assembly.LoadFrom(@"$(MicrosoftNETBuildTasksDirectoryRoot)\..\..\..\DotnetTools\dotnet-format\BuildHost-net472\System.Text.Json.dll"); | ||
| } | ||
| catch | ||
| { | ||
| // Best effort: if something moves in the SDK don't break the build. | ||
| } | ||
| ]]> | ||
| </Code> | ||
| </Task> | ||
| </UsingTask> | ||
| <!-- END workaround for https://github.com/dotnet/sdk/issues/43339 --> | ||
| </Project> |
26 changes: 0 additions & 26 deletions
26
tracer/src/Datadog.Trace.Tools.Analyzers/Directory.Build.props
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,30 +1,4 @@ | ||
| <Project> | ||
| <!-- Deliberately skipping parent directory props, note the "../../" --> | ||
| <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../../'))" /> | ||
|
|
||
| <!-- I HAVE NO WORDS --> | ||
| <!-- BEGIN workaround for https://github.com/dotnet/sdk/issues/43339; remove after updated to VS 17.12 or a future 17.11 patch --> | ||
| <Target Name="WorkaroundDotnetSdk43339" BeforeTargets="ResolvePackageAssets" Condition=" '$(MSBuildRuntimeType)' == 'Full' and $([MSBuild]::VersionLessThan($(MSBuildVersion), 17.12.0))"> | ||
| <PrimeSystemTextJson804 /> | ||
| </Target> | ||
| <UsingTask | ||
| TaskName="PrimeSystemTextJson804" | ||
| TaskFactory="RoslynCodeTaskFactory" | ||
| AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll" > | ||
| <Task> | ||
| <Code Type="Fragment" Language="cs"> | ||
| <![CDATA[ | ||
| try | ||
| { | ||
| System.Reflection.Assembly.LoadFrom(@"$(MicrosoftNETBuildTasksDirectoryRoot)\..\..\..\DotnetTools\dotnet-format\BuildHost-net472\System.Text.Json.dll"); | ||
| } | ||
| catch | ||
| { | ||
| // Best effort: if something moves in the SDK don't break the build. | ||
| } | ||
| ]]> | ||
| </Code> | ||
| </Task> | ||
| </UsingTask> | ||
| <!-- END workaround for https://github.com/dotnet/sdk/issues/43339 --> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
45 changes: 0 additions & 45 deletions
45
...st-applications/integrations/dependency-libs/Samples.ExampleLibrary/Directory.Build.props
This file was deleted.
Oops, something went wrong.
45 changes: 0 additions & 45 deletions
45
...lications/integrations/dependency-libs/Samples.ExampleLibraryTracer/Directory.Build.props
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters