Skip to content

Target .NET 6, use [SkipLocalsInit] and remove Fody. #13

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

Open
teo-tsirpanis wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Target .NET 6, use [SkipLocalsInit] and remove Fody. #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
177e708
Target .NET 6, use `[SkipLocalsInit]` and remove Fody.
teo-tsirpanis Jun 16, 2022
6e410cd
Use static SHA hashing methods.
teo-tsirpanis Jun 16, 2022
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
2 changes: 1 addition & 1 deletion Bench/Bench.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
15 changes: 0 additions & 15 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,5 @@
<Project>
<ItemGroup>
<PackageReference Update="Fody" Version="6.0.8">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Update="LocalsInit.Fody" Version="1.1.0">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Update="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Update="Microsoft.CodeQuality.Analyzers" Version="2.9.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
<PackageReference Update="coverlet.collector" Version="1.2.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
2 changes: 0 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,6 @@ VxSort is based on the following ideas/papers:

VxSort uses the following projects:

* [**`Fody`**](https://github.com/Fody/Fody) by the Fody developers.
* [**`LocalsInit.Fody`**](https://github.com/ltrzesniewski/LocalsInit.Fody/tree/master/src) for getting rid of `.locals init` by [Lucas Trzesniewski](https://github.com/ltrzesniewski)
* The Logo `sort` by Markus from the Noun Project

## Author
Expand Down
16 changes: 6 additions & 10 deletions Test/DataGeneration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,14 @@ internal static (int[] randomData, int[] sortedData, string reproContext) Genera
Array.Sort(sorted);
}

var reproContext = "";
Span<byte> hash = stackalloc byte[20];
SHA1.HashData(MemoryMarshal.Cast<int, byte>(new ReadOnlySpan<int>(data)), hash);
var dataHash = Convert.ToBase64String(hash);
SHA1.HashData(MemoryMarshal.Cast<int, byte>(new ReadOnlySpan<int>(sorted)), hash);
var sortedHash = Convert.ToBase64String(hash);

using (var sha1 = new SHA1CryptoServiceProvider()) {
Span<byte> hash = stackalloc byte[20];
sha1.TryComputeHash(MemoryMarshal.Cast<int, byte>(new ReadOnlySpan<int>(data)), hash, out _);
var dataHash = Convert.ToBase64String(hash);
sha1.TryComputeHash(MemoryMarshal.Cast<int, byte>(new ReadOnlySpan<int>(sorted)), hash, out _);
var sortedHash = Convert.ToBase64String(hash);
var reproContext = $"[{size},{seed}] -> [{dataHash},{sortedHash}]";

reproContext = $"[{size},{seed}] -> [{dataHash},{sortedHash}]";
}

return (data, sorted, reproContext);
}
}
Expand Down
2 changes: 1 addition & 1 deletion Test/Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="coverlet.collector" />
Expand Down
4 changes: 0 additions & 4 deletions VxSort/FodyWeavers.xml
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions VxSort/FodyWeavers.xsd
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion VxSort/InternalsVisibleTo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System.Runtime.CompilerServices;
using LocalsInit;

[assembly: InternalsVisibleTo("Test")]
[assembly: InternalsVisibleTo("Bench")]
Expand Down
4 changes: 2 additions & 2 deletions VxSort/LocalsInit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using LocalsInit;
using System.Runtime.CompilerServices;

[assembly: LocalsInit(false)]
[module: SkipLocalsInit]

6 changes: 1 addition & 5 deletions VxSort/VxSort.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<Title>VxSort</Title>
<Authors>damageboy</Authors>
Expand All @@ -22,10 +22,6 @@
<PackageIconUrl>..\vxsort.png</PackageIconUrl>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Fody" />
<PackageReference Include="LocalsInit.Fody" />
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" />
<PackageReference Include="Microsoft.CodeQuality.Analyzers" />
<PackageReference Include="Microsoft.SourceLink.GitHub" />
</ItemGroup>
<ItemGroup>
Expand Down