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
9 changes: 8 additions & 1 deletion CryptoNet.ExtShared/CryptoNet.ExtShared.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,14 @@
<TargetFramework>netstandard2.0</TargetFramework>
<LangVersion>10.0</LangVersion>
<Nullable>enable</Nullable>
<_SkipUpgradeNetAnalyzersNuGetWarning>true</_SkipUpgradeNetAnalyzersNuGetWarning>

<IsPackable>false</IsPackable>
<RepositoryUrl>https://github.com/itbackyard/CryptoNet</RepositoryUrl>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<DebugType>portable</DebugType>
<Deterministic>true</Deterministic>
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
</PropertyGroup>

<ItemGroup>
Expand Down
8 changes: 8 additions & 0 deletions CryptoNet.Models/CryptoNet.Models.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@
<TargetFramework>netstandard2.0</TargetFramework>
<LangVersion>10.0</LangVersion>
<Nullable>enable</Nullable>

<IsPackable>false</IsPackable>
<RepositoryUrl>https://github.com/itbackyard/CryptoNet</RepositoryUrl>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<DebugType>portable</DebugType>
<Deterministic>true</Deterministic>
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
</PropertyGroup>

<ItemGroup>
Expand Down
11 changes: 6 additions & 5 deletions CryptoNet.UnitTests/CryptoNet.UnitTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,20 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="Microsoft.Build" Version="17.11.48" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Core" Version="9.0.0" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="NUnit" Version="4.4.0" />
<PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
<PackageReference Include="NUnit3TestAdapter" Version="5.2.0" />
<PackageReference Include="coverlet.collector" Version="6.0.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="ReportGenerator" Version="5.4.12" />
<PackageReference Include="ReportGenerator" Version="5.5.0" />
<PackageReference Include="Shouldly" Version="4.3.0" />
<PackageReference Include="SharperHacks.CoreLibs.IO" Version="7.0.3" />
<PackageReference Include="System.Text.Json" Version="9.0.8" />
<PackageReference Include="SharperHacks.CoreLibs.IO" Version="7.0.5" />
<PackageReference Include="System.Text.Json" Version="10.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
41 changes: 35 additions & 6 deletions CryptoNet/CryptoNet.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
<Company>itbackyard</Company>
<Authors>Maytham Fahmi</Authors>
<MinClientVersion>1.0.0</MinClientVersion>
<Version>3.0.0</Version>
<Title>CryptoNet</Title>
<Product>CryptoNet</Product>
<RootNamespace>CryptoNet</RootNamespace>
Expand All @@ -27,12 +26,12 @@
<Copyright>Copyright © 2020</Copyright>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<DebugType>embedded</DebugType>
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
<_SkipUpgradeNetAnalyzersNuGetWarning>true</_SkipUpgradeNetAnalyzersNuGetWarning>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<IncludeReferencedProjects>true</IncludeReferencedProjects>
</PropertyGroup>

<Target Name="PrepareReleaseNotes" BeforeTargets="GenerateNuspec">
Expand All @@ -46,8 +45,8 @@
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</Content>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0" PrivateAssets="All" />
<PackageReference Include="System.Text.Json" Version="9.0.8" />
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.100" PrivateAssets="All" />
<PackageReference Include="System.Text.Json" Version="10.0.0" />
</ItemGroup>

<ItemGroup>
Expand All @@ -63,4 +62,34 @@
<ProjectReference Include="..\CryptoNet.Models\CryptoNet.Models.csproj" PrivateAssets="all" />
</ItemGroup>

<Target Name="IncludeReferencedDllsInPackage" BeforeTargets="GenerateNuspec">
<ItemGroup>
<None Include="$(OutputPath)CryptoNet.ExtShared.dll">
<Pack>true</Pack>
<PackagePath>lib\netstandard2.0\</PackagePath>
</None>
<None Include="$(OutputPath)CryptoNet.ExtShared.pdb" Condition="Exists('$(OutputPath)CryptoNet.ExtShared.pdb')">
<Pack>true</Pack>
<PackagePath>lib\netstandard2.0\</PackagePath>
</None>
<None Include="$(OutputPath)CryptoNet.ExtShared.xml" Condition="Exists('$(OutputPath)CryptoNet.ExtShared.xml')">
<Pack>true</Pack>
<PackagePath>lib\netstandard2.0\</PackagePath>
</None>

<None Include="$(OutputPath)CryptoNet.Models.dll">
<Pack>true</Pack>
<PackagePath>lib\netstandard2.0\</PackagePath>
</None>
<None Include="$(OutputPath)CryptoNet.Models.pdb" Condition="Exists('$(OutputPath)CryptoNet.Models.pdb')">
<Pack>true</Pack>
<PackagePath>lib\netstandard2.0\</PackagePath>
</None>
<None Include="$(OutputPath)CryptoNet.Models.xml" Condition="Exists('$(OutputPath)CryptoNet.Models.xml')">
<Pack>true</Pack>
<PackagePath>lib\netstandard2.0\</PackagePath>
</None>
</ItemGroup>
</Target>

</Project>
8 changes: 7 additions & 1 deletion Directory.Build.Props
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,20 @@
<PropertyGroup>
<Authors>Maytham Fahmi and Contributors</Authors>
<Copyright>All Rights Reserved</Copyright>
<Version>3.2.0</Version>
<FileVersion>3.2.0.0</FileVersion>
<AssemblyVersion>3.2.0.0</AssemblyVersion>
</PropertyGroup>

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Deterministic>true</Deterministic>
<PathMap>$(SolutionDir)={CryptoNet}/</PathMap>

<!-- Only set PathMap when SolutionDir is defined to avoid malformed /pathmap -->
<PathMap Condition=" '$(SolutionDir)' != '' ">$(SolutionDir)={CryptoNet}/</PathMap>

<!-- Some of us are already working with the next SDK -->
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion Examples/AESExample/AESExample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Text.Json" Version="9.0.8" />
<PackageReference Include="System.Text.Json" Version="10.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Examples/DSAExample/DSAExample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Text.Json" Version="9.0.8" />
<PackageReference Include="System.Text.Json" Version="10.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
12 changes: 6 additions & 6 deletions Examples/Examples.UnitTests/Examples.UnitTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CliWrap" Version="3.9.0" />
<PackageReference Include="CliWrap" Version="3.10.0" />
<PackageReference Include="coverlet.collector" Version="6.0.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand All @@ -23,15 +23,15 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="NUnit" Version="4.4.0" />
<PackageReference Include="NUnit.Analyzers" Version="4.10.0">
<PackageReference Include="NUnit.Analyzers" Version="4.11.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
<PackageReference Include="SharperHacks.CoreLibs.IO" Version="7.0.3" />
<PackageReference Include="System.Text.Json" Version="9.0.8" />
<PackageReference Include="NUnit3TestAdapter" Version="5.2.0" />
<PackageReference Include="SharperHacks.CoreLibs.IO" Version="7.0.5" />
<PackageReference Include="System.Text.Json" Version="10.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Examples/RSAExample/RSAExample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Text.Json" Version="9.0.8" />
<PackageReference Include="System.Text.Json" Version="10.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
7 changes: 7 additions & 0 deletions run_nuget_validation.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Install if not installed
# dotnet tool install --global dotnet-validate --prerelease
# from solution root run:
dotnet clean -c Release
dotnet build -c Release
dotnet pack -c Release
dotnet-validate package local .\CryptoNet\bin\Release\*.nupkg