diff --git a/Build.build.ps1 b/Build.build.ps1 index 28728fa..0fbcd5c 100644 --- a/Build.build.ps1 +++ b/Build.build.ps1 @@ -41,9 +41,6 @@ $InformationPreference = "Continue" # The name of the module to publish $script:PSModuleName = "TerminalBlocks" -# The DotNetPublishRoot is the "publish" folder within the OutputRoot (used for dotnet publish output) -$script:DotNetPublishRoot ??= Join-Path $script:BuildRoot assemblies - $Tasks = "Tasks", "../Tasks", "../../Tasks" | Convert-Path -ErrorAction Ignore | Select-Object -First 1 Write-Information "$($PSStyle.Foreground.BrightCyan)Found shared tasks in $Tasks" -Tag "InvokeBuild" ## Self-contained build script - can be invoked directly or via Invoke-Build diff --git a/Earthfile b/Earthfile index 44bd00e..146a90a 100644 --- a/Earthfile +++ b/Earthfile @@ -12,6 +12,8 @@ ARG --global TEMP_ROOT=/temp # These are my common build args, used in my shared /Tasks repo ARG --global MODULE_NAME=Pansies ARG --global CONFIGURATION=Release +ARG --global PSMODULE_PUBLISH_KEY +ARG --global NUGET_API_KEY deps: # Dotnet tools and scripts installed by PSGet @@ -54,3 +56,4 @@ test: publish: FROM +build RUN ["pwsh", "--command", "Invoke-Build", "-Task", "Publish", "-File", "Build.build.ps1"] + SAVE ARTIFACT $OUTPUT_ROOT/publish AS LOCAL ./output/publish diff --git a/Pansies.csproj b/Pansies.csproj index ef8c30a..d1d7464 100644 --- a/Pansies.csproj +++ b/Pansies.csproj @@ -48,8 +48,12 @@ - - + + diff --git a/Source/Pansies.psd1 b/Source/Pansies.psd1 index cbf33f1..1eb281b 100644 --- a/Source/Pansies.psd1 +++ b/Source/Pansies.psd1 @@ -37,7 +37,7 @@ Description = 'A PowerShell module for handling color and cursor positioning via FormatsToProcess = @("Pansies.format.ps1xml") # Modules to import as nested modules of the module specified in RootModule/ModuleToProcess -NestedModules = @( "assemblies/Pansies.dll" ) +NestedModules = @( "lib/Pansies.dll" ) # Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export. FunctionsToExport = @() diff --git a/build.psd1 b/build.psd1 index 2dded46..ceccad0 100644 --- a/build.psd1 +++ b/build.psd1 @@ -3,5 +3,4 @@ # The rest of the paths are relative to the manifest OutputDirectory = ".." VersionedOutputDirectory = $true - CopyDirectories = @('../assemblies') }