Skip to content

Commit d78bafe

Browse files
committed
Update .netcore to .net8
1 parent d6fee24 commit d78bafe

File tree

6 files changed

+18
-21
lines changed

6 files changed

+18
-21
lines changed

build.fsx

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ let mutable dotnetExePath = "dotnet"
6767

6868
let buildDir = "bin"
6969
let buildDirNet461 = buildDir @@ "net461"
70-
let buildDirNetCore = buildDir @@ "netcoreapp2.1"
70+
let buildDirNet = buildDir @@ "net8"
7171
let buildDirBootstrapper = "bin_bootstrapper"
7272
let buildDirBootstrapperNet461 = buildDirBootstrapper @@ "net461"
73-
let buildDirBootstrapperNetCore = buildDirBootstrapper @@ "netcoreapp2.1"
73+
let buildDirBootstrapperNet = buildDirBootstrapper @@ "net8"
7474
let tempDir = "temp"
7575
let buildMergedDir = buildDir @@ "merged"
7676
let paketFile = buildMergedDir @@ "paket.exe"
@@ -116,10 +116,10 @@ Target "Clean" (fun _ ->
116116
++ "tests/**/bin"
117117
++ buildDir
118118
++ buildDirNet461
119-
++ buildDirNetCore
119+
++ buildDirNet
120120
++ buildDirBootstrapper
121121
++ buildDirBootstrapperNet461
122-
++ buildDirBootstrapperNetCore
122+
++ buildDirBootstrapperNet
123123
++ tempDir
124124
|> CleanDirs
125125

@@ -199,8 +199,8 @@ Target "Publish" (fun _ ->
199199
DotNetCli.Publish (fun c ->
200200
{ c with
201201
Project = "src/Paket"
202-
Framework = "netcoreapp2.1"
203-
Output = FullName (currentDirectory </> buildDirNetCore)
202+
Framework = "net8"
203+
Output = FullName (currentDirectory </> buildDirNet)
204204
ToolPath = dotnetExePath
205205
AdditionalArgs = publishArgs
206206
})
@@ -217,8 +217,8 @@ Target "Publish" (fun _ ->
217217
DotNetCli.Publish (fun c ->
218218
{ c with
219219
Project = "src/Paket.Bootstrapper"
220-
Framework = "netcoreapp2.1"
221-
Output = FullName (currentDirectory </> buildDirBootstrapperNetCore)
220+
Framework = "net8"
221+
Output = FullName (currentDirectory </> buildDirBootstrapperNet)
222222
ToolPath = dotnetExePath
223223
AdditionalArgs = publishArgs
224224
})
@@ -248,10 +248,10 @@ Target "RunTests" (fun _ ->
248248
})
249249

250250
runTest "net" "Paket.Tests" "net461"
251-
runTest "netcore" "Paket.Tests" "netcoreapp3.0"
251+
runTest "netcore" "Paket.Tests" "net8"
252252

253253
runTest "net" "Paket.Bootstrapper.Tests" "net461"
254-
runTest "netcore" "Paket.Bootstrapper.Tests" "netcoreapp3.0"
254+
runTest "netcore" "Paket.Bootstrapper.Tests" "net8"
255255
)
256256

257257
Target "QuickTest" (fun _ ->
@@ -355,7 +355,7 @@ Target "RunIntegrationTestsNetCore" (fun _ ->
355355
DotNetCli.Test (fun c ->
356356
{ c with
357357
Project = "integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj"
358-
Framework = "netcoreapp3.1"
358+
Framework = "net8"
359359
AdditionalArgs =
360360
[ "--filter"; (if testSuiteFilterFlakyTests then "TestCategory=Flaky" else "TestCategory!=Flaky")
361361
sprintf "--logger:trx;LogFileName=%s" ("tests_result/netcore/Paket.IntegrationTests/TestResult.trx" |> Path.GetFullPath) ]

integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>net461;net8</TargetFrameworks>
55
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
66
<DefineConstants Condition=" '$(TargetFramework)' != 'net461'">PAKET_NETCORE;NO_UNIT_PLATFORMATTRIBUTE;TESTSUITE_KNOWN_FAILURE_DOTNETCORE_3005;FAKE_NETSTANDARD_API;@(DefineConstants)</DefineConstants>
77
</PropertyGroup>

src/Paket.Bootstrapper/Paket.Bootstrapper.csproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
5+
<TargetFrameworks>net461;net8</TargetFrameworks>
66
<StartupObject>Paket.Bootstrapper.Program</StartupObject>
77
<AssemblyName>paket.bootstrapper</AssemblyName>
88
<ToolCommandName>paketbootstrapper</ToolCommandName>
@@ -15,8 +15,7 @@
1515
</PropertyGroup>
1616

1717
<PropertyGroup Condition=" '$(PackAsTool)' == 'true'">
18-
<TargetFrameworks></TargetFrameworks>
19-
<TargetFramework>netcoreapp2.1</TargetFramework>
18+
<TargetFramework>net8</TargetFramework>
2019
</PropertyGroup>
2120

2221
<ItemGroup Condition=" '$(PackAsTool)' == 'true'">

src/Paket/Paket.fsproj

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
4+
<TargetFrameworks>net461;net8</TargetFrameworks>
55
<PackageId>Paket</PackageId>
66
<AssemblyName>paket</AssemblyName>
77
<IsPackable>true</IsPackable>
88
</PropertyGroup>
99
<PropertyGroup Condition=" '$(PackAsTool)' == 'true' ">
10-
<!-- .net tools support netcoreapp only -->
11-
<TargetFrameworks></TargetFrameworks>
12-
<TargetFramework>netcoreapp2.1</TargetFramework>
10+
<TargetFramework>net8</TargetFramework>
1311
</PropertyGroup>
1412
<ItemGroup>
1513
<None Include="../../README.md" Pack="true" PackagePath="\"/>

tests/Paket.Bootstrapper.Tests/Paket.Bootstrapper.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Library</OutputType>
5-
<TargetFrameworks>net461;netcoreapp3.0</TargetFrameworks>
5+
<TargetFrameworks>net461;net8</TargetFrameworks>
66
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
77
</PropertyGroup>
88
<ItemGroup>

tests/Paket.Tests/Paket.Tests.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Library</OutputType>
5-
<TargetFrameworks>net461;net6</TargetFrameworks>
5+
<TargetFrameworks>net461;net8</TargetFrameworks>
66
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
77
<!-- these two properties are set for some tests around assembly metadata parsing.
88
they're written to the generated AssemblyInfo.fs -->

0 commit comments

Comments
 (0)