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
15 changes: 4 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,15 @@ jobs:
- uses: actions/setup-dotnet@v1
with:
dotnet-version: |
8.0.x
6.0.x
- uses: actions/setup-dotnet@v1
with:
dotnet-version: '6.0.100'
source-url: https://nuget.pkg.github.com/nullean/index.json
env:
NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}

9.0.x

- run: ./build.sh build -s true
name: Build
- run: ./build.sh generatepackages -s true
name: Generate local nuget packages
- run: ./build.sh validatepackages -s true
name: "validate *.npkg files that were created"
- run: ./build.sh generateapichanges -s true
# name: "validate *.npkg files that were created"
# - run: ./build.sh generateapichanges -s true
name: "Inspect public API changes"

- name: publish to github package repository
Expand Down
13 changes: 6 additions & 7 deletions build/scripts/Targets.fs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ open CommandLine
open Fake.Tools.Git
open ProcNet


let exec binary args =
let r = Proc.Exec (binary, args |> List.map (fun a -> sprintf "\"%s\"" a) |> List.toArray)
match r.HasValue with | true -> r.Value | false -> failwithf "invocation of `%s` timed out" binary
Expand All @@ -18,7 +17,7 @@ let private currentVersion =
lazy(
restoreTools.Value |> ignore
let r = Proc.Start("dotnet", "minver", "-p", "canary.0")
let o = r.ConsoleOut |> Seq.find (fun l -> not(l.Line.StartsWith("MinVer:")))
let o = r.ConsoleOut |> Seq.find (fun l -> not(l.Line.StartsWith "MinVer:"))
o.Line
)

Expand Down Expand Up @@ -46,19 +45,19 @@ let private generatePackages (arguments:ParseResults<Arguments>) =

let private validatePackages (arguments:ParseResults<Arguments>) =
let nugetPackage =
let p = Paths.Output.GetFiles("*.nupkg") |> Seq.sortByDescending(fun f -> f.CreationTimeUtc) |> Seq.head
let p = Paths.Output.GetFiles "*.nupkg" |> Seq.sortByDescending(fun f -> f.CreationTimeUtc) |> Seq.head
Paths.RootRelative p.FullName
exec "dotnet" ["nupkg-validator"; nugetPackage; "-v"; currentVersionInformational.Value; "-a"; Paths.ToolName; "-k"; "96c599bbe3e70f5d"] |> ignore
exec "dotnet" ["nupkg-validator"; nugetPackage; "-v"; currentVersionInformational.Value; "-a"; Paths.ToolName; "-k"; "96c599bbe3e70f5d"; "--allow-roll-forward"] |> ignore

let private generateApiChanges (arguments:ParseResults<Arguments>) =
let output = Paths.RootRelative <| Paths.Output.FullName
let currentVersion = currentVersion.Value
let project = Paths.RootRelative Paths.ToolProject.FullName
let dotnetRun =[ "run"; "-c"; "Release"; "-f"; "net6.0"; "--project"; project]
let dotnetRun =[ "run"; "-c"; "Release"; "-f"; "net9.0"; "--project"; project]
let args =
[
(sprintf "previous-nuget|%s|%s|netcoreapp3.1" Paths.ToolName currentVersion);
(sprintf "directory|src/%s/bin/Release/net6.0" Paths.ToolName);
sprintf "previous-nuget|%s|%s|net8.0" Paths.ToolName currentVersion;
sprintf "directory|src/%s/bin/Release/net9.0" Paths.ToolName;
"--target"; Paths.ToolName; "-f"; "github-comment"; "--output"; output
]

Expand Down
6 changes: 3 additions & 3 deletions build/scripts/scripts.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Argu" Version="6.0.0" />
<PackageReference Include="Argu" Version="6.2.5" />
<PackageReference Include="Bullseye" Version="3.3.0" />
<PackageReference Include="Proc" Version="0.6.2" />
<PackageReference Include="Fake.Tools.Git" Version="5.15.0" />
<PackageReference Include="Fake.Tools.Git" Version="5.20.3" />
<PackageReference Update="MinVer" Version="4.3.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.100",
"version": "9.0.100",
"rollForward": "latestFeature",
"allowPrerelease": false
}
Expand Down
22 changes: 10 additions & 12 deletions src/assembly-differ/assembly-differ.csproj
Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
<AssemblyName>assembly-differ</AssemblyName>
<RootNamespace>AssemblyDiffer</RootNamespace>
<PackAsTool>true</PackAsTool>
<ToolCommandName>assembly-differ</ToolCommandName>

<RollForward>Major</RollForward>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\build\keys\keypair.snk</AssemblyOriginatorKeyFile>

<PackageIcon>nuget-icon.png</PackageIcon>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<RepositoryUrl>https://github.com/nullean/assembly-differ</RepositoryUrl>
<PackageProjectUrl>https://github.com/nullean/assembly-differ</PackageProjectUrl>
<PackageReleaseNotes>https://github.com/nullean/assembly-differ/releases</PackageReleaseNotes>

<Title>assembly-differ: a dotnet tool to diff assemblies</Title>
<Description>Diff assemblies and nuget packages</Description>

</PropertyGroup>

<ItemGroup>
Expand All @@ -30,18 +27,19 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Argu" Version="6.2.5" />
<PackageReference Include="Mono.Options" Version="5.3.0.1" />
<PackageReference Include="Proc" Version="0.3.7" />
<PackageReference Include="System.IO.Compression" Version="4.3.0" />

<PackageReference Include="NuGet.Frameworks" Version="5.11.5" />
<PackageReference Include="NuGet.Versioning" Version="5.11.5" />
<PackageReference Include="NuGet.Protocol" Version="5.11.5" />
<PackageReference Include="NuGet.Packaging" Version="5.11.5" />
<PackageReference Include="NuGet.Resolver" Version="5.11.5" />
<PackageReference Include="NuGet.Common" Version="5.11.5" />
<PackageReference Include="NuGet.Frameworks" Version="6.13.1" />
<PackageReference Include="NuGet.Versioning" Version="6.13.1" />
<PackageReference Include="NuGet.Protocol" Version="6.13.1" />
<PackageReference Include="NuGet.Packaging" Version="6.13.1" />
<PackageReference Include="NuGet.Resolver" Version="6.13.1" />
<PackageReference Include="NuGet.Common" Version="6.13.1" />
<PackageReference Update="MinVer" Version="4.3.0" />
</ItemGroup>

<ItemGroup>
<Reference Include="JustAssembly.API, Version=0.0.0.1, Culture=neutral, PublicKeyToken=null">
<HintPath>lib\JustAssembly.API.dll</HintPath>
Expand Down