Skip to content

Commit

Permalink
bye bye PowerShell
Browse files Browse the repository at this point in the history
  • Loading branch information
forki committed Apr 28, 2017
1 parent dc50c50 commit 255340a
Show file tree
Hide file tree
Showing 22 changed files with 7 additions and 2,721 deletions.
26 changes: 0 additions & 26 deletions Paket.PowerShell.sln

This file was deleted.

1 change: 1 addition & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
* BUGFIX: Proper encoding "+" in package download url - https://github.com/fsprojects/Paket/pull/2288
* BUGFIX: Paket failed when group is removed (or renamed) - https://github.com/fsprojects/Paket/pull/2281
* BUGFIX: Filter .targets / .props earlier - https://github.com/fsprojects/Paket/pull/2286
* BREAKING CHANGE: Paket.PowerShell is no longer supported
* BREAKING CHANGE: `InstallModel` API changed and Paket.Core.dll users might need to adapt
* USABILITY: Don't let build continue when paket failed - https://github.com/fsprojects/Paket/pull/2302

Expand Down
68 changes: 0 additions & 68 deletions build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ let tags = "nuget, bundler, F#"

// File system information
let solutionFile = "Paket.sln"
let solutionFilePowerShell = "Paket.PowerShell.sln"

// Pattern specifying assemblies to be tested using NUnit
let testAssemblies = "tests/**/bin/Release/*Tests*.dll"
Expand Down Expand Up @@ -79,7 +78,6 @@ let netcoreFiles = !! "src/**.preview?/*.fsproj" |> Seq.toList
let buildDir = "bin"
let tempDir = "temp"
let buildMergedDir = buildDir @@ "merged"
let buildMergedDirPS = buildDir @@ "Paket.PowerShell"

Environment.CurrentDirectory <- __SOURCE_DIRECTORY__
// Read additional information from the release notes document
Expand Down Expand Up @@ -272,22 +270,6 @@ Target "DotnetPackage" (fun _ ->
)


// --------------------------------------------------------------------------------------
// Build PowerShell project

Target "BuildPowerShell" (fun _ ->
if File.Exists "src/Paket.PowerShell/System.Management.Automation.dll" = false then
let result =
ExecProcess (fun info ->
info.FileName <- Path.Combine(Environment.SystemDirectory, @"WindowsPowerShell\v1.0\powershell.exe")
info.Arguments <- "-executionpolicy bypass -noprofile -file src/Paket.PowerShell/System.Management.Automation.ps1") System.TimeSpan.MaxValue
if result <> 0 then failwithf "Error copying System.Management.Automation.dll"

!! solutionFilePowerShell
|> MSBuildRelease "" "Rebuild"
|> ignore
)

// --------------------------------------------------------------------------------------
// Run the unit tests using test runner

Expand Down Expand Up @@ -372,32 +354,6 @@ Target "RunIntegrationTests" (fun _ ->
)
"Clean" ==> "Build" ==> "RunIntegrationTests"

Target "MergePowerShell" (fun _ ->
CreateDir buildMergedDirPS

let toPack =
mergeLibs @ ["Paket.PowerShell.dll"]
|> List.map (fun l -> buildDir @@ l)
|> separated " "

let result =
ExecProcess (fun info ->
info.FileName <- currentDirectory </> "packages" </> "build" </> "ILRepack" </> "tools" </> "ILRepack.exe"
info.Arguments <- sprintf "/verbose /lib:%s /out:%s %s" buildDir (buildMergedDirPS @@ "Paket.PowerShell.dll") toPack
) (TimeSpan.FromMinutes 5.)

if result <> 0 then failwithf "Error during ILRepack execution."

// copy psd1 & set version
CopyFile (buildMergedDirPS @@ "ArgumentTabCompletion.ps1") "src/Paket.PowerShell/ArgumentTabCompletion.ps1"
let psd1 = buildMergedDirPS @@ "Paket.PowerShell.psd1"
CopyFile psd1 "src/Paket.PowerShell/Paket.PowerShell.psd1"
use psd = File.AppendText psd1
psd.WriteLine ""
psd.WriteLine (sprintf "ModuleVersion = '%s'" release.AssemblyVersion)
psd.WriteLine "}"
)

Target "SignAssemblies" (fun _ ->
let pfx = "code-sign.pfx"
if not <| fileExists pfx then
Expand Down Expand Up @@ -446,27 +402,6 @@ Target "MergeDotnetCoreIntoNuget" (fun _ ->
runTool """mergenupkg --source "%s" --other "%s" --framework netstandard1.6 """ nupkg netcoreNupkg
)

Target "PublishChocolatey" (fun _ ->
let chocoDir = tempDir </> "Choco"
let files = !! (tempDir </> "*PowerShell*")
if isMono then
files
|> Seq.iter File.Delete
else
CleanDir chocoDir
files
|> CopyTo chocoDir

Paket.Push (fun p ->
{ p with
ToolPath = "bin/merged/paket.exe"
PublishUrl = "https://chocolatey.org/"
ApiKey = getBuildParam "ChocoKey"
WorkingDir = chocoDir })

CleanDir chocoDir
)

Target "PublishNuGet" (fun _ ->
if hasBuildParam "PublishBootstrapper" |> not then
!! (tempDir </> "*bootstrapper*")
Expand Down Expand Up @@ -624,7 +559,6 @@ Target "All" DoNothing
"Clean"
==> "AssemblyInfo"
==> "Build"
=?> ("BuildPowerShell", not isMono)
<=> "BuildCore"
==> "RunTests"
=?> ("GenerateReferenceDocs",isLocalBuild && not isMono)
Expand All @@ -635,7 +569,6 @@ Target "All" DoNothing
"All"
=?> ("RunIntegrationTests", not <| hasBuildParam "SkipIntegrationTests")
==> "MergePaketTool"
=?> ("MergePowerShell", not isMono)
==> "SignAssemblies"
=?> ("NuGet", not <| hasBuildParam "SkipNuGet")
=?> ("MergeDotnetCoreIntoNuget", not <| hasBuildParam "DISABLE_NETCORE" && not <| hasBuildParam "SkipNuGet")
Expand All @@ -653,7 +586,6 @@ Target "All" DoNothing
==> "KeepRunning"

"BuildPackage"
==> "PublishChocolatey"
==> "PublishNuGet"

"PublishNuGet"
Expand Down
4 changes: 2 additions & 2 deletions src/Paket.Bootstrapper/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
[assembly: AssemblyDescriptionAttribute("A dependency manager for .NET with support for NuGet packages and git repositories.")]
[assembly: AssemblyVersionAttribute("5.0.0")]
[assembly: AssemblyFileVersionAttribute("5.0.0")]
[assembly: AssemblyInformationalVersionAttribute("5.0.0-alpha006")]
[assembly: AssemblyInformationalVersionAttribute("5.0.0-alpha007")]
namespace System {
internal static class AssemblyVersionInformation {
internal const System.String AssemblyTitle = "Paket.Bootstrapper";
internal const System.String AssemblyProduct = "Paket";
internal const System.String AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories.";
internal const System.String AssemblyVersion = "5.0.0";
internal const System.String AssemblyFileVersion = "5.0.0";
internal const System.String AssemblyInformationalVersion = "5.0.0-alpha006";
internal const System.String AssemblyInformationalVersion = "5.0.0-alpha007";
}
}
4 changes: 2 additions & 2 deletions src/Paket.Core/AssemblyInfo.fs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ open System.Reflection
[<assembly: AssemblyDescriptionAttribute("A dependency manager for .NET with support for NuGet packages and git repositories.")>]
[<assembly: AssemblyVersionAttribute("5.0.0")>]
[<assembly: AssemblyFileVersionAttribute("5.0.0")>]
[<assembly: AssemblyInformationalVersionAttribute("5.0.0-alpha006")>]
[<assembly: AssemblyInformationalVersionAttribute("5.0.0-alpha007")>]
do ()

module internal AssemblyVersionInformation =
Expand All @@ -18,4 +18,4 @@ module internal AssemblyVersionInformation =
let [<Literal>] AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories."
let [<Literal>] AssemblyVersion = "5.0.0"
let [<Literal>] AssemblyFileVersion = "5.0.0"
let [<Literal>] AssemblyInformationalVersion = "5.0.0-alpha006"
let [<Literal>] AssemblyInformationalVersion = "5.0.0-alpha007"
49 changes: 0 additions & 49 deletions src/Paket.PowerShell/ArgumentTabCompletion.ps1

This file was deleted.

21 changes: 0 additions & 21 deletions src/Paket.PowerShell/AssemblyInfo.fs

This file was deleted.

38 changes: 0 additions & 38 deletions src/Paket.PowerShell/CmdletExt.fs

This file was deleted.

39 changes: 0 additions & 39 deletions src/Paket.PowerShell/EventSink.fs

This file was deleted.

Loading

0 comments on commit 255340a

Please sign in to comment.