Skip to content

Commit 96cdbca

Browse files
gpetrougpetrou
committed
Update TargetFrameworks
1 parent 4a6b9e8 commit 96cdbca

19 files changed

+1597
-2017
lines changed

‎.github/workflows/integration-jobs.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ jobs:
3838
steps:
3939
- name: Checkout
4040
uses: actions/checkout@v3
41-
- uses: actions/setup-dotnet@v3
41+
- uses: actions/setup-dotnet@v4
4242
with:
43-
dotnet-version: '6.0.403'
43+
dotnet-version: '8.0.100'
4444
- uses: actions/cache@v3
4545
with:
4646
path: ~/.nuget/packages

‎.github/workflows/make-bump.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ jobs:
3333
Updates ${{ github.event.inputs.branch }} to version ${{ github.event.inputs.version }}.
3434
labels: "infra,code-gen"
3535
# Add version and backport labels automatically
36-
- uses: actions/setup-dotnet@v3
36+
- uses: actions/setup-dotnet@v4
3737
with:
38-
dotnet-version: '6.0.403'
38+
dotnet-version: '8.0.100'
3939
- name: Install dotnet-script
4040
run: dotnet tool install release-notes --tool-path dotnet-tool
4141

‎.github/workflows/make-release-notes.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ jobs:
4949
with:
5050
ref: "${{ matrix.branch }}"
5151

52-
- uses: actions/setup-dotnet@v3
52+
- uses: actions/setup-dotnet@v4
5353
with:
54-
dotnet-version: '6.0.403'
54+
dotnet-version: '8.0.100'
5555
- name: Install dotnet-script
5656
run: dotnet tool install release-notes --tool-path dotnet-tool
5757

‎.github/workflows/stale-jobs.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ jobs:
2222
steps:
2323
- name: Checkout
2424
uses: actions/checkout@v3
25-
- uses: actions/setup-dotnet@v3
25+
- uses: actions/setup-dotnet@v4
2626
with:
27-
dotnet-version: '6.0.403'
27+
dotnet-version: '8.0.100'
2828
- uses: actions/cache@v3
2929
with:
3030
path: ~/.nuget/packages

‎.github/workflows/test-jobs.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ jobs:
2121
steps:
2222
- name: Checkout
2323
uses: actions/checkout@v3
24-
- uses: actions/setup-dotnet@v3
24+
- uses: actions/setup-dotnet@v4
2525
with:
26-
dotnet-version: '6.0.403'
26+
dotnet-version: '8.0.100'
2727
- uses: actions/cache@v3
2828
with:
2929
path: ~/.nuget/packages
@@ -51,9 +51,9 @@ jobs:
5151
steps:
5252
- name: Checkout
5353
uses: actions/checkout@v3
54-
- uses: actions/setup-dotnet@v3
54+
- uses: actions/setup-dotnet@v4
5555
with:
56-
dotnet-version: '6.0.403'
56+
dotnet-version: '8.0.100'
5757
- uses: actions/cache@v3
5858
with:
5959
path: ~/.nuget/packages

‎.github/workflows/unified-release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ jobs:
2626
steps:
2727
- name: Checkout
2828
uses: actions/checkout@v3
29-
- uses: actions/setup-dotnet@v3
29+
- uses: actions/setup-dotnet@v4
3030
with:
31-
dotnet-version: '6.0.403'
31+
dotnet-version: '8.0.100'
3232

3333
- run: "./.ci/make.sh assemble ${{ matrix.stack_version }}"
3434
name: Assemble ${{ matrix.stack_version }}

‎build/scripts/Benchmarking.fs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ module Benchmarker =
1818
let password = match args.CommandArguments with | Benchmark b -> b.Password | _ -> None
1919
let runInteractive = not args.NonInteractive
2020
let credentials = (username, password)
21-
let runCommandPrefix = "run -f net5.0 -c Release"
21+
let runCommandPrefix = "run -f net8.0 -c Release"
2222
let runCommand =
2323
match (runInteractive, url, credentials) with
2424
| (false, Some url, (Some username, Some password)) -> sprintf "%s -- --all \"%s\" \"%s\" \"%s\"" runCommandPrefix url username password

‎build/scripts/Documentation.fs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ module Documentation =
1313

1414
exception DocGenError of string
1515
let Generate args =
16-
let path = Paths.InplaceBuildOutput "DocGenerator" "net5.0"
16+
let path = Paths.InplaceBuildOutput "DocGenerator" "net8.0"
1717
let generator = sprintf "%s.dll" "DocGenerator"
1818

1919
printfn "==> %s" path

‎global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "6.0.403",
3+
"version": "8.0.100",
44
"rollForward": "minor",
55
"allowPrerelease": false
66
},

‎src/Elastic.Clients.Elasticsearch.JsonNetSerializer/Elastic.Clients.Elasticsearch.JsonNetSerializer.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<PropertyGroup>
1111
<IsPackable>true</IsPackable>
1212
<GenerateDocumentationFile>true</GenerateDocumentationFile>
13-
<TargetFrameworks>netstandard2.0;net461;netstandard2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
13+
<TargetFrameworks>netstandard2.0;net462;netstandard2.1;net6.0;net8.0</TargetFrameworks>
1414
</PropertyGroup>
1515
<ItemGroup>
1616
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />

‎src/Elastic.Clients.Elasticsearch.JsonNetSerializer/packages.lock.json

+7-214
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"version": 1,
33
"dependencies": {
4-
".NETCoreApp,Version=v3.1": {
4+
".NETFramework,Version=v4.6.2": {
55
"ConfigureAwaitChecker.Analyzer": {
66
"type": "Direct",
77
"requested": "[5.0.0.1, )",
@@ -26,162 +26,7 @@
2626
"resolved": "1.0.3",
2727
"contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
2828
"dependencies": {
29-
"Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.3"
30-
}
31-
},
32-
"Newtonsoft.Json": {
33-
"type": "Direct",
34-
"requested": "[13.0.1, )",
35-
"resolved": "13.0.1",
36-
"contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A=="
37-
},
38-
"Elastic.Transport": {
39-
"type": "Transitive",
40-
"resolved": "0.4.17",
41-
"contentHash": "T8QGwTt3E+5b3YCkctyp+aUzJRZKiKZbbngCvell9tqhqfN4Po+Fbsw2ilX5Qm0JFnoIUzpIFJyTK6mCVf4rkg==",
42-
"dependencies": {
43-
"Microsoft.CSharp": "4.7.0",
44-
"System.Buffers": "4.5.1",
45-
"System.Diagnostics.DiagnosticSource": "6.0.1",
46-
"System.Text.Json": "6.0.0",
47-
"System.Threading.Tasks.Extensions": "4.5.4"
48-
}
49-
},
50-
"Microsoft.Build.Tasks.Git": {
51-
"type": "Transitive",
52-
"resolved": "1.1.1",
53-
"contentHash": "AT3HlgTjsqHnWpBHSNeR0KxbLZD7bztlZVj7I8vgeYG9SYqbeFGh0TM/KVtC6fg53nrWHl3VfZFvb5BiQFcY6Q=="
54-
},
55-
"Microsoft.CSharp": {
56-
"type": "Transitive",
57-
"resolved": "4.7.0",
58-
"contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA=="
59-
},
60-
"Microsoft.NETFramework.ReferenceAssemblies.net461": {
61-
"type": "Transitive",
62-
"resolved": "1.0.3",
63-
"contentHash": "AmOJZwCqnOCNp6PPcf9joyogScWLtwy0M1WkqfEQ0M9nYwyDD7EX9ZjscKS5iYnyvteX7kzSKFCKt9I9dXA6mA=="
64-
},
65-
"Microsoft.SourceLink.AzureRepos.Git": {
66-
"type": "Transitive",
67-
"resolved": "1.1.1",
68-
"contentHash": "qB5urvw9LO2bG3eVAkuL+2ughxz2rR7aYgm2iyrB8Rlk9cp2ndvGRCvehk3rNIhRuNtQaeKwctOl1KvWiklv5w==",
69-
"dependencies": {
70-
"Microsoft.Build.Tasks.Git": "1.1.1",
71-
"Microsoft.SourceLink.Common": "1.1.1"
72-
}
73-
},
74-
"Microsoft.SourceLink.Bitbucket.Git": {
75-
"type": "Transitive",
76-
"resolved": "1.1.1",
77-
"contentHash": "cDzxXwlyWpLWaH0em4Idj0H3AmVo3L/6xRXKssYemx+7W52iNskj/SQ4FOmfCb8YQt39otTDNMveCZzYtMoucQ==",
78-
"dependencies": {
79-
"Microsoft.Build.Tasks.Git": "1.1.1",
80-
"Microsoft.SourceLink.Common": "1.1.1"
81-
}
82-
},
83-
"Microsoft.SourceLink.Common": {
84-
"type": "Transitive",
85-
"resolved": "1.1.1",
86-
"contentHash": "WMcGpWKrmJmzrNeuaEb23bEMnbtR/vLmvZtkAP5qWu7vQsY59GqfRJd65sFpBszbd2k/bQ8cs8eWawQKAabkVg=="
87-
},
88-
"Microsoft.SourceLink.GitHub": {
89-
"type": "Transitive",
90-
"resolved": "1.1.1",
91-
"contentHash": "IaJGnOv/M7UQjRJks7B6p7pbPnOwisYGOIzqCz5ilGFTApZ3ktOR+6zJ12ZRPInulBmdAf1SrGdDG2MU8g6XTw==",
92-
"dependencies": {
93-
"Microsoft.Build.Tasks.Git": "1.1.1",
94-
"Microsoft.SourceLink.Common": "1.1.1"
95-
}
96-
},
97-
"Microsoft.SourceLink.GitLab": {
98-
"type": "Transitive",
99-
"resolved": "1.1.1",
100-
"contentHash": "tvsg47DDLqqedlPeYVE2lmiTpND8F0hkrealQ5hYltSmvruy/Gr5nHAKSsjyw5L3NeM/HLMI5ORv7on/M4qyZw==",
101-
"dependencies": {
102-
"Microsoft.Build.Tasks.Git": "1.1.1",
103-
"Microsoft.SourceLink.Common": "1.1.1"
104-
}
105-
},
106-
"System.Buffers": {
107-
"type": "Transitive",
108-
"resolved": "4.5.1",
109-
"contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg=="
110-
},
111-
"System.Diagnostics.DiagnosticSource": {
112-
"type": "Transitive",
113-
"resolved": "6.0.1",
114-
"contentHash": "KiLYDu2k2J82Q9BJpWiuQqCkFjRBWVq4jDzKKWawVi9KWzyD0XG3cmfX0vqTQlL14Wi9EufJrbL0+KCLTbqWiQ==",
115-
"dependencies": {
116-
"System.Memory": "4.5.4",
117-
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
118-
}
119-
},
120-
"System.Memory": {
121-
"type": "Transitive",
122-
"resolved": "4.5.4",
123-
"contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw=="
124-
},
125-
"System.Runtime.CompilerServices.Unsafe": {
126-
"type": "Transitive",
127-
"resolved": "6.0.0",
128-
"contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
129-
},
130-
"System.Text.Encodings.Web": {
131-
"type": "Transitive",
132-
"resolved": "6.0.0",
133-
"contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==",
134-
"dependencies": {
135-
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
136-
}
137-
},
138-
"System.Text.Json": {
139-
"type": "Transitive",
140-
"resolved": "6.0.0",
141-
"contentHash": "zaJsHfESQvJ11vbXnNlkrR46IaMULk/gHxYsJphzSF+07kTjPHv+Oc14w6QEOfo3Q4hqLJgStUaYB9DBl0TmWg==",
142-
"dependencies": {
143-
"System.Runtime.CompilerServices.Unsafe": "6.0.0",
144-
"System.Text.Encodings.Web": "6.0.0"
145-
}
146-
},
147-
"System.Threading.Tasks.Extensions": {
148-
"type": "Transitive",
149-
"resolved": "4.5.4",
150-
"contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg=="
151-
},
152-
"elastic.clients.elasticsearch": {
153-
"type": "Project",
154-
"dependencies": {
155-
"Elastic.Transport": "[0.4.17, )"
156-
}
157-
}
158-
},
159-
".NETFramework,Version=v4.6.1": {
160-
"ConfigureAwaitChecker.Analyzer": {
161-
"type": "Direct",
162-
"requested": "[5.0.0.1, )",
163-
"resolved": "5.0.0.1",
164-
"contentHash": "jqOPPOJzHiUajPVGNw0MJzqUYLM3nHYEXEo1X91VqbwBqvq0+u8ASgcdmlmr4E9ffWJkjIo8vPEH9EMrKh69EQ=="
165-
},
166-
"DotNet.ReproducibleBuilds": {
167-
"type": "Direct",
168-
"requested": "[1.1.1, )",
169-
"resolved": "1.1.1",
170-
"contentHash": "+H2t/t34h6mhEoUvHi8yGXyuZ2GjSovcGYehJrS2MDm2XgmPfZL2Sdxg+uL2lKgZ4M6tTwKHIlxOob2bgh0NRQ==",
171-
"dependencies": {
172-
"Microsoft.SourceLink.AzureRepos.Git": "1.1.1",
173-
"Microsoft.SourceLink.Bitbucket.Git": "1.1.1",
174-
"Microsoft.SourceLink.GitHub": "1.1.1",
175-
"Microsoft.SourceLink.GitLab": "1.1.1"
176-
}
177-
},
178-
"Microsoft.NETFramework.ReferenceAssemblies": {
179-
"type": "Direct",
180-
"requested": "[1.0.3, )",
181-
"resolved": "1.0.3",
182-
"contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
183-
"dependencies": {
184-
"Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.3"
29+
"Microsoft.NETFramework.ReferenceAssemblies.net462": "1.0.3"
18530
}
18631
},
18732
"Newtonsoft.Json": {
@@ -220,10 +65,10 @@
22065
"resolved": "4.7.0",
22166
"contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA=="
22267
},
223-
"Microsoft.NETFramework.ReferenceAssemblies.net461": {
68+
"Microsoft.NETFramework.ReferenceAssemblies.net462": {
22469
"type": "Transitive",
22570
"resolved": "1.0.3",
226-
"contentHash": "AmOJZwCqnOCNp6PPcf9joyogScWLtwy0M1WkqfEQ0M9nYwyDD7EX9ZjscKS5iYnyvteX7kzSKFCKt9I9dXA6mA=="
71+
"contentHash": "IzAV30z22ESCeQfxP29oVf4qEo8fBGXLXSU6oacv/9Iqe6PzgHDKCaWfwMBak7bSJQM0F5boXWoZS+kChztRIQ=="
22772
},
22873
"Microsoft.SourceLink.AzureRepos.Git": {
22974
"type": "Transitive",
@@ -722,7 +567,7 @@
722567
}
723568
}
724569
},
725-
".NETCoreApp,Version=v5.0": {
570+
"net6.0": {
726571
"ConfigureAwaitChecker.Analyzer": {
727572
"type": "Direct",
728573
"requested": "[5.0.0.1, )",
@@ -759,25 +604,13 @@
759604
"Elastic.Transport": {
760605
"type": "Transitive",
761606
"resolved": "0.4.17",
762-
"contentHash": "T8QGwTt3E+5b3YCkctyp+aUzJRZKiKZbbngCvell9tqhqfN4Po+Fbsw2ilX5Qm0JFnoIUzpIFJyTK6mCVf4rkg==",
763-
"dependencies": {
764-
"Microsoft.CSharp": "4.7.0",
765-
"System.Buffers": "4.5.1",
766-
"System.Diagnostics.DiagnosticSource": "6.0.1",
767-
"System.Text.Json": "6.0.0",
768-
"System.Threading.Tasks.Extensions": "4.5.4"
769-
}
607+
"contentHash": "T8QGwTt3E+5b3YCkctyp+aUzJRZKiKZbbngCvell9tqhqfN4Po+Fbsw2ilX5Qm0JFnoIUzpIFJyTK6mCVf4rkg=="
770608
},
771609
"Microsoft.Build.Tasks.Git": {
772610
"type": "Transitive",
773611
"resolved": "1.1.1",
774612
"contentHash": "AT3HlgTjsqHnWpBHSNeR0KxbLZD7bztlZVj7I8vgeYG9SYqbeFGh0TM/KVtC6fg53nrWHl3VfZFvb5BiQFcY6Q=="
775613
},
776-
"Microsoft.CSharp": {
777-
"type": "Transitive",
778-
"resolved": "4.7.0",
779-
"contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA=="
780-
},
781614
"Microsoft.NETFramework.ReferenceAssemblies.net461": {
782615
"type": "Transitive",
783616
"resolved": "1.0.3",
@@ -824,54 +657,14 @@
824657
"Microsoft.SourceLink.Common": "1.1.1"
825658
}
826659
},
827-
"System.Buffers": {
828-
"type": "Transitive",
829-
"resolved": "4.5.1",
830-
"contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg=="
831-
},
832-
"System.Diagnostics.DiagnosticSource": {
833-
"type": "Transitive",
834-
"resolved": "6.0.1",
835-
"contentHash": "KiLYDu2k2J82Q9BJpWiuQqCkFjRBWVq4jDzKKWawVi9KWzyD0XG3cmfX0vqTQlL14Wi9EufJrbL0+KCLTbqWiQ==",
836-
"dependencies": {
837-
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
838-
}
839-
},
840-
"System.Runtime.CompilerServices.Unsafe": {
841-
"type": "Transitive",
842-
"resolved": "6.0.0",
843-
"contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
844-
},
845-
"System.Text.Encodings.Web": {
846-
"type": "Transitive",
847-
"resolved": "6.0.0",
848-
"contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==",
849-
"dependencies": {
850-
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
851-
}
852-
},
853-
"System.Text.Json": {
854-
"type": "Transitive",
855-
"resolved": "6.0.0",
856-
"contentHash": "zaJsHfESQvJ11vbXnNlkrR46IaMULk/gHxYsJphzSF+07kTjPHv+Oc14w6QEOfo3Q4hqLJgStUaYB9DBl0TmWg==",
857-
"dependencies": {
858-
"System.Runtime.CompilerServices.Unsafe": "6.0.0",
859-
"System.Text.Encodings.Web": "6.0.0"
860-
}
861-
},
862-
"System.Threading.Tasks.Extensions": {
863-
"type": "Transitive",
864-
"resolved": "4.5.4",
865-
"contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg=="
866-
},
867660
"elastic.clients.elasticsearch": {
868661
"type": "Project",
869662
"dependencies": {
870663
"Elastic.Transport": "[0.4.17, )"
871664
}
872665
}
873666
},
874-
"net6.0": {
667+
"net8.0": {
875668
"ConfigureAwaitChecker.Analyzer": {
876669
"type": "Direct",
877670
"requested": "[5.0.0.1, )",

0 commit comments

Comments
 (0)