From 402655cec3d542b243285897be8b0d0026a31719 Mon Sep 17 00:00:00 2001 From: Benjamin Michaelis Date: Thu, 1 Sep 2022 15:08:49 -0700 Subject: [PATCH 1/2] Update name to Multitool --- .github/workflows/deploy.yml | 8 ++++---- .../ClaimsPrincipalGetRolesTests.cs | 4 ++-- .../ClaimsPrincipalGetUserIdTests.cs | 4 ++-- .../IntelliTect.Multitool.Tests.csproj | 2 +- IntelliTect.sln => IntelliTect.Multitool.sln | 6 +++--- .../AssemblyInfo.cs | 2 +- .../CustomDictionary.xml | 0 .../IntelliTect.Multitool.csproj | 6 +++--- .../Properties/AssemblyInfo.cs | 0 .../Security/ClaimsPrincipalExtensions.cs | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) rename {IntelliTect.Utilities.Tests => IntelliTect.Multitool.Tests}/ClaimsPrincipalGetRolesTests.cs (92%) rename {IntelliTect.Utilities.Tests => IntelliTect.Multitool.Tests}/ClaimsPrincipalGetUserIdTests.cs (91%) rename IntelliTect.Utilities.Tests/IntelliTect.Utilities.Tests.csproj => IntelliTect.Multitool.Tests/IntelliTect.Multitool.Tests.csproj (88%) rename IntelliTect.sln => IntelliTect.Multitool.sln (90%) rename {IntelliTect.Utilities => IntelliTect.Multitool}/AssemblyInfo.cs (98%) rename {IntelliTect.Utilities => IntelliTect.Multitool}/CustomDictionary.xml (100%) rename IntelliTect.Utilities/IntelliTect.Utilities.csproj => IntelliTect.Multitool/IntelliTect.Multitool.csproj (86%) rename {IntelliTect.Utilities => IntelliTect.Multitool}/Properties/AssemblyInfo.cs (100%) rename {IntelliTect.Utilities => IntelliTect.Multitool}/Security/ClaimsPrincipalExtensions.cs (97%) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 52c54c7..e99c89a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -42,13 +42,13 @@ jobs: run: dotnet test --no-build --configuration Release --verbosity normal - name: Pack if: startsWith(github.ref, 'refs/tags/v') - run: dotnet pack -p:PackageVersion=${{ env.nugetVersion }} --configuration Release -o ${{env.DOTNET_ROOT}}/IntelliTect.UtilitiesPack --no-build + run: dotnet pack -p:PackageVersion=${{ env.nugetVersion }} --configuration Release -o ${{env.DOTNET_ROOT}}/IntelliTect.MultitoolPack --no-build - name: Upload Artifacts if: startsWith(github.ref, 'refs/tags/v') uses: actions/upload-artifact@v2 with: name: NuGet - path: ${{env.DOTNET_ROOT}}/IntelliTect.UtilitiesPack + path: ${{env.DOTNET_ROOT}}/IntelliTect.MultitoolPack deploy: if: startsWith(github.ref, 'refs/tags/v') @@ -65,11 +65,11 @@ jobs: run: | $tagVersion = "${{ github.ref }}".substring(11) echo '::set-output name=TAG_VERSION::$tagVersion' - dotnet nuget push IntelliTect.Utilities.$tagVersion.nupkg --source https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_API_KEY }} --skip-duplicate + dotnet nuget push IntelliTect.Multitool.$tagVersion.nupkg --source https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_API_KEY }} --skip-duplicate id: tag-version - name: Upload nupkg to Releases uses: softprops/action-gh-release@v1 with: fail_on_unmatched_files: true generate_release_notes: true - files: IntelliTect.Utilities.${{ steps.tag-version.outputs.TAG_VERSION }}.nupkg \ No newline at end of file + files: IntelliTect.Multitool.${{ steps.tag-version.outputs.TAG_VERSION }}.nupkg \ No newline at end of file diff --git a/IntelliTect.Utilities.Tests/ClaimsPrincipalGetRolesTests.cs b/IntelliTect.Multitool.Tests/ClaimsPrincipalGetRolesTests.cs similarity index 92% rename from IntelliTect.Utilities.Tests/ClaimsPrincipalGetRolesTests.cs rename to IntelliTect.Multitool.Tests/ClaimsPrincipalGetRolesTests.cs index eeea264..0be8a21 100644 --- a/IntelliTect.Utilities.Tests/ClaimsPrincipalGetRolesTests.cs +++ b/IntelliTect.Multitool.Tests/ClaimsPrincipalGetRolesTests.cs @@ -1,10 +1,10 @@ using System; using System.Security.Claims; using System.Security.Principal; -using IntelliTect.Utilities.Security; +using IntelliTect.Multitool.Security; using Xunit; -namespace IntelliTect.Utilities.Tests +namespace IntelliTect.Multitool.Tests { public class ClaimsPrincipalGetRolesTests { diff --git a/IntelliTect.Utilities.Tests/ClaimsPrincipalGetUserIdTests.cs b/IntelliTect.Multitool.Tests/ClaimsPrincipalGetUserIdTests.cs similarity index 91% rename from IntelliTect.Utilities.Tests/ClaimsPrincipalGetUserIdTests.cs rename to IntelliTect.Multitool.Tests/ClaimsPrincipalGetUserIdTests.cs index 814c58d..b6c0fb4 100644 --- a/IntelliTect.Utilities.Tests/ClaimsPrincipalGetUserIdTests.cs +++ b/IntelliTect.Multitool.Tests/ClaimsPrincipalGetUserIdTests.cs @@ -1,10 +1,10 @@ using System; using System.Security.Claims; using System.Security.Principal; -using IntelliTect.Utilities.Security; +using IntelliTect.Multitool.Security; using Xunit; -namespace IntelliTect.Utilities.Tests +namespace IntelliTect.Multitool.Tests { public class ClaimsPrincipalGetUserIdTests { diff --git a/IntelliTect.Utilities.Tests/IntelliTect.Utilities.Tests.csproj b/IntelliTect.Multitool.Tests/IntelliTect.Multitool.Tests.csproj similarity index 88% rename from IntelliTect.Utilities.Tests/IntelliTect.Utilities.Tests.csproj rename to IntelliTect.Multitool.Tests/IntelliTect.Multitool.Tests.csproj index 598bec0..099932d 100644 --- a/IntelliTect.Utilities.Tests/IntelliTect.Utilities.Tests.csproj +++ b/IntelliTect.Multitool.Tests/IntelliTect.Multitool.Tests.csproj @@ -18,7 +18,7 @@ - + diff --git a/IntelliTect.sln b/IntelliTect.Multitool.sln similarity index 90% rename from IntelliTect.sln rename to IntelliTect.Multitool.sln index eb0a66e..0f527ca 100644 --- a/IntelliTect.sln +++ b/IntelliTect.Multitool.sln @@ -1,11 +1,11 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.3.32825.248 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntelliTect.Utilities", "IntelliTect.Utilities\IntelliTect.Utilities.csproj", "{4AEDF7B5-8FD1-4361-B230-173646A0D20C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntelliTect.Multitool", "IntelliTect.Multitool\IntelliTect.Multitool.csproj", "{4AEDF7B5-8FD1-4361-B230-173646A0D20C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntelliTect.Utilities.Tests", "IntelliTect.Utilities.Tests\IntelliTect.Utilities.Tests.csproj", "{B0281AA3-FAED-4A2C-8C5A-C2F3DC39511A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntelliTect.Multitool.Tests", "IntelliTect.Multitool.Tests\IntelliTect.Multitool.Tests.csproj", "{B0281AA3-FAED-4A2C-8C5A-C2F3DC39511A}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7FB66610-EB11-460E-8CC8-F49044F452D0}" ProjectSection(SolutionItems) = preProject diff --git a/IntelliTect.Utilities/AssemblyInfo.cs b/IntelliTect.Multitool/AssemblyInfo.cs similarity index 98% rename from IntelliTect.Utilities/AssemblyInfo.cs rename to IntelliTect.Multitool/AssemblyInfo.cs index 399c69b..6779875 100644 --- a/IntelliTect.Utilities/AssemblyInfo.cs +++ b/IntelliTect.Multitool/AssemblyInfo.cs @@ -2,7 +2,7 @@ using System.IO; using System.Reflection; -namespace IntelliTect.Utilities +namespace IntelliTect.Multitool { /// /// Information about the executing assembly. diff --git a/IntelliTect.Utilities/CustomDictionary.xml b/IntelliTect.Multitool/CustomDictionary.xml similarity index 100% rename from IntelliTect.Utilities/CustomDictionary.xml rename to IntelliTect.Multitool/CustomDictionary.xml diff --git a/IntelliTect.Utilities/IntelliTect.Utilities.csproj b/IntelliTect.Multitool/IntelliTect.Multitool.csproj similarity index 86% rename from IntelliTect.Utilities/IntelliTect.Utilities.csproj rename to IntelliTect.Multitool/IntelliTect.Multitool.csproj index bd4f947..daa69e8 100644 --- a/IntelliTect.Utilities/IntelliTect.Utilities.csproj +++ b/IntelliTect.Multitool/IntelliTect.Multitool.csproj @@ -10,10 +10,10 @@ IntelliTect A utility library for IntelliTect Copyright © IntelliTect 2019 - https://github.com/IntelliTect/Utilities - https://github.com/IntelliTect/Utilities + https://github.com/IntelliTect/Multitool + https://github.com/IntelliTect/Multitool Git - IntelliTect Utilities + IntelliTect Utilities, IntelliTect Multitool MIT git true diff --git a/IntelliTect.Utilities/Properties/AssemblyInfo.cs b/IntelliTect.Multitool/Properties/AssemblyInfo.cs similarity index 100% rename from IntelliTect.Utilities/Properties/AssemblyInfo.cs rename to IntelliTect.Multitool/Properties/AssemblyInfo.cs diff --git a/IntelliTect.Utilities/Security/ClaimsPrincipalExtensions.cs b/IntelliTect.Multitool/Security/ClaimsPrincipalExtensions.cs similarity index 97% rename from IntelliTect.Utilities/Security/ClaimsPrincipalExtensions.cs rename to IntelliTect.Multitool/Security/ClaimsPrincipalExtensions.cs index de4766c..24e0b39 100644 --- a/IntelliTect.Utilities/Security/ClaimsPrincipalExtensions.cs +++ b/IntelliTect.Multitool/Security/ClaimsPrincipalExtensions.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Security.Claims; -namespace IntelliTect.Utilities.Security +namespace IntelliTect.Multitool.Security { /// /// Gets information from a From 7aed8370fb894f87a3aeb79c751d80eb81dab903 Mon Sep 17 00:00:00 2001 From: Benjamin Michaelis Date: Thu, 1 Sep 2022 15:19:52 -0700 Subject: [PATCH 2/2] Update IntelliTect.Multitool/IntelliTect.Multitool.csproj Co-authored-by: Kevin B --- IntelliTect.Multitool/IntelliTect.Multitool.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IntelliTect.Multitool/IntelliTect.Multitool.csproj b/IntelliTect.Multitool/IntelliTect.Multitool.csproj index daa69e8..b4c2b67 100644 --- a/IntelliTect.Multitool/IntelliTect.Multitool.csproj +++ b/IntelliTect.Multitool/IntelliTect.Multitool.csproj @@ -13,7 +13,7 @@ https://github.com/IntelliTect/Multitool https://github.com/IntelliTect/Multitool Git - IntelliTect Utilities, IntelliTect Multitool + IntelliTect, Utilities, Multitool MIT git true