add Directory.Build.props

dombrovsky · May 29, 2024 · a36ea07 · a36ea07
1 parent a98a027
commit a36ea07
Show file tree

Hide file tree

Showing 8 changed files with 86 additions and 176 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="17.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <LangVersion>12</LangVersion>
+    <Nullable>enable</Nullable>
+    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <Version>1.0.0-rc4</Version>
+    <Authors>Volodymyr Dombrovskyi</Authors>
+    <Copyright>Copyright (c) 2023 Volodymyr Dombrovskyi</Copyright>
+    <RepositoryUrl>https://github.com/dombrovsky/TaskFlow.git</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <PackageProjectUrl>https://dombrovsky.github.io/TaskFlow</PackageProjectUrl>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
+    <EnableNETAnalyzers>true</EnableNETAnalyzers>
+    <AnalysisLevel>latest</AnalysisLevel>
+    <AnalysisMode>AllEnabledByDefault</AnalysisMode>
+    <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
+    <CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
+    <SignAssembly>True</SignAssembly>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)TaskFlow.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="IsExternalInit" Version="1.0.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <AssemblyAttribute Include="System.CLSCompliant">
+      <_Parameter1>true</_Parameter1>
+      <_Parameter1_TypeName>System.Boolean</_Parameter1_TypeName>
+    </AssemblyAttribute>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+      <_Parameter1>
+        $(AssemblyName).Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010019048320f9788f50a6b96919219d35d14047ed0202e32cd3e19bb1d28de1a43a7f2527998078d2d6dbe4b38f16e377d0da9edb6708dcd4c880a765abf40eb940b97827a05295acf2694a990fbaf532a537223ab8d3b3f576e29403e286d30e115a6b5c72b9a8118db4828a1ac78e4a583bbdcf0589b5aafc830218de1bd9b8c4
+      </_Parameter1>
+    </AssemblyAttribute>
+  </ItemGroup>
+
+</Project>
diff --git a/...ns.Microsoft.DependencyInjection/TaskFlow.Extensions.Microsoft.DependencyInjection.csproj b/...ns.Microsoft.DependencyInjection/TaskFlow.Extensions.Microsoft.DependencyInjection.csproj
@@ -1,70 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<LangVersion>12</LangVersion>
 		<TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
-		<Nullable>enable</Nullable>
-		<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
-		<Deterministic>true</Deterministic>
 		<RootNamespace>System.Threading.Tasks.Flow</RootNamespace>
+    <PackageId>TaskFlow.Microsoft.Extensions.DependencyInjection</PackageId>
 	</PropertyGroup>
 
-	<PropertyGroup>
-		<PackageId>TaskFlow.Microsoft.Extensions.DependencyInjection</PackageId>
-		<Version>1.0.0-rc3</Version>
-		<Authors>Volodymyr Dombrovskyi</Authors>
-		<Copyright>Copyright (c) 2023 Volodymyr Dombrovskyi</Copyright>
-		<PackageTags>TODO</PackageTags>
-		<Description>TODO</Description>
-		<RepositoryUrl>https://github.com/dombrovsky/TaskFlow.git</RepositoryUrl>
-		<RepositoryType>git</RepositoryType>
-		<PackageProjectUrl>https://dombrovsky.github.io/TaskFlow</PackageProjectUrl>
-		<PackageLicenseFile>LICENSE</PackageLicenseFile>
-		<PackageReadmeFile>README.md</PackageReadmeFile>
-
-		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-		<PublishRepositoryUrl>true</PublishRepositoryUrl>
-		<IncludeSymbols>true</IncludeSymbols>
-		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
-		<EmbedUntrackedSources>true</EmbedUntrackedSources>
-	</PropertyGroup>
-
-	<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
-  		<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-	</PropertyGroup>
-
-	<PropertyGroup>
-		<RunCodeAnalysis>false</RunCodeAnalysis>
-		<EnableNETAnalyzers>true</EnableNETAnalyzers>
-		<AnalysisLevel>latest</AnalysisLevel>
-		<AnalysisMode>AllEnabledByDefault</AnalysisMode>
-		<EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
-		<CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
-		<SignAssembly>True</SignAssembly>
-		<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)..\TaskFlow.snk</AssemblyOriginatorKeyFile>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<AssemblyAttribute Include="System.CLSCompliant">
-			<_Parameter1>true</_Parameter1>
-			<_Parameter1_TypeName>System.Boolean</_Parameter1_TypeName>
-		</AssemblyAttribute>
-	</ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
-    <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
 	</ItemGroup>
 
-    <ItemGroup>
+  <ItemGroup>
 		<None Include="..\LICENSE" Pack="true" PackagePath="\" />
 		<None Include="..\README.md" Pack="true" PackagePath="\" />
 	</ItemGroup>
 
-    <ItemGroup>
-      <ProjectReference Include="..\TaskFlow\TaskFlow.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\TaskFlow\TaskFlow.csproj" />
+  </ItemGroup>
 
-    <Import Project="..\TaskFlow.Annotations\TaskFlow.Annotations.projitems" Label="Shared" />
+  <Import Project="..\TaskFlow.Annotations\TaskFlow.Annotations.projitems" Label="Shared" />
 
 </Project>
diff --git a/TaskFlow.Extensions.Time/TaskFlow.Extensions.Time.csproj b/TaskFlow.Extensions.Time/TaskFlow.Extensions.Time.csproj
@@ -1,60 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <LangVersion>12</LangVersion>
     <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
-    <Nullable>enable</Nullable>
-    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
-    <Deterministic>true</Deterministic>
     <RootNamespace>System.Threading.Tasks.Flow</RootNamespace>
-  </PropertyGroup>
-
-  <PropertyGroup>
     <PackageId>TaskFlow.Extensions.Time</PackageId>
-    <Version>1.0.0-rc3</Version>
-    <Authors>Volodymyr Dombrovskyi</Authors>
-    <Copyright>Copyright (c) 2023 Volodymyr Dombrovskyi</Copyright>
-    <PackageTags>TODO</PackageTags>
-    <Description>TODO</Description>
-    <RepositoryUrl>https://github.com/dombrovsky/TaskFlow.git</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-    <PackageProjectUrl>https://dombrovsky.github.io/TaskFlow</PackageProjectUrl>
-    <PackageLicenseFile>LICENSE</PackageLicenseFile>
-    <PackageReadmeFile>README.md</PackageReadmeFile>
-
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-    <EnableNETAnalyzers>true</EnableNETAnalyzers>
-    <AnalysisLevel>latest</AnalysisLevel>
-    <AnalysisMode>AllEnabledByDefault</AnalysisMode>
-    <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
-    <CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
-    <SignAssembly>True</SignAssembly>
-    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)..\TaskFlow.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <AssemblyAttribute Include="System.CLSCompliant">
-      <_Parameter1>true</_Parameter1>
-      <_Parameter1_TypeName>System.Boolean</_Parameter1_TypeName>
-    </AssemblyAttribute>
-    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
-      <_Parameter1>
-        $(AssemblyName).Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010019048320f9788f50a6b96919219d35d14047ed0202e32cd3e19bb1d28de1a43a7f2527998078d2d6dbe4b38f16e377d0da9edb6708dcd4c880a765abf40eb940b97827a05295acf2694a990fbaf532a537223ab8d3b3f576e29403e286d30e115a6b5c72b9a8118db4828a1ac78e4a583bbdcf0589b5aafc830218de1bd9b8c4
-      </_Parameter1>
-    </AssemblyAttribute>
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.Bcl.TimeProvider" Version="8.0.0" />
   </ItemGroup>
@@ -63,15 +13,6 @@
     <Compile Include="..\TaskFlow\Extensions\ThrottlingTaskSchedulerExtensions.cs" Link="ThrottlingTaskSchedulerExtensions.cs" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="IsExternalInit" Version="1.0.3">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Include="..\LICENSE" Pack="true" PackagePath="\" />
     <None Include="..\README.md" Pack="true" PackagePath="\" />

diff --git a/TaskFlow.Tests/Extensions/TimeoutTaskSchedulerExtensionsFixture.cs b/TaskFlow.Tests/Extensions/TimeoutTaskSchedulerExtensionsFixture.cs
@@ -68,7 +68,7 @@ public void InfiniteTimeout_ShouldNotThrowTimeoutException(ITaskFlow taskFlow)
         }
 
         [TestCaseSource(typeof(TaskFlows), nameof(TaskFlows.CreateTaskFlows))]
-        public async Task Timeout_WhenOperationNameSpecified_ShouldThrowTimeoutExceptionWithOperationName(ITaskFlow taskFlow)
+        public void Timeout_WhenOperationNameSpecified_ShouldThrowTimeoutExceptionWithOperationName(ITaskFlow taskFlow)
         {
             _taskFlow = taskFlow;
 

diff --git a/TaskFlow.Tests/TaskFlow.Tests.csproj b/TaskFlow.Tests/TaskFlow.Tests.csproj
@@ -4,10 +4,13 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <EnableNETAnalyzers>false</EnableNETAnalyzers>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="JetBrains.dotMemoryUnit" Version="3.2.20220510" />
     <PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" Version="8.5.0" />

diff --git a/TaskFlow.Tests/TaskSchedulerBaseFixture.Scheduling.cs b/TaskFlow.Tests/TaskSchedulerBaseFixture.Scheduling.cs
@@ -192,7 +192,7 @@ public async Task Enqueue_AsyncContinuationThrowsException_ShouldExecuteNextOper
             await task2;
 
             Assert.That(() => task1.IsFaulted, Is.True.After(100, 10));
-            Assert.That(task1.Exception.InnerException, Is.TypeOf<InvalidOperationException>());
+            Assert.That(task1.Exception?.InnerException, Is.TypeOf<InvalidOperationException>());
             Assert.That(task2.Result, Is.EqualTo(2));
         }
     }

diff --git a/TaskFlow.sln b/TaskFlow.sln
@@ -15,6 +15,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TaskFlow.Extensions.Microso
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TaskFlow.Extensions.Time", "TaskFlow.Extensions.Time\TaskFlow.Extensions.Time.csproj", "{DD1D5309-B058-4563-8BB3-96B93AB7731F}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{92762303-0A4A-484E-A984-001AEE05A94F}"
+	ProjectSection(SolutionItems) = preProject
+		Directory.Build.props = Directory.Build.props
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

diff --git a/TaskFlow/TaskFlow.csproj b/TaskFlow/TaskFlow.csproj
@@ -1,60 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<LangVersion>12</LangVersion>
 		<TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
-		<Nullable>enable</Nullable>
-		<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
-		<Deterministic>true</Deterministic>
 		<RootNamespace>System.Threading.Tasks.Flow</RootNamespace>
+    <PackageId>TaskFlow</PackageId>
 	</PropertyGroup>
 
-	<PropertyGroup>
-		<PackageId>TaskFlow</PackageId>
-		<Version>1.0.0-rc3</Version>
-		<Authors>Volodymyr Dombrovskyi</Authors>
-		<Copyright>Copyright (c) 2023 Volodymyr Dombrovskyi</Copyright>
-		<PackageTags>TODO</PackageTags>
-		<Description>TODO</Description>
-		<RepositoryUrl>https://github.com/dombrovsky/TaskFlow.git</RepositoryUrl>
-		<RepositoryType>git</RepositoryType>
-		<PackageProjectUrl>https://dombrovsky.github.io/TaskFlow</PackageProjectUrl>
-		<PackageLicenseFile>LICENSE</PackageLicenseFile>
-		<PackageReadmeFile>README.md</PackageReadmeFile>
-
-		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-		<PublishRepositoryUrl>true</PublishRepositoryUrl>
-		<IncludeSymbols>true</IncludeSymbols>
-		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
-		<EmbedUntrackedSources>true</EmbedUntrackedSources>
-	</PropertyGroup>
-
-	<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-	</PropertyGroup>
-
-	<PropertyGroup>
-		<RunCodeAnalysis>false</RunCodeAnalysis>
-		<EnableNETAnalyzers>true</EnableNETAnalyzers>
-		<AnalysisLevel>latest</AnalysisLevel>
-		<AnalysisMode>AllEnabledByDefault</AnalysisMode>
-		<EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
-		<CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
-		<SignAssembly>True</SignAssembly>
-		<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)..\TaskFlow.snk</AssemblyOriginatorKeyFile>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<AssemblyAttribute Include="System.CLSCompliant">
-			<_Parameter1>true</_Parameter1>
-			<_Parameter1_TypeName>System.Boolean</_Parameter1_TypeName>
-		</AssemblyAttribute>
-    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
-      <_Parameter1>
-        $(AssemblyName).Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010019048320f9788f50a6b96919219d35d14047ed0202e32cd3e19bb1d28de1a43a7f2527998078d2d6dbe4b38f16e377d0da9edb6708dcd4c880a765abf40eb940b97827a05295acf2694a990fbaf532a537223ab8d3b3f576e29403e286d30e115a6b5c72b9a8118db4828a1ac78e4a583bbdcf0589b5aafc830218de1bd9b8c4
-      </_Parameter1>
-    </AssemblyAttribute>
-	</ItemGroup>
-
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.0.0" />
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.2" />
@@ -65,20 +15,11 @@
     <Compile Remove="Extensions\ThrottlingTaskSchedulerExtensions.cs" />
   </ItemGroup>
 
-  <ItemGroup>
-      <PackageReference Include="IsExternalInit" Version="1.0.3">
-        <PrivateAssets>all</PrivateAssets>
-        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      </PackageReference>
-      <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
-      <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-	</ItemGroup>
-
   <ItemGroup>
 		<None Include="..\LICENSE" Pack="true" PackagePath="\" />
 		<None Include="..\README.md" Pack="true" PackagePath="\" />
 	</ItemGroup>
 
-    <Import Project="..\TaskFlow.Annotations\TaskFlow.Annotations.projitems" Label="Shared" />
+  <Import Project="..\TaskFlow.Annotations\TaskFlow.Annotations.projitems" Label="Shared" />
 
 </Project>