Skip to content

Commit

Permalink
Bump version to 9.0.0-alpha001
Browse files Browse the repository at this point in the history
  • Loading branch information
forki committed Nov 13, 2024
1 parent e5a50ef commit 352dcc1
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 75 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"paket": {
"version": "8.0.3",
"version": "8.1.0-alpha004",
"commands": [
"paket"
],
Expand Down
3 changes: 2 additions & 1 deletion RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#### 8.1.0-alpha005 - 2024-03-25
#### 9.0.0-alpha001 - 2024-11-13
* Support for .NET 9.0 - https://github.com/fsprojects/Paket/pull/4248
* Added support for central package managments to fix issue about [references: strict either does not work, or does not work as expected](https://github.com/fsprojects/Paket/issues/2257)

#### 8.1.0-alpha004 - 2024-06-19
Expand Down
71 changes: 3 additions & 68 deletions build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ let tags = "nuget, bundler, F#"
let solutionFile = "Paket.sln"

// Pattern specifying assemblies to be tested using NUnit
let testAssemblies = "tests/**/bin/Release/net461/*Tests*.dll"
let integrationTestAssemblies = "integrationtests/Paket.IntegrationTests/bin/Release/net461/*Tests*.dll"

// Git configuration (used for publishing documentation in gh-pages branch)
// The profile where the project is posted
Expand All @@ -66,10 +64,8 @@ let mutable dotnetExePath = "dotnet"
// --------------------------------------------------------------------------------------

let buildDir = "bin"
let buildDirNet461 = buildDir @@ "net461"
let buildDirNet = buildDir @@ "net8"
let buildDirBootstrapper = "bin_bootstrapper"
let buildDirBootstrapperNet461 = buildDirBootstrapper @@ "net461"
let buildDirBootstrapperNet = buildDirBootstrapper @@ "net8"
let tempDir = "temp"
let buildMergedDir = buildDir @@ "merged"
Expand Down Expand Up @@ -114,11 +110,8 @@ Target "InstallDotNetCore" (fun _ ->
Target "Clean" (fun _ ->
!! "src/**/bin"
++ "tests/**/bin"
++ buildDir
++ buildDirNet461
++ buildDirNet
++ buildDirBootstrapper
++ buildDirBootstrapperNet461
++ buildDirBootstrapperNet
++ tempDir
|> CleanDirs
Expand Down Expand Up @@ -187,15 +180,6 @@ Target "Publish" (fun _ ->
] // since no build, we have to ensure that the build sets assemblyinfo correctly, especially because the publish output of this step
// is used in the ILRepack of the .net executable

DotNetCli.Publish (fun c ->
{ c with
Project = "src/Paket"
Framework = "net461"
Output = FullName (currentDirectory </> buildDirNet461)
ToolPath = dotnetExePath
AdditionalArgs = publishArgs
})

DotNetCli.Publish (fun c ->
{ c with
Project = "src/Paket"
Expand All @@ -205,15 +189,6 @@ Target "Publish" (fun _ ->
AdditionalArgs = publishArgs
})

DotNetCli.Publish (fun c ->
{ c with
Project = "src/Paket.Bootstrapper"
Framework = "net461"
Output = FullName (currentDirectory </> buildDirBootstrapperNet461)
ToolPath = dotnetExePath
AdditionalArgs = publishArgs
})

DotNetCli.Publish (fun c ->
{ c with
Project = "src/Paket.Bootstrapper"
Expand Down Expand Up @@ -247,10 +222,8 @@ Target "RunTests" (fun _ ->
ToolPath = dotnetExePath
})

runTest "net" "Paket.Tests" "net461"
runTest "netcore" "Paket.Tests" "net8"

runTest "net" "Paket.Bootstrapper.Tests" "net461"
runTest "netcore" "Paket.Bootstrapper.Tests" "net8"
)

Expand Down Expand Up @@ -283,46 +256,9 @@ Target "QuickIntegrationTests" (fun _ ->

Target "MergePaketTool" (fun _ ->
CreateDir buildMergedDir
let inBuildDirNet461 (file: string) = buildDirNet461 @@ file

// syntax for ilrepack requires the 'primary' assembly to be the first positional argument, so we enforce that by not making
// paket.exe part of the ordered 'component' libraries
let primaryExe = inBuildDirNet461 "paket.exe"

let mergeLibs =
[
"Argu.dll"
"Chessie.dll"
"Fake.Core.ReleaseNotes.dll"
"FSharp.Core.dll"
"Mono.Cecil.dll"
"Newtonsoft.Json.dll"
"NuGet.Common.dll"
"NuGet.Configuration.dll"
"NuGet.Frameworks.dll"
"NuGet.Packaging.dll"
"NuGet.Versioning.dll"
"Paket.Core.dll"
"System.Buffers.dll"
"System.Configuration.ConfigurationManager.dll"
"System.Memory.dll"
"System.Net.Http.WinHttpHandler.dll"
"System.Numerics.Vectors.dll"
"System.Runtime.CompilerServices.Unsafe.dll"
"System.Security.Cryptography.Cng.dll"
"System.Security.Cryptography.Pkcs.dll"
"System.Threading.Tasks.Extensions.dll"
]
|> List.map inBuildDirNet461
|> separated " "

let result =
ExecProcess (fun info ->
info.FileName <- currentDirectory </> "packages" </> "build" </> "ILRepack" </> "tools" </> "ILRepack.exe"
info.Arguments <- sprintf "/copyattrs /lib:%s /ver:%s /out:%s %s %s" buildDirNet461 release.AssemblyVersion paketFile primaryExe mergeLibs
) (TimeSpan.FromMinutes 5.)

if result <> 0 then failwithf "Error during ILRepack execution."
() // no more ILRepack
)
"Publish" ==> "MergePaketTool"

Expand All @@ -335,7 +271,7 @@ Target "RunIntegrationTestsNet" (fun _ ->
DotNetCli.Test (fun c ->
{ c with
Project = "integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj"
Framework = "net461"
Framework = "net8"
AdditionalArgs =
[ "--filter"; (if testSuiteFilterFlakyTests then "TestCategory=Flaky" else "TestCategory!=Flaky")
sprintf "--logger:trx;LogFileName=%s" ("tests_result/net/Paket.IntegrationTests/TestResult.trx" |> Path.GetFullPath) ]
Expand Down Expand Up @@ -470,7 +406,7 @@ Target "PublishNuGet" (fun _ ->
// --------------------------------------------------------------------------------------
// Generate the documentation

let disableDocs = false // https://github.com/fsprojects/FSharp.Formatting/issues/461
let disableDocs = true // https://github.com/fsprojects/FSharp.Formatting/issues/461

let fakePath = __SOURCE_DIRECTORY__ @@ "packages" @@ "build" @@ "FAKE" @@ "tools" @@ "FAKE.exe"
let fakeStartInfo fsiargs script workingDirectory args environmentVars =
Expand Down Expand Up @@ -657,7 +593,6 @@ Target "ReleaseGitHub" (fun _ ->
|> uploadFile "./bin/merged/paket.exe"
|> uploadFile "./bin/merged/paket-sha256.txt"
|> uploadFile "./src/FSharp.DependencyManager.Paket/bin/Release/netstandard2.0/FSharp.DependencyManager.Paket.dll"
|> uploadFile "./bin_bootstrapper/net461/paket.bootstrapper.exe"
|> uploadFile ".paket/paket.targets"
|> uploadFile ".paket/Paket.Restore.targets"
|> uploadFile (tempDir </> sprintf "Paket.%s.nupkg" (release.NugetVersion))
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.403",
"version": "9.0.100",
"rollForward": "latestMinor"
}
}
4 changes: 2 additions & 2 deletions src/Paket.Bootstrapper/Paket.Bootstrapper.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net461;net8</TargetFrameworks>
<TargetFrameworks>net8</TargetFrameworks>
<StartupObject>Paket.Bootstrapper.Program</StartupObject>
<AssemblyName>paket.bootstrapper</AssemblyName>
<ToolCommandName>paketbootstrapper</ToolCommandName>
Expand All @@ -19,7 +19,7 @@
</PropertyGroup>

<ItemGroup Condition=" '$(PackAsTool)' == 'true'">
<Content Include="..\..\bin_bootstrapper\net461\paket.bootstrapper.exe">
<Content Include="..\..\bin_bootstrapper\net8\paket.bootstrapper.exe">
<Pack>true</Pack>
<PackagePath>tools</PackagePath>
<Visible>true</Visible>
Expand Down
2 changes: 1 addition & 1 deletion src/Paket/Paket.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net461;net8</TargetFrameworks>
<TargetFrameworks>net8</TargetFrameworks>
<PackageId>Paket</PackageId>
<AssemblyName>paket</AssemblyName>
<IsPackable>true</IsPackable>
Expand Down
2 changes: 1 addition & 1 deletion tests/Paket.Tests/Paket.Tests.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>net461;net8</TargetFrameworks>
<TargetFrameworks>net8</TargetFrameworks>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<!-- these two properties are set for some tests around assembly metadata parsing.
they're written to the generated AssemblyInfo.fs -->
Expand Down

0 comments on commit 352dcc1

Please sign in to comment.