Merge pull request #132 from ShimakazeProject/feat/refactor

重构 并带来 .Net Framework 4.8 支持

Directory.Build.props

@@ -13,9 +13,16 @@
     <ShimakazeSdk_IsTest Condition=" $(MSBuildProjectFullPath.StartsWith('$(ShimakazeSdk_UnitTestFolder)')) ">True</ShimakazeSdk_IsTest>
   </PropertyGroup>
 
+  <PropertyGroup Condition="$(ShimakazeSdk_IsCSharp)">
+    <TargetFrameworks>netstandard2.0;net48;net8.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="$(ShimakazeSdk_IsTest)">
+    <TargetFrameworks>net48;net8.0</TargetFrameworks>
+  </PropertyGroup>
+
   <!-- CSharp -->
   <PropertyGroup Condition="$(ShimakazeSdk_IsCSharp)">
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net8.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
@@ -32,8 +39,12 @@
     <AnalysisLevel>latest-recommended</AnalysisLevel>
 
     <!-- Polyfill -->
-    <NoWarn Condition="$(TargetFramework.StartsWith('netstandard'))">1701;1702;8601;8604;8767</NoWarn>
-    <Nullable Condition="$(TargetFramework.StartsWith('netstandard'))">annotations</Nullable>
+    <NoWarn Condition="$(TargetFramework) == 'netstandard2.0' or
+                       $(TargetFramework) == 'netcoreapp2.0' or
+                       $(TargetFrameworkIdentifier) == '.NETFramework'">1701;1702;8601;8604;8618;8767</NoWarn>
+    <Nullable Condition="$(TargetFramework) == 'netstandard2.0' or
+                         $(TargetFramework) == 'netcoreapp2.0' or
+                         $(TargetFrameworkIdentifier) == '.NETFramework'">annotations</Nullable>
 
     <Authors>Shimakaze Project</Authors>
     <Copyright>Copyright © 2020 - $([System.DateTime]::Now.ToString("yyyy")) $(Authors)</Copyright>
@@ -57,6 +68,10 @@
     <None Include="$(ReadmeFile)" Condition=" '$(ReadmeFile)' != '' " Pack="True" PackagePath="\" />
   </ItemGroup>
 
+  <ItemGroup Condition="$(ShimakazeSdk_IsCSharp) AND $(MSBuildProjectName) != 'Shimakaze.Sdk.Common' AND $(MSBuildProjectName) != 'Shimakaze.Sdk.Polyfill'" >
+    <ProjectReference Include="$(ShimakazeSdk_SourceFolder)Shimakaze.Sdk.Common\Shimakaze.Sdk.Common.csproj" />
+  </ItemGroup>
+
   <ItemGroup Condition="$(ShimakazeSdk_IsCSharp)">
     <PackageReference Include="IDisposableAnalyzers" Version="4.0.7">
       <PrivateAssets>all</PrivateAssets>
@@ -71,7 +86,6 @@
 
   <!-- CSharp UnitTest -->
   <PropertyGroup Condition="$(ShimakazeSdk_IsTest)">
-    <TargetFrameworks>net8.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
 

Shimakaze.Sdk.sln

@@ -115,6 +115,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shimakaze.Sdk.Csf.Xml.Tests
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shimakaze.Sdk.Csf.Yaml.Tests", "test\Shimakaze.Sdk.Csf.Yaml.Tests\Shimakaze.Sdk.Csf.Yaml.Tests.csproj", "{315515ED-E32E-45C7-A4CB-DE3C2507BC2D}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "System", "System", "{3AB90C06-6426-4F22-B85C-A8372C52631B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{A15A4A0D-E047-4A71-A1C3-8436D0D9EE2B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shimakaze.Sdk.Common.Tests", "test\Shimakaze.Sdk.Common.Tests\Shimakaze.Sdk.Common.Tests.csproj", "{51EE7AF6-4755-43F7-8499-DD6F97E025B2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -245,11 +251,16 @@ Global
 		{315515ED-E32E-45C7-A4CB-DE3C2507BC2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{315515ED-E32E-45C7-A4CB-DE3C2507BC2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{315515ED-E32E-45C7-A4CB-DE3C2507BC2D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{51EE7AF6-4755-43F7-8499-DD6F97E025B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{51EE7AF6-4755-43F7-8499-DD6F97E025B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{51EE7AF6-4755-43F7-8499-DD6F97E025B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{51EE7AF6-4755-43F7-8499-DD6F97E025B2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+		{9EB75B01-280D-442C-8C00-F4BB9767C37E} = {3AB90C06-6426-4F22-B85C-A8372C52631B}
 		{BA622C63-F0C1-4726-9229-FB6FF44B7B35} = {DD6D9467-7D41-4749-896A-1684A101F399}
 		{DB4DC32F-8BF2-4A3C-9055-4FF4EB135630} = {DD6D9467-7D41-4749-896A-1684A101F399}
 		{D8A5978D-6C4E-44B7-9D3A-66E76D66894D} = {DD6D9467-7D41-4749-896A-1684A101F399}
@@ -259,6 +270,7 @@ Global
 		{D0CF35E5-76B5-40A7-B78A-04FABA845D02} = {276B7594-B77E-4D94-A9EA-FFB7F42E702A}
 		{AD7F08CD-FD3C-4E77-943E-EC3D700E1C15} = {276B7594-B77E-4D94-A9EA-FFB7F42E702A}
 		{79E5E75B-4B7E-4ACD-B2AA-164948F5BB34} = {AD7F08CD-FD3C-4E77-943E-EC3D700E1C15}
+		{5B7422DF-93AE-4BE3-B64C-103A491F5184} = {3AB90C06-6426-4F22-B85C-A8372C52631B}
 		{12037EB7-5403-4978-885C-7D41D6AEF4B8} = {80CC1DD6-91A9-472A-A58F-9499037AB6F6}
 		{2FE1D9B4-BF91-459D-97AA-9DB8C69A9CBA} = {80CC1DD6-91A9-472A-A58F-9499037AB6F6}
 		{775BF941-C645-4743-81AB-326E1F0ED5DD} = {80CC1DD6-91A9-472A-A58F-9499037AB6F6}
@@ -289,6 +301,8 @@ Global
 		{3DE158DA-2EBA-4228-A52F-3C6A55E3EFEE} = {A6A54DD2-06C2-4CB0-B4C1-920AF1926A5D}
 		{B73EB0C8-B3C4-4B6E-933D-E003CE3215FD} = {A6A54DD2-06C2-4CB0-B4C1-920AF1926A5D}
 		{315515ED-E32E-45C7-A4CB-DE3C2507BC2D} = {A6A54DD2-06C2-4CB0-B4C1-920AF1926A5D}
+		{A15A4A0D-E047-4A71-A1C3-8436D0D9EE2B} = {3AB90C06-6426-4F22-B85C-A8372C52631B}
+		{51EE7AF6-4755-43F7-8499-DD6F97E025B2} = {A15A4A0D-E047-4A71-A1C3-8436D0D9EE2B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1C5FF25D-B54D-4920-A61E-180CCE63A876}