Skip to content

Commit a36ea07

Browse files
dombrovskydombrovsky
committed
add Directory.Build.props
1 parent a98a027 commit a36ea07

8 files changed

Lines changed: 86 additions & 176 deletions

File tree

‎Directory.Build.props‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="17.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
5+
</PropertyGroup>
6+
7+
<PropertyGroup>
8+
<LangVersion>12</LangVersion>
9+
<Nullable>enable</Nullable>
10+
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
11+
<Deterministic>true</Deterministic>
12+
</PropertyGroup>
13+
14+
<PropertyGroup>
15+
<Version>1.0.0-rc4</Version>
16+
<Authors>Volodymyr Dombrovskyi</Authors>
17+
<Copyright>Copyright (c) 2023 Volodymyr Dombrovskyi</Copyright>
18+
<RepositoryUrl>https://github.com/dombrovsky/TaskFlow.git</RepositoryUrl>
19+
<RepositoryType>git</RepositoryType>
20+
<PackageProjectUrl>https://dombrovsky.github.io/TaskFlow</PackageProjectUrl>
21+
<PackageLicenseFile>LICENSE</PackageLicenseFile>
22+
<PackageReadmeFile>README.md</PackageReadmeFile>
23+
24+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
25+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
26+
<IncludeSymbols>true</IncludeSymbols>
27+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
28+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
29+
</PropertyGroup>
30+
31+
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
32+
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
33+
</PropertyGroup>
34+
35+
<PropertyGroup>
36+
<RunCodeAnalysis>false</RunCodeAnalysis>
37+
<EnableNETAnalyzers>true</EnableNETAnalyzers>
38+
<AnalysisLevel>latest</AnalysisLevel>
39+
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
40+
<EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
41+
<CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
42+
<SignAssembly>True</SignAssembly>
43+
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)TaskFlow.snk</AssemblyOriginatorKeyFile>
44+
</PropertyGroup>
45+
46+
<ItemGroup>
47+
<PackageReference Include="IsExternalInit" Version="1.0.3">
48+
<PrivateAssets>all</PrivateAssets>
49+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
50+
</PackageReference>
51+
<PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
52+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
53+
</ItemGroup>
54+
55+
<ItemGroup>
56+
<AssemblyAttribute Include="System.CLSCompliant">
57+
<_Parameter1>true</_Parameter1>
58+
<_Parameter1_TypeName>System.Boolean</_Parameter1_TypeName>
59+
</AssemblyAttribute>
60+
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
61+
<_Parameter1>
62+
$(AssemblyName).Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010019048320f9788f50a6b96919219d35d14047ed0202e32cd3e19bb1d28de1a43a7f2527998078d2d6dbe4b38f16e377d0da9edb6708dcd4c880a765abf40eb940b97827a05295acf2694a990fbaf532a537223ab8d3b3f576e29403e286d30e115a6b5c72b9a8118db4828a1ac78e4a583bbdcf0589b5aafc830218de1bd9b8c4
63+
</_Parameter1>
64+
</AssemblyAttribute>
65+
</ItemGroup>
66+
67+
</Project>

‎TaskFlow.Extensions.Microsoft.DependencyInjection/TaskFlow.Extensions.Microsoft.DependencyInjection.csproj‎

Lines changed: 6 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,23 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<LangVersion>12</LangVersion>
43
<TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
5-
<Nullable>enable</Nullable>
6-
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
7-
<Deterministic>true</Deterministic>
84
<RootNamespace>System.Threading.Tasks.Flow</RootNamespace>
5+
<PackageId>TaskFlow.Microsoft.Extensions.DependencyInjection</PackageId>
96
</PropertyGroup>
107

11-
<PropertyGroup>
12-
<PackageId>TaskFlow.Microsoft.Extensions.DependencyInjection</PackageId>
13-
<Version>1.0.0-rc3</Version>
14-
<Authors>Volodymyr Dombrovskyi</Authors>
15-
<Copyright>Copyright (c) 2023 Volodymyr Dombrovskyi</Copyright>
16-
<PackageTags>TODO</PackageTags>
17-
<Description>TODO</Description>
18-
<RepositoryUrl>https://github.com/dombrovsky/TaskFlow.git</RepositoryUrl>
19-
<RepositoryType>git</RepositoryType>
20-
<PackageProjectUrl>https://dombrovsky.github.io/TaskFlow</PackageProjectUrl>
21-
<PackageLicenseFile>LICENSE</PackageLicenseFile>
22-
<PackageReadmeFile>README.md</PackageReadmeFile>
23-
24-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
25-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
26-
<IncludeSymbols>true</IncludeSymbols>
27-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
28-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
29-
</PropertyGroup>
30-
31-
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
32-
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
33-
</PropertyGroup>
34-
35-
<PropertyGroup>
36-
<RunCodeAnalysis>false</RunCodeAnalysis>
37-
<EnableNETAnalyzers>true</EnableNETAnalyzers>
38-
<AnalysisLevel>latest</AnalysisLevel>
39-
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
40-
<EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
41-
<CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
42-
<SignAssembly>True</SignAssembly>
43-
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)..\TaskFlow.snk</AssemblyOriginatorKeyFile>
44-
</PropertyGroup>
45-
46-
<ItemGroup>
47-
<AssemblyAttribute Include="System.CLSCompliant">
48-
<_Parameter1>true</_Parameter1>
49-
<_Parameter1_TypeName>System.Boolean</_Parameter1_TypeName>
50-
</AssemblyAttribute>
51-
</ItemGroup>
52-
538
<ItemGroup>
549
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
55-
<PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
56-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
5710
</ItemGroup>
5811

59-
<ItemGroup>
12+
<ItemGroup>
6013
<None Include="..\LICENSE" Pack="true" PackagePath="\" />
6114
<None Include="..\README.md" Pack="true" PackagePath="\" />
6215
</ItemGroup>
6316

64-
<ItemGroup>
65-
<ProjectReference Include="..\TaskFlow\TaskFlow.csproj" />
66-
</ItemGroup>
17+
<ItemGroup>
18+
<ProjectReference Include="..\TaskFlow\TaskFlow.csproj" />
19+
</ItemGroup>
6720

68-
<Import Project="..\TaskFlow.Annotations\TaskFlow.Annotations.projitems" Label="Shared" />
21+
<Import Project="..\TaskFlow.Annotations\TaskFlow.Annotations.projitems" Label="Shared" />
6922

7023
</Project>

‎TaskFlow.Extensions.Time/TaskFlow.Extensions.Time.csproj‎

Lines changed: 0 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<LangVersion>12</LangVersion>
43
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
5-
<Nullable>enable</Nullable>
6-
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
7-
<Deterministic>true</Deterministic>
84
<RootNamespace>System.Threading.Tasks.Flow</RootNamespace>
9-
</PropertyGroup>
10-
11-
<PropertyGroup>
125
<PackageId>TaskFlow.Extensions.Time</PackageId>
13-
<Version>1.0.0-rc3</Version>
14-
<Authors>Volodymyr Dombrovskyi</Authors>
15-
<Copyright>Copyright (c) 2023 Volodymyr Dombrovskyi</Copyright>
16-
<PackageTags>TODO</PackageTags>
17-
<Description>TODO</Description>
18-
<RepositoryUrl>https://github.com/dombrovsky/TaskFlow.git</RepositoryUrl>
19-
<RepositoryType>git</RepositoryType>
20-
<PackageProjectUrl>https://dombrovsky.github.io/TaskFlow</PackageProjectUrl>
21-
<PackageLicenseFile>LICENSE</PackageLicenseFile>
22-
<PackageReadmeFile>README.md</PackageReadmeFile>
23-
24-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
25-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
26-
<IncludeSymbols>true</IncludeSymbols>
27-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
28-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
296
</PropertyGroup>
307

31-
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
32-
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
33-
</PropertyGroup>
34-
35-
<PropertyGroup>
36-
<RunCodeAnalysis>false</RunCodeAnalysis>
37-
<EnableNETAnalyzers>true</EnableNETAnalyzers>
38-
<AnalysisLevel>latest</AnalysisLevel>
39-
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
40-
<EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
41-
<CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
42-
<SignAssembly>True</SignAssembly>
43-
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)..\TaskFlow.snk</AssemblyOriginatorKeyFile>
44-
</PropertyGroup>
45-
46-
<ItemGroup>
47-
<AssemblyAttribute Include="System.CLSCompliant">
48-
<_Parameter1>true</_Parameter1>
49-
<_Parameter1_TypeName>System.Boolean</_Parameter1_TypeName>
50-
</AssemblyAttribute>
51-
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
52-
<_Parameter1>
53-
$(AssemblyName).Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010019048320f9788f50a6b96919219d35d14047ed0202e32cd3e19bb1d28de1a43a7f2527998078d2d6dbe4b38f16e377d0da9edb6708dcd4c880a765abf40eb940b97827a05295acf2694a990fbaf532a537223ab8d3b3f576e29403e286d30e115a6b5c72b9a8118db4828a1ac78e4a583bbdcf0589b5aafc830218de1bd9b8c4
54-
</_Parameter1>
55-
</AssemblyAttribute>
56-
</ItemGroup>
57-
588
<ItemGroup>
599
<PackageReference Include="Microsoft.Bcl.TimeProvider" Version="8.0.0" />
6010
</ItemGroup>
@@ -63,15 +13,6 @@
6313
<Compile Include="..\TaskFlow\Extensions\ThrottlingTaskSchedulerExtensions.cs" Link="ThrottlingTaskSchedulerExtensions.cs" />
6414
</ItemGroup>
6515

66-
<ItemGroup>
67-
<PackageReference Include="IsExternalInit" Version="1.0.3">
68-
<PrivateAssets>all</PrivateAssets>
69-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
70-
</PackageReference>
71-
<PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
72-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
73-
</ItemGroup>
74-
7516
<ItemGroup>
7617
<None Include="..\LICENSE" Pack="true" PackagePath="\" />
7718
<None Include="..\README.md" Pack="true" PackagePath="\" />

‎TaskFlow.Tests/Extensions/TimeoutTaskSchedulerExtensionsFixture.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public void InfiniteTimeout_ShouldNotThrowTimeoutException(ITaskFlow taskFlow)
6868
}
6969

7070
[TestCaseSource(typeof(TaskFlows), nameof(TaskFlows.CreateTaskFlows))]
71-
public async Task Timeout_WhenOperationNameSpecified_ShouldThrowTimeoutExceptionWithOperationName(ITaskFlow taskFlow)
71+
public void Timeout_WhenOperationNameSpecified_ShouldThrowTimeoutExceptionWithOperationName(ITaskFlow taskFlow)
7272
{
7373
_taskFlow = taskFlow;
7474

‎TaskFlow.Tests/TaskFlow.Tests.csproj‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@
44
<TargetFramework>net8.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
7-
87
<IsPackable>false</IsPackable>
98
</PropertyGroup>
109

10+
<PropertyGroup>
11+
<EnableNETAnalyzers>false</EnableNETAnalyzers>
12+
</PropertyGroup>
13+
1114
<ItemGroup>
1215
<PackageReference Include="JetBrains.dotMemoryUnit" Version="3.2.20220510" />
1316
<PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" Version="8.5.0" />

‎TaskFlow.Tests/TaskSchedulerBaseFixture.Scheduling.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ public async Task Enqueue_AsyncContinuationThrowsException_ShouldExecuteNextOper
192192
await task2;
193193

194194
Assert.That(() => task1.IsFaulted, Is.True.After(100, 10));
195-
Assert.That(task1.Exception.InnerException, Is.TypeOf<InvalidOperationException>());
195+
Assert.That(task1.Exception?.InnerException, Is.TypeOf<InvalidOperationException>());
196196
Assert.That(task2.Result, Is.EqualTo(2));
197197
}
198198
}

‎TaskFlow.sln‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TaskFlow.Extensions.Microso
1515
EndProject
1616
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TaskFlow.Extensions.Time", "TaskFlow.Extensions.Time\TaskFlow.Extensions.Time.csproj", "{DD1D5309-B058-4563-8BB3-96B93AB7731F}"
1717
EndProject
18+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{92762303-0A4A-484E-A984-001AEE05A94F}"
19+
ProjectSection(SolutionItems) = preProject
20+
Directory.Build.props = Directory.Build.props
21+
EndProjectSection
22+
EndProject
1823
Global
1924
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2025
Debug|Any CPU = Debug|Any CPU

‎TaskFlow/TaskFlow.csproj‎

Lines changed: 2 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<LangVersion>12</LangVersion>
43
<TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
5-
<Nullable>enable</Nullable>
6-
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
7-
<Deterministic>true</Deterministic>
84
<RootNamespace>System.Threading.Tasks.Flow</RootNamespace>
5+
<PackageId>TaskFlow</PackageId>
96
</PropertyGroup>
107

11-
<PropertyGroup>
12-
<PackageId>TaskFlow</PackageId>
13-
<Version>1.0.0-rc3</Version>
14-
<Authors>Volodymyr Dombrovskyi</Authors>
15-
<Copyright>Copyright (c) 2023 Volodymyr Dombrovskyi</Copyright>
16-
<PackageTags>TODO</PackageTags>
17-
<Description>TODO</Description>
18-
<RepositoryUrl>https://github.com/dombrovsky/TaskFlow.git</RepositoryUrl>
19-
<RepositoryType>git</RepositoryType>
20-
<PackageProjectUrl>https://dombrovsky.github.io/TaskFlow</PackageProjectUrl>
21-
<PackageLicenseFile>LICENSE</PackageLicenseFile>
22-
<PackageReadmeFile>README.md</PackageReadmeFile>
23-
24-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
25-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
26-
<IncludeSymbols>true</IncludeSymbols>
27-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
28-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
29-
</PropertyGroup>
30-
31-
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
32-
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
33-
</PropertyGroup>
34-
35-
<PropertyGroup>
36-
<RunCodeAnalysis>false</RunCodeAnalysis>
37-
<EnableNETAnalyzers>true</EnableNETAnalyzers>
38-
<AnalysisLevel>latest</AnalysisLevel>
39-
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
40-
<EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
41-
<CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
42-
<SignAssembly>True</SignAssembly>
43-
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)..\TaskFlow.snk</AssemblyOriginatorKeyFile>
44-
</PropertyGroup>
45-
46-
<ItemGroup>
47-
<AssemblyAttribute Include="System.CLSCompliant">
48-
<_Parameter1>true</_Parameter1>
49-
<_Parameter1_TypeName>System.Boolean</_Parameter1_TypeName>
50-
</AssemblyAttribute>
51-
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
52-
<_Parameter1>
53-
$(AssemblyName).Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010019048320f9788f50a6b96919219d35d14047ed0202e32cd3e19bb1d28de1a43a7f2527998078d2d6dbe4b38f16e377d0da9edb6708dcd4c880a765abf40eb940b97827a05295acf2694a990fbaf532a537223ab8d3b3f576e29403e286d30e115a6b5c72b9a8118db4828a1ac78e4a583bbdcf0589b5aafc830218de1bd9b8c4
54-
</_Parameter1>
55-
</AssemblyAttribute>
56-
</ItemGroup>
57-
588
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
599
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.0.0" />
6010
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.2" />
@@ -65,20 +15,11 @@
6515
<Compile Remove="Extensions\ThrottlingTaskSchedulerExtensions.cs" />
6616
</ItemGroup>
6717

68-
<ItemGroup>
69-
<PackageReference Include="IsExternalInit" Version="1.0.3">
70-
<PrivateAssets>all</PrivateAssets>
71-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
72-
</PackageReference>
73-
<PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
74-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
75-
</ItemGroup>
76-
7718
<ItemGroup>
7819
<None Include="..\LICENSE" Pack="true" PackagePath="\" />
7920
<None Include="..\README.md" Pack="true" PackagePath="\" />
8021
</ItemGroup>
8122

82-
<Import Project="..\TaskFlow.Annotations\TaskFlow.Annotations.projitems" Label="Shared" />
23+
<Import Project="..\TaskFlow.Annotations\TaskFlow.Annotations.projitems" Label="Shared" />
8324

8425
</Project>

0 commit comments

Comments
 (0)