Skip to content
Open
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
24 changes: 9 additions & 15 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,25 +73,19 @@ jobs:
git tag --list
- uses: actions/setup-dotnet@v5
with:
dotnet-version: |
10.0.x

# Build the local Nullean.Make.Fs DLL (only needed while it isn't on NuGet yet;
# once published, replace with #r "nuget: Nullean.Make.Fs" in build.fsx)
- run: dotnet build src/Nullean.Make.Fs/Nullean.Make.Fs.fsproj -c Release
name: Build Nullean.Make.Fs (local reference bootstrap)
global-json-file: ./global.json

- run: ./build.fsx build -s
- run: dotnet run build.cs -- build -s
name: Build
- run: ./build.fsx test -s
- run: dotnet run build.cs -- test -s
name: Test
- run: ./build.fsx schema validate -s
- run: dotnet run build.cs -- schema validate -s
name: Validate schema/argh-cli-schema.json is up to date
- run: ./build.fsx pkg generate -s
- run: dotnet run build.cs -- pkg generate -s
name: Generate local nuget packages
- run: ./build.fsx pkg validate -s
- run: dotnet run build.cs -- pkg validate -s
name: "Validate *.nupkg files that were created"
- run: ./build.fsx generate-api-changes -s
- run: dotnet run build.cs -- generate-api-changes -s
name: "Inspect public API changes"

- name: Publish to GitHub Package Repository
Expand All @@ -100,10 +94,10 @@ jobs:
run: |
until dotnet nuget push 'build/output/*.nupkg' -s https://nuget.pkg.github.com/nullean/index.json -k ${{secrets.GITHUB_TOKEN}} --skip-duplicate --no-symbols; do echo "Retrying"; sleep 1; done;

- run: ./build.fsx generate-release-notes -s
- run: dotnet run build.cs -- generate-release-notes -s
name: Generate release notes for tag
if: github.event_name == 'push' && startswith(github.ref, 'refs/tags')
- run: ./build.fsx create-release-on-github -s --token ${{secrets.GITHUB_TOKEN}}
- run: dotnet run build.cs -- create-release-on-github -s --token ${{secrets.GITHUB_TOKEN}}
if: github.event_name == 'push' && startswith(github.ref, 'refs/tags')
name: Create or update release for tag on GitHub

Expand Down
2 changes: 0 additions & 2 deletions Argh.slnx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
<Project Path="build/scripts/scripts.fsproj" />

<File Path="build.cs" />
<File Path="build.fsx" />
</Folder>
<Folder Name="/src/">
<Project Path="src/Nullean.Argh.Interfaces/Nullean.Argh.Interfaces.csproj" />
Expand All @@ -22,7 +21,6 @@
<Project Path="src/Nullean.Argh.Generator/Nullean.Argh.Generator.csproj" />
<Project Path="src/Nullean.Argh.Hosting/Nullean.Argh.Hosting.csproj" />
<Project Path="src/Nullean.Make/Nullean.Make.csproj" />
<Project Path="src/Nullean.Make.Fs/Nullean.Make.Fs.fsproj" />
</Folder>
<Folder Name="/examples/">
<Project Path="examples/ArghAotSmoketest/ArghAotSmoketest.csproj" />
Expand Down
10 changes: 0 additions & 10 deletions build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,6 @@
// ReSharper disable ArrangeTypeMemberModifiers
// ReSharper disable ArrangeTypeModifiers

// ── constants ─────────────────────────────────────────────────────────────────

Target Clean = _ => _
.Description("Delete build output")
.Executes(() =>
{
if (Output.Exists) Output.Delete(true);
Proc.Exec("dotnet", new[] { "clean" });
});

await MakeApp.Execute<Make>(args);

// ── per-target DTOs ───────────────────────────────────────────────────────────
Expand Down
236 changes: 0 additions & 236 deletions build.fsx

This file was deleted.

2 changes: 1 addition & 1 deletion build/scripts/Targets.fs
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ let private generateApiChanges (arguments:ParseResults<Arguments>) =
/// Unified artifacts layout (<UseArtifactsOutput>): `.artifacts/bin/<Project>/release[_<tfm>]/`.
let assembliesDir (packageId: string) =
match packageId with
| "Nullean.Argh.Hosting" | "Nullean.Argh.Interfaces" ->
| "Nullean.Argh.Hosting" | "Nullean.Argh.Interfaces" | "Nullean.Argh.Core" ->
sprintf ".artifacts/bin/%s/release_%s" packageId Paths.MainTFM
| _ -> sprintf ".artifacts/bin/%s/release" packageId
let nugetPackages =
Expand Down
2 changes: 1 addition & 1 deletion build/scripts/scripts.fsproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<IsPackable>false</IsPackable>
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion examples/ArghAotSmoketest/ArghAotSmoketest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<RootNamespace>ArghAotSmoketest</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion examples/Basic/Basic.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<RootNamespace>Basic</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion examples/Hosted/Hosted.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<RootNamespace>Hosted</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion examples/HostedRoot/HostedRoot.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<RootNamespace>HostedRoot</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion examples/MakeBuild/MakeBuild.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
Expand Down
2 changes: 1 addition & 1 deletion examples/XmlDocShowcase/XmlDocShowcase.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<RootNamespace>XmlDocShowcase</RootNamespace>
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"sdk": {
"version": "10.0.100",
"version": "11.0.100-preview.7.26381.103",
"rollForward": "latestFeature",
"allowPrerelease": false
"allowPrerelease": true
}
}
Loading
Loading