Skip to content

Commit df2a743

Browse files
davidkallesendavidkallesen
authored
Merge pull request #64 from atc-net/feature/multi-distributions
Feature/multi distributions
2 parents f4861b9 + e900537 commit df2a743

28 files changed

+1516
-6
lines changed

‎distribution/dotnet5/.editorconfig

+491
Large diffs are not rendered by default.

‎distribution/dotnet5/Directory.Build.props

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
4+
<PropertyGroup Label="Metadata configuration">
5+
<OrganizationName><!-- insert organization name here --></OrganizationName>
6+
<RepositoryName><!-- insert repository name here --></RepositoryName>
7+
</PropertyGroup>
8+
9+
<!-- Solution wide properties -->
10+
<PropertyGroup Label="Assembly Naming">
11+
<Company>$(OrganizationName)</Company>
12+
<Authors>$(OrganizationName)</Authors>
13+
<NeutralLanguage>en</NeutralLanguage>
14+
<DefaultLanguage>en-US</DefaultLanguage>
15+
</PropertyGroup>
16+
17+
<PropertyGroup Label="Compile settings">
18+
<Nullable>enable</Nullable>
19+
<LangVersion>9.0</LangVersion>
20+
<TargetFramework>net5.0</TargetFramework>
21+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
22+
<NoWarn>1573,1591,1712,CA1014</NoWarn>
23+
24+
<!-- Used by code coverage -->
25+
<DebugType>full</DebugType>
26+
<DebugSymbols>true</DebugSymbols>
27+
</PropertyGroup>
28+
29+
<PropertyGroup Label="Analyzer settings">
30+
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
31+
<EnableNETAnalyzers>true</EnableNETAnalyzers>
32+
<AnalysisLevel>latest</AnalysisLevel>
33+
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
34+
</PropertyGroup>
35+
36+
<!-- Treat warnings as errors are always on when building in release -->
37+
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
38+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
39+
</PropertyGroup>
40+
41+
<!-- Shared code analyzers used for all projects in the solution -->
42+
<ItemGroup Label="Code Analyzers">
43+
<PackageReference Include="AsyncFixer" Version="1.5.1" PrivateAssets="All" />
44+
<PackageReference Include="Asyncify" Version="0.9.7" PrivateAssets="All" />
45+
<PackageReference Include="Meziantou.Analyzer" Version="1.0.688" PrivateAssets="All" />
46+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0" PrivateAssets="All" />
47+
<PackageReference Include="SecurityCodeScan.VS2019" Version="5.6.0" PrivateAssets="All" />
48+
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
49+
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.33.0.40503" PrivateAssets="All" />
50+
</ItemGroup>
51+
52+
</Project>

‎distribution/dotnet5/global.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"sdk": {
3+
"version": "5.0.101",
4+
"rollForward": "latestMinor",
5+
"allowPrerelease": false
6+
}
7+
}

‎distribution/sample/.editorconfig renamed to ‎distribution/dotnet5/sample/.editorconfig

File renamed without changes.

‎distribution/sample/Directory.Build.props renamed to ‎distribution/dotnet5/sample/Directory.Build.props

File renamed without changes.

‎distribution/src/.editorconfig renamed to ‎distribution/dotnet5/src/.editorconfig

File renamed without changes.

‎distribution/src/Directory.Build.props renamed to ‎distribution/dotnet5/src/Directory.Build.props

File renamed without changes.

‎distribution/test/.editorconfig renamed to ‎distribution/dotnet5/test/.editorconfig

File renamed without changes.

‎distribution/dotnet5/test/Directory.Build.props

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
4+
<!--
5+
Add any shared properties you want for the projects under this directory that need to be set before the auto imported Directory.Build.props
6+
-->
7+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.props))\Directory.Build.props" />
8+
9+
<PropertyGroup Label="Compile settings">
10+
<Nullable>annotations</Nullable>
11+
</PropertyGroup>
12+
13+
<ItemGroup>
14+
<PackageReference Include="Atc.Test" Version="1.0.45" />
15+
<PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.15" PrivateAssets="All" />
16+
</ItemGroup>
17+
18+
<ItemGroup>
19+
<Using Include="Atc.Test" />
20+
<Using Include="AutoFixture" />
21+
<Using Include="AutoFixture.Xunit2" />
22+
<Using Include="FluentAssertions" />
23+
<Using Include="NSubstitute" />
24+
<Using Include="Xunit" />
25+
</ItemGroup>
26+
27+
</Project>

‎distribution/.editorconfig renamed to ‎distribution/dotnet6/.editorconfig

File renamed without changes.

‎distribution/Directory.Build.props renamed to ‎distribution/dotnet6/Directory.Build.props

+4-6
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
<PropertyGroup Label="Compile settings">
1818
<Nullable>enable</Nullable>
1919
<LangVersion>10.0</LangVersion>
20-
<!-- Commented out due to issues with older TargetFramework dependencies that gives CS0234
21-
<ImplicitUsings>enable</ImplicitUsings>
22-
-->
20+
<ImplicitUsings>enable</ImplicitUsings>
2321
<TargetFramework>net6.0</TargetFramework>
2422
<GenerateDocumentationFile>true</GenerateDocumentationFile>
2523
<NoWarn>1573,1591,1712,CA1014</NoWarn>
@@ -45,10 +43,10 @@
4543
<ItemGroup Label="Code Analyzers">
4644
<PackageReference Include="AsyncFixer" Version="1.5.1" PrivateAssets="All" />
4745
<PackageReference Include="Asyncify" Version="0.9.7" PrivateAssets="All" />
48-
<PackageReference Include="Meziantou.Analyzer" Version="1.0.679" PrivateAssets="All" />
49-
<PackageReference Include="SecurityCodeScan.VS2019" Version="5.2.1" PrivateAssets="All" />
46+
<PackageReference Include="Meziantou.Analyzer" Version="1.0.688" PrivateAssets="All" />
47+
<PackageReference Include="SecurityCodeScan.VS2019" Version="5.6.0" PrivateAssets="All" />
5048
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
51-
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.32.0.39516" PrivateAssets="All" />
49+
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.33.0.40503" PrivateAssets="All" />
5250
</ItemGroup>
5351

5452
</Project>

‎distribution/global.json renamed to ‎distribution/dotnet6/global.json

File renamed without changes.

‎distribution/dotnet6/sample/.editorconfig

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# ATC coding rules - https://github.com/atc-net/atc-coding-rules
2+
# Version: 1.0.0
3+
# Updated: 04-12-2020
4+
# Location: Sample
5+
# Inspired by: https://docs.microsoft.com/en-us/dotnet/fundamentals/code-analysis/code-style-rule-options
6+
7+
##########################################
8+
# Code Analyzers Rules
9+
##########################################
10+
[*.{cs,csx,cake}]
11+
12+
# AsyncFixer
13+
# http://www.asyncfixer.com
14+
15+
16+
# Asyncify
17+
# https://github.com/hvanbakel/Asyncify-CSharp
18+
19+
20+
# Meziantou
21+
# https://www.meziantou.net/enforcing-asynchronous-code-good-practices-using-a-roslyn-analyzer.htm
22+
23+
24+
# Microsoft - Code Analysis
25+
# https://docs.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/
26+
27+
28+
# Microsoft - Compiler Errors
29+
# https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/compiler-messages/
30+
31+
32+
# Microsoft - FxCop
33+
# https://github.com/dotnet/roslyn-analyzers
34+
35+
36+
# SecurityCodeScan
37+
# https://security-code-scan.github.io/
38+
39+
40+
# StyleCop
41+
# https://github.com/DotNetAnalyzers/StyleCopAnalyzers
42+
43+
44+
##########################################
45+
# Custom - Code Analyzers Rules
46+
##########################################

‎distribution/dotnet6/sample/Directory.Build.props

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
4+
<!--
5+
Add any shared properties you want for the projects under this directory that need to be set before the auto imported Directory.Build.props
6+
-->
7+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.props))\Directory.Build.props" />
8+
9+
<!-- Place any common sample properties here -->
10+
11+
</Project>

‎distribution/dotnet6/src/.editorconfig

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# ATC coding rules - https://github.com/atc-net/atc-coding-rules
2+
# Version: 1.0.5
3+
# Updated: 02-05-2021
4+
# Location: Src
5+
# Inspired by: https://docs.microsoft.com/en-us/dotnet/fundamentals/code-analysis/code-style-rule-options
6+
7+
##########################################
8+
# Code Analyzers Rules
9+
##########################################
10+
[*.{cs,csx,cake}]
11+
12+
# AsyncFixer
13+
# http://www.asyncfixer.com
14+
15+
16+
# Asyncify
17+
# https://github.com/hvanbakel/Asyncify-CSharp
18+
19+
20+
# Meziantou
21+
# https://www.meziantou.net/enforcing-asynchronous-code-good-practices-using-a-roslyn-analyzer.htm
22+
23+
24+
# Microsoft - Code Analysis
25+
# https://docs.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/
26+
27+
28+
# Microsoft - Compiler Errors
29+
# https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/compiler-messages/
30+
31+
32+
# SecurityCodeScan
33+
# https://security-code-scan.github.io/
34+
35+
36+
# StyleCop
37+
# https://github.com/DotNetAnalyzers/StyleCopAnalyzers
38+
39+
40+
# SonarAnalyzer.CSharp
41+
# https://rules.sonarsource.com/csharp
42+
43+
44+
##########################################
45+
# Custom - Code Analyzers Rules
46+
##########################################

‎distribution/dotnet6/src/Directory.Build.props

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
4+
<!--
5+
Add any shared properties you want for the projects under this directory that need to be set before the auto imported Directory.Build.props
6+
-->
7+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.props))\Directory.Build.props" />
8+
9+
<PropertyGroup Label="Build instructions">
10+
<OutputType>Library</OutputType>
11+
<!-- Creates a regular package and a symbols package -->
12+
<IncludeSymbols>true</IncludeSymbols>
13+
<!-- Creates symbol package in the new .snupkg format -->
14+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
15+
<!--
16+
Instruct the build system to embed project source files that are not tracked by the source control
17+
or imported from a source package to the generated PDB.
18+
-->
19+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
20+
<!-- Recommended: Embed symbols containing Source Link in the main file (exe/dll) -->
21+
<DebugType>embedded</DebugType>
22+
</PropertyGroup>
23+
</Project>

‎distribution/dotnet6/test/.editorconfig

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# ATC coding rules - https://github.com/atc-net/atc-coding-rules
2+
# Version: 1.0.7
3+
# Updated: 18-06-2021
4+
# Location: Test
5+
# Inspired by: https://docs.microsoft.com/en-us/dotnet/fundamentals/code-analysis/code-style-rule-options
6+
7+
##########################################
8+
# Code Analyzers Rules
9+
##########################################
10+
[*.{cs,csx,cake}]
11+
12+
# AsyncFixer
13+
# http://www.asyncfixer.com
14+
15+
16+
# Asyncify
17+
# https://github.com/hvanbakel/Asyncify-CSharp
18+
19+
20+
# Meziantou
21+
# https://www.meziantou.net/enforcing-asynchronous-code-good-practices-using-a-roslyn-analyzer.htm
22+
dotnet_diagnostic.MA0004.severity = none # https://github.com/atc-net/atc-coding-rules/blob/main/documentation/CodeAnalyzersRules/Meziantou/MA0004.md
23+
dotnet_diagnostic.MA0016.severity = none # https://github.com/atc-net/atc-coding-rules/blob/main/documentation/CodeAnalyzersRules/Meziantou/MA0016.md
24+
25+
26+
# Microsoft - Code Analysis
27+
# https://docs.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/
28+
dotnet_diagnostic.CA1068.severity = none # https://github.com/atc-net/atc-coding-rules/blob/main/documentation/CodeAnalyzersRules/MicrosoftCodeAnalysis/CA1068.md
29+
dotnet_diagnostic.CA1707.severity = none # https://github.com/atc-net/atc-coding-rules/blob/main/documentation/CodeAnalyzersRules/MicrosoftCodeAnalysis/CA1707.md
30+
dotnet_diagnostic.CA2007.severity = none # https://github.com/atc-net/atc-coding-rules/blob/main/documentation/CodeAnalyzersRules/MicrosoftCodeAnalysis/CA2007.md
31+
32+
33+
# Microsoft - Compiler Errors
34+
# https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/compiler-messages/
35+
36+
37+
# SecurityCodeScan
38+
# https://security-code-scan.github.io/
39+
40+
41+
# StyleCop
42+
# https://github.com/DotNetAnalyzers/StyleCopAnalyzers
43+
dotnet_diagnostic.SA1122.severity = none # https://github.com/atc-net/atc-coding-rules/blob/main/documentation/CodeAnalyzersRules/StyleCop/SA1122.md
44+
dotnet_diagnostic.SA1133.severity = none # https://github.com/atc-net/atc-coding-rules/blob/main/documentation/CodeAnalyzersRules/StyleCop/SA1133.md
45+
46+
47+
# SonarAnalyzer.CSharp
48+
# https://rules.sonarsource.com/csharp
49+
50+
51+
##########################################
52+
# Custom - Code Analyzers Rules
53+
##########################################

‎distribution/test/Directory.Build.props renamed to ‎distribution/dotnet6/test/Directory.Build.props

File renamed without changes.

0 commit comments

Comments
 (0)