Skip to content

Commit

Permalink
Remove .NET Core 2.1 support, bump up to 1.4.368 (#1645)
Browse files Browse the repository at this point in the history
* remove .NET  Core 2.1 support
* remove netcoreapp2.1 task from devops pipeline
  • Loading branch information
mregen committed Dec 21, 2021
1 parent c6742ad commit 5bcadf4
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
4 changes: 0 additions & 4 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,6 @@ stages:
framework: net462
agents: '@{ windows = "windows-2019" }'
jobnamesuffix: net462
- template: .azurepipelines/test.yml
parameters:
framework: netcoreapp2.1
configuration: Release
- template: .azurepipelines/test.yml
parameters:
configuration: Release
Expand Down
2 changes: 1 addition & 1 deletion common.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<Product>OPC UA .NET Standard Library</Product>
<RepositoryUrl>https://github.com/OPCFoundation/UA-.NETStandard</RepositoryUrl>
<VersionPrefix>1.04.360</VersionPrefix>
<VersionPrefix>1.04.368</VersionPrefix>
<VersionSuffix>preview-$([System.DateTime]::Now.ToString("yyyyMMdd"))</VersionSuffix>
<Copyright>Copyright © 2004-2021 OPC Foundation, Inc</Copyright>
<Company>OPC Foundation</Company>
Expand Down
18 changes: 11 additions & 7 deletions targets.props
Original file line number Diff line number Diff line change
@@ -1,29 +1,33 @@
<Project>
<!-- Uncomment to suppress warning that .NET Core 2.1 is used with .NET 6 library. -->
<!--
<PropertyGroup>
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
</PropertyGroup>
-->
<Choose>
<!-- Visual Studio 2022 -->
<!-- Note: .NET Core 2.x is end of life, removed netcoreapp2.1 from any target. -->
<!-- Visual Studio 2022, supports .NET Framework 4.6.2, .NET Core 3.1 and .NET 6 -->
<When Condition="'$(VisualStudioVersion)' == '17.0'">
<PropertyGroup>
<AppTargetFrameworks>net6.0;netcoreapp3.1;net462</AppTargetFrameworks>
<AppTargetFramework>net6.0</AppTargetFramework>
<TestsTargetFrameworks>net462;netcoreapp2.1;netcoreapp3.1;net6.0</TestsTargetFrameworks>
<TestsTargetFrameworks>net462;netcoreapp3.1;net6.0</TestsTargetFrameworks>
<LibTargetFrameworks>net462;netstandard2.0;netstandard2.1;net6.0</LibTargetFrameworks>
<LibxTargetFrameworks>net462;netcoreapp2.1;netstandard2.1;net6.0</LibxTargetFrameworks>
<LibxTargetFrameworks>net462;netstandard2.1;net6.0</LibxTargetFrameworks>
</PropertyGroup>
</When>
<!-- Visual Studio 2019 -->
<!-- Visual Studio 2019, supports .NET Framework 4.6.2 and .NET Core 3.1 -->
<When Condition="'$(VisualStudioVersion)' == '16.0'">
<PropertyGroup>
<AppTargetFrameworks>netcoreapp3.1;net462</AppTargetFrameworks>
<AppTargetFramework>netcoreapp3.1</AppTargetFramework>
<TestsTargetFrameworks>net462;netcoreapp2.1;netcoreapp3.1</TestsTargetFrameworks>
<TestsTargetFrameworks>net462;netcoreapp3.1</TestsTargetFrameworks>
<LibTargetFrameworks>net462;netstandard2.0;netstandard2.1</LibTargetFrameworks>
<LibxTargetFrameworks>net462;netcoreapp2.1;netstandard2.1</LibxTargetFrameworks>
<LibxTargetFrameworks>net462;netstandard2.1</LibxTargetFrameworks>
</PropertyGroup>
</When>
<!-- Visual Studio 2017 and earlier, support only .NET framework 4.6.2 because .NET Core 2.x is end of life.-->
<!-- Visual Studio 2017 and earlier, support only .NET Framework 4.6.2 because .NET Core 2.x is end of life. -->
<Otherwise>
<PropertyGroup>
<AppTargetFrameworks>net462</AppTargetFrameworks>
Expand Down
2 changes: 1 addition & 1 deletion version.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
"version": "1.4.367-preview",
"version": "1.4.368-preview",
"versionHeightOffset": 0,
"nugetPackageVersion": {
"semVer": 2
Expand Down

0 comments on commit 5bcadf4

Please sign in to comment.