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
8 changes: 4 additions & 4 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand All @@ -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
files: IntelliTect.Multitool.${{ steps.tag-version.outputs.TAG_VERSION }}.nupkg
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\IntelliTect.Utilities\IntelliTect.Utilities.csproj" />
<ProjectReference Include="..\IntelliTect.Multitool\IntelliTect.Multitool.csproj" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions IntelliTect.sln → IntelliTect.Multitool.sln
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.IO;
using System.Reflection;

namespace IntelliTect.Utilities
namespace IntelliTect.Multitool
{
/// <summary>
/// Information about the executing assembly.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
<Authors>IntelliTect</Authors>
<Description>A utility library for IntelliTect</Description>
<Copyright>Copyright © IntelliTect 2019</Copyright>
<PackageProjectUrl>https://github.com/IntelliTect/Utilities</PackageProjectUrl>
<RepositoryUrl>https://github.com/IntelliTect/Utilities</RepositoryUrl>
<PackageProjectUrl>https://github.com/IntelliTect/Multitool</PackageProjectUrl>
<RepositoryUrl>https://github.com/IntelliTect/Multitool</RepositoryUrl>
<RepositoryType>Git</RepositoryType>
<PackageTags>IntelliTect Utilities</PackageTags>
<PackageTags>IntelliTect, Utilities, Multitool</PackageTags>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<RepositoryType>git</RepositoryType>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Linq;
using System.Security.Claims;

namespace IntelliTect.Utilities.Security
namespace IntelliTect.Multitool.Security
{
/// <summary>
/// Gets information from a <see cref="ClaimsPrincipal"/>
Expand Down