Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove net461 support from API and SDK #3191

Merged
merged 9 commits into from
Apr 15, 2022
Merged

Remove net461 support from API and SDK #3191

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f8dd71c
Remove net461 support from API and SDK
cijothomas Apr 15, 2022
1f13496
Add public api
cijothomas Apr 15, 2022
15c369a
api compat
cijothomas Apr 15, 2022
a415b87
Merge branch 'main' into cijothomas/removenet461_apisdk
cijothomas Apr 15, 2022
f59922f
correct chaneglog
cijothomas Apr 15, 2022
d9c87ae
clog
cijothomas Apr 15, 2022
b4bcad1
space
cijothomas Apr 15, 2022
6476320
Merge branch 'cijothomas/removenet461_apisdk' of https://github.com/c…
cijothomas Apr 15, 2022
3e6d9f7
space fix
cijothomas Apr 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ On all platforms, the minimum requirements are:
* Visual Studio 2022+ for Mac or Visual Studio Code

Mono might be required by your IDE but is not required by this project. This is
because unit tests targeting .NET Framework (i.e: `net461`) are disabled outside
because unit tests targeting .NET Framework (i.e: `net462`) are disabled outside
of Windows.

### Windows

* Visual Studio 2022+ or Visual Studio Code
* .NET Framework 4.6.1+
* .NET Framework 4.6.2+

### Public API

Expand Down
2 changes: 1 addition & 1 deletion docs/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
<!-- https://dotnet.microsoft.com/download/dotnet-framework -->
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net461;net462;net47;net471;net472;net48</TargetFrameworks>
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net462;net47;net471;net472;net48</TargetFrameworks>
</PropertyGroup>

<PropertyGroup Label="Package versions used in this folder">
Expand Down
0 ...i/.publicApi/net461/PublicAPI.Shipped.txt → ...i/.publicApi/net462/PublicAPI.Shipped.txt
View file
Open in desktop
File renamed without changes.
0 ....publicApi/net461/PublicAPI.Unshipped.txt → ....publicApi/net462/PublicAPI.Unshipped.txt
View file
Open in desktop
File renamed without changes.
3 changes: 3 additions & 0 deletions src/OpenTelemetry.Api/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## Unreleased

* Removes .NET Framework 4.6.1. The minimum .NET Framework
version supported is .NET 4.6.2. ([#2138](https://github.com/open-telemetry/opentelemetry-dotnet/issues/2138))

## 1.2.0

Released 2022-Apr-15
Expand Down
8 changes: 4 additions & 4 deletions src/OpenTelemetry.Api/OpenTelemetry.Api.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
<Description>OpenTelemetry .NET API</Description>
<RootNamespace>OpenTelemetry</RootNamespace>

<NoWarn>$(NoWarn),CS0618</NoWarn>
<MinVerTagPrefix>core-</MinVerTagPrefix>
</PropertyGroup>

<!--Do not run ApiCompat for net461 as this is newly added. There is no existing contract for net461 against which we could compare the implementation.
Remove this property once we have released a stable net461 version.-->
<PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
<!--Do not run ApiCompat for net462 as this is newly added. There is no existing contract for net462 against which we could compare the implementation.
Remove this property once we have released a stable net462 version.-->
<PropertyGroup Condition="'$(TargetFramework)' == 'net462'">
<RunApiCompat>false</RunApiCompat>
</PropertyGroup>

Expand Down
0 ...y/.publicApi/net461/PublicAPI.Shipped.txt → ...y/.publicApi/net462/PublicAPI.Shipped.txt
View file
Open in desktop
File renamed without changes.
0 ....publicApi/net461/PublicAPI.Unshipped.txt → ....publicApi/net462/PublicAPI.Unshipped.txt
View file
Open in desktop
File renamed without changes.
8 changes: 7 additions & 1 deletion src/OpenTelemetry/OpenTelemetry.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
<Description>OpenTelemetry .NET SDK</Description>
<!--
TODO: Disable this exception, and actually do document all public API.
Expand All @@ -10,6 +10,12 @@
<MinVerTagPrefix>core-</MinVerTagPrefix>
</PropertyGroup>

<!--Do not run ApiCompat for net462 as this is newly added. There is no existing contract for net462 against which we could compare the implementation.
Remove this property once we have released a stable net462 version.-->
<PropertyGroup Condition="'$(TargetFramework)' == 'net462'">
<RunApiCompat>false</RunApiCompat>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutablePkgVer)" />
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="$(SystemReflectionEmitLightweightPkgVer)" />
Expand Down
4 changes: 2 additions & 2 deletions test/OpenTelemetry.Tests/OpenTelemetry.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Description>Unit test project for OpenTelemetry</Description>
<!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net461</TargetFrameworks>
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we update the workflows now or will that be a seperate PR?

opentelemetry-dotnet/.github/workflows/windows-ci.yml

Lines 17 to 19 in 503d2b0

strategy:
matrix:
version: [net461,netcoreapp3.1,net5.0,net6.0]

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yea will do in follow ups.

<NoWarn>$(NoWarn),CS0618</NoWarn>
</PropertyGroup>

Expand Down