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
1 change: 0 additions & 1 deletion .codex/hooks.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
{
"type": "command",
"command": "bash \"$(git rev-parse --show-toplevel)/.codex/hooks/format-csharp.sh\"",
"commandWindows": "powershell -NoProfile -ExecutionPolicy Bypass -Command \"$root = git rev-parse --show-toplevel; & (Join-Path $root '.codex/hooks/format-csharp.ps1')\"",
"timeout": 600,
"statusMessage": "Formatting C# with CSharpier"
}
Expand Down
14 changes: 0 additions & 14 deletions .codex/hooks/format-csharp.ps1

This file was deleted.

14 changes: 2 additions & 12 deletions .github/workflows/PrxCi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,8 @@ on:

jobs:
build:
strategy:
matrix:
os:
- windows
- linux
include:
- os: windows
build_platform: windows-2022
- os: linux
build_platform: ubuntu-24.04
name: Build & Test Prexonite on ${{ matrix.os }}
runs-on: ${{ matrix.build_platform }}
name: Build & Test Prexonite on Linux
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@v4
Expand Down
44 changes: 14 additions & 30 deletions .github/workflows/PrxRelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,13 @@ on:

jobs:
build:
strategy:
matrix:
os:
- windows
- linux
include:
- os: windows
build_platform: windows-2022
runtime_ident: win-x64
- os: linux
build_platform: ubuntu-24.04
runtime_ident: linux-x64
name: Release Prexonite on ${{ matrix.os }}
runs-on: ${{ matrix.build_platform }}
name: Release Prexonite for Linux
runs-on: ubuntu-24.04
permissions:
contents: write # required for creating a release
env:
DOTNET_NOLOGO: true
RUNTIME_IDENTIFIER: linux-x64

steps:
- name: Determine version
Expand All @@ -37,7 +26,7 @@ jobs:
# remove refs/tags/v prefix (11 characters)
ver="${ref:11}"
echo "Version: $ver"
echo "::set-output name=version::$ver"
echo "version=$ver" >> "$GITHUB_OUTPUT"
shell: bash
- uses: actions/checkout@v4
- name: Setup .NET SDK
Expand All @@ -56,39 +45,34 @@ jobs:
restore-keys: |
${{ runner.os }}-nuget
- name: Install dependencies
run: dotnet restore --runtime ${{ matrix.runtime_ident }} --lock-file-path=./packages.lock.json --verbosity=normal
run: dotnet restore --runtime ${{ env.RUNTIME_IDENTIFIER }} --lock-file-path=./packages.lock.json --verbosity=normal
- name: Build
run: dotnet build --configuration=Release --no-restore --verbosity=normal -p:Version=${{steps.determine-version.outputs.version}}
- name: Test
run: dotnet test --configuration=Release --no-restore --no-build --verbosity=normal -p:Version=${{steps.determine-version.outputs.version}}
- name: Pack (windows-only)
if: matrix.os == 'windows'
- name: Pack
run: dotnet pack --configuration=Release --no-restore --no-build --verbosity=normal -p:Version=${{steps.determine-version.outputs.version}}
- name: Publish
run: dotnet publish --configuration=Release --runtime ${{ matrix.runtime_ident }} --verbosity=normal -p:Version=${{steps.determine-version.outputs.version}}
run: dotnet publish --configuration=Release --runtime ${{ env.RUNTIME_IDENTIFIER }} --verbosity=normal -p:Version=${{steps.determine-version.outputs.version}}
- name: Prepare Binary ZIP
run: |
ver='${{steps.determine-version.outputs.version}}'
cd Prx/bin/Release/net10.0/${{ matrix.runtime_ident }} && \
cd Prx/bin/Release/net10.0/${{ env.RUNTIME_IDENTIFIER }} && \
mkdir zip-env && \
mv publish "zip-env/prexonite-v$ver"
shell: bash
- name: Binary ZIP
uses: thedoctor0/zip-release@0.6.1
with:
filename: prexonite-v${{steps.determine-version.outputs.version}}-${{ matrix.runtime_ident }}.zip
directory: Prx/bin/Release/net10.0/${{ matrix.runtime_ident }}/zip-env
- name: Push Prexonite Package (windows-only)
if: matrix.os == 'windows'
filename: prexonite-v${{steps.determine-version.outputs.version}}-${{ env.RUNTIME_IDENTIFIER }}.zip
directory: Prx/bin/Release/net10.0/${{ env.RUNTIME_IDENTIFIER }}/zip-env
- name: Push Prexonite Package
run: dotnet nuget push Prexonite/bin/Release/Prexonite.${{steps.determine-version.outputs.version}}.nupkg
- name: Push Prexonite Symbols Package (windows-only)
if: matrix.os == 'windows'
- name: Push Prexonite Symbols Package
run: dotnet nuget push Prexonite/bin/Release/Prexonite.${{steps.determine-version.outputs.version}}.snupkg
- name: Push Prx Package (windows-only)
if: matrix.os == 'windows'
- name: Push Prx Package
run: dotnet nuget push Prx/bin/Release/Prx.${{steps.determine-version.outputs.version}}.nupkg
- name: Push Prx Symbols Package (windows-only)
if: matrix.os == 'windows'
- name: Push Prx Symbols Package
run: dotnet nuget push Prx/bin/Release/Prx.${{steps.determine-version.outputs.version}}.snupkg
- name: Create Release
uses: ncipollo/release-action@v1.10.0
Expand Down
11 changes: 1 addition & 10 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,6 @@ _UpgradeReport_Files/
Backup*/
UpgradeLog*.XML

############
## Windows
############

# Windows image file caches
Thumbs.db

# Folder config file
Desktop.ini

# Ignore merge by-products
*.orig

Expand All @@ -92,6 +82,7 @@ Prexonite/Properties/Resources.Designer.cs

# Ignore NuGet packages folder
packages/*
.nuget/
codemap/*

# Ignore files designated local-only
Expand Down
Binary file removed .nuget/CredentialProvider.VSS.exe
Binary file not shown.
6 changes: 0 additions & 6 deletions .nuget/NuGet.Config

This file was deleted.

Binary file removed .nuget/NuGet.exe
Binary file not shown.
185 changes: 0 additions & 185 deletions .nuget/NuGet.targets

This file was deleted.

2 changes: 1 addition & 1 deletion Prexonite/Compiler/Internal/PathSet.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ static string canonical(string path)
if (!path.StartsWith(ResourceSpec.Prefix))
{
path = Path.GetFullPath(path);
if (OperatingSystem.IsMacOS() || OperatingSystem.IsWindows())
if (OperatingSystem.IsMacOS())
{
// PRX-58 This generalization is of course not correct, but there currently is no convenient API
// to get a canonical path.
Expand Down
2 changes: 1 addition & 1 deletion Prx/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ static void _runApplication(Engine engine, Application app, IEnumerable<string>

#region Stopwatch commands

//prx.exe provides these three additional commands for high speed access to a stopwatch from your script code
//prx provides these three additional commands for high speed access to a stopwatch from your script code
var timer = new Stopwatch();
engine.Commands.AddHostCommand(
@"timer\start",
Expand Down
5 changes: 1 addition & 4 deletions Prx/Prx.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@
<PropertyGroup>
<PublishSingleFile>true</PublishSingleFile>
<SelfContained>true</SelfContained>
<RuntimeIdentifier Condition="$([MSBuild]::IsOSPlatform('Windows'))"
>win-x64</RuntimeIdentifier>
<RuntimeIdentifier Condition="$([MSBuild]::IsOSPlatform('Linux'))"
>linux-x64</RuntimeIdentifier>
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
<!-- Ready to run makes a HUGE difference in terms of startup time.
Reduces startup time from ~820ms down to ~210ms. -->
<PublishReadyToRun>true</PublishReadyToRun>
Expand Down
Loading
Loading