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.

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

Fix build on Linux (and other stuff) #355

Merged
merged 8 commits into from
Jan 21, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 6 additions & 16 deletions az-templates/stage-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ stages:
arguments: '-c $(BuildConfiguration) --no-incremental --nologo -p:TreatWarningsAsErrors=true -p:Version=$(SemVer) -p:InformationalVersion=$(InfoVer)'

- task: VSTest@2
displayName: 'UnitTests .NetCoreApp2.2'
displayName: 'UnitTests .NetCoreApp3.1'
inputs:
testSelector: 'testAssemblies'
testAssemblyVer2: 'src/Tests/UnitTests/bin/$(BuildConfiguration)/netcoreapp2.2/UnitTests.dll'
testAssemblyVer2: 'src/Tests/UnitTests/bin/$(BuildConfiguration)/netcoreapp3.1/UnitTests.dll'
configuration: $(BuildConfiguration)
testRunTitle: 'UnitTests .NetCoreApp2.2'
testRunTitle: 'UnitTests .NetCoreApp3.1'

- task: VSTest@2
displayName: 'UnitTests .Net4.5.2'
Expand Down Expand Up @@ -64,24 +64,14 @@ stages:
Write-Host "##vso[task.setvariable variable=PATH;]${env:PATH};$natsServerDir"

- task: VSTest@2
displayName: 'IntegrationTests .NetCoreApp2.2'
displayName: 'IntegrationTests .NetCoreApp3.1'
inputs:
testSelector: 'testAssemblies'
testAssemblyVer2: 'src/Tests/IntegrationTests/bin/$(BuildConfiguration)/netcoreapp2.2/IntegrationTests.dll'
testAssemblyVer2: 'src/Tests/IntegrationTests/bin/$(BuildConfiguration)/netcoreapp3.1/IntegrationTests.dll'
configuration: $(BuildConfiguration)
rerunFailedTests: True
rerunMaxAttempts: 2
testRunTitle: 'IntegrationTests .NetCoreApp2.2'

- task: VSTest@2
displayName: 'IntegrationTests .NetCoreApp3.0'
inputs:
testSelector: 'testAssemblies'
testAssemblyVer2: 'src/Tests/IntegrationTests/bin/$(BuildConfiguration)/netcoreapp3.0/IntegrationTests.dll'
configuration: $(BuildConfiguration)
rerunFailedTests: True
rerunMaxAttempts: 2
testRunTitle: 'IntegrationTests .NetCoreApp3.0'
testRunTitle: 'IntegrationTests .NetCoreApp3.1'

- task: VSTest@2
displayName: 'IntegrationTests .Net4.5.2'
Expand Down
5 changes: 0 additions & 5 deletions global.json

This file was deleted.

17 changes: 3 additions & 14 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,22 +1,11 @@
<Project>
<PropertyGroup>
<IsLinux Condition="'$(Configuration)' == 'LinuxDebug' OR '$(Configuration)' == 'LinuxRelease'">true</IsLinux>
<IsLinux Condition="'$(Configuration)' != 'LinuxDebug' AND '$(Configuration)' != 'LinuxRelease'">false</IsLinux>
</PropertyGroup>

<PropertyGroup Condition="'$(IsLinux)'=='true'">
<DefineConstants>Linux</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(IsLinux)'=='false'">
<DefineConstants>Windows</DefineConstants>
</PropertyGroup>

<PropertyGroup>
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">netcoreapp3.1;net452</TargetFrameworks>
<TargetFramework Condition="$(OS) != 'Windows_NT'">netcoreapp3.1</TargetFramework>
<Version>0.0.0</Version>
<Company>CNCF</Company>
<Authors>The NATS Authors</Authors>
<Copyright>Copyright © The NATS Authors 2016-2019</Copyright>
<Copyright>Copyright © The NATS Authors 2016-$([System.DateTime]::Now.ToString(yyyy))</Copyright>
<RepositoryUrl>https://github.com/nats-io/nats.net</RepositoryUrl>
<RepositoryType>Git</RepositoryType>
</PropertyGroup>
Expand Down
21 changes: 8 additions & 13 deletions src/NATS.Client/NATS.Client.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks Condition="'$(IsLinux)'=='false'">netstandard1.6;net45</TargetFrameworks>
<TargetFrameworks Condition="'$(IsLinux)'=='true'">netstandard1.6</TargetFrameworks>
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">netstandard1.6;net45</TargetFrameworks>
<TargetFramework Condition="$(OS) != 'Windows_NT'">netstandard1.6</TargetFramework>
<Title>NATS .NET Client</Title>
<Description>NATS acts as a central nervous system for distributed systems at scale for IoT, edge computing, and cloud native and on-premise applications. This is the .NET client API.</Description>
<PackageId>NATS.Client</PackageId>
Expand All @@ -12,28 +12,23 @@
<PackageReleaseNotes>https://github.com/nats-io/nats.net/releases</PackageReleaseNotes>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageTags>CNCF NATS Messaging Cloud Publish Subscribe PubSub</PackageTags>
<Configurations>Debug;Release;LinuxRelease;LinuxDebug</Configurations>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
<NoWarn>1591;1701;1702;</NoWarn>
<DocumentationFile>bin\Release\$(TargetFramework)\NATS.Client.xml</DocumentationFile>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\NATS.Client.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='LinuxRelease|AnyCPU'">
<PropertyGroup Condition="$(Configuration) == 'Release'">
<NoWarn>1591;1701;1702;</NoWarn>
<DocumentationFile>bin\Release\$(TargetFramework)\NATS.Client.xml</DocumentationFile>
jasper-d marked this conversation as resolved.
Show resolved Hide resolved
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\NATS.Client.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

<ItemGroup>
<None Include="package-icon.png" Pack="true" PackagePath="\"/>
<None Include="package-icon.png">
<Pack>True</Pack>
<PackagePath />
</None>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.6'">
<ItemGroup Condition="$(TargetFramework) == 'netstandard1.6'">
<PackageReference Include="System.Net.Security" Version="4.3.2" />
<PackageReference Include="System.Reflection.Extensions" Version="4.3.0" />
<PackageReference Include="System.Runtime" Version="4.3.1" />
Expand Down
44 changes: 0 additions & 44 deletions src/NATS.sln
Original file line number Diff line number Diff line change
Expand Up @@ -37,95 +37,51 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
LinuxDebug|Any CPU = LinuxDebug|Any CPU
LinuxRelease|Any CPU = LinuxRelease|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{2997E272-4506-4725-B9D0-11FA37178FBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2997E272-4506-4725-B9D0-11FA37178FBD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2997E272-4506-4725-B9D0-11FA37178FBD}.LinuxDebug|Any CPU.ActiveCfg = LinuxDebug|Any CPU
{2997E272-4506-4725-B9D0-11FA37178FBD}.LinuxDebug|Any CPU.Build.0 = LinuxDebug|Any CPU
{2997E272-4506-4725-B9D0-11FA37178FBD}.LinuxRelease|Any CPU.ActiveCfg = LinuxRelease|Any CPU
{2997E272-4506-4725-B9D0-11FA37178FBD}.LinuxRelease|Any CPU.Build.0 = LinuxRelease|Any CPU
{2997E272-4506-4725-B9D0-11FA37178FBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2997E272-4506-4725-B9D0-11FA37178FBD}.Release|Any CPU.Build.0 = Release|Any CPU
{7A09A089-18F5-42E3-B069-9F0BBC97E0C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7A09A089-18F5-42E3-B069-9F0BBC97E0C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7A09A089-18F5-42E3-B069-9F0BBC97E0C4}.LinuxDebug|Any CPU.ActiveCfg = LinuxDebug|Any CPU
{7A09A089-18F5-42E3-B069-9F0BBC97E0C4}.LinuxDebug|Any CPU.Build.0 = LinuxDebug|Any CPU
{7A09A089-18F5-42E3-B069-9F0BBC97E0C4}.LinuxRelease|Any CPU.ActiveCfg = LinuxRelease|Any CPU
{7A09A089-18F5-42E3-B069-9F0BBC97E0C4}.LinuxRelease|Any CPU.Build.0 = LinuxRelease|Any CPU
{7A09A089-18F5-42E3-B069-9F0BBC97E0C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7A09A089-18F5-42E3-B069-9F0BBC97E0C4}.Release|Any CPU.Build.0 = Release|Any CPU
{858ED1E5-0969-4BBB-812D-310C136B801D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{858ED1E5-0969-4BBB-812D-310C136B801D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{858ED1E5-0969-4BBB-812D-310C136B801D}.LinuxDebug|Any CPU.ActiveCfg = LinuxDebug|Any CPU
{858ED1E5-0969-4BBB-812D-310C136B801D}.LinuxDebug|Any CPU.Build.0 = LinuxDebug|Any CPU
{858ED1E5-0969-4BBB-812D-310C136B801D}.LinuxRelease|Any CPU.ActiveCfg = LinuxRelease|Any CPU
{858ED1E5-0969-4BBB-812D-310C136B801D}.LinuxRelease|Any CPU.Build.0 = LinuxRelease|Any CPU
{858ED1E5-0969-4BBB-812D-310C136B801D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{858ED1E5-0969-4BBB-812D-310C136B801D}.Release|Any CPU.Build.0 = Release|Any CPU
{9DB0DC17-BA58-493A-B1A4-832AB56CA09D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9DB0DC17-BA58-493A-B1A4-832AB56CA09D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9DB0DC17-BA58-493A-B1A4-832AB56CA09D}.LinuxDebug|Any CPU.ActiveCfg = LinuxDebug|Any CPU
{9DB0DC17-BA58-493A-B1A4-832AB56CA09D}.LinuxDebug|Any CPU.Build.0 = LinuxDebug|Any CPU
{9DB0DC17-BA58-493A-B1A4-832AB56CA09D}.LinuxRelease|Any CPU.ActiveCfg = LinuxRelease|Any CPU
{9DB0DC17-BA58-493A-B1A4-832AB56CA09D}.LinuxRelease|Any CPU.Build.0 = LinuxRelease|Any CPU
{9DB0DC17-BA58-493A-B1A4-832AB56CA09D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9DB0DC17-BA58-493A-B1A4-832AB56CA09D}.Release|Any CPU.Build.0 = Release|Any CPU
{4ED5A942-B170-4D1F-9288-2394CA708576}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4ED5A942-B170-4D1F-9288-2394CA708576}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4ED5A942-B170-4D1F-9288-2394CA708576}.LinuxDebug|Any CPU.ActiveCfg = LinuxDebug|Any CPU
{4ED5A942-B170-4D1F-9288-2394CA708576}.LinuxDebug|Any CPU.Build.0 = LinuxDebug|Any CPU
{4ED5A942-B170-4D1F-9288-2394CA708576}.LinuxRelease|Any CPU.ActiveCfg = LinuxRelease|Any CPU
{4ED5A942-B170-4D1F-9288-2394CA708576}.LinuxRelease|Any CPU.Build.0 = LinuxRelease|Any CPU
{4ED5A942-B170-4D1F-9288-2394CA708576}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4ED5A942-B170-4D1F-9288-2394CA708576}.Release|Any CPU.Build.0 = Release|Any CPU
{725F4B11-9275-4966-AD46-383021EEC152}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{725F4B11-9275-4966-AD46-383021EEC152}.Debug|Any CPU.Build.0 = Debug|Any CPU
{725F4B11-9275-4966-AD46-383021EEC152}.LinuxDebug|Any CPU.ActiveCfg = LinuxDebug|Any CPU
{725F4B11-9275-4966-AD46-383021EEC152}.LinuxDebug|Any CPU.Build.0 = LinuxDebug|Any CPU
{725F4B11-9275-4966-AD46-383021EEC152}.LinuxRelease|Any CPU.ActiveCfg = LinuxRelease|Any CPU
{725F4B11-9275-4966-AD46-383021EEC152}.LinuxRelease|Any CPU.Build.0 = LinuxRelease|Any CPU
{725F4B11-9275-4966-AD46-383021EEC152}.Release|Any CPU.ActiveCfg = Release|Any CPU
{725F4B11-9275-4966-AD46-383021EEC152}.Release|Any CPU.Build.0 = Release|Any CPU
{B5C69B45-658C-431D-9D0D-C9D2D098248A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B5C69B45-658C-431D-9D0D-C9D2D098248A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B5C69B45-658C-431D-9D0D-C9D2D098248A}.LinuxDebug|Any CPU.ActiveCfg = LinuxDebug|Any CPU
{B5C69B45-658C-431D-9D0D-C9D2D098248A}.LinuxDebug|Any CPU.Build.0 = LinuxDebug|Any CPU
{B5C69B45-658C-431D-9D0D-C9D2D098248A}.LinuxRelease|Any CPU.ActiveCfg = LinuxRelease|Any CPU
{B5C69B45-658C-431D-9D0D-C9D2D098248A}.LinuxRelease|Any CPU.Build.0 = LinuxRelease|Any CPU
{B5C69B45-658C-431D-9D0D-C9D2D098248A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B5C69B45-658C-431D-9D0D-C9D2D098248A}.Release|Any CPU.Build.0 = Release|Any CPU
{2F052465-A58D-4670-8600-24CCB2F220A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2F052465-A58D-4670-8600-24CCB2F220A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2F052465-A58D-4670-8600-24CCB2F220A5}.LinuxDebug|Any CPU.ActiveCfg = LinuxDebug|Any CPU
{2F052465-A58D-4670-8600-24CCB2F220A5}.LinuxDebug|Any CPU.Build.0 = LinuxDebug|Any CPU
{2F052465-A58D-4670-8600-24CCB2F220A5}.LinuxRelease|Any CPU.ActiveCfg = LinuxRelease|Any CPU
{2F052465-A58D-4670-8600-24CCB2F220A5}.LinuxRelease|Any CPU.Build.0 = LinuxRelease|Any CPU
{2F052465-A58D-4670-8600-24CCB2F220A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2F052465-A58D-4670-8600-24CCB2F220A5}.Release|Any CPU.Build.0 = Release|Any CPU
{8BC71128-1FC5-4126-9582-41223E96C2CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8BC71128-1FC5-4126-9582-41223E96C2CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8BC71128-1FC5-4126-9582-41223E96C2CA}.LinuxDebug|Any CPU.ActiveCfg = LinuxDebug|Any CPU
{8BC71128-1FC5-4126-9582-41223E96C2CA}.LinuxDebug|Any CPU.Build.0 = LinuxDebug|Any CPU
{8BC71128-1FC5-4126-9582-41223E96C2CA}.LinuxRelease|Any CPU.ActiveCfg = LinuxRelease|Any CPU
{8BC71128-1FC5-4126-9582-41223E96C2CA}.LinuxRelease|Any CPU.Build.0 = LinuxRelease|Any CPU
{8BC71128-1FC5-4126-9582-41223E96C2CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8BC71128-1FC5-4126-9582-41223E96C2CA}.Release|Any CPU.Build.0 = Release|Any CPU
{C21CBF59-9884-436C-8A24-0248F8598979}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C21CBF59-9884-436C-8A24-0248F8598979}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C21CBF59-9884-436C-8A24-0248F8598979}.LinuxDebug|Any CPU.ActiveCfg = LinuxDebug|Any CPU
{C21CBF59-9884-436C-8A24-0248F8598979}.LinuxDebug|Any CPU.Build.0 = LinuxDebug|Any CPU
{C21CBF59-9884-436C-8A24-0248F8598979}.LinuxRelease|Any CPU.ActiveCfg = LinuxRelease|Any CPU
{C21CBF59-9884-436C-8A24-0248F8598979}.LinuxRelease|Any CPU.Build.0 = LinuxRelease|Any CPU
{C21CBF59-9884-436C-8A24-0248F8598979}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C21CBF59-9884-436C-8A24-0248F8598979}.Release|Any CPU.Build.0 = Release|Any CPU
{10ED0146-1701-4BC9-9E26-824B22D18CB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{10ED0146-1701-4BC9-9E26-824B22D18CB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{10ED0146-1701-4BC9-9E26-824B22D18CB8}.LinuxDebug|Any CPU.ActiveCfg = LinuxDebug|Any CPU
{10ED0146-1701-4BC9-9E26-824B22D18CB8}.LinuxRelease|Any CPU.ActiveCfg = LinuxRelease|Any CPU
{10ED0146-1701-4BC9-9E26-824B22D18CB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{10ED0146-1701-4BC9-9E26-824B22D18CB8}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
Expand Down
3 changes: 0 additions & 3 deletions src/Samples/Benchmark/Benchmark.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,9 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks Condition="'$(IsLinux)'=='false'">netcoreapp2.2;net45</TargetFrameworks>
<TargetFrameworks Condition="'$(IsLinux)'=='true'">netcoreapp2.2</TargetFrameworks>
<Title>NATS Benchmark</Title>
<Description>NATS Benchmarking Application</Description>
<IsPackable>false</IsPackable>
<Configurations>Debug;Release;LinuxRelease;LinuxDebug</Configurations>
</PropertyGroup>

<ItemGroup>
Expand Down
3 changes: 0 additions & 3 deletions src/Samples/Publish/Publish.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,9 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks Condition="'$(IsLinux)'=='false'">netcoreapp2.2;net45</TargetFrameworks>
<TargetFrameworks Condition="'$(IsLinux)'=='true'">netcoreapp2.2</TargetFrameworks>
<Title>NATS Publisher</Title>
<Description>NATS Publish Example</Description>
<IsPackable>false</IsPackable>
<Configurations>Debug;Release;LinuxRelease;LinuxDebug</Configurations>
</PropertyGroup>

<ItemGroup>
Expand Down
3 changes: 0 additions & 3 deletions src/Samples/QueueGroup/QueueGroup.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,9 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks Condition="'$(IsLinux)'=='false'">netcoreapp2.2;net45</TargetFrameworks>
<TargetFrameworks Condition="'$(IsLinux)'=='true'">netcoreapp2.2</TargetFrameworks>
<Title>NATS QueueGroup</Title>
<Description>NATS QueueGroup Example</Description>
<IsPackable>false</IsPackable>
<Configurations>Debug;Release;LinuxRelease;LinuxDebug</Configurations>
</PropertyGroup>

<ItemGroup>
Expand Down
3 changes: 0 additions & 3 deletions src/Samples/Replier/Replier.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,9 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks Condition="'$(IsLinux)'=='false'">netcoreapp2.2;net45</TargetFrameworks>
<TargetFrameworks Condition="'$(IsLinux)'=='true'">netcoreapp2.2</TargetFrameworks>
<Title>NATS Replier</Title>
<Description>NATS Replier Example</Description>
<IsPackable>false</IsPackable>
<Configurations>Debug;Release;LinuxRelease;LinuxDebug</Configurations>
</PropertyGroup>

<ItemGroup>
Expand Down
3 changes: 0 additions & 3 deletions src/Samples/Requestor/Requestor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,9 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks Condition="'$(IsLinux)'=='false'">netcoreapp2.2;net45</TargetFrameworks>
<TargetFrameworks Condition="'$(IsLinux)'=='true'">netcoreapp2.2</TargetFrameworks>
<Title>NATS Requestor</Title>
<Description>NATS Requestor Example</Description>
<IsPackable>false</IsPackable>
<Configurations>Debug;Release;LinuxRelease;LinuxDebug</Configurations>
</PropertyGroup>

<ItemGroup>
Expand Down
3 changes: 0 additions & 3 deletions src/Samples/RxSample/RxSample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,9 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks Condition="'$(IsLinux)'=='false'">netcoreapp2.2;net45</TargetFrameworks>
<TargetFrameworks Condition="'$(IsLinux)'=='true'">netcoreapp2.2</TargetFrameworks>
<Title>NATS RxSample</Title>
<Description>NATS Rx Example</Description>
<IsPackable>false</IsPackable>
<Configurations>Debug;Release;LinuxRelease;LinuxDebug</Configurations>
</PropertyGroup>

<ItemGroup>
Expand Down
3 changes: 0 additions & 3 deletions src/Samples/Subscribe/Subscribe.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,9 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks Condition="'$(IsLinux)'=='false'">netcoreapp2.2;net45</TargetFrameworks>
<TargetFrameworks Condition="'$(IsLinux)'=='true'">netcoreapp2.2</TargetFrameworks>
<Title>NATS Subscriber</Title>
<Description>NATS Subscriber Example</Description>
<IsPackable>false</IsPackable>
<Configurations>Debug;Release;LinuxRelease;LinuxDebug</Configurations>
</PropertyGroup>

<ItemGroup>
Expand Down
6 changes: 2 additions & 4 deletions src/Samples/WinFormsSample/Form1.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions src/Samples/WinFormsSample/Form1.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#if Windows
using System;
using System;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
Expand Down Expand Up @@ -212,5 +211,4 @@ await Task.Run(async () =>
}
}
}
}
#endif
}
14 changes: 1 addition & 13 deletions src/Samples/WinFormsSample/Program.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#if Windows
using System;
using System.Windows.Forms;

Expand All @@ -18,15 +17,4 @@ static void Main()
Application.Run(new Form1());
}
}
}
#else
namespace WinFormsSample
{
static class Program
{
static void Main()
{
}
}
}
#endif
}
Loading