Skip to content

Commit

Permalink
Remove dependency on non-existent packages
Browse files Browse the repository at this point in the history
  • Loading branch information
Jaykul committed Oct 28, 2023
1 parent 36d2ac9 commit 71e8de3
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 7 deletions.
3 changes: 0 additions & 3 deletions Build.build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
8 changes: 6 additions & 2 deletions Pansies.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,12 @@
<PackageReference Include="PowerShellStandard.Library" Version="5.1.0" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="lib\p2f\src\CodeOwls.PowerShell\CodeOwls.PowerShell.Paths\CodeOwls.PowerShell.Paths.csproj" />
<ProjectReference Include="lib\p2f\src\CodeOwls.PowerShell\CodeOwls.PowerShell.Provider\CodeOwls.PowerShell.Provider.csproj" />
<ProjectReference
Include="lib\p2f\src\CodeOwls.PowerShell\CodeOwls.PowerShell.Paths\CodeOwls.PowerShell.Paths.csproj"
PrivateAssets="All" />
<ProjectReference
Include="lib\p2f\src\CodeOwls.PowerShell\CodeOwls.PowerShell.Provider\CodeOwls.PowerShell.Provider.csproj"
PrivateAssets="All" />
</ItemGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion Source/Pansies.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -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 = @()
Expand Down
1 change: 0 additions & 1 deletion build.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@
# The rest of the paths are relative to the manifest
OutputDirectory = ".."
VersionedOutputDirectory = $true
CopyDirectories = @('../assemblies')
}

0 comments on commit 71e8de3

Please sign in to comment.