Skip to content

Commit

Permalink
- update dependencies and nuspec generation process
Browse files Browse the repository at this point in the history
  • Loading branch information
nikolaygekht committed Jan 10, 2025
1 parent a6fa450 commit 6952497
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 17 deletions.
12 changes: 6 additions & 6 deletions Gehtsoft.Measurements.Test/Gehtsoft.Measurements.Test.csproj
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net60</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Binaron.Serializer" Version="4.1.0" />
<PackageReference Include="FluentAssertions" Version="6.8.0" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PackageReference Include="FluentAssertions" Version="7.0.0" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.2.0">
<PackageReference Include="coverlet.collector" Version="6.0.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion Gehtsoft.Measurements/DecimalMeasurement.cs
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ public bool Equals(DecimalMeasurement<T> other)
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public int CompareTo(DecimalMeasurement<T> other)
{
decimal v1, v2, e;
decimal v1, v2;
v1 = In(BaseUnit);
v2 = other.In(BaseUnit);
return v1.CompareTo(v2);
Expand Down
2 changes: 1 addition & 1 deletion Gehtsoft.Measurements/Gehtsoft.Measurements.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Text.Json" Version="6.0.6" />
<PackageReference Include="System.Text.Json" Version="9.0.0" />
</ItemGroup>

</Project>
10 changes: 5 additions & 5 deletions doc/project.proj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Gehtsoft.Build.DocGen" Version="0.1.28" IncludeAssets="build" />
<PackageReference Include="Gehtsoft.Build.DocGen" Version="0.1.32" IncludeAssets="build" />
<PackageReference Include="Gehtsoft.Build.ContentDelivery" Version="0.1.10" IncludeAssets="build" />
</ItemGroup>
<PropertyGroup>
Expand All @@ -25,10 +25,10 @@
<MakeDir Directories="$(DocTargetDir)" />
<DocGen Project="project.xml" />
<Copy SourceFiles="@(CustomFile)" DestinationFolder="$(DocTargetDir)" />
<ContentFromPackage Package="gehtsoft.build.docgen" Source="Content/template/html/res" Version="0.1.28" Destination="$(DocTargetDir)/res" />
<ContentFromPackage Package="gehtsoft.build.docgen" Source="Content/template/html/highlighter" Version="0.1.28" Destination="$(DocTargetDir)/highlighter" />
<ContentFromPackage Package="gehtsoft.build.docgen" Source="Content/template/html/menu" Version="0.1.28" Destination="$(DocTargetDir)/menu" />
<ContentFromPackage Package="gehtsoft.build.docgen" Source="Content/template/html/pageImages" Version="0.1.28" Destination="$(DocTargetDir)/pageImages" />
<ContentFromPackage Package="gehtsoft.build.docgen" Source="Content/template/html/res" Version="0.1.32" Destination="$(DocTargetDir)/res" />
<ContentFromPackage Package="gehtsoft.build.docgen" Source="Content/template/html/highlighter" Version="0.1.32" Destination="$(DocTargetDir)/highlighter" />
<ContentFromPackage Package="gehtsoft.build.docgen" Source="Content/template/html/menu" Version="0.1.32" Destination="$(DocTargetDir)/menu" />
<ContentFromPackage Package="gehtsoft.build.docgen" Source="Content/template/html/pageImages" Version="0.1.32" Destination="$(DocTargetDir)/pageImages" />
</Target>
<ItemGroup>
<DocSource Include="$(MSBuildProjectDirectory)/../Gehtsoft.Measurements/bin/Release/netstandard2.0/Gehtsoft.Measurements.dll" />
Expand Down
6 changes: 4 additions & 2 deletions nuget/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<nuget xmlns="http://www.gehtsoft.com/build/nuget">
<!-- versions. the FIRST version is the current -->
<versions>
<version id="1.1.15">Update dependencies.</version>
<version id="1.1.14">Add decimal measurements. Update dependencies.</version>
<version id="1.1.13">Add solid angle units.</version>
<version id="1.1.12">Fix comparison of very small values. Update dependencies, minor changes.</version>
Expand All @@ -11,13 +12,14 @@
<owner>Gehtsoft</owner>
<projectUrl>https://github.com/gehtsoft-usa/Gehtsoft.Measurements</projectUrl>
<license type="expression">LGPL-2.1-or-later</license>
<copyright>Gehtsoft USA LLC 2016-2022</copyright>
<copyright>Gehtsoft USA LLC 2016-2024</copyright>
<custom-property id="readme">docs/README.md</custom-property>
</properties>
<projects>
<project id="Gehtsoft.Measurements">
<description>Measurements math, manipulations and unit conversion library</description>
<additional-file file="../doc/Gehtsoft.Measurements.xml" target="*" />
<additional-file file="../nuget/readme.md" target="docs/" />
<additional-file file="../nuget/README.md" target="docs/" />
</project>
</projects>
</nuget>
4 changes: 2 additions & 2 deletions nuget/nuget.proj
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net46</TargetFramework>
<TargetFramework>net472</TargetFramework>
</PropertyGroup>


<ItemGroup>
<PackageReference Include="Gehtsoft.Build.Nuget" Version="0.1.5" PrivateAssets="All" />
<PackageReference Include="Gehtsoft.Build.Nuget" Version="0.1.6" PrivateAssets="All" />
</ItemGroup>

<Target Name="Prepare">
Expand Down
3 changes: 3 additions & 0 deletions nuget/sign-cloud.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
rem @ECHO off
forfiles /m *.nupkg /c "cmd /c smctl sign --fingerprint %digicert-fingerprint% --input @path"
rem for /f %f in ('dir /b *.nupkg' ) do smctl sign --keypair-alias %digicert-alias% %f

0 comments on commit 6952497

Please sign in to comment.