Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Standardize Repo / Solution with nats.net #26

Merged
merged 8 commits into from
Dec 9, 2024
Merged

Standardize Repo / Solution with nats.net #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2dc58aa
reorganize repo/solution
rickdotnet Dec 5, 2024
127a8a0
update build.props
rickdotnet Dec 5, 2024
1b022e2
cleanup missing project + adjust test cicd
rickdotnet Dec 5, 2024
2d635a2
fix test path
rickdotnet Dec 5, 2024
217e031
cleanup LangVersion; add missing working directory property
rickdotnet Dec 6, 2024
c57433e
update packages
rickdotnet Dec 6, 2024
7a3f516
remove unused packages
rickdotnet Dec 7, 2024
877bec9
cleanup usings
rickdotnet Dec 7, 2024
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
1 change: 1 addition & 0 deletions .github/workflows/format.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ jobs:
dotnet-version: '8.x'

- name: Check formatting
working-directory: ./src
run: |
if dotnet format --verify-no-changes; then
echo "formatting passed"
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ jobs:

- id: tag
name: Determine tag
working-directory: ./src
run: |
version="$(head -n 1 version.txt)"
ref_name="v$version"
Expand All @@ -38,12 +39,14 @@ jobs:

- if: ${{ fromJSON(steps.tag.outputs.create) }}
name: Pack
working-directory: ./src
# https://learn.microsoft.com/en-us/nuget/create-packages/symbol-packages-snupkg
# https://devblogs.microsoft.com/dotnet/producing-packages-with-source-link/
run: dotnet pack -c Release -o dist -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg -p:ContinuousIntegrationBuild=true

- if: ${{ fromJSON(steps.tag.outputs.create) }}
name: Push
working-directory: ./src
run: |
cd dist
ls -lh
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,15 @@ jobs:
8.x

- name: Restore
working-directory: ./src
run: dotnet restore

- name: Build
working-directory: ./src
run: dotnet build --no-restore -p:ContinuousIntegrationBuild=true

- name: Test
working-directory: ./src
# Collect code coverage
# https://github.com/MarcoRossignoli/coverlet/blob/master/Documentation/KnownIssues.md#tests-fail-if-assembly-is-strong-named
run: dotnet test --no-build --logger:"console;verbosity=normal" --collect:"XPlat Code Coverage" --settings Default.runsettings -- RunConfiguration.DisableAppDomain=true
Expand All @@ -71,6 +74,7 @@ jobs:
token: ${{ secrets.CODECOV_TOKEN }}

- name: Test Native AOT
working-directory: ./tests
shell: bash
run: |
echo ">> Set up for AOT compilation..."
Expand Down
0 .editorconfig → src/.editorconfig
View file
Open in desktop
File renamed without changes.
0 Default.runsettings → src/Default.runsettings
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions Directory.Build.props → src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
</PropertyGroup>

<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)LICENSE" Pack="true" PackagePath=""/>
<None Include="$(MSBuildThisFileDirectory)README.md" Pack="true" PackagePath=""/>
<None Include="$(MSBuildThisFileDirectory)Icon.png" Pack="true" PackagePath=""/>
<None Include="$(MSBuildThisFileDirectory)..\LICENSE" Pack="true" PackagePath=""/>
<None Include="$(MSBuildThisFileDirectory)..\README.md" Pack="true" PackagePath=""/>
<None Include="$(MSBuildThisFileDirectory)..\Icon.png" Pack="true" PackagePath=""/>
</ItemGroup>

</Project>
36 changes: 22 additions & 14 deletions NATS.Jwt.sln → src/NATS.Jwt.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,39 +5,43 @@ VisualStudioVersion = 17.0.31903.59
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NATS.Jwt", "NATS.Jwt\NATS.Jwt.csproj", "{9B613C47-922B-4AA8-82D7-1520A13E0F74}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NATS.Jwt.Tests", "NATS.Jwt.Tests\NATS.Jwt.Tests.csproj", "{707139DF-D75B-40F8-9AA7-816C64E98572}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NATS.Jwt.Tests", "..\tests\NATS.Jwt.Tests\NATS.Jwt.Tests.csproj", "{707139DF-D75B-40F8-9AA7-816C64E98572}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NATS.Jwt.TestNativeAot", "..\tests\NATS.Jwt.TestNativeAot\NATS.Jwt.TestNativeAot.csproj", "{E144211D-3549-4E78-BFC4-B5BF7E70AEDA}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F3E7EFAD-B3EA-45F4-907B-F3C2338771CE}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{79B0CD3B-C106-44A2-9A2A-CFDA69A3016A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".", ".", "{1F24478C-D5CB-4A58-A74E-6371F7F95C01}"
ProjectSection(SolutionItems) = preProject
README.md = README.md
LICENSE = LICENSE
README.md = ..\README.md
LICENSE = ..\LICENSE
Directory.Build.props = Directory.Build.props
Icon.png = Icon.png
Icon.png = ..\Icon.png
version.txt = version.txt
.editorconfig = .editorconfig
.gitattributes = .gitattributes
.gitignore = .gitignore
.gitattributes = ..\.gitattributes
.gitignore = ..\.gitignore
Default.runsettings = Default.runsettings
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{03E5999C-5D20-4EA2-B8C8-53ACE65B221F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ISSUE_TEMPLATE", "ISSUE_TEMPLATE", "{1EB01F81-8857-4646-B8BF-16024F357506}"
ProjectSection(SolutionItems) = preProject
.github\ISSUE_TEMPLATE\config.yml = .github\ISSUE_TEMPLATE\config.yml
.github\ISSUE_TEMPLATE\defect.yml = .github\ISSUE_TEMPLATE\defect.yml
.github\ISSUE_TEMPLATE\proposal.yml = .github\ISSUE_TEMPLATE\proposal.yml
.github\ISSUE_TEMPLATE\config.yml = ..\.github\ISSUE_TEMPLATE\config.yml
.github\ISSUE_TEMPLATE\defect.yml = ..\.github\ISSUE_TEMPLATE\defect.yml
.github\ISSUE_TEMPLATE\proposal.yml = ..\.github\ISSUE_TEMPLATE\proposal.yml
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{9C98B59B-D0C0-4F2B-8333-2242ED1B5F70}"
ProjectSection(SolutionItems) = preProject
.github\workflows\format.yml = .github\workflows\format.yml
.github\workflows\release.yml = .github\workflows\release.yml
.github\workflows\test.yml = .github\workflows\test.yml
.github\workflows\format.yml = ..\.github\workflows\format.yml
.github\workflows\release.yml = ..\.github\workflows\release.yml
.github\workflows\test.yml = ..\.github\workflows\test.yml
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NATS.Jwt.TestNativeAot", "NATS.Jwt.TestNativeAot\NATS.Jwt.TestNativeAot.csproj", "{E144211D-3549-4E78-BFC4-B5BF7E70AEDA}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -61,7 +65,11 @@ Global
{E144211D-3549-4E78-BFC4-B5BF7E70AEDA}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{9B613C47-922B-4AA8-82D7-1520A13E0F74} = {F3E7EFAD-B3EA-45F4-907B-F3C2338771CE}
{E144211D-3549-4E78-BFC4-B5BF7E70AEDA} = {79B0CD3B-C106-44A2-9A2A-CFDA69A3016A}
{707139DF-D75B-40F8-9AA7-816C64E98572} = {79B0CD3B-C106-44A2-9A2A-CFDA69A3016A}
{1EB01F81-8857-4646-B8BF-16024F357506} = {03E5999C-5D20-4EA2-B8C8-53ACE65B221F}
{9C98B59B-D0C0-4F2B-8333-2242ED1B5F70} = {03E5999C-5D20-4EA2-B8C8-53ACE65B221F}
{03E5999C-5D20-4EA2-B8C8-53ACE65B221F} = {1F24478C-D5CB-4A58-A74E-6371F7F95C01}
EndGlobalSection
EndGlobal
0 NATS.Jwt.sln.DotSettings → src/NATS.Jwt.sln.DotSettings
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt.snk → src/NATS.Jwt.snk
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/EncodingUtils.cs → src/NATS.Jwt/EncodingUtils.cs
View file
Open in desktop
File renamed without changes.
2 changes: 0 additions & 2 deletions ...nternal/NatsAccountSigningKeyConverter.cs → ...nternal/NatsAccountSigningKeyConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@

using System;
using System.Collections.Generic;
using System.Text;
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Text.Json.Serialization.Metadata;
using NATS.Jwt.Models;

namespace NATS.Jwt.Internal
Expand Down
0 NATS.Jwt/Internal/NatsBufferWriter.cs → src/NATS.Jwt/Internal/NatsBufferWriter.cs
View file
Open in desktop
File renamed without changes.
0 ...wt/Internal/NatsBufferWriterExtensions.cs → ...wt/Internal/NatsBufferWriterExtensions.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/Internal/NatsExportComparer.cs → src/NATS.Jwt/Internal/NatsExportComparer.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/Internal/NatsImportComparer.cs → src/NATS.Jwt/Internal/NatsImportComparer.cs
View file
Open in desktop
File renamed without changes.
0 ...nternal/NatsJsJsonNanosecondsConverter.cs → ...nternal/NatsJsJsonNanosecondsConverter.cs
View file
Open in desktop
File renamed without changes.
0 ...NatsJsJsonNullableNanosecondsConverter.cs → ...NatsJsJsonNullableNanosecondsConverter.cs
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion ...ternal/NatsJsonDateTimeOffsetConverter.cs → ...ternal/NatsJsonDateTimeOffsetConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using System;
using System.Text.Json;
using System.Text.Json.Serialization;
using NATS.Jwt.Models;

namespace NATS.Jwt.Internal;

Expand Down
0 ...t/Internal/NatsJsonStringEnumConverter.cs → ...t/Internal/NatsJsonStringEnumConverter.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/Internal/SHA512256.cs → src/NATS.Jwt/Internal/SHA512256.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/JsonContext.cs → src/NATS.Jwt/JsonContext.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/Models/JetStreamLimits.cs → src/NATS.Jwt/Models/JetStreamLimits.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/Models/JwtClaimsData.cs → src/NATS.Jwt/Models/JwtClaimsData.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/Models/JwtHeader.cs → src/NATS.Jwt/Models/JwtHeader.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/Models/NatsAccount.cs → src/NATS.Jwt/Models/NatsAccount.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/Models/NatsAccountClaims.cs → src/NATS.Jwt/Models/NatsAccountClaims.cs
View file
Open in desktop
File renamed without changes.
3 changes: 0 additions & 3 deletions ...Jwt/Models/NatsAccountScopedSigningKey.cs → ...Jwt/Models/NatsAccountScopedSigningKey.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
// Copyright (c) The NATS Authors.
// Licensed under the Apache License, Version 2.0.

using System;
using System.Collections.Generic;
using System.Text;
using System.Text.Json.Serialization;

namespace NATS.Jwt.Models
Expand Down
4 changes: 0 additions & 4 deletions NATS.Jwt/Models/NatsAccountSigningKey.cs → src/NATS.Jwt/Models/NatsAccountSigningKey.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
// Copyright (c) The NATS Authors.
// Licensed under the Apache License, Version 2.0.

using System;
using System.Collections.Generic;
using System.Text;

namespace NATS.Jwt.Models
{
/// <summary>
Expand Down
0 NATS.Jwt/Models/NatsActivation.cs → src/NATS.Jwt/Models/NatsActivation.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/Models/NatsActivationClaims.cs → src/NATS.Jwt/Models/NatsActivationClaims.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/Models/NatsAuthorizationRequest.cs → ...TS.Jwt/Models/NatsAuthorizationRequest.cs
View file
Open in desktop
File renamed without changes.
0 .../Models/NatsAuthorizationRequestClaims.cs → .../Models/NatsAuthorizationRequestClaims.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/Models/NatsAuthorizationResponse.cs → ...S.Jwt/Models/NatsAuthorizationResponse.cs
View file
Open in desktop
File renamed without changes.
0 ...Models/NatsAuthorizationResponseClaims.cs → ...Models/NatsAuthorizationResponseClaims.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/Models/NatsClientInformation.cs → src/NATS.Jwt/Models/NatsClientInformation.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/Models/NatsClientTls.cs → src/NATS.Jwt/Models/NatsClientTls.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/Models/NatsConnectOptions.cs → src/NATS.Jwt/Models/NatsConnectOptions.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/Models/NatsExport.cs → src/NATS.Jwt/Models/NatsExport.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/Models/NatsExportType.cs → src/NATS.Jwt/Models/NatsExportType.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/Models/NatsExternalAuthorization.cs → ...S.Jwt/Models/NatsExternalAuthorization.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/Models/NatsGenericClaims.cs → src/NATS.Jwt/Models/NatsGenericClaims.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/Models/NatsGenericFields.cs → src/NATS.Jwt/Models/NatsGenericFields.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/Models/NatsGenericFieldsClaims.cs → ...ATS.Jwt/Models/NatsGenericFieldsClaims.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/Models/NatsImport.cs → src/NATS.Jwt/Models/NatsImport.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/Models/NatsMsgTrace.cs → src/NATS.Jwt/Models/NatsMsgTrace.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/Models/NatsOperator.cs → src/NATS.Jwt/Models/NatsOperator.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/Models/NatsOperatorClaims.cs → src/NATS.Jwt/Models/NatsOperatorClaims.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/Models/NatsOperatorLimits.cs → src/NATS.Jwt/Models/NatsOperatorLimits.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/Models/NatsPermission.cs → src/NATS.Jwt/Models/NatsPermission.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/Models/NatsPermissions.cs → src/NATS.Jwt/Models/NatsPermissions.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/Models/NatsResponsePermission.cs → ...NATS.Jwt/Models/NatsResponsePermission.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/Models/NatsServerId.cs → src/NATS.Jwt/Models/NatsServerId.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/Models/NatsServiceLatency.cs → src/NATS.Jwt/Models/NatsServiceLatency.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/Models/NatsUser.cs → src/NATS.Jwt/Models/NatsUser.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/Models/NatsUserClaims.cs → src/NATS.Jwt/Models/NatsUserClaims.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/Models/NatsWeightedMapping.cs → src/NATS.Jwt/Models/NatsWeightedMapping.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/Models/TimeRange.cs → src/NATS.Jwt/Models/TimeRange.cs
View file
Open in desktop
File renamed without changes.
82 changes: 38 additions & 44 deletions NATS.Jwt/NATS.Jwt.csproj → src/NATS.Jwt/NATS.Jwt.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,44 +1,38 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

<!-- NuGet Packaging -->
<PackageTags>nats;jwt</PackageTags>
<Description>NATS JWT for .NET</Description>
<IsPackable>true</IsPackable>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' != 'netstandard2.0' AND '$(TargetFramework)' != 'netstandard2.1'">
<IsTrimmable>true</IsTrimmable>
</PropertyGroup>

<!-- Dependencies for netstandard only -->
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1'">
<PackageReference Include="System.Threading.Channels" Version="8.0.0"/>
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.1"/>
<PackageReference Include="Nullable" Version="1.3.1"/>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="System.Memory" Version="4.5.5"/>
<PackageReference Include="System.Buffers" Version="4.5.1"/>
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0"/>
<!-- Nerdbank.Streams for SequenceReader support https://github.com/dotnet/standard/issues/1493 -->
<PackageReference Include="Nerdbank.Streams" Version="2.10.72"/>
<PackageReference Include="IndexRange" Version="1.0.3"/>
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Text.Json" Version="8.0.5"/>
<PackageReference Include="NATS.NKeys" Version="1.0.0-preview.1"/>
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" ExcludeAssets="Compile" PrivateAssets="All"/>
</ItemGroup>

<ItemGroup>
<InternalsVisibleTo Include="NATS.Jwt.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a56954898c64f94b3785de8ff48cf4b9cf7ce5398602da1680f15e3dccc398e8bca151641158df6542afc9623805c0f6ac513a4bcf1b3289f45a27c5eb927711854ebc8a42afce2cbbe7deebde1a431ee53d2bdf64418ff964fc3a2c561e344ba79b30704d916a879afac5e7aea531198afa8a3a1979a4232a9c590f6ee5cfc2"/>
</ItemGroup>

</Project>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

<!-- NuGet Packaging -->
<PackageTags>nats;jwt</PackageTags>
<Description>NATS JWT for .NET</Description>
<IsPackable>true</IsPackable>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' != 'netstandard2.0' AND '$(TargetFramework)' != 'netstandard2.1'">
<IsTrimmable>true</IsTrimmable>
</PropertyGroup>

<!-- Dependencies for netstandard only -->
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1'">
<PackageReference Include="Nullable" Version="1.3.1"/>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="System.Memory" Version="4.6.0" />
<PackageReference Include="System.Buffers" Version="4.6.0" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Text.Json" Version="8.0.5"/>
<PackageReference Include="NATS.NKeys" Version="1.0.0-preview.1"/>
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" ExcludeAssets="Compile" PrivateAssets="All"/>
</ItemGroup>

<ItemGroup>
<InternalsVisibleTo Include="NATS.Jwt.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a56954898c64f94b3785de8ff48cf4b9cf7ce5398602da1680f15e3dccc398e8bca151641158df6542afc9623805c0f6ac513a4bcf1b3289f45a27c5eb927711854ebc8a42afce2cbbe7deebde1a431ee53d2bdf64418ff964fc3a2c561e344ba79b30704d916a879afac5e7aea531198afa8a3a1979a4232a9c590f6ee5cfc2"/>
</ItemGroup>

</Project>
0 NATS.Jwt/NatsJwt.cs → src/NATS.Jwt/NatsJwt.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/NatsJwtException.cs → src/NATS.Jwt/NatsJwtException.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/PublicAPI.Shipped.txt → src/NATS.Jwt/PublicAPI.Shipped.txt
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt/PublicAPI.Unshipped.txt → src/NATS.Jwt/PublicAPI.Unshipped.txt
View file
Open in desktop
File renamed without changes.
0 version.txt → src/version.txt
View file
Open in desktop
File renamed without changes.
9 changes: 9 additions & 0 deletions tests/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<Project>
<PropertyGroup>
<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)..\src\NATS.Jwt.snk</AssemblyOriginatorKeyFile>
<IsPackable>false</IsPackable>
</PropertyGroup>
</Project>
0 NATS.Jwt.TestNativeAot/Assert.cs → tests/NATS.Jwt.TestNativeAot/Assert.cs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...stNativeAot/NATS.Jwt.TestNativeAot.csproj → ...stNativeAot/NATS.Jwt.TestNativeAot.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\NATS.Jwt\NATS.Jwt.csproj" />
<ProjectReference Include="..\..\src\NATS.Jwt\NATS.Jwt.csproj" />
</ItemGroup>

</Project>
0 NATS.Jwt.TestNativeAot/Program.cs → tests/NATS.Jwt.TestNativeAot/Program.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt.Tests/ConnectTests.cs → tests/NATS.Jwt.Tests/ConnectTests.cs
View file
Open in desktop
File renamed without changes.
0 ....Jwt.Tests/Models/JetStreamLimitsTests.cs → ....Jwt.Tests/Models/JetStreamLimitsTests.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt.Tests/Models/JwtClaimsDataTests.cs → ...TS.Jwt.Tests/Models/JwtClaimsDataTests.cs
View file
Open in desktop
File renamed without changes.
0 ...wt.Tests/Models/NatsAccountClaimsTests.cs → ...wt.Tests/Models/NatsAccountClaimsTests.cs
View file
Open in desktop
File renamed without changes.
0 ...Tests/Models/NatsActivationClaimsTests.cs → ...Tests/Models/NatsActivationClaimsTests.cs
View file
Open in desktop
File renamed without changes.
0 ...ls/NatsAuthorizationRequestClaimsTests.cs → ...ls/NatsAuthorizationRequestClaimsTests.cs
View file
Open in desktop
File renamed without changes.
0 ...s/NatsAuthorizationResponseClaimsTests.cs → ...s/NatsAuthorizationResponseClaimsTests.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt.Tests/Models/NatsExportTests.cs → .../NATS.Jwt.Tests/Models/NatsExportTests.cs
View file
Open in desktop
File renamed without changes.
0 ...ts/Models/NatsGenericFieldsClaimsTests.cs → ...ts/Models/NatsGenericFieldsClaimsTests.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt.Tests/Models/NatsImportTests.cs → .../NATS.Jwt.Tests/Models/NatsImportTests.cs
View file
Open in desktop
File renamed without changes.
0 ...s/NatsJsonDateTimeOffsetConverterTests.cs → ...s/NatsJsonDateTimeOffsetConverterTests.cs
View file
Open in desktop
File renamed without changes.
0 ...t.Tests/Models/NatsOperatorClaimsTests.cs → ...t.Tests/Models/NatsOperatorClaimsTests.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt.Tests/Models/NatsServerIdTests.cs → ...ATS.Jwt.Tests/Models/NatsServerIdTests.cs
View file
Open in desktop
File renamed without changes.
0 ...t.Tests/Models/NatsServiceLatencyTests.cs → ...t.Tests/Models/NatsServiceLatencyTests.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt.Tests/Models/NatsUserClaimsTests.cs → ...S.Jwt.Tests/Models/NatsUserClaimsTests.cs
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions NATS.Jwt.Tests/NATS.Jwt.Tests.csproj → tests/NATS.Jwt.Tests/NATS.Jwt.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@

<ItemGroup>
<PackageReference Include="JsonDiffPatch.Net" Version="2.3.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0"/>
<PackageReference Include="NATS.Client.Core" Version="2.3.0-preview.1" />
<PackageReference Include="xunit" Version="2.4.2"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="NATS.Client.Core" Version="2.5.4" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="6.0.0">
<PackageReference Include="coverlet.collector" Version="6.0.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\NATS.Jwt\NATS.Jwt.csproj" />
<ProjectReference Include="..\..\src\NATS.Jwt\NATS.Jwt.csproj" />
</ItemGroup>

</Project>
0 NATS.Jwt.Tests/NatsGenericClaimsTests.cs → .../NATS.Jwt.Tests/NatsGenericClaimsTests.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt.Tests/NatsJwtTests.cs → tests/NATS.Jwt.Tests/NatsJwtTests.cs
View file
Open in desktop
File renamed without changes.
0 NATS.Jwt.Tests/NatsServerProcess.cs → tests/NATS.Jwt.Tests/NatsServerProcess.cs
View file
Open in desktop
File renamed without changes.
Loading