Skip to content

Commit 8038ed2

Browse files
bednarbednar
authored
chore: change target framework monikers from netcoreapp to net (#433)
1 parent 9c54998 commit 8038ed2

File tree

8 files changed

+24
-21
lines changed

8 files changed

+24
-21
lines changed

‎.circleci/config.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
parameters:
6262
dotnet-image:
6363
type: string
64-
default: &default-dotnet-image "mcr.microsoft.com/dotnet/sdk:6.0"
64+
default: &default-dotnet-image "mcr.microsoft.com/dotnet/sdk:7.0"
6565
dotnet-target-version:
6666
type: string
6767
default: "netstandard2.1"
@@ -130,11 +130,11 @@ jobs:
130130
command: /c/influxdata/influxdb-1.8.0-1/influxd.exe -config "Scripts/influxdb.conf"
131131
background: true
132132
- run: |
133-
sed -i '/<TargetFrameworks>netcoreapp3.1;netcoreapp5.0;netcoreapp6.0<\/TargetFrameworks>/c\<TargetFramework>'netcoreapp5.0'<\/TargetFramework>' Client.Core.Test/Client.Core.Test.csproj
134-
sed -i '/<TargetFrameworks>netcoreapp3.1;netcoreapp5.0;netcoreapp6.0<\/TargetFrameworks>/c\<TargetFramework>'netcoreapp5.0'<\/TargetFramework>' Client.Test/Client.Test.csproj
135-
sed -i '/<TargetFrameworks>netcoreapp3.1;netcoreapp5.0;netcoreapp6.0<\/TargetFrameworks>/c\<TargetFramework>'netcoreapp5.0'<\/TargetFramework>' Client.Legacy.Test/Client.Legacy.Test.csproj
136-
sed -i '/<TargetFrameworks>netcoreapp3.1;netcoreapp5.0;netcoreapp6.0<\/TargetFrameworks>/c\<TargetFramework>'netcoreapp5.0'<\/TargetFramework>' Client.Linq.Test/Client.Linq.Test.csproj
137-
sed -i '/<TargetFrameworks>netcoreapp3.1;netcoreapp5.0;netcoreapp6.0<\/TargetFrameworks>/c\<TargetFramework>'netcoreapp5.0'<\/TargetFramework>' Examples/Examples.csproj
133+
sed -i '/<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0<\/TargetFrameworks>/c\<TargetFramework>'net5.0'<\/TargetFramework>' Client.Core.Test/Client.Core.Test.csproj
134+
sed -i '/<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0<\/TargetFrameworks>/c\<TargetFramework>'net5.0'<\/TargetFramework>' Client.Test/Client.Test.csproj
135+
sed -i '/<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0<\/TargetFrameworks>/c\<TargetFramework>'net5.0'<\/TargetFramework>' Client.Legacy.Test/Client.Legacy.Test.csproj
136+
sed -i '/<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0<\/TargetFrameworks>/c\<TargetFramework>'net5.0'<\/TargetFramework>' Client.Linq.Test/Client.Linq.Test.csproj
137+
sed -i '/<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0<\/TargetFrameworks>/c\<TargetFramework>'net5.0'<\/TargetFramework>' Examples/Examples.csproj
138138
- run: dotnet sln remove Examples/ExampleBlazor/ExampleBlazor.csproj
139139
- run: dotnet nuget locals --clear all
140140
- run: dotnet restore --no-cache --force -s https://api.nuget.org/v3/index.json
@@ -214,9 +214,9 @@ workflows:
214214
dotnet-image: "mcr.microsoft.com/dotnet/sdk:5.0"
215215
- tests-dotnet:
216216
name: dotnet-6.0
217+
dotnet-image: "mcr.microsoft.com/dotnet/sdk:6.0"
217218
- tests-dotnet:
218219
name: dotnet-7.0
219-
dotnet-image: "mcr.microsoft.com/dotnet/sdk:7.0"
220220
- tests-windows:
221221
name: dotnet-windows
222222
- deploy-preview:

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
## 4.9.0 [unreleased]
22

3+
### Others
4+
1. [#433](https://github.com/influxdata/influxdb-client-csharp/pull/433): Add `.NET 7.0` to supported `.NET` versions
5+
36
### Dependencies
47
Update dependencies:
58

‎Client.Core.Test/Client.Core.Test.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1;netcoreapp5.0;netcoreapp6.0</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
55
<LangVersion>8</LangVersion>
66

77
<IsPackable>false</IsPackable>
@@ -24,7 +24,7 @@
2424
</ItemGroup>
2525

2626
<PropertyGroup>
27-
<NetCore5PlusFrameworks>|netcoreapp5.0|netcoreapp6.0|</NetCore5PlusFrameworks>
27+
<NetCore5PlusFrameworks>|net5.0|net6.0|net7.0|</NetCore5PlusFrameworks>
2828
</PropertyGroup>
2929

3030
<ItemGroup Condition="$(NetCore5PlusFrameworks.Contains('|$(TargetFramework)|'))">

‎Client.Legacy.Test/Client.Legacy.Test.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1;netcoreapp5.0;netcoreapp6.0</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
55
<LangVersion>8</LangVersion>
66

77
<IsPackable>false</IsPackable>
@@ -21,7 +21,7 @@
2121
</ItemGroup>
2222

2323
<PropertyGroup>
24-
<NetCore5PlusFrameworks>|netcoreapp5.0|netcoreapp6.0|</NetCore5PlusFrameworks>
24+
<NetCore5PlusFrameworks>|net5.0|net6.0|net7.0|</NetCore5PlusFrameworks>
2525
</PropertyGroup>
2626

2727
<ItemGroup Condition="$(NetCore5PlusFrameworks.Contains('|$(TargetFramework)|'))">

‎Client.Linq.Test/Client.Linq.Test.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1;netcoreapp5.0;netcoreapp6.0</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
55
<LangVersion>8</LangVersion>
66

77
<IsPackable>false</IsPackable>
@@ -23,7 +23,7 @@
2323
</ItemGroup>
2424

2525
<PropertyGroup>
26-
<NetCore5PlusFrameworks>|netcoreapp5.0|netcoreapp6.0|</NetCore5PlusFrameworks>
26+
<NetCore5PlusFrameworks>|net5.0|net6.0|net7.0|</NetCore5PlusFrameworks>
2727
</PropertyGroup>
2828

2929
<ItemGroup Condition="$(NetCore5PlusFrameworks.Contains('|$(TargetFramework)|'))">

‎Client.Test/Client.Test.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1;netcoreapp5.0;netcoreapp6.0</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
55
<LangVersion>8</LangVersion>
66

77
<IsPackable>false</IsPackable>
@@ -24,7 +24,7 @@
2424
</ItemGroup>
2525

2626
<PropertyGroup>
27-
<NetCore5PlusFrameworks>|netcoreapp5.0|netcoreapp6.0|</NetCore5PlusFrameworks>
27+
<NetCore5PlusFrameworks>|net5.0|net6.0|net7.0|</NetCore5PlusFrameworks>
2828
</PropertyGroup>
2929

3030
<ItemGroup Condition="$(NetCore5PlusFrameworks.Contains('|$(TargetFramework)|'))">

‎Examples/Examples.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>netcoreapp3.1;netcoreapp5.0;netcoreapp6.0</TargetFrameworks>
5+
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
66
<LangVersion>8</LangVersion>
77
<VersionPrefix>4.9.0</VersionPrefix>
88
<VersionSuffix>dev</VersionSuffix>

‎Scripts/ci-test.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ echo "$NET_TEST_VERSION"
2020
DEFAULT_NET_TARGET_VERSION="netstandard2.1"
2121
NET_TARGET_VERSION="${NET_TARGET_VERSION:-$DEFAULT_NET_TARGET_VERSION}"
2222

23-
sed -i '/<TargetFrameworks>netcoreapp3.1;netcoreapp5.0;netcoreapp6.0<\/TargetFrameworks>/c\<TargetFramework>'"${NET_TEST_VERSION}"'<\/TargetFramework>' Client.Core.Test/Client.Core.Test.csproj
24-
sed -i '/<TargetFrameworks>netcoreapp3.1;netcoreapp5.0;netcoreapp6.0<\/TargetFrameworks>/c\<TargetFramework>'"${NET_TEST_VERSION}"'<\/TargetFramework>' Client.Test/Client.Test.csproj
25-
sed -i '/<TargetFrameworks>netcoreapp3.1;netcoreapp5.0;netcoreapp6.0<\/TargetFrameworks>/c\<TargetFramework>'"${NET_TEST_VERSION}"'<\/TargetFramework>' Client.Legacy.Test/Client.Legacy.Test.csproj
26-
sed -i '/<TargetFrameworks>netcoreapp3.1;netcoreapp5.0;netcoreapp6.0<\/TargetFrameworks>/c\<TargetFramework>'"${NET_TEST_VERSION}"'<\/TargetFramework>' Client.Linq.Test/Client.Linq.Test.csproj
27-
sed -i '/<TargetFrameworks>netcoreapp3.1;netcoreapp5.0;netcoreapp6.0<\/TargetFrameworks>/c\<TargetFramework>'"${NET_TEST_VERSION}"'<\/TargetFramework>' Examples/Examples.csproj
23+
sed -i '/<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0<\/TargetFrameworks>/c\<TargetFramework>'"${NET_TEST_VERSION}"'<\/TargetFramework>' Client.Core.Test/Client.Core.Test.csproj
24+
sed -i '/<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0<\/TargetFrameworks>/c\<TargetFramework>'"${NET_TEST_VERSION}"'<\/TargetFramework>' Client.Test/Client.Test.csproj
25+
sed -i '/<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0<\/TargetFrameworks>/c\<TargetFramework>'"${NET_TEST_VERSION}"'<\/TargetFramework>' Client.Legacy.Test/Client.Legacy.Test.csproj
26+
sed -i '/<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0<\/TargetFrameworks>/c\<TargetFramework>'"${NET_TEST_VERSION}"'<\/TargetFramework>' Client.Linq.Test/Client.Linq.Test.csproj
27+
sed -i '/<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0<\/TargetFrameworks>/c\<TargetFramework>'"${NET_TEST_VERSION}"'<\/TargetFramework>' Examples/Examples.csproj
2828

2929
sed -i '/<TargetFrameworks>netstandard2.0;netstandard2.1<\/TargetFrameworks>/c\<TargetFramework>'"${NET_TARGET_VERSION}"'<\/TargetFramework>' Client.Core/Client.Core.csproj
3030
sed -i '/<TargetFrameworks>netstandard2.0;netstandard2.1<\/TargetFrameworks>/c\<TargetFramework>'"${NET_TARGET_VERSION}"'<\/TargetFramework>' Client/Client.csproj

0 commit comments

Comments
 (0)