From 66c1d8c65a69b32df91ff329b9f73533383cd0c3 Mon Sep 17 00:00:00 2001 From: Bela VanderVoort Date: Mon, 20 Jan 2025 14:05:10 -0600 Subject: [PATCH 1/2] Formatting with alpha10 --- .config/dotnet-tools.json | 4 +- .csharpierignore | 2 + .github/Github.csproj | 3 +- .../.idea.CSharpier/.idea/CSharpierPlugin.xml | 2 +- .../.idea/codeStyles/codeStyleConfig.xml | 2 +- .idea/.idea.CSharpier/.idea/indexLayout.xml | 2 +- .../inspectionProfiles/Project_Default.xml | 9 ++- .idea/.idea.CSharpier/.idea/vcs.xml | 2 +- .idea/modules.xml | 7 +- .idea/prettier.xml | 2 +- .idea/vcs.xml | 2 +- .run/Playground.run.xml | 14 +++- Directory.Packages.props | 2 +- Nuget/Build.props | 2 +- Scripts/Scripts.csproj | 3 +- Shell/Shell.csproj | 3 +- .../.idea/encodings.xml | 2 +- .../CSharpier.MsBuild.csproj | 43 ++++++------- Src/CSharpier.MsBuild/MsBuild.csproj | 6 +- .../build/CSharpier.MsBuild.props | 10 +-- .../build/CSharpier.MsBuild.targets | 62 +++++++++++++----- Src/CSharpier.Playground/.idea/modules.xml | 7 +- Src/CSharpier.Playground/.idea/prettier.xml | 2 +- Src/CSharpier.Playground/.idea/vcs.xml | 2 +- .../CSharpier.Playground.csproj | 21 ++++-- .../ClientApp/.idea/codeStyles/Project.xml | 2 +- .../.idea/codeStyles/codeStyleConfig.xml | 2 +- .../ClientApp/.idea/encodings.xml | 2 +- .../ClientApp/.idea/modules.xml | 7 +- .../ClientApp/.idea/vcs.xml | 2 +- .../.run/Run IDE for UI Tests.run.xml | 9 ++- .../.run/Run IDE with Plugin.run.xml | 9 ++- .../.run/Run Plugin Tests.run.xml | 7 +- .../.run/Run Plugin Verification.run.xml | 18 +++++- Src/CSharpier.Rider/.run/Run Qodana.run.xml | 9 ++- .../src/main/resources/META-INF/plugin.xml | 64 ++++++++++--------- Src/CSharpier.Tests/CSharpier.Tests.csproj | 6 +- .../.idea/codeStyles/Project.xml | 2 +- .../.idea/codeStyles/codeStyleConfig.xml | 2 +- .../inspectionProfiles/Project_Default.xml | 2 +- Src/CSharpier.VSCode/.idea/modules.xml | 7 +- Src/CSharpier.VSCode/.idea/vcs.xml | 2 +- .../.idea/CSharpierPlugin.xml | 2 +- .../.idea/encodings.xml | 2 +- .../.idea/indexLayout.xml | 2 +- .../.idea/vcs.xml | 2 +- .../CSharpier.VisualStudio.csproj | 33 ++++++++-- .../CSharpier.VisualStudio2019.csproj | 33 ++++++++-- .../Directory.Build.props | 2 +- .../Directory.Packages.props | 2 +- Src/CSharpier/CSharpier.csproj | 6 +- Src/Website/.idea/modules.xml | 7 +- Src/Website/.idea/prettier.xml | 2 +- Src/Website/.idea/vcs.xml | 2 +- Src/Website/Website.csproj | 3 +- .../.idea/.idea.Test/.idea/encodings.xml | 2 +- .../.idea/.idea.Test/.idea/indexLayout.xml | 2 +- .../.idea/.idea.Test/.idea/vcs.xml | 2 +- .../Directory.Build.props | 3 +- .../CSharpier.MsBuild.Test/net48/net48.csproj | 3 - .../net7.0/net7.0.csproj | 3 - .../net8.0/net8.0.csproj | 3 - Tests/CSharpier.MsBuild.Test/nuget.config | 2 +- Tests/MsBuild/Directory.Build.props | 2 +- Tests/MsBuild/nuget.config | 3 +- docs/Docs.csproj | 22 +++---- nuget.config | 1 - 67 files changed, 324 insertions(+), 190 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index db21a0aee..e9702aaa2 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,9 +3,9 @@ "isRoot": true, "tools": { "csharpier": { - "version": "0.30.1", + "version": "1.0.0-alpha10", "commands": [ - "dotnet-csharpier" + "csharpier" ] } } diff --git a/.csharpierignore b/.csharpierignore index 236410b22..2eb6f6ce8 100644 --- a/.csharpierignore +++ b/.csharpierignore @@ -1,3 +1,5 @@ +build + Uploads/ Tests/MsBuild/TestCases/ diff --git a/.github/Github.csproj b/.github/Github.csproj index 1aefdbaef..6116e9553 100644 --- a/.github/Github.csproj +++ b/.github/Github.csproj @@ -1,2 +1 @@ - - + diff --git a/.idea/.idea.CSharpier/.idea/CSharpierPlugin.xml b/.idea/.idea.CSharpier/.idea/CSharpierPlugin.xml index bd05466d2..9c7089a4d 100644 --- a/.idea/.idea.CSharpier/.idea/CSharpierPlugin.xml +++ b/.idea/.idea.CSharpier/.idea/CSharpierPlugin.xml @@ -5,4 +5,4 @@