From a07a71c0d4ae86d07f58cfbc1e97b48e228f11dc Mon Sep 17 00:00:00 2001 From: kevin Date: Mon, 12 Jun 2023 21:35:21 -0400 Subject: .NET 7 and NativeAOT Builds Removed .NET 6 builds. Added .NET 7 and NativeAOT builds. --- .github/workflows/dev.yml | 15 +++++++++--- .github/workflows/release.yml | 17 ++++++++++---- Inveigh/Inveigh.csproj | 27 +++++++++++++++------- Inveigh/Program.cs | 2 +- .../Quiddity/Listeners/NetBIOSNSListener.cs | 2 +- .../Protocols/Quiddity/Quiddity/Quiddity.csproj | 8 +++---- 6 files changed, 50 insertions(+), 21 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 61245b0..6ad0b21 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -39,9 +39,9 @@ jobs: - name: Publish - Trimmed/Single File run: | VERSION=${{ github.ref_name }} - dotnet publish -r linux-x64 -f net7.0 -p:AssemblyName=inveigh -c debug - dotnet publish -r osx-x64 -f net7.0 -p:AssemblyName=inveigh -c debug - dotnet publish -r win-x64 -f net7.0 -c debug + dotnet publish --self-contained=true -p:PublishSingleFile=true -p:PublishTrimmed=true -r linux-x64 -f net7.0 -p:AssemblyName=inveigh -c debug + dotnet publish --self-contained=true -p:PublishSingleFile=true -p:PublishTrimmed=true -r osx-x64 -f net7.0 -p:AssemblyName=inveigh -c debug + dotnet publish --self-contained=true -p:PublishSingleFile=true -p:PublishTrimmed=true -r win-x64 -f net7.0 -c debug - name: Zip - Publish run: | @@ -49,6 +49,15 @@ jobs: tar -czvf Inveigh-net7.0-osx-x64-trimmed-single-dev.tar.gz --directory=$PWD/Inveigh/bin/debug/net7.0/osx-x64/publish/ . 7z a -tzip -mx9 Inveigh-net7.0-win-x64-trimmed-single-dev.zip $PWD/Inveigh/bin/debug/net7.0/win-x64/publish/* + - name: Publish - NativeAOT + run: | + VERSION=${{ github.ref_name }} + dotnet publish -p:Version=${VERSION:1} -r win-x64 -f net7.0 -p:PublishAot=true -c debug + + - name: Zip - Publish - NativeAOT + run: | + 7z a -tzip -mx9 Inveigh-net7.0-win-x64-nativeaot-${{ github.ref_name }}.zip $PWD/Inveigh/bin/debug/net7.0/win-x64/native/* + - name: Release .zip if: "! startsWith(github.event_name, 'pull_request')" uses: softprops/action-gh-release@v1 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c69117f..55fef8d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,16 +38,25 @@ jobs: - name: Publish - Trimmed/Single File run: | VERSION=${{ github.ref_name }} - dotnet publish -p:Version=${VERSION:1} -r linux-x64 -f net7.0 -p:AssemblyName=inveigh -c release - dotnet publish -p:Version=${VERSION:1} -r osx-x64 -f net7.0 -p:AssemblyName=inveigh -c release - dotnet publish -p:Version=${VERSION:1} -r win-x64 -f net7.0 -c release - + dotnet publish --self-contained=true -p:PublishSingleFile=true -p:PublishTrimmed=true -p:Version=${VERSION:1} -r linux-x64 -f net7.0 -p:AssemblyName=inveigh -c release + dotnet publish --self-contained=true -p:PublishSingleFile=true -p:PublishTrimmed=true -p:Version=${VERSION:1} -r osx-x64 -f net7.0 -p:AssemblyName=inveigh -c release + dotnet publish --self-contained=true -p:PublishSingleFile=true -p:PublishTrimmed=true -p:Version=${VERSION:1} -r win-x64 -f net7.0 -c release + - name: Zip - Publish run: | tar -czvf Inveigh-net7.0-linux-x64-trimmed-single-${{ github.ref_name }}.tar.gz --directory=$PWD/Inveigh/bin/release/net7.0/linux-x64/publish/ . tar -czvf Inveigh-net7.0-osx-x64-trimmed-single-${{ github.ref_name }}.tar.gz --directory=$PWD/Inveigh/bin/release/net7.0/osx-x64/publish/ . 7z a -tzip -mx9 Inveigh-net7.0-win-x64-trimmed-single-${{ github.ref_name }}.zip $PWD/Inveigh/bin/release/net7.0/win-x64/publish/* + - name: Publish - NativeAOT + run: | + VERSION=${{ github.ref_name }} + dotnet publish -p:Version=${VERSION:1} -r win-x64 -f net7.0 -p:PublishAot=true -c release + + - name: Zip - Publish - NativeAOT + run: | + 7z a -tzip -mx9 Inveigh-net7.0-win-x64-nativeaot-${{ github.ref_name }}.zip $PWD/Inveigh/bin/release/net7.0/win-x64/native/Inveigh.exe + - name: Release .zip uses: softprops/action-gh-release@v1 with: diff --git a/Inveigh/Inveigh.csproj b/Inveigh/Inveigh.csproj index a0a77e2..66da355 100644 --- a/Inveigh/Inveigh.csproj +++ b/Inveigh/Inveigh.csproj @@ -4,7 +4,8 @@ Exe net35;net462;net7.0 AnyCPU - true + true + true @@ -21,23 +22,33 @@ - 6.0.1 + 7.0.0 - + - + + 7.0.0 + all - - + all - runtime; build; native; contentfiles; analyzers; buildtransitive - + + + + all + + + all + + + + diff --git a/Inveigh/Program.cs b/Inveigh/Program.cs index 57c16c4..c5547aa 100644 --- a/Inveigh/Program.cs +++ b/Inveigh/Program.cs @@ -174,7 +174,7 @@ namespace Inveigh public static string netbiosDomain = Environment.UserDomainName; public static string dnsDomain = ""; public static ulong smb2Session = 5548434740922023936; // todo check - public static string version = "2.0.9"; + public static string version = "2.0.10"; static void Main(string[] arguments) { diff --git a/Inveigh/Protocols/Quiddity/Quiddity/Listeners/NetBIOSNSListener.cs b/Inveigh/Protocols/Quiddity/Quiddity/Listeners/NetBIOSNSListener.cs index 82e5590..4693dc5 100644 --- a/Inveigh/Protocols/Quiddity/Quiddity/Listeners/NetBIOSNSListener.cs +++ b/Inveigh/Protocols/Quiddity/Quiddity/Listeners/NetBIOSNSListener.cs @@ -50,7 +50,7 @@ namespace Quiddity this.TTL = ttl; } - public new void Start(IPAddress ipAddress, string replyIP) + public void Start(IPAddress ipAddress, string replyIP) { Start(ipAddress, replyIP, 0); } diff --git a/Inveigh/Protocols/Quiddity/Quiddity/Quiddity.csproj b/Inveigh/Protocols/Quiddity/Quiddity/Quiddity.csproj index 597c46a..616dcfe 100644 --- a/Inveigh/Protocols/Quiddity/Quiddity/Quiddity.csproj +++ b/Inveigh/Protocols/Quiddity/Quiddity/Quiddity.csproj @@ -1,7 +1,7 @@ - net35;net462;net6.0 + net35;net462;net7.0 @@ -29,13 +29,13 @@ - 6.0.1 + 7.0.0 - + - 6.0.1 + 7.0.0 -- cgit v1.2.3