Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ jobs:
with:
fetch-depth: 0

- name: Install .NET Core
uses: actions/setup-dotnet@v3
- name: Install .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.x
dotnet-version: 10.0.x

- name: Build
run: dotnet publish
run: dotnet publish .\PSCommander.slnx
10 changes: 5 additions & 5 deletions .github/workflows/production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ jobs:
with:
fetch-depth: 0

- name: Install .NET Core
uses: actions/setup-dotnet@v3
- name: Install .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.x
dotnet-version: 10.0.x

- name: Build
run: dotnet publish -o pscommander
run: dotnet publish .\pscommander\pscommander.csproj -o pscommander

- name: Release
run: Publish-Module -Path .\pscommander -NuGetApiKey $Env:APIKEY
env:
APIKEY: ${{ secrets.IMS_PSGALLERY }}
shell: pwsh
shell: pwsh
6 changes: 3 additions & 3 deletions AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ The solution has two projects:

## Important files and directories

- `PSCommander.sln`: solution entry point.
- `PSCommander.slnx`: solution entry point.
- `pscommander\PSCommander.psm1`: public PowerShell cmdlet functions such as `New-CommanderHotKey`, `New-CommanderSchedule`, `Start-Commander`, and `Register-CommanderDataSource`.
- `pscommander\PSCommander.psd1`: PowerShell module manifest.
- `pscommander\App.xaml.cs`: command-line argument parsing. Secondary invocations forward file association, shortcut, context menu, and protocol commands over named pipes.
Expand All @@ -28,7 +28,7 @@ The solution has two projects:
Run commands from the repository root unless noted.

```powershell
dotnet restore .\PSCommander.sln
dotnet restore .\PSCommander.slnx
dotnet publish
```

Expand All @@ -41,7 +41,7 @@ dotnet publish .\pscommander\pscommander.csproj
dotnet build .\pscommander.models\pscommander.models.csproj
```

This is a Windows-only WPF app (`net6.0-windows`, `UseWPF`, `UseWindowsForms`). Do not assume Linux/macOS validation will work.
This is a Windows-only WPF app (`net10.0-windows`, `UseWPF`, `UseWindowsForms`). Do not assume Linux/macOS validation will work.

## Runtime behavior to preserve

Expand Down
31 changes: 0 additions & 31 deletions PSCommander.sln

This file was deleted.

4 changes: 4 additions & 0 deletions PSCommander.slnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<Solution>
<Project Path="pscommander.models/pscommander.models.csproj" />
<Project Path="pscommander/pscommander.csproj" />
</Solution>
7 changes: 7 additions & 0 deletions global.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"sdk": {
"version": "10.0.100",
"rollForward": "latestFeature",
"allowPrerelease": false
}
}
8 changes: 4 additions & 4 deletions pscommander/pscommander.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<UseWPF>true</UseWPF>
<UseWindowsForms>true</UseWindowsForms>
<ApplicationIcon>Resources\icon.ico</ApplicationIcon>
Expand All @@ -16,8 +16,8 @@
<PackageReference Include="LiveCharts.Wpf" Version="0.9.7" />
<PackageReference Include="MaterialDesignColors" Version="2.0.0" />
<PackageReference Include="MaterialDesignThemes" Version="4.0.0" />
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.1.3" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.6.4" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
</ItemGroup>

<ItemGroup>
Expand All @@ -37,4 +37,4 @@
<Resource Include="Resources\icon.ico" />
</ItemGroup>

</Project>
</Project>
Loading