Skip to content

avoid left over artifacts #3

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
Martin521 merged 2 commits into from
Sep 1, 2025
Merged

avoid left over artifacts #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e872a6c
avoid artifact left-overs on error
Martin521 Sep 1, 2025
de6a1eb
change log
Martin521 Sep 1, 2025
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# CHANGELOG

## 1.0.4

### changed

* Avoid artifact left-over in certain error situations

## 1.0.3

### changed
Expand Down
22 changes: 12 additions & 10 deletions src/Runfs/Build.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ open Microsoft.Build.Evaluation
open Microsoft.Build.Execution
open Microsoft.Build.Framework
open Microsoft.Build.Logging
open Microsoft.Build.Locator
open System
open System.IO
open System.Xml
Expand All @@ -21,7 +20,7 @@ type Project =

type MSBuildError = MSBuildError of target: string * result: string

let initMSBuild() = MSBuildLocator.RegisterDefaults() |> ignore
let initMSBuild() = Microsoft.Build.Locator.MSBuildLocator.RegisterDefaults() |> ignore

let createProject verbose projectFilePath (projectFileText: string) : Project =
let verbosity = if verbose then "m" else "q"
Expand All @@ -46,14 +45,17 @@ let createProject verbose projectFilePath (projectFileText: string) : Project =
// let projectInstance = ProjectInstance.FromProjectRootElement(projectRoot, options)

File.WriteAllText(projectFilePath, projectFileText)
let projectInstance = ProjectInstance.FromFile(projectFilePath, options)

let parameters = BuildParameters projectCollection
parameters.Loggers <- loggers
parameters.LogTaskInputs <- false
let buildManager = BuildManager.DefaultBuildManager
buildManager.BeginBuild parameters
{buildManager = buildManager; projectInstance = projectInstance}
try
let projectInstance = ProjectInstance.FromFile(projectFilePath, options)
let parameters = BuildParameters projectCollection
parameters.Loggers <- loggers
parameters.LogTaskInputs <- false
let buildManager = BuildManager.DefaultBuildManager
buildManager.BeginBuild parameters
{buildManager = buildManager; projectInstance = projectInstance}
with ex ->
File.Delete projectFilePath
reraise()

let build target project =
let flags =
Expand Down
7 changes: 3 additions & 4 deletions src/Runfs/Runfs.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,10 @@
<ItemGroup>
<PackageReference Include="FSharp.SystemTextJson" Version="1.4.36" />
<PackageReference Include="FsToolkit.ErrorHandling" Version="5.0.1" />

<PackageReference Include="Microsoft.Build" Version="17.14.8" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Locator" Version="1.9.1" />
<!-- <PackageReference Include="Microsoft.Build" Version="17.15.0-preview-25277-114" />
<PackageReference Include="Microsoft.Build.Framework" Version="17.15.0-preview-25277-114" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.15.0-preview-25277-114" />
<PackageReference Include="Microsoft.Build.Runtime" Version="17.15.0-preview-25277-114" /> -->

<!-- <PackageReference Include="Microsoft.Build" Version="17.15.0-preview-25277-114" /> -->
</ItemGroup>
</Project>
Loading