Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions .github/conventions.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
# applied automatically by https://github.com/Faithlife/RepoConventionsApplier (DO NOT REMOVE THIS LINE)
conventions:
- path: Faithlife/CodingGuidelines/conventions/faithlife-auto-apply-conventions
- path: Faithlife/CodingGuidelines/conventions/dotnet-common
- path: Faithlife/CodingGuidelines/conventions/faithlife-dotnet-library-build
- path: Faithlife/CodingGuidelines/conventions/faithlife-dotnet-library-workflow
- path: Faithlife/CodingGuidelines/conventions/faithlife-license-mit
- path: Faithlife/CodingGuidelines/conventions/faithlife-dotnet-library

pull-request:
reviewers:
Expand Down
21 changes: 13 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
.vs/
.idea/
# DO NOT EDIT: gitignore-common convention
.DS_Store
Thumbs.db
*.log
# END DO NOT EDIT

# DO NOT EDIT: gitignore-dotnet convention
artifacts/
bin/
obj/
release/
# END DO NOT EDIT

# DO NOT EDIT: gitignore-ide convention
.vs/
.idea/
*.cache
*.log
*.ncrunchproject
*.ncrunchsolution
*.user
launchSettings.json
nCrunchTemp*
*.userprefs
_ReSharper*
.DS_Store
# END DO NOT EDIT
14 changes: 12 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
<!-- DO NOT EDIT: generated by Faithlife/CodingGuidelines/conventions/dotnet-common-contributing -->

# Contributing

## Publishing

To publish an official release:

* Update the `<VersionPrefix>` in [`Directory.Build.props`](Directory.Build.props)
* Add a corresponding section to the top of [`ReleaseNotes.md`](ReleaseNotes.md)
* Update the `<VersionPrefix>` in [`Directory.Build.props`](Directory.Build.props).
* Add a corresponding section to the top of [`ReleaseNotes.md`](ReleaseNotes.md).
* Push or create a PR for review.

### Prereleases

Certain changes can be hard to unit test and are better tested in a real consumer project. In this case, you can publish a beta version of the library for testing.

To publish a beta, add a `<VersionSuffix>` below `<VersionPrefix>` in [`Directory.Build.props`](Directory.Build.props), e.g., `beta.1`. Publish as above.

When beta testing is done, delete the `<VersionSuffix>` and publish again.
18 changes: 13 additions & 5 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,20 +1,24 @@
<Project>

<PropertyGroup>
<VersionPrefix>0.1.1</VersionPrefix>
<VersionPrefix>0.1.2</VersionPrefix>
<NoWarn>$(NoWarn);1591;1998;CA2007;NU1507;NU5105</NoWarn>
<GitHubOrganization>Faithlife</GitHubOrganization>
<RepositoryName>EditorConfigFix</RepositoryName>
</PropertyGroup>

<!-- DO NOT EDIT: dotnet-common-props convention -->
<PropertyGroup>
<LangVersion>14.0</LangVersion>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>$(NoWarn);1591;1998;CA2007;NU1507;NU5105</NoWarn>
<NeutralLanguage>en-US</NeutralLanguage>
<DebugType>embedded</DebugType>
<GitHubOrganization>Faithlife</GitHubOrganization>
<RepositoryName>EditorConfigFix</RepositoryName>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/$(GitHubOrganization)/$(RepositoryName)</PackageProjectUrl>
<PackageReleaseNotes>https://github.com/$(GitHubOrganization)/$(RepositoryName)/blob/master/ReleaseNotes.md</PackageReleaseNotes>
<RepositoryUrl>https://github.com/$(GitHubOrganization)/$(RepositoryName)</RepositoryUrl>
<RepositoryUrl>https://github.com/$(GitHubOrganization)/$(RepositoryName).git</RepositoryUrl>
<Authors>Faithlife</Authors>
<Copyright>Copyright $(Authors)</Copyright>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
Expand All @@ -25,9 +29,13 @@
<IsTestProject>false</IsTestProject>
<SelfContained>false</SelfContained>
<UseArtifactsOutput>true</UseArtifactsOutput>
<EnableStrictModeForCompatibleFrameworksInPackageValidation>true</EnableStrictModeForCompatibleFrameworksInPackageValidation>
<EnableStrictModeForCompatibleTfms>true</EnableStrictModeForCompatibleTfms>
<DisablePackageBaselineValidation Condition=" $(PackageValidationBaselineVersion) == $(VersionPrefix) or $(PackageValidationBaselineVersion) == '0.0.0' ">true</DisablePackageBaselineValidation>
<NuGetAudit>true</NuGetAudit>
<NuGetAuditMode>all</NuGetAuditMode>
<NuGetAuditLevel>low</NuGetAuditLevel>
</PropertyGroup>
<!-- END DO NOT EDIT -->

</Project>
12 changes: 9 additions & 3 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
<Project>
<!-- DO NOT EDIT: dotnet-common-props/properties convention -->
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
<CentralPackageFloatingVersionsEnabled>true</CentralPackageFloatingVersionsEnabled>
</PropertyGroup>
<!-- END DO NOT EDIT -->
<ItemGroup>
<PackageVersion Include="editorconfig" Version="0.15.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
<PackageVersion Include="NUnit" Version="4.5.1" />
<PackageVersion Include="NUnit3TestAdapter" Version="6.2.0" />
<PackageVersion Include="System.CommandLine" Version="2.0.5" />
</ItemGroup>
<!-- DO NOT EDIT: dotnet-common-props/analyzers convention -->
<ItemGroup>
<GlobalPackageReference Include="Faithlife.Analyzers" Version="1.5.1" />
<GlobalPackageReference Include="NUnit.Analyzers" Version="4.12.0" />
<GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
<GlobalPackageReference Include="Faithlife.Analyzers" Version="1.*" />
<GlobalPackageReference Include="NUnit.Analyzers" Version="4.*" />
<GlobalPackageReference Include="StyleCop.Analyzers" Version="1.*-*" />
</ItemGroup>
<!-- END DO NOT EDIT -->
</Project>
23 changes: 0 additions & 23 deletions EditorConfigFix.slnx
Original file line number Diff line number Diff line change
@@ -1,27 +1,4 @@
<Solution>
<!-- dotnet-solution-items: *; .github/*; .github/workflows/* -->
<Folder Name="/Solution Items/">
<File Path=".editorconfig" />
<File Path=".gitattributes" />
<File Path=".gitignore" />
<File Path="AGENTS.md" />
<File Path="build.ps1" />
<File Path="CONTRIBUTING.md" />
<File Path="Directory.Build.props" />
<File Path="Directory.Packages.props" />
<File Path="global.json" />
<File Path="LICENSE" />
<File Path="nuget.config" />
<File Path="README.md" />
<File Path="ReleaseNotes.md" />
</Folder>
<Folder Name="/Solution Items/.github/">
<File Path=".github/conventions.yml" />
</Folder>
<Folder Name="/Solution Items/.github/workflows/">
<File Path=".github/workflows/build.yaml" />
<File Path=".github/workflows/repo-conventions.yml" />
</Folder>
<Project Path="src/EditorConfigFix/EditorConfigFix.csproj" />
<Project Path="tests/EditorConfigFix.Tests/EditorConfigFix.Tests.csproj" />
<Project Path="tools/Build/Build.csproj" />
Expand Down
4 changes: 4 additions & 0 deletions ReleaseNotes.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Release Notes

## 0.1.2

* Update package README.

## 0.1.x

- Initial releases.
4 changes: 2 additions & 2 deletions nuget.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- DO NOT EDIT: generated by Faithlife/CodingGuidelines/conventions/nuget-config -->
<configuration>
<packageSources>
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>
</configuration>
1 change: 1 addition & 0 deletions src/EditorConfigFix/EditorConfigFix.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<PackAsTool>true</PackAsTool>
<AssemblyName>editorconfig-fix</AssemblyName>
<PackageReadmeFile>README.md</PackageReadmeFile>
<RewritePackageReadmeLinks>true</RewritePackageReadmeLinks>
</PropertyGroup>

<ItemGroup>
Expand Down
Loading