Skip to content

Commit a07a71c

Browse files
Kevin-RobertsonKevin-Robertson
committed
.NET 7 and NativeAOT Builds
Removed .NET 6 builds. Added .NET 7 and NativeAOT builds.
1 parent 99da789 commit a07a71c

File tree

6 files changed

+50
-21
lines changed

6 files changed

+50
-21
lines changed

‎.github/workflows/dev.yml‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,25 @@ jobs:
3939
- name: Publish - Trimmed/Single File
4040
run: |
4141
VERSION=${{ github.ref_name }}
42-
dotnet publish -r linux-x64 -f net7.0 -p:AssemblyName=inveigh -c debug
43-
dotnet publish -r osx-x64 -f net7.0 -p:AssemblyName=inveigh -c debug
44-
dotnet publish -r win-x64 -f net7.0 -c debug
42+
dotnet publish --self-contained=true -p:PublishSingleFile=true -p:PublishTrimmed=true -r linux-x64 -f net7.0 -p:AssemblyName=inveigh -c debug
43+
dotnet publish --self-contained=true -p:PublishSingleFile=true -p:PublishTrimmed=true -r osx-x64 -f net7.0 -p:AssemblyName=inveigh -c debug
44+
dotnet publish --self-contained=true -p:PublishSingleFile=true -p:PublishTrimmed=true -r win-x64 -f net7.0 -c debug
4545
4646
- name: Zip - Publish
4747
run: |
4848
tar -czvf Inveigh-net7.0-linux-x64-trimmed-single-dev.tar.gz --directory=$PWD/Inveigh/bin/debug/net7.0/linux-x64/publish/ .
4949
tar -czvf Inveigh-net7.0-osx-x64-trimmed-single-dev.tar.gz --directory=$PWD/Inveigh/bin/debug/net7.0/osx-x64/publish/ .
5050
7z a -tzip -mx9 Inveigh-net7.0-win-x64-trimmed-single-dev.zip $PWD/Inveigh/bin/debug/net7.0/win-x64/publish/*
5151
52+
- name: Publish - NativeAOT
53+
run: |
54+
VERSION=${{ github.ref_name }}
55+
dotnet publish -p:Version=${VERSION:1} -r win-x64 -f net7.0 -p:PublishAot=true -c debug
56+
57+
- name: Zip - Publish - NativeAOT
58+
run: |
59+
7z a -tzip -mx9 Inveigh-net7.0-win-x64-nativeaot-${{ github.ref_name }}.zip $PWD/Inveigh/bin/debug/net7.0/win-x64/native/*
60+
5261
- name: Release .zip
5362
if: "! startsWith(github.event_name, 'pull_request')"
5463
uses: softprops/action-gh-release@v1

‎.github/workflows/release.yml‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,25 @@ jobs:
3838
- name: Publish - Trimmed/Single File
3939
run: |
4040
VERSION=${{ github.ref_name }}
41-
dotnet publish -p:Version=${VERSION:1} -r linux-x64 -f net7.0 -p:AssemblyName=inveigh -c release
42-
dotnet publish -p:Version=${VERSION:1} -r osx-x64 -f net7.0 -p:AssemblyName=inveigh -c release
43-
dotnet publish -p:Version=${VERSION:1} -r win-x64 -f net7.0 -c release
44-
41+
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
42+
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
43+
dotnet publish --self-contained=true -p:PublishSingleFile=true -p:PublishTrimmed=true -p:Version=${VERSION:1} -r win-x64 -f net7.0 -c release
44+
4545
- name: Zip - Publish
4646
run: |
4747
tar -czvf Inveigh-net7.0-linux-x64-trimmed-single-${{ github.ref_name }}.tar.gz --directory=$PWD/Inveigh/bin/release/net7.0/linux-x64/publish/ .
4848
tar -czvf Inveigh-net7.0-osx-x64-trimmed-single-${{ github.ref_name }}.tar.gz --directory=$PWD/Inveigh/bin/release/net7.0/osx-x64/publish/ .
4949
7z a -tzip -mx9 Inveigh-net7.0-win-x64-trimmed-single-${{ github.ref_name }}.zip $PWD/Inveigh/bin/release/net7.0/win-x64/publish/*
5050
51+
- name: Publish - NativeAOT
52+
run: |
53+
VERSION=${{ github.ref_name }}
54+
dotnet publish -p:Version=${VERSION:1} -r win-x64 -f net7.0 -p:PublishAot=true -c release
55+
56+
- name: Zip - Publish - NativeAOT
57+
run: |
58+
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
59+
5160
- name: Release .zip
5261
uses: softprops/action-gh-release@v1
5362
with:

‎Inveigh/Inveigh.csproj‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
<OutputType>Exe</OutputType>
55
<TargetFrameworks>net35;net462;net7.0</TargetFrameworks>
66
<PlatformTarget>AnyCPU</PlatformTarget>
7-
<PublishAot Condition="'$(TargetFramework)' == 'net7.0'">true</PublishAot>
7+
<DisableFody Condition="'$(PublishAot)' == 'true' Or '$(PublishTrimmed)' == 'true'">true</DisableFody>
8+
<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
89
</PropertyGroup>
910

1011
<PropertyGroup Condition="'$(Configuration)|$(TargetFrameworks)|$(Platform)'=='Debug|net35|AnyCPU'">
@@ -21,23 +22,33 @@
2122

2223
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
2324
<PackageReference Include="System.DirectoryServices.Protocols">
24-
<Version>6.0.1</Version>
25+
<Version>7.0.0</Version>
2526
</PackageReference>
2627
</ItemGroup>
27-
28+
2829
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
29-
<PackageReference Include="System.DirectoryServices.Protocols" Version="7.0.0-*" />
30+
<PackageReference Include="System.DirectoryServices.Protocols">
31+
<Version>7.0.0</Version>
32+
</PackageReference>
3033
</ItemGroup>
3134

3235
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
3336
<PackageReference Include="Costura.Fody" Version="5.7.0">
3437
<PrivateAssets>all</PrivateAssets>
35-
<!--<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>-->
3638
</PackageReference>
37-
<PackageReference Include="Fody" Version="6.6.3">
39+
<PackageReference Include="Fody" Version="6.6.4">
3840
<PrivateAssets>all</PrivateAssets>
39-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4041
</PackageReference>
4142
</ItemGroup>
42-
43+
44+
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
45+
<PackageReference Include="Costura.Fody" Version="5.7.0">
46+
<PrivateAssets>all</PrivateAssets>
47+
</PackageReference>
48+
<PackageReference Include="Fody" Version="6.6.4">
49+
<PrivateAssets>all</PrivateAssets>
50+
</PackageReference>
51+
</ItemGroup>
52+
53+
4354
</Project>

‎Inveigh/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ class Program
174174
public static string netbiosDomain = Environment.UserDomainName;
175175
public static string dnsDomain = "";
176176
public static ulong smb2Session = 5548434740922023936; // todo check
177-
public static string version = "2.0.9";
177+
public static string version = "2.0.10";
178178

179179
static void Main(string[] arguments)
180180
{

‎Inveigh/Protocols/Quiddity/Quiddity/Listeners/NetBIOSNSListener.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public NetBIOSNSListener(uint ttl)
5050
this.TTL = ttl;
5151
}
5252

53-
public new void Start(IPAddress ipAddress, string replyIP)
53+
public void Start(IPAddress ipAddress, string replyIP)
5454
{
5555
Start(ipAddress, replyIP, 0);
5656
}

‎Inveigh/Protocols/Quiddity/Quiddity/Quiddity.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net35;net462;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net35;net462;net7.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<PropertyGroup>
@@ -29,13 +29,13 @@
2929

3030
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
3131
<PackageReference Include="System.DirectoryServices.Protocols">
32-
<Version>6.0.1</Version>
32+
<Version>7.0.0</Version>
3333
</PackageReference>
3434
</ItemGroup>
3535

36-
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
36+
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
3737
<PackageReference Include="System.DirectoryServices.Protocols">
38-
<Version>6.0.1</Version>
38+
<Version>7.0.0</Version>
3939
</PackageReference>
4040
</ItemGroup>
4141

0 commit comments

Comments
 (0)