Merge pull request #1 from PandaTechAM/development

structure change
PandaTechAM · Nov 29, 2023 · 7031718 · 7031718
2 parents 12dd874 + 6d5c388
commit 7031718
Show file tree

Hide file tree

Showing 23 changed files with 13 additions and 181 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,7 +1,7 @@
 name: Deploy NuGet Package
 
 env:
-  PROJECT_PATH: './Pandatech.Crypto/Pandatech.Crypto.csproj'
+  PROJECT_PATH: './src/Pandatech.Crypto/Pandatech.Crypto.csproj'
   OUTPUT_DIR: 'nupkgs'
   NUGET_SOURCE: 'https://api.nuget.org/v3/index.json'
   NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
@@ -18,21 +18,18 @@ jobs:
         dotnet-version: [ '8.x.x' ]
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: ${{ matrix.dotnet-version }}
 
       - name: Build
         run: dotnet build ${{ env.PROJECT_PATH }}
 
-      - name: Test
-        run: dotnet test ${{ env.PROJECT_PATH }} --collect:"XPlat Code Coverage"
-
       - name: Pack
-        run: dotnet pack ${{ env.PROJECT_PATH }} --output ${{ env.OUTPUT_DIR }} 
+        run: dotnet pack ${{ env.PROJECT_PATH }} --output ${{ env.OUTPUT_DIR }}
 
       - name: Publish
-        run: dotnet nuget push ${{ env.OUTPUT_DIR }}/*.nupkg -k ${{ env.NUGET_API_KEY }} -s ${{ env.NUGET_SOURCE }}
+        run: dotnet nuget push ${{ env.OUTPUT_DIR }}/*.nupkg -k ${{ env.NUGET_API_KEY }} -s ${{ env.NUGET_SOURCE }}
diff --git a/Pandatech.Crypto/Readme.md b/Pandatech.Crypto/Readme.md
diff --git a/global.json b/global.json
diff --git a/Pandatech.Crypto/pandatech.png → pandatech.png b/Pandatech.Crypto/pandatech.png → pandatech.png
diff --git a/Pandatech.Crypto.sln → src/Pandatech.Crypto.sln b/Pandatech.Crypto.sln → src/Pandatech.Crypto.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.7.34024.191
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pandatech.Crypto.Tests", "Pandatech.Crypto.Tests\Pandatech.Crypto.Tests.csproj", "{89D6535F-549C-4091-BF21-96565F098C3F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pandatech.Crypto.Tests", "../tests/Pandatech.Crypto.Tests\Pandatech.Crypto.Tests.csproj", "{89D6535F-549C-4091-BF21-96565F098C3F}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pandatech.Crypto", "Pandatech.Crypto\Pandatech.Crypto.csproj", "{97B88123-20B1-4F0A-82E7-DFDD08A03B7C}"
 EndProject

diff --git a/Pandatech.Crypto.sln.DotSettings → src/Pandatech.Crypto.sln.DotSettings b/Pandatech.Crypto.sln.DotSettings → src/Pandatech.Crypto.sln.DotSettings
diff --git a/Pandatech.Crypto/Aes256.cs → src/Pandatech.Crypto/Aes256.cs b/Pandatech.Crypto/Aes256.cs → src/Pandatech.Crypto/Aes256.cs
diff --git a/Pandatech.Crypto/Argon2Id.cs → src/Pandatech.Crypto/Argon2Id.cs b/Pandatech.Crypto/Argon2Id.cs → src/Pandatech.Crypto/Argon2Id.cs
diff --git a/Pandatech.Crypto/HostBuilderExtensions.cs → ...Pandatech.Crypto/HostBuilderExtensions.cs b/Pandatech.Crypto/HostBuilderExtensions.cs → ...Pandatech.Crypto/HostBuilderExtensions.cs
diff --git a/Pandatech.Crypto/Options.cs → src/Pandatech.Crypto/Options.cs b/Pandatech.Crypto/Options.cs → src/Pandatech.Crypto/Options.cs
diff --git a/Pandatech.Crypto/Pandatech.Crypto.csproj → src/Pandatech.Crypto/Pandatech.Crypto.csproj b/Pandatech.Crypto/Pandatech.Crypto.csproj → src/Pandatech.Crypto/Pandatech.Crypto.csproj
@@ -4,25 +4,20 @@
         <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <Version>2.2.1</Version>
-        <Title>Pandatech.Crypto</Title>
         <Authors>Pandatech</Authors>
         <PackageIcon>pandatech.png</PackageIcon>
         <PackageReadmeFile>Readme.md</PackageReadmeFile>
+        <Version>2.2.2</Version>
+        <Title>Pandatech.Crypto</Title>
+        <PackageTags>Pandatech, library, encryption, hash, algorythms, security</PackageTags>
         <Description>PandaTech.Crypto is a .NET library simplifying common cryptograhic functions.</Description>
         <RepositoryUrl>https://github.com/PandaTechAM/be-lib-pandatech-crypto</RepositoryUrl>
-        <PackageReleaseNotes>Nullable byte in aes256 decrypt</PackageReleaseNotes>
+        <PackageReleaseNotes>Structure change</PackageReleaseNotes>
     </PropertyGroup>
 
     <ItemGroup>
-      <None Update="pandatech.png">
-        <Pack>True</Pack>
-        <PackagePath></PackagePath>
-      </None>
-      <None Update="Readme.md">
-        <Pack>True</Pack>
-        <PackagePath>\</PackagePath>
-      </None>
+        <None Include="..\..\pandatech.png" Pack="true" PackagePath="\"/>
+        <None Include="..\..\Readme.md" Pack="true" PackagePath="\"/>
     </ItemGroup>
 
     <ItemGroup>

diff --git a/Pandatech.Crypto/Password.cs → src/Pandatech.Crypto/Password.cs b/Pandatech.Crypto/Password.cs → src/Pandatech.Crypto/Password.cs
diff --git a/Pandatech.Crypto/Random.cs → src/Pandatech.Crypto/Random.cs b/Pandatech.Crypto/Random.cs → src/Pandatech.Crypto/Random.cs
diff --git a/Pandatech.Crypto/Sha3.cs → src/Pandatech.Crypto/Sha3.cs b/Pandatech.Crypto/Sha3.cs → src/Pandatech.Crypto/Sha3.cs
diff --git a/Pandatech.Crypto.Tests/Aes256Tests.cs → tests/Pandatech.Crypto.Tests/Aes256Tests.cs b/Pandatech.Crypto.Tests/Aes256Tests.cs → tests/Pandatech.Crypto.Tests/Aes256Tests.cs
diff --git a/Pandatech.Crypto.Tests/Argon2IdTests.cs → ...s/Pandatech.Crypto.Tests/Argon2IdTests.cs b/Pandatech.Crypto.Tests/Argon2IdTests.cs → ...s/Pandatech.Crypto.Tests/Argon2IdTests.cs
diff --git a/Pandatech.Crypto.Tests/GlobalUsings.cs → tests/Pandatech.Crypto.Tests/GlobalUsings.cs b/Pandatech.Crypto.Tests/GlobalUsings.cs → tests/Pandatech.Crypto.Tests/GlobalUsings.cs
diff --git a/Pandatech.Crypto.Tests/HostBuilderTests.cs → ...andatech.Crypto.Tests/HostBuilderTests.cs b/Pandatech.Crypto.Tests/HostBuilderTests.cs → ...andatech.Crypto.Tests/HostBuilderTests.cs
diff --git a/...rypto.Tests/Pandatech.Crypto.Tests.csproj → ...rypto.Tests/Pandatech.Crypto.Tests.csproj b/...rypto.Tests/Pandatech.Crypto.Tests.csproj → ...rypto.Tests/Pandatech.Crypto.Tests.csproj
@@ -23,7 +23,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\Pandatech.Crypto\Pandatech.Crypto.csproj" />
+      <ProjectReference Include="..\..\src\Pandatech.Crypto\Pandatech.Crypto.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/Pandatech.Crypto.Tests/PasswordTests.cs → ...s/Pandatech.Crypto.Tests/PasswordTests.cs b/Pandatech.Crypto.Tests/PasswordTests.cs → ...s/Pandatech.Crypto.Tests/PasswordTests.cs
diff --git a/Pandatech.Crypto.Tests/RandomTests.cs → tests/Pandatech.Crypto.Tests/RandomTests.cs b/Pandatech.Crypto.Tests/RandomTests.cs → tests/Pandatech.Crypto.Tests/RandomTests.cs
diff --git a/Pandatech.Crypto.Tests/Sha3Tests.cs → tests/Pandatech.Crypto.Tests/Sha3Tests.cs b/Pandatech.Crypto.Tests/Sha3Tests.cs → tests/Pandatech.Crypto.Tests/Sha3Tests.cs