Skip to content

Commit

Permalink
Upgrade .NET target framework from 3.5 to 4.6.1
Browse files Browse the repository at this point in the history
Older frameworks, 4, 4.5 and 4.5.1 no longer have support as of Jan 12, 2016.

Fixes issues when building on Linux under Mono where older frameworks have been removed.
  • Loading branch information
chmorgan committed Feb 11, 2017
1 parent edb9bd9 commit 62f152f
Show file tree
Hide file tree
Showing 6 changed files with 127 additions and 140 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{6AF85EE0-52EB-47D2-B753-4676F286DFF5}</ProjectGuid>
<OutputType>Exe</OutputType>
<AssemblyName>CapturingAndParsingPackets</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<RootNamespace>CapturingAndParsingPackets</RootNamespace>
<FileUpgradeFlags>
</FileUpgradeFlags>
Expand All @@ -33,8 +31,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="SharpPcap, Version=3.6.0.0, Culture=neutral, PublicKeyToken=null">
<SpecificVersion>False</SpecificVersion>
<Reference Include="SharpPcap">
<HintPath>..\SharpPcap.dll</HintPath>
</Reference>
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{AC5CE3D3-8DB0-45C1-8399-A715D5C6FFB6}</ProjectGuid>
<OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>CapturingAndParsingWiFiPackets</RootNamespace>
<AssemblyName>CapturingAndParsingWiFiPackets</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
Expand Down
4 changes: 1 addition & 3 deletions Examples/ConstructingPackets/ConstructingPackets.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{7CA1E07C-DB49-40B6-820A-5A8F1370127B}</ProjectGuid>
<OutputType>Exe</OutputType>
<AssemblyName>ConstructingPackets</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<RootNamespace>ConstructingPackets</RootNamespace>
<FileUpgradeFlags>
</FileUpgradeFlags>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{17699F21-32D6-4511-AFD7-595BB4DCB5C6}</ProjectGuid>
<OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ConstructingWiFiPackets</RootNamespace>
<AssemblyName>ConstructingWiFiPackets</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
Expand Down Expand Up @@ -39,8 +37,7 @@
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="SharpPcap, Version=4.0.0.0, Culture=neutral, PublicKeyToken=null">
<SpecificVersion>False</SpecificVersion>
<Reference Include="SharpPcap">
<HintPath>..\SharpPcap.dll</HintPath>
</Reference>
</ItemGroup>
Expand Down
8 changes: 3 additions & 5 deletions PacketDotNet/PacketDotNet.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{55ABBA4C-AAF9-4726-A592-0C92436CEC92}</ProjectGuid>
<OutputType>Library</OutputType>
<AssemblyName>PacketDotNet</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<RootNamespace>PacketDotNet</RootNamespace>
<FileUpgradeFlags>
</FileUpgradeFlags>
Expand All @@ -24,7 +22,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<GenerateDocumentation>true</GenerateDocumentation>
<DocumentationFile>bin\Debug\PacketDotNet.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
Expand All @@ -33,7 +31,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<GenerateDocumentation>true</GenerateDocumentation>
<DocumentationFile>bin\Release\PacketDotNet.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down
237 changes: 118 additions & 119 deletions Test/Test.csproj
Original file line number Diff line number Diff line change
@@ -1,122 +1,121 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{D1FEC3AA-A58B-4E14-AC50-5008E97D1BBC}</ProjectGuid>
<OutputType>Library</OutputType>
<AssemblyName>Test</AssemblyName>
<RootNamespace>Test</RootNamespace>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug</OutputPath>
<DefineConstants>DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Release</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="log4net">
<HintPath>..\PacketDotNet\Libraries\log4net.dll</HintPath>
</Reference>
<Reference Include="SharpPcap">
<HintPath>lib\SharpPcap\SharpPcap.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
<HintPath>lib\nunit.framework.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="PacketType\Ieee80211\CapabilityInformationFieldTest.cs" />
<Compile Include="PacketType\Ieee80211\ActionFrameTest.cs" />
<Compile Include="PacketType\Ieee80211\BlockAcknowledgmentFrameTest.cs" />
<Compile Include="PacketType\Ieee80211\AssociationResponseFrameTest.cs" />
<Compile Include="PacketType\Ieee80211\AssociationRequestFrameTest.cs" />
<Compile Include="PacketType\Ieee80211\AuthenticationFrameTest.cs" />
<Compile Include="PacketType\Ieee80211\BlockAcknowledgmentRequestFrameTest.cs" />
<Compile Include="PacketType\Ieee80211\DeauthenticationFrameTest.cs" />
<Compile Include="PacketType\Ieee80211\BeaconFrameTest.cs" />
<Compile Include="PacketType\Ieee80211\ContentionFreeEndFrameTest.cs" />
<Compile Include="PacketType\Ieee80211\DataDataFrameTest.cs" />
<Compile Include="PacketType\Ieee80211\DisassociationFrameTest.cs" />
<Compile Include="PacketType\Ieee80211\FrameControlFieldTest.cs" />
<Compile Include="PacketType\Ieee80211\InformationElementTest.cs" />
<Compile Include="PacketType\Ieee80211\NullDataFrameTest.cs" />
<Compile Include="PacketType\Ieee80211\PerPacketInformationTest.cs" />
<Compile Include="PacketType\Ieee80211\QosDataFrameTest.cs" />
<Compile Include="PacketType\Ieee80211\QosNullDataFrameTest.cs" />
<Compile Include="PacketType\Ieee80211\RadioPacketTest.cs" />
<Compile Include="PacketType\Ieee80211\RawPacketTest.cs" />
<Compile Include="PacketType\Ieee80211\ProbeRequestTest.cs" />
<Compile Include="PacketType\Ieee80211\ProbeResponseTest.cs" />
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{D1FEC3AA-A58B-4E14-AC50-5008E97D1BBC}</ProjectGuid>
<OutputType>Library</OutputType>
<AssemblyName>Test</AssemblyName>
<RootNamespace>Test</RootNamespace>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation />
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug</OutputPath>
<DefineConstants>DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Release</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="log4net">
<HintPath>..\PacketDotNet\Libraries\log4net.dll</HintPath>
</Reference>
<Reference Include="SharpPcap">
<HintPath>lib\SharpPcap\SharpPcap.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
<HintPath>lib\nunit.framework.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="PacketType\Ieee80211\CapabilityInformationFieldTest.cs" />
<Compile Include="PacketType\Ieee80211\ActionFrameTest.cs" />
<Compile Include="PacketType\Ieee80211\BlockAcknowledgmentFrameTest.cs" />
<Compile Include="PacketType\Ieee80211\AssociationResponseFrameTest.cs" />
<Compile Include="PacketType\Ieee80211\AssociationRequestFrameTest.cs" />
<Compile Include="PacketType\Ieee80211\AuthenticationFrameTest.cs" />
<Compile Include="PacketType\Ieee80211\BlockAcknowledgmentRequestFrameTest.cs" />
<Compile Include="PacketType\Ieee80211\DeauthenticationFrameTest.cs" />
<Compile Include="PacketType\Ieee80211\BeaconFrameTest.cs" />
<Compile Include="PacketType\Ieee80211\ContentionFreeEndFrameTest.cs" />
<Compile Include="PacketType\Ieee80211\DataDataFrameTest.cs" />
<Compile Include="PacketType\Ieee80211\DisassociationFrameTest.cs" />
<Compile Include="PacketType\Ieee80211\FrameControlFieldTest.cs" />
<Compile Include="PacketType\Ieee80211\InformationElementTest.cs" />
<Compile Include="PacketType\Ieee80211\NullDataFrameTest.cs" />
<Compile Include="PacketType\Ieee80211\PerPacketInformationTest.cs" />
<Compile Include="PacketType\Ieee80211\QosDataFrameTest.cs" />
<Compile Include="PacketType\Ieee80211\QosNullDataFrameTest.cs" />
<Compile Include="PacketType\Ieee80211\RadioPacketTest.cs" />
<Compile Include="PacketType\Ieee80211\RawPacketTest.cs" />
<Compile Include="PacketType\Ieee80211\ProbeRequestTest.cs" />
<Compile Include="PacketType\Ieee80211\ProbeResponseTest.cs" />
<Compile Include="PacketType\OSPFv2PacketTest.cs" />
<Compile Include="Rate.cs" />
<Compile Include="ByteSetupMethods.cs" />
<Compile Include="NUnitSetupClass.cs" />
<Compile Include="LoggingConfiguration.cs" />
<Compile Include="Performance\BitConversionPerformance.cs" />
<Compile Include="Performance\ByteCopyPerformance.cs" />
<Compile Include="Misc\ConstructingPackets.cs" />
<Compile Include="Misc\ChecksumUtilsTest.cs" />
<Compile Include="Misc\PacketTest.cs" />
<Compile Include="Misc\StringOutput.cs" />
<Compile Include="PacketType\ArpPacketTest.cs" />
<Compile Include="PacketType\EthernetPacketTest.cs" />
<Compile Include="PacketType\ICMPv4PacketTest.cs" />
<Compile Include="PacketType\ICMPv6PacketTest.cs" />
<Compile Include="PacketType\IpPacketTest.cs" />
<Compile Include="PacketType\IPv4PacketTest.cs" />
<Compile Include="PacketType\IPv6PacketTest.cs" />
<Compile Include="PacketType\LinuxCookedCaptureTest.cs" />
<Compile Include="PacketType\PPPoEPPPTest.cs" />
<Compile Include="PacketType\TcpPacketTest.cs" />
<Compile Include="PacketType\UdpTest.cs" />
<Compile Include="PacketType\LldpTest.cs" />
<Compile Include="PacketType\WakeOnLanTest.cs" />
<Compile Include="PacketType\IGMPv2PacketTest.cs" />
<Compile Include="PacketType\PPPPacketTest.cs" />
<Compile Include="PacketType\Ieee80211\InformationElementListTest.cs" />
<Compile Include="PacketType\Ieee80211\MacFrameTest.cs" />
<Compile Include="PacketType\Ieee80211\BlockAcknowledgmentControlFieldTest.cs" />
<Compile Include="PacketType\Ieee80211\ReassociationRequestFrameTest.cs" />
<Compile Include="PacketType\Ieee80211\AckFrameTest.cs" />
<Compile Include="PacketType\Ieee80211\CtsFrameTest.cs" />
<Compile Include="PacketType\Ieee80211\RadioTapFieldsTest.cs" />
<Compile Include="PacketType\Ieee80211\SequenceControlFieldTest.cs" />
<Compile Include="PacketType\Ieee80211\PpiFieldsTests.cs" />
<Compile Include="Performance\ByteRetrievalPerformance.cs" />
<Compile Include="Performance\GetSubPacketPerformance.cs" />
<Compile Include="PacketType\Vlan802_1QTest.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<ProjectReference Include="..\PacketDotNet\PacketDotNet.csproj">
<Project>{55ABBA4C-AAF9-4726-A592-0C92436CEC92}</Project>
<Name>PacketDotNet</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="log4net.config" />
</ItemGroup>
<ItemGroup />
<Compile Include="Rate.cs" />
<Compile Include="ByteSetupMethods.cs" />
<Compile Include="NUnitSetupClass.cs" />
<Compile Include="LoggingConfiguration.cs" />
<Compile Include="Performance\BitConversionPerformance.cs" />
<Compile Include="Performance\ByteCopyPerformance.cs" />
<Compile Include="Misc\ConstructingPackets.cs" />
<Compile Include="Misc\ChecksumUtilsTest.cs" />
<Compile Include="Misc\PacketTest.cs" />
<Compile Include="Misc\StringOutput.cs" />
<Compile Include="PacketType\ArpPacketTest.cs" />
<Compile Include="PacketType\EthernetPacketTest.cs" />
<Compile Include="PacketType\ICMPv4PacketTest.cs" />
<Compile Include="PacketType\ICMPv6PacketTest.cs" />
<Compile Include="PacketType\IpPacketTest.cs" />
<Compile Include="PacketType\IPv4PacketTest.cs" />
<Compile Include="PacketType\IPv6PacketTest.cs" />
<Compile Include="PacketType\LinuxCookedCaptureTest.cs" />
<Compile Include="PacketType\PPPoEPPPTest.cs" />
<Compile Include="PacketType\TcpPacketTest.cs" />
<Compile Include="PacketType\UdpTest.cs" />
<Compile Include="PacketType\LldpTest.cs" />
<Compile Include="PacketType\WakeOnLanTest.cs" />
<Compile Include="PacketType\IGMPv2PacketTest.cs" />
<Compile Include="PacketType\PPPPacketTest.cs" />
<Compile Include="PacketType\Ieee80211\InformationElementListTest.cs" />
<Compile Include="PacketType\Ieee80211\MacFrameTest.cs" />
<Compile Include="PacketType\Ieee80211\BlockAcknowledgmentControlFieldTest.cs" />
<Compile Include="PacketType\Ieee80211\ReassociationRequestFrameTest.cs" />
<Compile Include="PacketType\Ieee80211\AckFrameTest.cs" />
<Compile Include="PacketType\Ieee80211\CtsFrameTest.cs" />
<Compile Include="PacketType\Ieee80211\RadioTapFieldsTest.cs" />
<Compile Include="PacketType\Ieee80211\SequenceControlFieldTest.cs" />
<Compile Include="PacketType\Ieee80211\PpiFieldsTests.cs" />
<Compile Include="Performance\ByteRetrievalPerformance.cs" />
<Compile Include="Performance\GetSubPacketPerformance.cs" />
<Compile Include="PacketType\Vlan802_1QTest.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<ProjectReference Include="..\PacketDotNet\PacketDotNet.csproj">
<Project>{55ABBA4C-AAF9-4726-A592-0C92436CEC92}</Project>
<Name>PacketDotNet</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="log4net.config" />
</ItemGroup>
<ItemGroup />
</Project>

0 comments on commit 62f152f

Please sign in to comment.