优化MSBuild配置

LQ2002 · Feb 20, 2021 · f3db1a2 · f3db1a2
1 parent 59096c8
commit f3db1a2
Show file tree

Hide file tree

Showing 21 changed files with 24 additions and 98 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,12 @@
+<Project>
+  <PropertyGroup>
+    <LangVersion>9.0</LangVersion>
+    <Nullable>enable</Nullable>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
+  <PropertyGroup Condition="Exists('..\Unicorn.pfx')">
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>false</DelaySign>
+    <AssemblyOriginatorKeyFile>..\Unicorn.pfx</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+</Project>
diff --git a/SteamToolsV1.2+.sln b/SteamToolsV1.2+.sln
@@ -52,6 +52,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B4B548C1-9AFE-4EBB-96E4-990B57C0A953}"
 	ProjectSection(SolutionItems) = preProject
 		.gitignore = .gitignore
+		Directory.Build.props = Directory.Build.props
 		global.json = global.json
 		README.md = README.md
 	EndProjectSection

diff --git a/...ication.Repositories.sqlite-net-pcl/System.Application.Repositories.sqlite-net-pcl.csproj b/...ication.Repositories.sqlite-net-pcl/System.Application.Repositories.sqlite-net-pcl.csproj
@@ -2,12 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>9.0</LangVersion>
-    <Nullable>enable</Nullable>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <SignAssembly>true</SignAssembly>
-    <DelaySign>false</DelaySign>
-    <AssemblyOriginatorKeyFile>..\Unicorn.pfx</AssemblyOriginatorKeyFile>
     <RootNamespace>System</RootNamespace>
   </PropertyGroup>
 

diff --git a/...ent.Desktop.Avalonia.App/System.Application.SteamTools.Client.Desktop.Avalonia.App.csproj b/...ent.Desktop.Avalonia.App/System.Application.SteamTools.Client.Desktop.Avalonia.App.csproj
@@ -3,13 +3,8 @@
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net5.0</TargetFramework>
-    <LangVersion>9.0</LangVersion>
-    <Nullable>enable</Nullable>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <SignAssembly>false</SignAssembly>
     <!--(SignAssembly)对此程序集进行签名会导致编译失败(CompileAvaloniaXamlTask)-->
-    <DelaySign>false</DelaySign>
-    <AssemblyOriginatorKeyFile>..\Unicorn.pfx</AssemblyOriginatorKeyFile>
     <RootNamespace>System.Application.UI</RootNamespace>
     <AssemblyName>Steam++</AssemblyName>
     <ApplicationIcon>Assets\Icon.ico</ApplicationIcon>

diff --git a/...ools.Client.Desktop.Avalonia/System.Application.SteamTools.Client.Desktop.Avalonia.csproj b/...ools.Client.Desktop.Avalonia/System.Application.SteamTools.Client.Desktop.Avalonia.csproj
@@ -2,12 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <LangVersion>9.0</LangVersion>
-    <Nullable>enable</Nullable>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <SignAssembly>true</SignAssembly>
-    <DelaySign>false</DelaySign>
-    <AssemblyOriginatorKeyFile>..\Unicorn.pfx</AssemblyOriginatorKeyFile>
     <RootNamespace>System.Application</RootNamespace>
   </PropertyGroup>
 

diff --git a/System.Application.SteamTools.Client.Desktop/MainThreadDesktop.cs b/System.Application.SteamTools.Client.Desktop/MainThreadDesktop.cs
@@ -85,7 +85,7 @@ public static Task InvokeOnMainThreadAsync(Func<Task> funcTask)
                 return funcTask();
             }
 
-            var tcs = new TaskCompletionSource<object>();
+            var tcs = new TaskCompletionSource<object?>();
 
             BeginInvokeOnMainThread(
                 async () =>

diff --git a/...Application.SteamTools.Client.Desktop/System.Application.SteamTools.Client.Desktop.csproj b/...Application.SteamTools.Client.Desktop/System.Application.SteamTools.Client.Desktop.csproj
@@ -2,12 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>9.0</LangVersion>
-    <Nullable>enable</Nullable>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <SignAssembly>true</SignAssembly>
-    <DelaySign>false</DelaySign>
-    <AssemblyOriginatorKeyFile>..\Unicorn.pfx</AssemblyOriginatorKeyFile>
     <RootNamespace>System.Application</RootNamespace>
   </PropertyGroup>
 

diff --git a/System.Application.SteamTools.Client/System.Application.SteamTools.Client.csproj b/System.Application.SteamTools.Client/System.Application.SteamTools.Client.csproj
@@ -2,12 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>9.0</LangVersion>
-    <Nullable>enable</Nullable>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <SignAssembly>true</SignAssembly>
-    <DelaySign>false</DelaySign>
-    <AssemblyOriginatorKeyFile>..\Unicorn.pfx</AssemblyOriginatorKeyFile>
     <RootNamespace>System.Application</RootNamespace>
     <DefineConstants>ORM_SQLITE_PCL;$(DefineConstants)</DefineConstants>
   </PropertyGroup>

diff --git a/...ces.CloudService.Models/System.Application.SteamTools.Services.CloudService.Models.csproj b/...ces.CloudService.Models/System.Application.SteamTools.Services.CloudService.Models.csproj
@@ -2,12 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>9.0</LangVersion>
-    <Nullable>enable</Nullable>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <SignAssembly>true</SignAssembly>
-    <DelaySign>false</DelaySign>
-    <AssemblyOriginatorKeyFile>..\Unicorn.pfx</AssemblyOriginatorKeyFile>
     <RootNamespace>System.Application</RootNamespace>
   </PropertyGroup>
 

diff --git a/...eamTools.Services.CloudService/System.Application.SteamTools.Services.CloudService.csproj b/...eamTools.Services.CloudService/System.Application.SteamTools.Services.CloudService.csproj
@@ -2,12 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>9.0</LangVersion>
-    <Nullable>enable</Nullable>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <SignAssembly>true</SignAssembly>
-    <DelaySign>false</DelaySign>
-    <AssemblyOriginatorKeyFile>..\Unicorn.pfx</AssemblyOriginatorKeyFile>
     <RootNamespace>System.Application</RootNamespace>
   </PropertyGroup>
 

diff --git a/System.Application.SteamTools/System.Application.SteamTools.csproj b/System.Application.SteamTools/System.Application.SteamTools.csproj
@@ -2,12 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>9.0</LangVersion>
-    <Nullable>enable</Nullable>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <SignAssembly>true</SignAssembly>
-    <DelaySign>false</DelaySign>
-    <AssemblyOriginatorKeyFile>..\Unicorn.pfx</AssemblyOriginatorKeyFile>
     <RootNamespace>System.Application</RootNamespace>
   </PropertyGroup>
 

diff --git a/System.Common.ClientLib.Droid/System.Common.ClientLib.Droid.csproj b/System.Common.ClientLib.Droid/System.Common.ClientLib.Droid.csproj
@@ -2,12 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>MonoAndroid10.0</TargetFramework>
-    <LangVersion>9.0</LangVersion>
-    <Nullable>enable</Nullable>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <SignAssembly>true</SignAssembly>
-    <DelaySign>false</DelaySign>
-    <AssemblyOriginatorKeyFile>..\Unicorn.pfx</AssemblyOriginatorKeyFile>
     <RootNamespace>System</RootNamespace>
     <AndroidUseIntermediateDesignerFile>false</AndroidUseIntermediateDesignerFile>
   </PropertyGroup>

diff --git a/System.Common.ClientLib.iOS/System.Common.ClientLib.iOS.csproj b/System.Common.ClientLib.iOS/System.Common.ClientLib.iOS.csproj
@@ -2,12 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>Xamarin.iOS10</TargetFramework>
-    <LangVersion>9.0</LangVersion>
-    <Nullable>enable</Nullable>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <SignAssembly>true</SignAssembly>
-    <DelaySign>false</DelaySign>
-    <AssemblyOriginatorKeyFile>..\Unicorn.pfx</AssemblyOriginatorKeyFile>
     <RootNamespace>System</RootNamespace>
   </PropertyGroup>
 

diff --git a/System.Common.ClientLib/System.Common.ClientLib.csproj b/System.Common.ClientLib/System.Common.ClientLib.csproj
@@ -2,12 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>9.0</LangVersion>
-    <Nullable>enable</Nullable>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <SignAssembly>true</SignAssembly>
-    <DelaySign>false</DelaySign>
-    <AssemblyOriginatorKeyFile>..\Unicorn.pfx</AssemblyOriginatorKeyFile>
     <RootNamespace>System</RootNamespace>
   </PropertyGroup>
 

diff --git a/System.Common.CoreLib/Properties/ThisAssembly.cs b/System.Common.CoreLib/Properties/ThisAssembly.cs
@@ -29,11 +29,16 @@ public static class ThisAssembly
         /// </summary>
         public const string AssemblyCompany = "SteamTools Team";
 
-        public const string PublicKey = ", PublicKey=" +
-           "002400000480000094000000060200000024000052534131000400000100010029b4f7706cbb7e23b3cf33be41127d4b" +
-           "12c14a77cc1094412e73ccbbea4fbc873883042b5a9e517df99137f31f610624f79b46980bcceb990db3caa619fbbb31989f" +
-           "5b6db3689d99ff1f70cb9bc20cc4d548beb942e09859cf2c0690683c9ad160a4a7287070e9e49795c75ba3d12723ddb4" +
-           "ddeb11d32f193e0882db10b41de3";
+        public const string PublicKey =
+#if SIGN_ASSEMBLY
+            ", PublicKey=" +
+            "002400000480000094000000060200000024000052534131000400000100010029b4f7706cbb7e23b3cf33be41127d4b" +
+            "12c14a77cc1094412e73ccbbea4fbc873883042b5a9e517df99137f31f610624f79b46980bcceb990db3caa619fbbb31989f" +
+            "5b6db3689d99ff1f70cb9bc20cc4d548beb942e09859cf2c0690683c9ad160a4a7287070e9e49795c75ba3d12723ddb4" +
+            "ddeb11d32f193e0882db10b41de3";
+#else
+            "";
+#endif
 
         public const bool Debuggable =
 #if DEBUG

diff --git a/System.Common.CoreLib/System.Common.CoreLib.csproj b/System.Common.CoreLib/System.Common.CoreLib.csproj
@@ -2,12 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>9.0</LangVersion>
-    <Nullable>enable</Nullable>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <SignAssembly>true</SignAssembly>
-    <DelaySign>false</DelaySign>
-    <AssemblyOriginatorKeyFile>..\Unicorn.pfx</AssemblyOriginatorKeyFile>
     <RootNamespace>System</RootNamespace>
   </PropertyGroup>
 

diff --git a/System.Common.DesktopLib/System.Common.DesktopLib.csproj b/System.Common.DesktopLib/System.Common.DesktopLib.csproj
@@ -2,12 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <LangVersion>9.0</LangVersion>
-    <Nullable>enable</Nullable>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <SignAssembly>true</SignAssembly>
-    <DelaySign>false</DelaySign>
-    <AssemblyOriginatorKeyFile>..\Unicorn.pfx</AssemblyOriginatorKeyFile>
     <RootNamespace>System</RootNamespace>
   </PropertyGroup>
 

diff --git a/System.Common.UnitTest.Droid.App/System.Common.UnitTest.Droid.App.csproj b/System.Common.UnitTest.Droid.App/System.Common.UnitTest.Droid.App.csproj
@@ -24,9 +24,6 @@
     </NuGetPackageImportStamp>
     <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
     <TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
-    <SignAssembly>true</SignAssembly>
-    <DelaySign>false</DelaySign>
-    <AssemblyOriginatorKeyFile>..\Unicorn.pfx</AssemblyOriginatorKeyFile>
     <AndroidUseIntermediateDesignerFile>false</AndroidUseIntermediateDesignerFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

diff --git a/System.Common.UnitTest.Droid/System.Common.UnitTest.Droid.csproj b/System.Common.UnitTest.Droid/System.Common.UnitTest.Droid.csproj
@@ -2,12 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>MonoAndroid10.0</TargetFramework>
-    <LangVersion>9.0</LangVersion>
-    <Nullable>enable</Nullable>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <SignAssembly>true</SignAssembly>
-    <DelaySign>false</DelaySign>
-    <AssemblyOriginatorKeyFile>..\Unicorn.pfx</AssemblyOriginatorKeyFile>
     <RootNamespace>System.UnitTest</RootNamespace>
     <IsPackable>false</IsPackable>
     <DefineConstants>UnitTest;$(DefineConstants)</DefineConstants>

diff --git a/System.Common.UnitTest/System.Common.UnitTest.csproj b/System.Common.UnitTest/System.Common.UnitTest.csproj
@@ -2,12 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <LangVersion>9.0</LangVersion>
-    <Nullable>enable</Nullable>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <SignAssembly>true</SignAssembly>
-    <DelaySign>false</DelaySign>
-    <AssemblyOriginatorKeyFile>..\Unicorn.pfx</AssemblyOriginatorKeyFile>
     <RootNamespace>System</RootNamespace>
     <IsPackable>false</IsPackable>
     <DefineConstants>UnitTest;$(DefineConstants)</DefineConstants>

diff --git a/Unicorn.pfx b/Unicorn.pfx