Skip to content

Commit fbc23a8

Browse files
Merge branch 'main' into main
2 parents 24071f0 + a55a5ac commit fbc23a8

File tree

3 files changed

+1
-19
lines changed

3 files changed

+1
-19
lines changed

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
close-pr-message: 'Closed as inactive. Feel free to reopen if this PR is still being worked on.'
1919
operations-per-run: 400
2020
days-before-pr-stale: 7
21-
days-before-issue-stale: 600
21+
days-before-issue-stale: 450
2222
days-before-pr-close: 7
2323
days-before-issue-close: 7
2424
exempt-all-issue-milestones: true

src/Directory.Build.targets

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,6 @@
1616
<EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)"/>
1717
</ItemGroup>
1818

19-
<ItemGroup Condition="'$(TargetFramework)'=='$(NetFrameworkMinimumSupportedVersion)'">
20-
<!--ImplicitUsings will add this namespace that is not available for NetFX.
21-
https://github.com/dotnet/sdk/issues/24146
22-
https://github.com/dotnet/runtime/issues/59163
23-
https://github.com/dotnet/sdk/issues/22515
24-
-->
25-
<Using Remove="System.Net.Http" />
26-
</ItemGroup>
27-
2819
<ItemGroup Condition="'$(IsPackable)' == 'true'">
2920
<None Include="$(PackagePrimaryLicenseFile)"
3021
PackagePath="$([System.IO.Path]::GetFileName('$(PackagePrimaryLicenseFile)'))"

test/Directory.Build.targets

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,6 @@
22

33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'OpenTelemetry.sln'))\build\Common.targets" />
44

5-
<ItemGroup Condition="'$(TargetFramework)'=='$(NetFrameworkMinimumSupportedVersion)'">
6-
<!--ImplicitUsings will add this namespace that is not available for NetFX.
7-
https://github.com/dotnet/sdk/issues/24146
8-
https://github.com/dotnet/runtime/issues/59163
9-
https://github.com/dotnet/sdk/issues/22515
10-
-->
11-
<Using Remove="System.Net.Http" />
12-
</ItemGroup>
13-
145
<ItemGroup Condition="'$(ReferenceCoyotePackages)' == 'true'">
156
<PackageReference Include="Microsoft.Coyote" />
167

0 commit comments

Comments
 (0)