Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update project structure to VS2017 #649

Merged
merged 11 commits into from
Mar 21, 2017
Merged

Update project structure to VS2017 #649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b2d8cad
Optimise usings.
drewnoakes Mar 21, 2017
be023bb
Wrap field declaration with #if/#endif
drewnoakes Mar 21, 2017
37263e3
Exclude files from NET35 using #if/#endif
drewnoakes Mar 21, 2017
57eb299
Upgrade project structure to VS2017
drewnoakes Mar 21, 2017
8cd660a
Remove TFMs monoandroid60 and xamarinios10
drewnoakes Mar 21, 2017
c62ac34
Let msbuild set assembly attributes (version, title, etc)
drewnoakes Mar 21, 2017
1eea492
Bump package: JetBrains.Annotations
drewnoakes Mar 21, 2017
180324f
Bump package: NUnit
drewnoakes Mar 21, 2017
65225e5
Bump package: Microsoft.NET.Test.Sdk
drewnoakes Mar 21, 2017
1f03289
Remove non-existant solution item
drewnoakes Mar 21, 2017
828eeda
Add appveyor.yml file
drewnoakes Mar 21, 2017
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
18 changes: 18 additions & 0 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
version: 1.0.{build}
skip_tags: true
branches:
only:
- master
image: Visual Studio 2017
configuration: Release
before_build:
appveyor-retry dotnet restore src
build:
project: src/NetMQ.sln
parallel: true
verbosity: minimal
test:
assemblies:
- NetMQ.Tests.dll
test_script:
- dotnet test src\NetMQ.Tests\NetMQ.Tests.csproj --configuration Release --no-build
164 changes: 0 additions & 164 deletions src/NetMQ-Core.sln
View file
Open in desktop

This file was deleted.

180 changes: 28 additions & 152 deletions src/NetMQ.Tests/NetMQ.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,162 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{526095CB-16A6-47C3-9F45-72A8530E5762}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>NetMQ.Tests</RootNamespace>
<TargetFrameworks>net451;netcoreapp1.0</TargetFrameworks>
<DebugType>portable</DebugType>
<AssemblyName>NetMQ.Tests</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AssemblyOriginatorKeyFile>../NetMQ/NetMQ.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\NetMQ\NetMQ.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<StartupObject>
</StartupObject>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
<PackageId>NetMQ.Tests</PackageId>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);netcoreapp1.0;portable-net45+win8</PackageTargetFallback>
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.0.4</RuntimeFrameworkVersion>
</PropertyGroup>

<ItemGroup>
<Reference Include="AsyncIO, Version=0.1.18.0, Culture=neutral, PublicKeyToken=44a94435bd6f33f8, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\AsyncIO.0.1.18.0\lib\net40\AsyncIO.dll</HintPath>
</Reference>
<Reference Include="JetBrains.Annotations">
<HintPath>..\packages\JetBrains.Annotations.10.0.0\lib\net20\JetBrains.Annotations.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\packages\NUnit.3.4.1\lib\net40\nunit.framework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
<ItemGroup>
<Compile Include="ActorTests.cs" />
<Compile Include="BeaconTests.cs" />
<Compile Include="ByteArraySegmentTests.cs" />
<Compile Include="CleanupTests.cs" />
<Compile Include="EventDelegatorTests.cs" />
<Compile Include="ExceptionTests.cs" />
<Compile Include="InProcActors\AccountJSON\Account.cs" />
<Compile Include="InProcActors\AccountJSON\AccountAction.cs" />
<Compile Include="InProcActors\AccountJSON\AccountShimHandler.cs" />
<Compile Include="InProcActors\AccountJSON\AccountActorTests.cs" />
<Compile Include="InProcActors\ExceptionShimExample\ExceptionShimActorTests.cs" />
<Compile Include="InProcActors\ExceptionShimExample\ExceptionShimHandler.cs" />
<Compile Include="InProcActors\Echo\EchoShimHandler.cs" />
<Compile Include="InProcActors\Echo\EchoActorTests.cs" />
<Compile Include="MockBufferPool.cs" />
<Compile Include="MsgTests.cs" />
<Compile Include="NetMQProactorTests.cs" />
<Compile Include="NetMQQueueTests.cs" />
<Compile Include="OutgoingSocketExtensionsTests.cs" />
<Compile Include="NetMQPollerTest.cs" />
<Compile Include="ReceivingSocketExtensionsTests.cs" />
<Compile Include="RequestWithRetryTests.cs" />
<Compile Include="RouterTests.cs" />
<Compile Include="Setup.cs" />
<Compile Include="XPubSubTests.cs" />
<Compile Include="MessageTests.cs" />
<Compile Include="NetMQMonitorTests.cs" />
<Compile Include="NetworkOrderBitsConverterTests.cs" />
<Compile Include="PgmTests.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ProxyTests.cs" />
<Compile Include="PubSubTests.cs" />
<Compile Include="PushPullTests.cs" />
<Compile Include="ReqRepTests.cs" />
<Compile Include="SocketTests.cs" />
<Compile Include="StreamTests.cs" />
<Compile Include="Core\YQueueTests.cs" />
<Compile Include="SocketOptionsTests.cs" />
<ProjectReference Include="..\NetMQ\NetMQ.csproj" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\NetMQ\NetMQ.csproj">
<Project>{82934BAC-07FB-41AC-AE59-46FEE6026A40}</Project>
<Name>NetMQ</Name>
</ProjectReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
<PackageReference Include="dotnet-test-nunit-with-labels" Version="3.4.0-alpha7" />
<PackageReference Include="NUnit" Version="3.6.1" />
<PackageReference Include="JetBrains.Annotations" Version="10.4.0">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />

<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
<ItemGroup>
<None Include="NetMQ.Testing.crt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="NetMQ.Testing.pfx">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="packages.NetMQ.Tests.config" />

<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
<PackageReference Include="System.Threading.Thread" Version="4.0.0" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>

</Project>
Loading