Skip to content

unify the setting of version + package metadata in the 461 and .net core builds of Paket #4083

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 15, 2021
Merged

unify the setting of version + package metadata in the 461 and .net core builds of Paket #4083

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 41 additions & 38 deletions build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,36 @@ Target "CleanDocs" (fun _ ->
// --------------------------------------------------------------------------------------
// Build library & test project

let releaseNotesProp releaseNotesLines =
let xn name = XName.Get(name)
let text = releaseNotesLines |> String.concat Environment.NewLine
let doc =
XDocument(
[ XComment("This document was automatically generated.") :> obj
XElement(xn "Project",
XElement(xn "PropertyGroup",
XElement(xn "PackageReleaseNotes", text)
)
) :> obj ]
)

let path = Path.GetTempFileName()
doc.Save(path)
path

let releaseNotesPath = releaseNotesProp release.Notes

let packageProps = [
sprintf "/p:Version=%s" release.NugetVersion
sprintf "/p:PackageReleaseNotesFile=%s" releaseNotesPath
]

Target "Build" (fun _ ->
DotNetCli.Build (fun c ->
{ c with
Project = solutionFile
ToolPath = dotnetExePath
AdditionalArgs = packageProps
})
)

Expand All @@ -156,13 +181,19 @@ Target "Restore" (fun _ ->
)

Target "Publish" (fun _ ->
let publishArgs =
[
"--no-build"
] // 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 = ["--no-build"]
AdditionalArgs = publishArgs
})

DotNetCli.Publish (fun c ->
Expand All @@ -171,15 +202,16 @@ Target "Publish" (fun _ ->
Framework = "netcoreapp2.1"
Output = FullName (currentDirectory </> buildDirNetCore)
ToolPath = dotnetExePath
AdditionalArgs = ["--no-build"]
AdditionalArgs = publishArgs
})

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

DotNetCli.Publish (fun c ->
Expand All @@ -188,7 +220,7 @@ Target "Publish" (fun _ ->
Framework = "netcoreapp2.1"
Output = FullName (currentDirectory </> buildDirBootstrapperNetCore)
ToolPath = dotnetExePath
AdditionalArgs = ["--no-build"]
AdditionalArgs = publishArgs
})
)
"Clean" ==> "Build" ?=> "Publish"
Expand Down Expand Up @@ -286,7 +318,7 @@ Target "MergePaketTool" (fun _ ->
let result =
ExecProcess (fun info ->
info.FileName <- currentDirectory </> "packages" </> "build" </> "ILRepack" </> "tools" </> "ILRepack.exe"
info.Arguments <- sprintf "/lib:%s /ver:%s /out:%s %s %s" buildDirNet461 release.AssemblyVersion paketFile primaryExe mergeLibs
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."
Expand Down Expand Up @@ -388,63 +420,34 @@ Target "AddIconToExe" (fun _ ->
if result <> 0 then failwithf "Error during adding icon %s to %s with %s %s" paketExeIcon paketFile rhPath args
)

let releaseNotesProp releaseNotesLines =
let xn name = XName.Get(name)
let text = releaseNotesLines |> String.concat Environment.NewLine
let doc =
XDocument(
[ XComment("This document was automatically generated.") :> obj
XElement(xn "Project",
XElement(xn "PropertyGroup",
XElement(xn "PackageReleaseNotes", text)
)
) :> obj ]
)

let path = Path.GetTempFileName()
doc.Save(path)
path

Target "NuGet" (fun _ ->
let releaseNotesPath = releaseNotesProp release.Notes

DotNetCli.Pack (fun c ->
{ c with
Project = "src/Paket.Core/Paket.Core.fsproj"
OutputPath = tempDir
AdditionalArgs =
[ sprintf "/p:Version=%s" release.NugetVersion
sprintf "/p:PackageReleaseNotesFile=%s" releaseNotesPath ]
AdditionalArgs = packageProps
ToolPath = dotnetExePath
})

DotNetCli.Pack (fun c ->
{ c with
Project = "src/Paket/Paket.fsproj"
OutputPath = tempDir
AdditionalArgs =
[ sprintf "/p:Version=%s" release.NugetVersion
sprintf "/p:PackageReleaseNotesFile=%s" releaseNotesPath
"/p:PackAsTool=true" ]
AdditionalArgs = packageProps @ [ "/p:PackAsTool=true" ]
ToolPath = dotnetExePath
})
DotNetCli.Pack (fun c ->
{ c with
Project = "src/Paket.Bootstrapper/Paket.Bootstrapper.csproj"
OutputPath = tempDir
AdditionalArgs =
[ sprintf "/p:Version=%s" release.NugetVersion
sprintf "/p:PackageReleaseNotesFile=%s" releaseNotesPath
"/p:PackAsTool=true"]
AdditionalArgs = packageProps @ [ "/p:PackAsTool=true" ]
ToolPath = dotnetExePath
})
DotNetCli.Pack (fun c ->
{ c with
Project = "src/FSharp.DependencyManager.Paket/FSharp.DependencyManager.Paket.fsproj"
OutputPath = tempDir
AdditionalArgs =
[ sprintf "/p:Version=%s" release.NugetVersion
sprintf "/p:PackageReleaseNotesFile=%s" releaseNotesPath ]
AdditionalArgs = packageProps
ToolPath = dotnetExePath
})
)
Expand Down