Publish artifacts (#179)

dotpcap · May 14, 2022 · 4cc07cb · 4cc07cb
1 parent 87c6a77
commit 4cc07cb
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 43 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -72,5 +72,19 @@ jobs:
       - name: Test
         run: dotnet test
 
+      - name: Publish net47
+        uses: actions/upload-artifact@v2
+        with:
+          name: PacketDotNet-net47
+          path: |
+            PacketDotNet/bin/Release/net47
+
+      - name: Publish netstandard20
+        uses: actions/upload-artifact@v2
+        with:
+          name: PacketDotNet-netstandard20
+          path: |
+            PacketDotNet/bin/Release/netstandard2.0
+
       - name: Publish to NuGet
         run: nuget push **\*.nupkg -Source 'https://api.nuget.org/v3/index.json' -ApiKey ${{secrets.NUGET_API_KEY}}
diff --git a/.github/workflows/pull requests.yml b/.github/workflows/pull requests.yml
@@ -71,3 +71,17 @@ jobs:
 
       - name: Test
         run: dotnet test
+
+      - name: Publish net47
+        uses: actions/upload-artifact@v2
+        with:
+          name: PacketDotNet-net47
+          path: |
+            PacketDotNet/bin/Release/net47
+
+      - name: Publish netstandard20
+        uses: actions/upload-artifact@v2
+        with:
+          name: PacketDotNet-netstandard20
+          path: |
+            PacketDotNet/bin/Release/netstandard2.0
diff --git a/Examples/CapturingAndParsingPackets/CapturingAndParsingPackets.csproj b/Examples/CapturingAndParsingPackets/CapturingAndParsingPackets.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SharpPcap" Version="6.0.0" />
+    <PackageReference Include="SharpPcap" Version="6.2.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/PacketDotNet/AssemblyInfo.cs b/PacketDotNet/AssemblyInfo.cs
diff --git a/PacketDotNet/OspfV2Packet.cs b/PacketDotNet/OspfV2Packet.cs
@@ -29,9 +29,9 @@ public abstract class OspfV2Packet : OspfPacket
 #else
 // NOTE: No need to warn about lack of use, the compiler won't
 //       put any calls to 'log' here but we need 'log' to exist to compile
-#pragma warning disable 0169
+#pragma warning disable 0169, 0649
         private static readonly ILogInactive Log;
-#pragma warning restore 0169
+#pragma warning restore 0169, 0649
 #endif
 
         /// <summary>

diff --git a/PacketDotNet/PacketDotNet.csproj b/PacketDotNet/PacketDotNet.csproj
@@ -2,8 +2,6 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net47</TargetFrameworks>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <Authors>Chris Morgan ([email protected])</Authors>
     <LangVersion>latest</LangVersion>
     <SignAssembly>true</SignAssembly>
@@ -21,28 +19,25 @@
     <Pack>true</Pack>
     <RepositoryUrl>https://github.com/dotpcap/packetnet</RepositoryUrl>
     <LangVersion>latest</LangVersion>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DefineConstants>TRACE;RELEASE;</DefineConstants>
-    <OutputPath>bin\Release\netstandard2.0</OutputPath>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DefineConstants>TRACE;RELEASE</DefineConstants>
   </PropertyGroup> 
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DefineConstants>TRACE;DEBUG;</DefineConstants>
-    <OutputPath>bin\Debug\netstandard2.0</OutputPath>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <DebugType>embedded</DebugType>
     <DebugSymbols>true</DebugSymbols>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>  
 
   <ItemGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <PackageReference Include="log4net" Version="2.0.12" />
+    <PackageReference Include="log4net" Version="2.0.14" />
   </ItemGroup>  
 
   <ItemGroup>
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/Test/Test.csproj b/Test/Test.csproj
@@ -6,11 +6,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="log4net" Version="2.0.12" />
-    <PackageReference Include="nunit" Version="3.13.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
-    <PackageReference Include="SharpPcap" Version="6.0.0" />
+    <PackageReference Include="log4net" Version="2.0.14" />
+    <PackageReference Include="nunit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="SharpPcap" Version="6.2.1" />
   </ItemGroup>
 
   <ItemGroup>