Skip to content

Commit

Permalink
Fix/formatting issues (lduchosal#218)
Browse files Browse the repository at this point in the history
* Fix formatting issues

* Fix: revert to multiple framework build

* Fix: stylecop and formatting issues

* Fix: space

* Fix: stylecop.json

* Fix: spaces issues

Co-authored-by: lduchosal <[email protected]>
  • Loading branch information
lduchosal and lduchosal authored Aug 18, 2022
1 parent 5efce2d commit 2d7c789
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 19 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,4 @@ jobs:
- name: Build
run: dotnet build --no-restore -c release ./src/ConsoleApplication --no-restore
- name: Test
run: dotnet test --verbosity normal ./src/ConsoleApplication/ConsoleApplication.csproj /p:CollectCoverage=true /p:CoverletOutputFormat=opencover

run: dotnet test --verbosity normal ./src/ConsoleApplication/ConsoleApplication.csproj /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
12 changes: 6 additions & 6 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,23 @@ branches:

init:
- cmd: git config --global core.autocrlf true

before_build:
- cmd: dotnet --version
- cmd: dotnet tool install --global coveralls.net
- cmd: dotnet clean ./src
- cmd: dotnet restore ./src --verbosity m
- cmd: nuget restore ./src
- cmd: nuget restore ./src

build_script:
- cmd: dotnet pack -c release ./src/System.Net.IPNetwork
- cmd: dotnet build -c release ./src/ConsoleApplication

test_script:
- cmd: dotnet test ./src/TestProject/TestProject.csproj /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
- vstest.console /logger:Appveyor c:\Projects\ipnetwork\src\TestProject\bin\Debug\net5.0\TestProject.dll
- csmacnz.Coveralls.exe --opencover -i C:\projects\ipnetwork\src\TestProject\coverage.net5.0.opencover.xml --useRelativePaths

# 1. Regenerate AppVeyor Api Key
# https://www.nuget.org/account/apikeys
# 2. Encrypt configuration data
Expand All @@ -57,4 +57,4 @@ deploy:

artifacts:
- path: '**\IPNetwork2*.nupkg'
name: nuget
name: nuget
11 changes: 0 additions & 11 deletions src/TestProject/IPNetworkUnitTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1691,7 +1691,6 @@ public void TestContainsStatic3()
#pragma warning disable 0618
bool result = IPNetwork.Contains(ipnetwork, ipnetwork2);
#pragma warning restore 0618

}

[TestMethod]
Expand Down Expand Up @@ -2256,7 +2255,6 @@ public void TestSubnet1()
#pragma warning disable 0618
IPNetworkCollection result = IPNetwork.Subnet(ipnetwork, cidr);
#pragma warning restore 0618

}

[TestMethod]
Expand All @@ -2268,7 +2266,6 @@ public void TestSubnetStatic1()
#pragma warning disable 0618
IPNetworkCollection result = IPNetwork.Subnet(ipnetwork, cidr);
#pragma warning restore 0618

}

[TestMethod]
Expand Down Expand Up @@ -2451,7 +2448,6 @@ public void TestTrySubnet1()
#pragma warning disable 0618
bool subnetted = IPNetwork.TrySubnet(ipnetwork, cidr, out subnets);
#pragma warning restore 0618

}

[TestMethod]
Expand All @@ -2464,7 +2460,6 @@ public void TestTrySubnetStatic1()
#pragma warning disable 0618
bool subnetted = IPNetwork.TrySubnet(ipnetwork, cidr, out subnets);
#pragma warning restore 0618

}

[TestMethod]
Expand Down Expand Up @@ -2727,7 +2722,6 @@ public void TestTrySupernet2()
#pragma warning disable 0618
bool result = IPNetwork.TrySupernet(network1, network2, out supernet);
#pragma warning restore 0618

}

[TestMethod]
Expand All @@ -2740,7 +2734,6 @@ public void TestTrySupernetStatic2()
#pragma warning disable 0618
bool result = IPNetwork.TrySupernet(network1, network2, out supernet);
#pragma warning restore 0618

}

[TestMethod]
Expand Down Expand Up @@ -3588,11 +3581,8 @@ public void TrySubstractNetwork2() {
IEnumerable<IPNetwork> result;
bool substracted = IPNetwork.TrySubstractNetwork(ipns.ToArray(), nsubstract, out result);
Assert.AreEqual(true, substracted, "substracted");
}
#endregion
**/
#region Count
Expand Down Expand Up @@ -3934,6 +3924,5 @@ public void TestOperatorEqual2()
}

#endregion

}
}

0 comments on commit 2d7c789

Please sign in to comment.