upgrade: csproj structure (lduchosal#184)

* upgrade: csproj structure * fix: CI does not work with .net6 yet * fix: CI should build and test * fix: CI should compile in net5.0 * fix: CI script to build new projects * fix: .net CI * fix: snk path * fix: appveyor build with new project structure
maettu-this · Nov 19, 2021 · f537687 · f537687
1 parent 8abc2b7
commit f537687
Show file tree

Hide file tree

Showing 66 changed files with 7,961 additions and 8,458 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -26,7 +26,7 @@ jobs:
     - name: Pack
       run: dotnet pack -c release ./src/System.Net.IPNetwork
     - name: Build
-      run: dotnet build  --no-restore -c release ./src/System.Net.IPNetwork.ConsoleApplication.NetCore --no-restore
+      run: dotnet build  --no-restore -c release ./src/ConsoleApplication --no-restore
     - name: Test
-      run: dotnet test --verbosity normal ./src/System.Net.IPNetwork.TestProject.NetCore/System.Net.IPNetwork.TestProject.NetCore.csproj /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
+      run: dotnet test --verbosity normal ./src/ConsoleApplication/ConsoleApplication.csproj /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
 
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,7 @@ script:
   - cd src
   - dotnet restore
   - dotnet pack ./System.Net.IPNetwork
-  - dotnet test -f net5.0 ./System.Net.IPNetwork.TestProject.NetCore/System.Net.IPNetwork.TestProject.NetCore.csproj
+  - dotnet test -f net5.0 ./TestProject/TestProject.csproj
 global:
     - DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
     - DOTNET_CLI_TELEMETRY_OPTOUT=1
diff --git a/appveyor.yml b/appveyor.yml
@@ -36,13 +36,12 @@ before_build:
 
 build_script:
   - cmd: dotnet pack -c release ./src/System.Net.IPNetwork
-  - cmd: dotnet build -c release ./src/System.Net.IPNetwork.ConsoleApplication.NetFramework
-  - cmd: dotnet build -c release ./src/System.Net.IPNetwork.ConsoleApplication.NetCore
+  - cmd: dotnet build -c release ./src/ConsoleApplication
 
 test_script:
-  - cmd: dotnet test ./src/System.Net.IPNetwork.TestProject.NetCore/System.Net.IPNetwork.TestProject.NetCore.csproj /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
-  - vstest.console /logger:Appveyor c:\Projects\ipnetwork\src\System.Net.IPNetwork.TestProject.NetCore\bin\Debug\net5.0\System.Net.IPNetwork.TestProject.NetCore.dll
-  - csmacnz.Coveralls.exe --opencover -i C:\projects\ipnetwork\src\System.Net.IPNetwork.TestProject.NetCore\coverage.net5.0.opencover.xml --useRelativePaths
+  - 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

diff --git a/release/IPNetwork-1.2.1.zip b/release/IPNetwork-1.2.1.zip
diff --git a/release/IPNetwork-1.3.1.zip b/release/IPNetwork-1.3.1.zip
diff --git a/release/IPNetwork-1.3.2.zip b/release/IPNetwork-1.3.2.zip
diff --git a/release/IPNetwork-1.3.zip b/release/IPNetwork-1.3.zip
diff --git a/release/IPNetwork-2.0.1.zip b/release/IPNetwork-2.0.1.zip
diff --git a/release/IPNetwork-2.0.2.zip b/release/IPNetwork-2.0.2.zip
diff --git a/release/IPNetwork-2.0.3.zip b/release/IPNetwork-2.0.3.zip
diff --git a/release/IPNetwork-2.1.0.zip b/release/IPNetwork-2.1.0.zip
diff --git a/release/IPNetwork-2.1.1.zip b/release/IPNetwork-2.1.1.zip
diff --git a/release/IPNetwork-2.1.2.zip b/release/IPNetwork-2.1.2.zip
diff --git a/release/IPNetwork2.2.0.1.nupkg b/release/IPNetwork2.2.0.1.nupkg
diff --git a/release/IPNetwork2.2.0.2.nupkg b/release/IPNetwork2.2.0.2.nupkg
diff --git a/release/IPNetwork2.2.0.3.nupkg b/release/IPNetwork2.2.0.3.nupkg
diff --git a/release/IPNetwork2.2.1.0.nupkg b/release/IPNetwork2.2.1.0.nupkg
diff --git a/release/IPNetwork2.2.1.1.nupkg b/release/IPNetwork2.2.1.1.nupkg
diff --git a/release/IPNetwork2.2.1.2.nupkg b/release/IPNetwork2.2.1.2.nupkg
diff --git a/...k.ConsoleApplication.Source/ActionEnum.cs → src/ConsoleApplication/ActionEnum.cs b/...k.ConsoleApplication.Source/ActionEnum.cs → src/ConsoleApplication/ActionEnum.cs
@@ -1,4 +1,4 @@
-namespace System.Net.ConsoleApplication
+namespace System.Net.ConsoleApplication
 {
     public enum ActionEnum {
         Usage,

diff --git a/...rk.ConsoleApplication.Source/ArgParsed.cs → src/ConsoleApplication/ArgParsed.cs b/...rk.ConsoleApplication.Source/ArgParsed.cs → src/ConsoleApplication/ArgParsed.cs
@@ -1,4 +1,4 @@
-namespace System.Net.ConsoleApplication
+namespace System.Net.ConsoleApplication
 {
     public class ArgParsed {
         public int Arg;

diff --git a/...leApplication.Source/CidrParseTypeEnum.cs → src/ConsoleApplication/CidrParseTypeEnum.cs b/...leApplication.Source/CidrParseTypeEnum.cs → src/ConsoleApplication/CidrParseTypeEnum.cs
@@ -1,4 +1,4 @@
-namespace System.Net.ConsoleApplication
+namespace System.Net.ConsoleApplication
 {
     public enum CidrParseEnum {
         Default,

diff --git a/src/ConsoleApplication/ConsoleApplication.csproj b/src/ConsoleApplication/ConsoleApplication.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFrameworks>net45;net46;net47;net48;netcoreapp3.1;net5.0</TargetFrameworks>
+		<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">net5.0</TargetFrameworks>
+		<ImplicitUsings>disable</ImplicitUsings>
+		<SignAssembly>True</SignAssembly>
+		<AssemblyOriginatorKeyFile>..\System.Net.IPNetwork.snk</AssemblyOriginatorKeyFile>
+
+	</PropertyGroup>
+
+
+	<ItemGroup>
+    <ProjectReference Include="..\Gnu.Getopt\Gnu.Getopt.csproj" />
+    <ProjectReference Include="..\System.Net.IPNetwork\System.Net.IPNetwork.csproj" />
+  </ItemGroup>
+
+</Project>