Skip to content
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

Jump to bottom

#64 upgrade to terminal gui 1.17.1 #65

Merged
merged 1 commit into from
Jul 31, 2024
Merged

#64 upgrade to terminal gui 1.17.1 #65

Show file tree
Hide file tree
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
11 changes: 2 additions & 9 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,5 @@ jobs:
with:
dotnet-version: 6.0.x

- name: Build .NET Standard 2.1
run: dotnet build -c Release -f netstandard2.1

- name: Build .NET Framework 4.7.2
run: dotnet build -c Release -f net472

- name: List build artifacts
shell: pwsh
run: Get-ChildItem -Path .\bin\Release -Recurse
- name: Build
run: dotnet publish
9 changes: 3 additions & 6 deletions .github/workflows/production.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,13 @@ jobs:
with:
dotnet-version: 6.0.x

- name: Build .NET Standard 2.1
run: dotnet build -c Release -f netstandard2.1

- name: Build .NET Framework 4.7.2
run: dotnet build -c Release -f net472
- name: Build
run: dotnet publish -o psedit

- name: Release
run: |
Install-Module Microsoft.PowerShell.PSResourceGet -Scope CurrentUser -Force
Publish-PSResource -Path .\bin\Release -ApiKey $Env:APIKEY
Publish-PSResource -Path .\psedit -ApiKey $Env:APIKEY
env:
APIKEY: ${{ secrets.APIKEY }}
shell: pwsh
4 changes: 2 additions & 2 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"-Command",
"& { Import-Module .\\psedit.psd1; Show-PSEditor}"
],
"cwd": "${workspaceFolder}\\bin\\Debug",
"cwd": "${workspaceFolder}\\bin\\Debug\\netstandard2.0\\publish",
"console": "externalTerminal",
"stopAtEntry": false
},
Expand All @@ -30,7 +30,7 @@
"-Command",
"& { Import-Module .\\psedit.psd1; Show-PSEditor}"
],
"cwd": "${workspaceFolder}\\bin\\Debug",
"cwd": "${workspaceFolder}\\bin\\Debug\\netstandard2.0\\publish",
"console": "externalTerminal",
"stopAtEntry": false
},
Expand Down
2 changes: 1 addition & 1 deletion .vscode/tasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"command": "dotnet",
"type": "shell",
"args": [
"build",
"publish",
// Ask dotnet build to generate full paths for file names.
"/property:GenerateFullPaths=true",
// Do not generate summary otherwise it leads to duplicate errors in Problems panel
Expand Down
45 changes: 8 additions & 37 deletions psedit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,48 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.1;net472</TargetFrameworks>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="PowerShellStandard.Library" Version="5.1.1" />
<PackageReference Include="Terminal.Gui" Version="1.16.0" />
<PackageReference Include="Terminal.Gui" Version="1.17.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

<!-- Output paths for Debug configuration -->
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)'=='Debug|netstandard2.1'">
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<OutputPath>bin\Debug\coreclr\</OutputPath>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)'=='Debug|net472'">
<OutputPath>bin\Debug\clr\</OutputPath>
</PropertyGroup>

<Target Name="CopyAdditionalFiles" AfterTargets="Build" Condition="'$(Configuration)' == 'Debug'">
<!-- Copy psedit.psd1 to the root output directory -->
<Copy SourceFiles="psedit.psd1"
DestinationFolder="bin\Debug"
SkipUnchangedFiles="true" />
</Target>

<!-- Output paths for Release configuration -->
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)'=='Release|netstandard2.1'">
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<OutputPath>bin\Release\coreclr\</OutputPath>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)'=='Release|net472'">
<OutputPath>bin\Release\clr\</OutputPath>
</PropertyGroup>

<Target Name="CopyAdditionalFilesRelease" AfterTargets="Build" Condition="'$(Configuration)' == 'Release'">
<!-- Copy psedit.psd1 to the root output directory -->
<Copy SourceFiles="psedit.psd1"
DestinationFolder="bin\Release"
SkipUnchangedFiles="true" />
</Target>
<ItemGroup>
<None Include="psedit.psd1">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>

</Project>
</Project>
9 changes: 1 addition & 8 deletions psedit.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,7 @@
@{

# Script module or binary module file associated with this manifest.
RootModule = if($PSEdition -eq 'Core')
{
'coreclr\psedit.dll'
}
else # Desktop
{
'clr\psedit.dll'
}
RootModule = 'psedit.dll'
# Version number of this module.
ModuleVersion = '0.0.7'

Expand Down
Loading