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
2 changes: 1 addition & 1 deletion .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 8.0.x
dotnet-version: 9.0.x
- name: Install dependencies
run: dotnet tool install --global coveralls.net
- name: Restore dependencies
Expand Down
13 changes: 0 additions & 13 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ Below some examples :
```JS
Provide at least one ipnetwork
Usage: ipnetwork [-inmcbflu] [-d cidr|-D] [-h|-s cidr|-S|-w|-W|-x|-C network|-o network] networks ...
Version: 3.0.0.0
Version: 3.1.0

Print options
-i : network
Expand Down
6 changes: 3 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '3.0.{build}'
version: '3.1.{build}'
image: Visual Studio 2022

assembly_info:
Expand Down Expand Up @@ -41,8 +41,8 @@ build_script:
- cmd: dotnet build -c release ./src/ConsoleApplication

test_script:
- cmd: dotnet test ./src/TestProject/TestProject.csproj --settings ./src/TestProject/coverlet.runsettings -f "net8.0"
- vstest.console /logger:Appveyor c:\Projects\ipnetwork\src\TestProject\bin\Debug\net8.0\TestProject.dll
- cmd: dotnet test ./src/TestProject/TestProject.csproj --settings ./src/TestProject/coverlet.runsettings -f "net9.0"
- vstest.console /logger:Appveyor c:\Projects\ipnetwork\src\TestProject\bin\Debug\net9.0\TestProject.dll
- ps: copy ./src/TestProject/TestResults/**/coverage.opencover.xml ./src/TestProject/TestResults
- csmacnz.Coveralls.exe --opencover -i C:\projects\ipnetwork\src\TestProject\TestResults\coverage.opencover.xml --useRelativePaths

Expand Down
27 changes: 13 additions & 14 deletions src/ConsoleApplication/ActionEnum.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,17 @@
// Copyright (c) IPNetwork. All rights reserved.
// </copyright>

namespace System.Net.ConsoleApplication
namespace System.Net;

public enum ActionEnum
{
public enum ActionEnum
{
Usage,
PrintNetworks,
Subnet,
Supernet,
WideSupernet,
ListIPAddress,
ContainNetwork,
OverlapNetwork,
SubtractNetwork,
}
}
Usage,
PrintNetworks,
Subnet,
Supernet,
WideSupernet,
ListIPAddress,
ContainNetwork,
OverlapNetwork,
SubtractNetwork,
}
23 changes: 11 additions & 12 deletions src/ConsoleApplication/ArgParsed.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,24 @@
// Copyright (c) IPNetwork. All rights reserved.
// </copyright>

namespace System.Net.ConsoleApplication
namespace System.Net;

public class ArgParsed
{
public class ArgParsed
{
public int Arg { get; set; }
public int Arg { get; set; }

private event ArgParsedDelegate OnArgParsed;
private event ArgParsedDelegate OnArgParsed;

public delegate void ArgParsedDelegate(ProgramContext ac, string arg);
public delegate void ArgParsedDelegate(ProgramContext ac, string arg);

public void Run(ProgramContext ac, string arg)
{
public void Run(ProgramContext ac, string arg)
{
this.OnArgParsed?.Invoke(ac, arg);
}

public ArgParsed(int arg, ArgParsedDelegate onArgParsed)
{
public ArgParsed(int arg, ArgParsedDelegate onArgParsed)
{
this.Arg = arg;
this.OnArgParsed += onArgParsed;
}
}
}
}
13 changes: 6 additions & 7 deletions src/ConsoleApplication/CidrParseTypeEnum.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@
// Copyright (c) IPNetwork. All rights reserved.
// </copyright>

namespace System.Net.ConsoleApplication
namespace System.Net;

public enum CidrParseEnum
{
public enum CidrParseEnum
{
Default,
Value,
}
}
Default,
Value,
}
7 changes: 5 additions & 2 deletions src/ConsoleApplication/ConsoleApplication.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net462;net47;net48;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">net8.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">net9.0</TargetFrameworks>
<ImplicitUsings>disable</ImplicitUsings>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\System.Net.IPNetwork.snk</AssemblyOriginatorKeyFile>
<Version>3.1.0</Version>
<RootNamespace>System.Net</RootNamespace>
<LangVersion>latestmajor</LangVersion>

</PropertyGroup>

Expand Down
Loading
Loading