From d78857fb227cf2d1950367edd8871c01889de113 Mon Sep 17 00:00:00 2001 From: BoBoBaSs84 <73112377+BoBoBaSs84@users.noreply.github.com> Date: Sun, 21 Jan 2024 10:50:34 +0100 Subject: [PATCH] feat: release preparation chnages: - workflow renamed - code of conduct added - directory package props added - global package management enabled closes #51 --- .filenesting.json | 3 - .github/workflows/{dotnet.yml => ci.yml} | 4 +- CODE_OF_CONDUCT.md | 128 ++++++++++++++++++++ DDS.Tools.sln | 7 +- Directory.Build.props | 10 +- Directory.Build.targets | 8 ++ Directory.Packages.props | 19 +++ README.md | 7 +- global.json | 10 ++ src/DDS2PNG/App.config | 4 +- src/DDS2PNG/DDS2PNG.csproj | 2 +- src/DDS2PNG/Properties/Settings.Designer.cs | 6 +- src/DDS2PNG/Properties/Settings.settings | 4 +- src/PNG2DDS/PNG2DDS.csproj | 2 +- src/Shared.Library/Shared.Library.csproj | 8 +- 15 files changed, 193 insertions(+), 29 deletions(-) delete mode 100644 .filenesting.json rename .github/workflows/{dotnet.yml => ci.yml} (89%) create mode 100644 CODE_OF_CONDUCT.md create mode 100644 Directory.Build.targets create mode 100644 Directory.Packages.props create mode 100644 global.json diff --git a/.filenesting.json b/.filenesting.json deleted file mode 100644 index 0b71966..0000000 --- a/.filenesting.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "help":"https://go.microsoft.com/fwlink/?linkid=866610" -} \ No newline at end of file diff --git a/.github/workflows/dotnet.yml b/.github/workflows/ci.yml similarity index 89% rename from .github/workflows/dotnet.yml rename to .github/workflows/ci.yml index 65427ae..28dff8f 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/ci.yml @@ -16,10 +16,10 @@ jobs: with: fetch-depth: 0 - - name: Setup .NET + - name: Setup uses: actions/setup-dotnet@v4 - - name: Restore dependencies + - name: Restore run: dotnet restore - name: Build diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 0000000..8b5c319 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,128 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +We as members, contributors, and leaders pledge to make participation in our +community a harassment-free experience for everyone, regardless of age, body +size, visible or invisible disability, ethnicity, sex characteristics, gender +identity and expression, level of experience, education, socio-economic status, +nationality, personal appearance, race, religion, or sexual identity +and orientation. + +We pledge to act and interact in ways that contribute to an open, welcoming, +diverse, inclusive, and healthy community. + +## Our Standards + +Examples of behavior that contributes to a positive environment for our +community include: + +* Demonstrating empathy and kindness toward other people +* Being respectful of differing opinions, viewpoints, and experiences +* Giving and gracefully accepting constructive feedback +* Accepting responsibility and apologizing to those affected by our mistakes, + and learning from the experience +* Focusing on what is best not just for us as individuals, but for the + overall community + +Examples of unacceptable behavior include: + +* The use of sexualized language or imagery, and sexual attention or + advances of any kind +* Trolling, insulting or derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or email + address, without their explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Enforcement Responsibilities + +Community leaders are responsible for clarifying and enforcing our standards of +acceptable behavior and will take appropriate and fair corrective action in +response to any behavior that they deem inappropriate, threatening, offensive, +or harmful. + +Community leaders have the right and responsibility to remove, edit, or reject +comments, commits, code, wiki edits, issues, and other contributions that are +not aligned to this Code of Conduct, and will communicate reasons for moderation +decisions when appropriate. + +## Scope + +This Code of Conduct applies within all community spaces, and also applies when +an individual is officially representing the community in public spaces. +Examples of representing our community include using an official e-mail address, +posting via an official social media account, or acting as an appointed +representative at an online or offline event. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported to the community leaders responsible for enforcement at +44d9a7bc84@gmail.com. +All complaints will be reviewed and investigated promptly and fairly. + +All community leaders are obligated to respect the privacy and security of the +reporter of any incident. + +## Enforcement Guidelines + +Community leaders will follow these Community Impact Guidelines in determining +the consequences for any action they deem in violation of this Code of Conduct: + +### 1. Correction + +**Community Impact**: Use of inappropriate language or other behavior deemed +unprofessional or unwelcome in the community. + +**Consequence**: A private, written warning from community leaders, providing +clarity around the nature of the violation and an explanation of why the +behavior was inappropriate. A public apology may be requested. + +### 2. Warning + +**Community Impact**: A violation through a single incident or series +of actions. + +**Consequence**: A warning with consequences for continued behavior. No +interaction with the people involved, including unsolicited interaction with +those enforcing the Code of Conduct, for a specified period of time. This +includes avoiding interactions in community spaces as well as external channels +like social media. Violating these terms may lead to a temporary or +permanent ban. + +### 3. Temporary Ban + +**Community Impact**: A serious violation of community standards, including +sustained inappropriate behavior. + +**Consequence**: A temporary ban from any sort of interaction or public +communication with the community for a specified period of time. No public or +private interaction with the people involved, including unsolicited interaction +with those enforcing the Code of Conduct, is allowed during this period. +Violating these terms may lead to a permanent ban. + +### 4. Permanent Ban + +**Community Impact**: Demonstrating a pattern of violation of community +standards, including sustained inappropriate behavior, harassment of an +individual, or aggression toward or disparagement of classes of individuals. + +**Consequence**: A permanent ban from any sort of public interaction within +the community. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], +version 2.0, available at +https://www.contributor-covenant.org/version/2/0/code_of_conduct.html. + +Community Impact Guidelines were inspired by [Mozilla's code of conduct +enforcement ladder](https://github.com/mozilla/diversity). + +[homepage]: https://www.contributor-covenant.org + +For answers to common questions about this code of conduct, see the FAQ at +https://www.contributor-covenant.org/faq. Translations are available at +https://www.contributor-covenant.org/translations. diff --git a/DDS.Tools.sln b/DDS.Tools.sln index a1ec61d..52b8b9e 100644 --- a/DDS.Tools.sln +++ b/DDS.Tools.sln @@ -15,12 +15,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DDS2PNG", "src\DDS2PNG\DDS2 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shared.LibraryTests", "tests\Shared.LibraryTests\Shared.LibraryTests.csproj", "{D7407680-5DF3-4C48-BCD5-9DE910F10A15}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{EF2EF755-8C69-4689-AD58-BBDE3C63CB4C}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4CEEF330-70B3-4088-9487-A72D2ACA703C}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig - .filenesting.json = .filenesting.json .gitignore = .gitignore + CODE_OF_CONDUCT.md = CODE_OF_CONDUCT.md Directory.Build.props = Directory.Build.props + Directory.Build.targets = Directory.Build.targets + Directory.Packages.props = Directory.Packages.props + global.json = global.json LICENSE = LICENSE PublicKey.snk = PublicKey.snk README.md = README.md diff --git a/Directory.Build.props b/Directory.Build.props index c848461..38bfcc0 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -61,15 +61,13 @@ - - - - - - + + + + diff --git a/Directory.Build.targets b/Directory.Build.targets new file mode 100644 index 0000000..d1bb3d9 --- /dev/null +++ b/Directory.Build.targets @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 0000000..0ccf8cc --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,19 @@ + + + + true + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index c21b966..713b526 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,12 @@ -[![.NET](https://github.com/BoBoBaSs84/DDS.Tools/actions/workflows/dotnet.yml/badge.svg?branch=main)](https://github.com/BoBoBaSs84/DDS.Tools/actions/workflows/dotnet.yml) +[![CI](https://github.com/BoBoBaSs84/DDS.Tools/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/BoBoBaSs84/DDS.Tools/actions/workflows/ci.yml) [![CodeQL](https://github.com/BoBoBaSs84/DDS.Tools/actions/workflows/codeql.yml/badge.svg?branch=main)](https://github.com/BoBoBaSs84/DDS.Tools/actions/workflows/codeql.yml) +[![.NET](https://img.shields.io/badge/net8.0-5C2D91?logo=.NET&labelColor=gray)](https://github.com/BoBoBaSs84/DDS.Tools) +[![C#](https://img.shields.io/badge/12.0-239120?logo=csharp&logoColor=white&labelColor=gray)](https://github.com/BoBoBaSs84/DDS.Tools) [![Issues](https://img.shields.io/github/issues/BoBoBaSs84/DDS.Tools)](https://github.com/BoBoBaSs84/DDS.Tools/issues) [![Commit](https://img.shields.io/github/last-commit/BoBoBaSs84/DDS.Tools)](https://github.com/BoBoBaSs84/DDS.Tools/commit/main) -[![Forks](https://img.shields.io/github/forks/BoBoBaSs84/DDS.Tools)](https://github.com/BoBoBaSs84/DDS.Tools/network) [![Size](https://img.shields.io/github/repo-size/BoBoBaSs84/DDS.Tools)](https://github.com/BoBoBaSs84/DDS.Tools) -[![stars](https://img.shields.io/github/stars/BoBoBaSs84/DDS.Tools)](https://github.com/BoBoBaSs84/DDS.Tools/stargazers) [![License](https://img.shields.io/github/license/BoBoBaSs84/DDS.Tools)](https://github.com/BoBoBaSs84/DDS.Tools/blob/main/LICENSE) +[![Release](https://img.shields.io/github/v/release/BoBoBaSs84/DDS.Tools)](https://github.com/BoBoBaSs84/DDS.Tools/releases/latest) # DDS.Tools diff --git a/global.json b/global.json new file mode 100644 index 0000000..a578ea2 --- /dev/null +++ b/global.json @@ -0,0 +1,10 @@ +{ + "sdk": { + "version": "8.0.100", + "allowPrerelease": false, + "rollForward": "major" + }, + "tools": { + "dotnet": "8.0.100" + } +} \ No newline at end of file diff --git a/src/DDS2PNG/App.config b/src/DDS2PNG/App.config index 5d51fa7..eea2d95 100644 --- a/src/DDS2PNG/App.config +++ b/src/DDS2PNG/App.config @@ -11,10 +11,10 @@ 0 - False + True - True + False True diff --git a/src/DDS2PNG/DDS2PNG.csproj b/src/DDS2PNG/DDS2PNG.csproj index d25680a..8259306 100644 --- a/src/DDS2PNG/DDS2PNG.csproj +++ b/src/DDS2PNG/DDS2PNG.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/DDS2PNG/Properties/Settings.Designer.cs b/src/DDS2PNG/Properties/Settings.Designer.cs index 8b8b012..4589292 100644 --- a/src/DDS2PNG/Properties/Settings.Designer.cs +++ b/src/DDS2PNG/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace DDS2PNG.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.5.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.8.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -34,7 +34,7 @@ public int CompressionLevel { [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] + [global::System.Configuration.DefaultSettingValueAttribute("True")] public bool SeparateMaps { get { return ((bool)(this["SeparateMaps"])); @@ -43,7 +43,7 @@ public bool SeparateMaps { [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("True")] + [global::System.Configuration.DefaultSettingValueAttribute("False")] public bool IgnoreMaps { get { return ((bool)(this["IgnoreMaps"])); diff --git a/src/DDS2PNG/Properties/Settings.settings b/src/DDS2PNG/Properties/Settings.settings index 7d4432e..3f11b7c 100644 --- a/src/DDS2PNG/Properties/Settings.settings +++ b/src/DDS2PNG/Properties/Settings.settings @@ -6,10 +6,10 @@ 0 - False + True - True + False True diff --git a/src/PNG2DDS/PNG2DDS.csproj b/src/PNG2DDS/PNG2DDS.csproj index 6f4a2f2..ba9ab0d 100644 --- a/src/PNG2DDS/PNG2DDS.csproj +++ b/src/PNG2DDS/PNG2DDS.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/Shared.Library/Shared.Library.csproj b/src/Shared.Library/Shared.Library.csproj index 6f61811..926d3ca 100644 --- a/src/Shared.Library/Shared.Library.csproj +++ b/src/Shared.Library/Shared.Library.csproj @@ -1,10 +1,10 @@ - - - - + + + +