Skip to content

Commit 3a6aec3

Browse files
ejballejball
authored
Modernize (#22)
1 parent fa40848 commit 3a6aec3

12 files changed

Lines changed: 68 additions & 64 deletions

‎.gitattributes‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
* text=auto eol=lf
22

3-
*.cs text diff=csharp
4-
*.csproj text merge=union
5-
*.sln text merge=union
6-
73
# DO NOT EDIT: csharp convention
84
*.cs text diff=csharp
95
# END DO NOT EDIT

‎.github/conventions.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
# applied automatically by https://github.com/Faithlife/RepoConventionsApplier (DO NOT REMOVE THIS LINE)
22
conventions:
3-
- path: Faithlife/CodingGuidelines/conventions/faithlife-auto-apply-conventions
4-
- path: Faithlife/CodingGuidelines/conventions/dotnet-common
5-
- path: Faithlife/CodingGuidelines/conventions/faithlife-dotnet-library-build
6-
- path: Faithlife/CodingGuidelines/conventions/faithlife-dotnet-library-workflow
7-
- path: Faithlife/CodingGuidelines/conventions/faithlife-license-mit
3+
- path: Faithlife/CodingGuidelines/conventions/faithlife-dotnet-library
84

95
pull-request:
106
reviewers:

‎.gitignore‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
1+
# DO NOT EDIT: gitignore-common convention
2+
.DS_Store
3+
Thumbs.db
4+
*.log
5+
# END DO NOT EDIT
6+
7+
# DO NOT EDIT: gitignore-dotnet convention
8+
artifacts/
19
bin/
210
obj/
311
release/
12+
# END DO NOT EDIT
13+
14+
# DO NOT EDIT: gitignore-ide convention
415
.vs/
516
.idea/
6-
Thumbs.db
717
*.cache
8-
*.log
918
*.user
1019
*.userprefs
11-
*.ncrunchproject
12-
*.ncrunchsolution
13-
nCrunchTemp*
1420
_ReSharper*
15-
.DS_Store
21+
# END DO NOT EDIT

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
<!-- DO NOT EDIT: generated by Faithlife/CodingGuidelines/conventions/dotnet-common-contributing -->
2+
13
# Contributing
24

35
## Publishing

‎Directory.Build.props‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,41 @@
11
<Project>
22

33
<PropertyGroup>
4-
<VersionPrefix>3.5.1</VersionPrefix>
5-
<LangVersion>11.0</LangVersion>
4+
<VersionPrefix>3.5.2</VersionPrefix>
5+
<NoWarn>$(NoWarn);1591;1998;NU1507;NU5105</NoWarn>
6+
<GitHubOrganization>Faithlife</GitHubOrganization>
7+
<RepositoryName>Parsing</RepositoryName>
8+
</PropertyGroup>
9+
10+
<!-- DO NOT EDIT: dotnet-common-props convention -->
11+
<PropertyGroup>
12+
<LangVersion>14.0</LangVersion>
613
<Nullable>enable</Nullable>
714
<ImplicitUsings>enable</ImplicitUsings>
815
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
9-
<NoWarn>$(NoWarn);1591;1998;NU5105</NoWarn>
16+
<NeutralLanguage>en-US</NeutralLanguage>
1017
<DebugType>embedded</DebugType>
11-
<GitHubOrganization>Faithlife</GitHubOrganization>
12-
<RepositoryName>Parsing</RepositoryName>
1318
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1419
<PackageProjectUrl>https://github.com/$(GitHubOrganization)/$(RepositoryName)</PackageProjectUrl>
1520
<PackageReleaseNotes>https://github.com/$(GitHubOrganization)/$(RepositoryName)/blob/master/ReleaseNotes.md</PackageReleaseNotes>
1621
<RepositoryUrl>https://github.com/$(GitHubOrganization)/$(RepositoryName).git</RepositoryUrl>
1722
<Authors>Faithlife</Authors>
1823
<Copyright>Copyright $(Authors)</Copyright>
19-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
20-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
2124
<EnableNETAnalyzers>true</EnableNETAnalyzers>
22-
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
25+
<AnalysisLevel>latest-all</AnalysisLevel>
2326
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
27+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
2428
<IsPackable>false</IsPackable>
2529
<IsTestProject>false</IsTestProject>
30+
<SelfContained>false</SelfContained>
31+
<UseArtifactsOutput>true</UseArtifactsOutput>
32+
<EnableStrictModeForCompatibleFrameworksInPackageValidation>true</EnableStrictModeForCompatibleFrameworksInPackageValidation>
33+
<EnableStrictModeForCompatibleTfms>true</EnableStrictModeForCompatibleTfms>
34+
<DisablePackageBaselineValidation Condition=" $(PackageValidationBaselineVersion) == $(VersionPrefix) or $(PackageValidationBaselineVersion) == '0.0.0' ">true</DisablePackageBaselineValidation>
35+
<NuGetAudit>true</NuGetAudit>
36+
<NuGetAuditMode>all</NuGetAuditMode>
37+
<NuGetAuditLevel>low</NuGetAuditLevel>
2638
</PropertyGroup>
27-
28-
<PropertyGroup Condition=" '$(BuildNumber)' != '' ">
29-
<AssemblyVersion>$(VersionPrefix).$(BuildNumber)</AssemblyVersion>
30-
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
31-
</PropertyGroup>
32-
33-
<ItemGroup>
34-
<PackageReference Include="Faithlife.Analyzers" Version="1.4.0" PrivateAssets="All" IncludeAssets="runtime; build; native; contentfiles; analyzers" />
35-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
36-
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435" PrivateAssets="All" IncludeAssets="runtime; build; native; contentfiles; analyzers" />
37-
</ItemGroup>
39+
<!-- END DO NOT EDIT -->
3840

3941
</Project>

‎Directory.Packages.props‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<Project>
2+
<!-- DO NOT EDIT: dotnet-common-props/properties convention -->
3+
<PropertyGroup>
4+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
5+
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
6+
<CentralPackageFloatingVersionsEnabled>true</CentralPackageFloatingVersionsEnabled>
7+
</PropertyGroup>
8+
<!-- END DO NOT EDIT -->
9+
<ItemGroup>
10+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
11+
<PackageVersion Include="xunit" Version="2.8.1" />
12+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.1" />
13+
</ItemGroup>
14+
<!-- DO NOT EDIT: dotnet-common-props/analyzers convention -->
15+
<ItemGroup>
16+
<GlobalPackageReference Include="Faithlife.Analyzers" Version="1.*" />
17+
<GlobalPackageReference Include="NUnit.Analyzers" Version="4.*" />
18+
<GlobalPackageReference Include="StyleCop.Analyzers" Version="1.*-*" />
19+
</ItemGroup>
20+
<!-- END DO NOT EDIT -->
21+
</Project>

‎Parsing.slnx‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,4 @@
11
<Solution>
2-
<!-- dotnet-solution-items: *; .github/*; .github/workflows/* -->
3-
<Folder Name="/Solution Items/">
4-
<File Path=".editorconfig" />
5-
<File Path=".gitattributes" />
6-
<File Path=".gitignore" />
7-
<File Path="build.ps1" />
8-
<File Path="CONTRIBUTING.md" />
9-
<File Path="Directory.Build.props" />
10-
<File Path="dotnet-tools.json" />
11-
<File Path="global.json" />
12-
<File Path="LICENSE" />
13-
<File Path="nuget.config" />
14-
<File Path="Parsing.slnx.DotSettings" />
15-
<File Path="README.md" />
16-
<File Path="ReleaseNotes.md" />
17-
</Folder>
18-
<Folder Name="/Solution Items/.github/">
19-
<File Path=".github/conventions.yml" />
20-
</Folder>
21-
<Folder Name="/Solution Items/.github/workflows/">
22-
<File Path=".github/workflows/build.yaml" />
23-
<File Path=".github/workflows/ci.yml" />
24-
<File Path=".github/workflows/copilot-setup-steps.yml" />
25-
<File Path=".github/workflows/publish-docs.yaml" />
26-
</Folder>
272
<Project Path="src/Faithlife.Parsing/Faithlife.Parsing.csproj" />
283
<Project Path="tests/Faithlife.Parsing.Tests/Faithlife.Parsing.Tests.csproj" />
294
<Project Path="tools/Build/Build.csproj" />

‎ReleaseNotes.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Release Notes
22

3+
## 3.5.2
4+
5+
* Update package README.
6+
37
## 3.5.1
48

59
* Add package README.

‎nuget.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
<!-- DO NOT EDIT: generated by Faithlife/CodingGuidelines/conventions/nuget-config -->
12
<configuration>
23
<packageSources>
3-
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
4+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
45
</packageSources>
56
</configuration>

‎src/Faithlife.Parsing/Faithlife.Parsing.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<PackageTags>parser parsers</PackageTags>
77
<IsPackable>true</IsPackable>
88
<PackageReadmeFile>README.md</PackageReadmeFile>
9+
<RewritePackageReadmeLinks>true</RewritePackageReadmeLinks>
910
</PropertyGroup>
1011

1112
<ItemGroup>

0 commit comments

Comments
 (0)