From 319bbcffad16e856fd23ffa19ea1c93b9324af7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?=
 <root@acid-chicken.com>
Date: Fri, 13 Apr 2018 23:06:10 +0900
Subject: [PATCH] Use 'Condition' attributes

refs: https://github.com/RogueException/Discord.Net/pull/1026/files/6f29dda78b35c4ce6296a0250d88ed223c5b363d#r181371650
---
 src/Discord.Net.Core/Discord.Net.Core.csproj  | 25 +++--------
 .../Discord.Net.DebugTools.csproj             | 25 +++--------
 src/Discord.Net.Rest/Discord.Net.Rest.csproj  | 45 ++++++-------------
 .../Discord.Net.WebSocket.csproj              | 28 ++++--------
 4 files changed, 36 insertions(+), 87 deletions(-)

diff --git a/src/Discord.Net.Core/Discord.Net.Core.csproj b/src/Discord.Net.Core/Discord.Net.Core.csproj
index df88b8212..7565fa178 100644
--- a/src/Discord.Net.Core/Discord.Net.Core.csproj
+++ b/src/Discord.Net.Core/Discord.Net.Core.csproj
@@ -1,23 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="../../Discord.Net.targets" />
-  <Choose>
-    <When Condition=" '$(OS)' == 'Windows_NT' ">
-      <PropertyGroup>
-        <AssemblyName>Discord.Net.Core</AssemblyName>
-        <RootNamespace>Discord</RootNamespace>
-        <Description>The core components for the Discord.Net library.</Description>
-        <TargetFrameworks>net45;netstandard1.1;netstandard1.3</TargetFrameworks>
-      </PropertyGroup>
-    </When>
-    <Otherwise>
-      <PropertyGroup>
-        <AssemblyName>Discord.Net.Core</AssemblyName>
-        <RootNamespace>Discord</RootNamespace>
-        <Description>The core components for the Discord.Net library.</Description>
-        <TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
+  <PropertyGroup>
+    <AssemblyName>Discord.Net.Core</AssemblyName>
+    <RootNamespace>Discord</RootNamespace>
+    <Description>The core components for the Discord.Net library.</Description>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net45;netstandard1.1;netstandard1.3</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard1.1;netstandard1.3</TargetFrameworks>
+  </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
     <PackageReference Include="System.Collections.Immutable" Version="1.3.1" />
diff --git a/src/Discord.Net.DebugTools/Discord.Net.DebugTools.csproj b/src/Discord.Net.DebugTools/Discord.Net.DebugTools.csproj
index d1dc9c7a9..8c56a5fb4 100644
--- a/src/Discord.Net.DebugTools/Discord.Net.DebugTools.csproj
+++ b/src/Discord.Net.DebugTools/Discord.Net.DebugTools.csproj
@@ -1,23 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="../../Discord.Net.targets" />
-  <Choose>
-    <When Condition=" '$(OS)' == 'Windows_NT' ">
-      <PropertyGroup>
-        <AssemblyName>Discord.Net.DebugTools</AssemblyName>
-        <RootNamespace>Discord</RootNamespace>
-        <Description>A Discord.Net extension adding some helper classes for diagnosing issues.</Description>
-        <TargetFrameworks>net45;netstandard1.3</TargetFrameworks>
-      </PropertyGroup>
-    </When>
-    <Otherwise>
-      <PropertyGroup>
-        <AssemblyName>Discord.Net.DebugTools</AssemblyName>
-        <RootNamespace>Discord</RootNamespace>
-        <Description>A Discord.Net extension adding some helper classes for diagnosing issues.</Description>
-        <TargetFrameworks>netstandard1.3</TargetFrameworks>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
+  <PropertyGroup>
+    <AssemblyName>Discord.Net.DebugTools</AssemblyName>
+    <RootNamespace>Discord</RootNamespace>
+    <Description>A Discord.Net extension adding some helper classes for diagnosing issues.</Description>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net45;netstandard1.3</TargetFrameworks>
+    <TargetFramework Condition=" '$(OS)' != 'Windows_NT' ">netstandard1.3</TargetFramework>
+  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Discord.Net.Core\Discord.Net.Core.csproj" />
   </ItemGroup>
diff --git a/src/Discord.Net.Rest/Discord.Net.Rest.csproj b/src/Discord.Net.Rest/Discord.Net.Rest.csproj
index 175500050..0eb07a4b2 100644
--- a/src/Discord.Net.Rest/Discord.Net.Rest.csproj
+++ b/src/Discord.Net.Rest/Discord.Net.Rest.csproj
@@ -1,37 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="../../Discord.Net.targets" />
-  <Choose>
-    <When Condition=" '$(OS)' == 'Windows_NT' ">
-      <PropertyGroup>
-        <AssemblyName>Discord.Net.Rest</AssemblyName>
-        <RootNamespace>Discord.Rest</RootNamespace>
-        <Description>A core Discord.Net library containing the REST client and models.</Description>
-        <TargetFrameworks>net45;netstandard1.1;netstandard1.3</TargetFrameworks>
-      </PropertyGroup>
-    </When>
-    <Otherwise>
-      <PropertyGroup>
-        <AssemblyName>Discord.Net.Rest</AssemblyName>
-        <RootNamespace>Discord.Rest</RootNamespace>
-        <Description>A core Discord.Net library containing the REST client and models.</Description>
-        <TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
+  <PropertyGroup>
+    <AssemblyName>Discord.Net.Rest</AssemblyName>
+    <RootNamespace>Discord.Rest</RootNamespace>
+    <Description>A core Discord.Net library containing the REST client and models.</Description>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net45;netstandard1.1;netstandard1.3</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard1.1;netstandard1.3</TargetFrameworks>
+  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Discord.Net.Core\Discord.Net.Core.csproj" />
   </ItemGroup>
-  <Choose>
-    <When Condition=" '$(TargetFramework)' != 'net45' ">
-      <ItemGroup>
-        <PackageReference Include="System.Net.Http" Version="4.3.2" />
-        <!-- https://github.com/dotnet/corefx/issues/19535 -->
-      </ItemGroup>
-    </When>
-    <Otherwise>
-      <ItemGroup>
-        <Reference Include="System.Net.Http" />
-      </ItemGroup>
-    </Otherwise>
-  </Choose>
+  <ItemGroup Condition=" '$(TargetFramework)' != 'net45' ">
+    <PackageReference Include="System.Net.Http" Version="4.3.2" />
+    <!-- https://github.com/dotnet/corefx/issues/19535 -->
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
+    <Reference Include="System.Net.Http" />
+  </ItemGroup>
 </Project>
diff --git a/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj b/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj
index c67dc412d..251cdb18b 100644
--- a/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj
+++ b/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj
@@ -1,25 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="../../Discord.Net.targets" />
-  <Choose>
-    <When Condition=" '$(OS)' == 'Windows_NT' ">
-      <PropertyGroup>
-        <AssemblyName>Discord.Net.WebSocket</AssemblyName>
-        <RootNamespace>Discord.WebSocket</RootNamespace>
-        <Description>A core Discord.Net library containing the WebSocket client and models.</Description>
-        <TargetFrameworks>net45;netstandard1.1;netstandard1.3</TargetFrameworks>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-      </PropertyGroup>
-    </When>
-    <Otherwise>
-      <PropertyGroup>
-        <AssemblyName>Discord.Net.WebSocket</AssemblyName>
-        <RootNamespace>Discord.WebSocket</RootNamespace>
-        <Description>A core Discord.Net library containing the WebSocket client and models.</Description>
-        <TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
+  <PropertyGroup>
+    <AssemblyName>Discord.Net.WebSocket</AssemblyName>
+    <RootNamespace>Discord.WebSocket</RootNamespace>
+    <Description>A core Discord.Net library containing the WebSocket client and models.</Description>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net45;netstandard1.1;netstandard1.3</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard1.1;netstandard1.3</TargetFrameworks>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Discord.Net.Core\Discord.Net.Core.csproj" />
     <ProjectReference Include="..\Discord.Net.Rest\Discord.Net.Rest.csproj" />