Skip to content

Commit 906529e

Browse files
committed
Bump version to 9.0.1
1 parent 5ce3e31 commit 906529e

File tree

16 files changed

+55
-41
lines changed

16 files changed

+55
-41
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 buildDirNet = buildDir @@ "net8"
70+
let buildDirNetCore = buildDir @@ "netcoreapp3.1"
7171
let buildDirBootstrapper = "bin_bootstrapper"
7272
let buildDirBootstrapperNet461 = buildDirBootstrapper @@ "net461"
73-
let buildDirBootstrapperNet = buildDirBootstrapper @@ "net8"
73+
let buildDirBootstrapperNetCore = buildDirBootstrapper @@ "netcoreapp2.1"
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-
++ buildDirNet
119+
++ buildDirNetCore
120120
++ buildDirBootstrapper
121121
++ buildDirBootstrapperNet461
122-
++ buildDirBootstrapperNet
122+
++ buildDirBootstrapperNetCore
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 = "net8"
203-
Output = FullName (currentDirectory </> buildDirNet)
202+
Framework = "netcoreapp3.1"
203+
Output = FullName (currentDirectory </> buildDirNetCore)
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 = "net8"
221-
Output = FullName (currentDirectory </> buildDirBootstrapperNet)
220+
Framework = "netcoreapp2.1"
221+
Output = FullName (currentDirectory </> buildDirBootstrapperNetCore)
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" "net8"
251+
runTest "netcore" "Paket.Tests" "netcoreapp3.0"
252252

253253
runTest "net" "Paket.Bootstrapper.Tests" "net461"
254-
runTest "netcore" "Paket.Bootstrapper.Tests" "net8"
254+
runTest "netcore" "Paket.Bootstrapper.Tests" "netcoreapp3.0"
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 = "net8"
358+
Framework = "netcoreapp3.1"
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/App.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<configuration>
33
<runtime>
44
<AppContextSwitchOverrides value="Switch.System.IO.UseLegacyPathHandling=false;Switch.System.IO.BlockLongPaths=false" />
5-
65

76
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
87
<dependentAssembly>

integrationtests/Paket.IntegrationTests/FsiExtension.fs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@ module FsiExtension =
2525
printfn "binding redirect for FSharp.Core..."
2626
typedefof<Map<_,_>>.Assembly
2727
else
28-
e.RequestingAssembly
28+
e.RequestingAssembly
2929
)
3030
let checker = FSharpChecker.Create(suggestNamesForErrors=true, keepAssemblyContents=true)
3131
let sourceText = """
3232
#r "paket: nuget FSharp.Data"
3333
let v = FSharp.Data.JsonValue.Boolean true
3434
"""
35-
let projectOptions =
35+
let projectOptions =
3636
checker.GetProjectOptionsFromScript("test.fsx", SourceText.ofString sourceText, otherFlags = [| "/langversion:preview"; sprintf "/compilertool:%s" pathToExtension |] )
3737
|> Async.RunSynchronously
3838
|> fst
39-
39+
4040
let _, answer = checker.ParseAndCheckFileInProject("test.fsx", 0, SourceText.ofString sourceText, projectOptions) |> Async.RunSynchronously
4141
match answer with
4242
| FSharpCheckFileAnswer.Succeeded(result) ->
@@ -67,7 +67,7 @@ module FsiExtension =
6767
p.WaitForExit()
6868
standardOutput, errorOutput
6969
{ file = fsxFile; stdOut = standardOutput; errOut = errorOutput; arguments = arguments }
70-
70+
7171
let runSingleFsxTest (fsxFile: FileInfo) =
7272

7373
let expectedOutput =
@@ -78,7 +78,7 @@ module FsiExtension =
7878
File.Create goldenFile |> ignore
7979
""
8080
let result = runSingleFsxTestForOutput fsxFile
81-
81+
8282
let actualOutput =
8383
(result.stdOut + result.errOut).Split([|System.Environment.NewLine|], System.StringSplitOptions.None)
8484
|> Array.filter (fun s -> not (s.StartsWith ":paket>"))
@@ -89,25 +89,25 @@ module FsiExtension =
8989
let actualOutput = normalizeCR actualOutput
9090
let expectedOutput = normalizeCR expectedOutput
9191
if actualOutput = expectedOutput then
92-
Pass fsxFile.FullName
93-
else
92+
Pass fsxFile.FullName
93+
else
9494
Failed(fsxFile.FullName, expectedOutput, actualOutput, result.arguments)
9595

9696
[<Test>]
9797
let ``run fsi integration tests that have deterministic output`` () =
9898
let fsxFiles = DirectoryInfo(fsxsFolder).GetFiles("*.fsx", SearchOption.AllDirectories)
99-
let failures =
99+
let failures =
100100
[|
101101
for fsx in fsxFiles do
102102
if not (fsx.Name.StartsWith "skip.") then
103-
103+
104104
match runSingleFsxTest fsx with
105105
| Pass _ -> printfn "OK: %s" fsx.FullName
106106
| Failed(file,_,_,commandArguments) ->
107107
printfn "KO: %s" fsx.FullName
108108
yield file, commandArguments
109109
|]
110-
110+
111111
if failures.Length > 0 then
112112
failures
113113
|> Array.map (fun (fsxFile, arguments) -> sprintf "file: %s\ncommand: %s" fsxFile arguments)

integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
<Compile Include="NugetDownloadSpecs.fs" />
1616
<Compile Include="InitSpecs.fs" />
1717
<Compile Include="InfoSpecs.fs" />
18-
<Compile Include="OutdatedSpecs.fs" />
1918
<Compile Include="NuGetV3Specs.fs" />
2019
<Compile Include="UpdatePackageSpecs.fs" />
2120
<Compile Include="UpdateGroupsSpecs.fs" />
2221
<Compile Include="AddSpecs.fs" />
22+
<Compile Include="OutdatedSpecs.fs" />
2323
<Compile Include="PackSpecs.fs" />
2424
<Compile Include="InstallSpecs.fs" />
2525
<Compile Include="RestoreSpecs.fs" />

integrationtests/Paket.IntegrationTests/TestHelper.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ let dotnetToolPath =
2121

2222
let paketToolPath =
2323
#if PAKET_NETCORE
24-
dotnetToolPath, FullName(__SOURCE_DIRECTORY__ + "../../../bin/net8/paket.dll")
24+
dotnetToolPath, FullName(__SOURCE_DIRECTORY__ + "../../../bin/netcoreapp2.1/paket.dll")
2525
#else
2626
"", FullName(__SOURCE_DIRECTORY__ + "../../../bin/net461/paket.exe")
2727
#endif
2828

2929
let paketBootstrapperToolPath =
3030
#if PAKET_NETCORE
31-
dotnetToolPath, FullName(__SOURCE_DIRECTORY__ + "../../../bin_bootstrapper/net8/paket.bootstrapper.dll")
31+
dotnetToolPath, FullName(__SOURCE_DIRECTORY__ + "../../../bin_bootstrapper/netcoreapp2.1/paket.bootstrapper.dll")
3232
#else
3333
"", FullName(__SOURCE_DIRECTORY__ + "../../../bin_bootstrapper/net461/paket.bootstrapper.exe")
3434
#endif

paket.dependencies

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ content: none
55

66
nuget Newtonsoft.Json >= 10.0.3 redirects: force
77
nuget Argu >= 5.1.0
8-
nuget FSharp.Core >= 6.0.3
8+
nuget FSharp.Core >= 6.0.3 redirects: force
99
nuget Chessie >= 0.6
1010
nuget Mono.Cecil ~> 0.11.1
1111

1212
nuget System.Security.Cryptography.ProtectedData >= 4.4
1313

1414
nuget NETStandard.Library ~> 2.0
15+
nuget Microsoft.NETCore.App ~> 2.1
1516
nuget System.Net.Http.WinHttpHandler >= 4.5
1617
nuget Nuget.Packaging
1718
nuget Microsoft.Win32.Registry
@@ -56,3 +57,7 @@ group Build
5657

5758
# add icon to exe
5859
github enricosada/add_icon_to_exe:e11eda501acea369ac2950beb34b8888495bf21f rh/ResourceHacker.exe
60+
61+
group FSharpDepManagerExtension
62+
source https://api.nuget.org/v3/index.json
63+
nuget FSharp.Core = 5.0.0 redirects: force

paket.lock

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -854,4 +854,8 @@ GITHUB
854854
modules/Octokit/Octokit.fsx (13eee5a7b990fa310813f9760094aa3cfebeb33f)
855855
Octokit (>= 0.20)
856856
remote: enricosada/add_icon_to_exe
857-
rh/ResourceHacker.exe (e11eda501acea369ac2950beb34b8888495bf21f)
857+
rh/ResourceHacker.exe (e11eda501acea369ac2950beb34b8888495bf21f)
858+
GROUP FSharpDepManagerExtension
859+
NUGET
860+
remote: https://api.nuget.org/v3/index.json
861+
FSharp.Core (5.0) - redirects: force
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
DotNet.ReproducibleBuilds
2+
3+
group FSharpDepManagerExtension
4+
25
FSharp.Core

src/Paket.Bootstrapper/Paket.Bootstrapper.csproj

Lines changed: 3 additions & 2 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;net8</TargetFrameworks>
5+
<TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
66
<StartupObject>Paket.Bootstrapper.Program</StartupObject>
77
<AssemblyName>paket.bootstrapper</AssemblyName>
88
<ToolCommandName>paketbootstrapper</ToolCommandName>
@@ -15,7 +15,8 @@
1515
</PropertyGroup>
1616

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

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

src/Paket.Core/app.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
43
<runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
54
<dependentAssembly>
65
<Paket>True</Paket>

0 commit comments

Comments
 (0)