Skip to content

Commit

Permalink
fixing ci and cleaning up
Browse files Browse the repository at this point in the history
  • Loading branch information
dadhi committed May 23, 2024
1 parent 909793f commit ffd5cb0
Show file tree
Hide file tree
Showing 9 changed files with 1,138 additions and 1,104 deletions.
4 changes: 2 additions & 2 deletions build_with_packaging.bat
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ echo:## Starting: RESTORE and BUILD...
echo:

dotnet clean -v:m
dotnet build -c:Release -v:m
dotnet build -c:Release -p:DevMode=false -v:m
if %ERRORLEVEL% neq 0 goto :error

echo:
Expand All @@ -15,7 +15,7 @@ echo:
echo:## Starting: TESTS...
echo:

dotnet test --no-build -c Release test/ImTools.UnitTests/ImTools.UnitTests.csproj
dotnet test --no-build -c Release -p:DevMode=false test/ImTools.UnitTests/ImTools.UnitTests.csproj
if %ERRORLEVEL% neq 0 goto :error

echo:
Expand Down
9 changes: 8 additions & 1 deletion nuspecs/ImTools.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata minClientVersion="3.3.0">
<id>ImTools</id>
<version>4.0.0</version>
<version>5.0.0-preview-01</version>
<authors>Maksim Volkau</authors>
<copyright>Copyright © 2016-2023 Maksim Volkau</copyright>
<projectUrl>https://github.com/dadhi/ImTools</projectUrl>
Expand All @@ -17,6 +17,13 @@
<tags>FP Performance Simple Functional Immutable Persistent Map Avl 2-3Tree Self Balanced Tree Dictionary Thread-safe Functional Atomic Ref Algebraic Discriminated Union SumType</tags>
<releaseNotes>
<![CDATA[
## v5.0.0 Major release
- Added SmallMap, SmallList and the friends
- Removed net7.0 target
## v4.0.0 Major release
### Breaking changes
Expand Down
2 changes: 1 addition & 1 deletion playground/Experiments/Experiments.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFrameworks Condition="'$(DevMode)' == 'true'">net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(DevMode)' != 'true'">net6.0;net472</TargetFrameworks>
<TargetFrameworks Condition="'$(DevMode)' != 'true'">net8.0;net6.0;net472</TargetFrameworks>
<NoWarn>1701;1702;AD0001;NU1608</NoWarn>
</PropertyGroup>

Expand Down
53 changes: 26 additions & 27 deletions playground/ImTools.Benchmarks/ImTools.Benchmarks.csproj
Original file line number Diff line number Diff line change
@@ -1,34 +1,33 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<PropertyGroup>
<OutputType>Exe</OutputType>

<TargetFrameworks Condition="'$(DevMode)' == 'true'">net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(DevMode)' != 'true'">net6.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>

<Platform>x64</Platform>
<Platform>x64</Platform>

<Description>Benchmarks and sandbox for experiments.</Description>
<TieredCompilation>false</TieredCompilation>
<!--skip tiering jitting for the fare benchmarks -->
<DebugType>pdbonly</DebugType>
<DebugSymbols>true</DebugSymbols>

<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<ItemGroup>
<Compile Remove="HashVsImHashMap.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
<PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.12" />
<PackageReference Include="Microsoft.Experimental.Collections" Version="1.0.6-e190117-3" />
<PackageReference Include="CommunityToolkit.HighPerformance" Version="8.2.2" />
<PackageReference Include="DotNext.IO" Version="5.4.0" />
</ItemGroup>
<Description>Benchmarks and sandbox for experiments.</Description>
<TieredCompilation>false</TieredCompilation>
<!--skip tiering jitting for the fare benchmarks -->
<DebugType>pdbonly</DebugType>
<DebugSymbols>true</DebugSymbols>

<ItemGroup>
<ProjectReference Include="..\..\src\ImTools\ImTools.csproj" />
<ProjectReference Include="..\..\playground\Experiments\Experiments.csproj" />
</ItemGroup>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<ItemGroup>
<Compile Remove="HashVsImHashMap.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
<PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.12" />
<PackageReference Include="Microsoft.Experimental.Collections" Version="1.0.6-e190117-3" />
<PackageReference Include="CommunityToolkit.HighPerformance" Version="8.2.2" />
<PackageReference Include="DotNext.IO" Version="5.4.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\ImTools\ImTools.csproj" />
<ProjectReference Include="..\..\playground\Experiments\Experiments.csproj" />
</ItemGroup>

</Project>
7 changes: 6 additions & 1 deletion src/ImTools/ImTools.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks Condition="'$(DevMode)' == 'true'">net8.0;net6.0</TargetFrameworks>
<TargetFrameworks Condition="'$(DevMode)' != 'true'">net6.0;net45;netstandard2.0</TargetFrameworks>
<TargetFrameworks Condition="'$(DevMode)' != 'true'">net8.0;net6.0;net45;netstandard2.0</TargetFrameworks>

<Product>ImTools</Product>
<VersionPrefix>5.0.0</VersionPrefix>
Expand All @@ -21,6 +21,11 @@
<PackageTags>FP Performance Simple Functional Immutable Persistent Map Avl 2-3Tree Self Balanced Tree Dictionary Thread-safe Functional Atomic Ref Algebraic Discriminated Union SumType</PackageTags>
<PackageReleaseNotes>
<![CDATA[
## v5.0.0 Major release
- Added SmallMap, SmallList and the friends
- Removed net7.0 target
## v4.0.0 Major release
Expand Down
Loading

0 comments on commit ffd5cb0

Please sign in to comment.