From f211dbfdd2394887e4606adad8a8d19e71b8a251 Mon Sep 17 00:00:00 2001
From: genteure <genteure@gmail.com>
Date: Tue, 17 May 2022 01:48:50 +0800
Subject: [PATCH] Fix build warnings

---
 .../BililiveRecorder.Cli.csproj               | 16 ++---
 Directory.Build.props                         | 60 ++++++++++++-------
 2 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/BililiveRecorder.Cli/BililiveRecorder.Cli.csproj b/BililiveRecorder.Cli/BililiveRecorder.Cli.csproj
index 669a46f..ff3e09a 100644
--- a/BililiveRecorder.Cli/BililiveRecorder.Cli.csproj
+++ b/BililiveRecorder.Cli/BililiveRecorder.Cli.csproj
@@ -1,24 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+  
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
     <StartupObject>BililiveRecorder.Cli.Program</StartupObject>
     <ValidateExecutableReferencesMatchSelfContained>false</ValidateExecutableReferencesMatchSelfContained>
-    <RuntimeIdentifiers>win-x64;osx-x64;osx.10.11-x64;linux-arm64;linux-arm;linux-x64</RuntimeIdentifiers>
-    <RuntimeIdentifier Condition=" '$(RuntimeIdentifier)' == 'any' "></RuntimeIdentifier>
-    <PublishDir Condition=" '$(RuntimeIdentifier)' == '' ">publish\any</PublishDir>
-    <PublishDir Condition=" '$(RuntimeIdentifier)' != '' ">publish\$(RuntimeIdentifier)</PublishDir>
-    <SelfContained Condition=" '$(RuntimeIdentifier)' == '' ">false</SelfContained>
-    <SelfContained Condition=" '$(SelfContained)' == '' ">true</SelfContained>
   </PropertyGroup>
-
+  
   <ItemGroup>
     <Compile Remove="publish\**" />
     <EmbeddedResource Remove="publish\**" />
     <None Remove="publish\**" />
   </ItemGroup>
-
+  
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
@@ -33,11 +27,11 @@
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.21308.1" />
     <PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
   </ItemGroup>
-
+  
   <ItemGroup>
     <ProjectReference Include="..\BililiveRecorder.Core\BililiveRecorder.Core.csproj" />
     <ProjectReference Include="..\BililiveRecorder.ToolBox\BililiveRecorder.ToolBox.csproj" />
     <ProjectReference Include="..\BililiveRecorder.Web\BililiveRecorder.Web.csproj" />
   </ItemGroup>
-
+  
 </Project>
diff --git a/Directory.Build.props b/Directory.Build.props
index 8a5dc91..5cfede6 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,22 +1,42 @@
 <Project>
-  <PropertyGroup>
-    <Copyright>Copyright © 2018 - 2021 Genteure</Copyright>
-    <Authors>Genteure</Authors>
-    <Company>$(Authors)</Company>
-    <LangVersion>9.0</LangVersion>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.3">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="GitVersion.MsBuild" Version="5.6.10">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
-    <AdditionalFiles Include="$(MSBuildThisFileDirectory)BannedSymbols.txt" Link="BannedSymbols.txt"/>
-  </ItemGroup>
+    <PropertyGroup>
+        <Copyright>Copyright © 2018 - 2022 Genteure</Copyright>
+        <Authors>Genteure</Authors>
+        <Company>$(Authors)</Company>
+        <LangVersion>9.0</LangVersion>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
+        <RuntimeIdentifiers>win-x64;osx-x64;osx.10.11-x64;linux-arm64;linux-arm;linux-x64</RuntimeIdentifiers>
+        <RuntimeIdentifier Condition=" '$(RuntimeIdentifier)' == 'any' "></RuntimeIdentifier>
+        <PublishDir Condition=" '$(RuntimeIdentifier)' == '' ">publish\any</PublishDir>
+        <PublishDir Condition=" '$(RuntimeIdentifier)' != '' ">publish\$(RuntimeIdentifier)</PublishDir>
+        <SelfContained Condition=" '$(RuntimeIdentifier)' == '' ">false</SelfContained>
+        <SelfContained Condition=" '$(SelfContained)' == '' ">true</SelfContained>
+    </PropertyGroup>
+    <Target Name="_DisableCommandLineWarnings" BeforeTargets="ValidateCommandLineProperties">
+        <!-- Disable warning message -->
+        <!-- warning NETSDK1179: One of '- -self-contained' or '- -no-self-contained' options are required when '- -runtime' is used. -->
+        <!--<Message Importance="High" Text="DEBUG1: $(_CommandLineDefinedRuntimeIdentifier) $(_CommandLineDefinedSelfContained) $(TargetFrameworkIdentifier) $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '6.0'))"/>-->
+        <PropertyGroup 
+            Condition="'$(_CommandLineDefinedRuntimeIdentifier)' == 'true' and
+                   '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and
+                   $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '6.0'))">
+            <_CommandLineDefinedSelfContained>true</_CommandLineDefinedSelfContained>
+        </PropertyGroup>
+        <!--<Message Importance="High" Text="DEBUG12 $(_CommandLineDefinedRuntimeIdentifier) $(_CommandLineDefinedSelfContained) $(TargetFrameworkIdentifier) $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '6.0'))"/>-->
+    </Target>
+    <ItemGroup>
+        <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.3">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+        <PackageReference Include="GitVersion.MsBuild" Version="5.6.10">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+    </ItemGroup>
+    <ItemGroup>
+        <AdditionalFiles Include="$(MSBuildThisFileDirectory)BannedSymbols.txt" Link="BannedSymbols.txt"/>
+    </ItemGroup>
 </Project>