Skip to content

Commit

Permalink
updated from recent template
Browse files Browse the repository at this point in the history
  • Loading branch information
lostmsu committed Dec 14, 2023
2 parents 66af3be + 2504155 commit 6eadcdd
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: '6.0.x'
dotnet-version: '8.0.x'

- name: Deps
run: dotnet restore
Expand Down
7 changes: 4 additions & 3 deletions src/NDetours.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net6.0-windows10.0.19041.0</TargetFrameworks>
<TargetPlatformMinVersion Condition="$(TargetFramework.Contains('-windows'))">10.0.19041.0</TargetPlatformMinVersion>
<LangVersion>11.0</LangVersion>
<LangVersion>12.0</LangVersion>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

<!-- Package stuff -->
<Version>0.0.11</Version>
<Version>0.0.12</Version>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageReadmeFile>README.md</PackageReadmeFile>
<Description>Managed package that simplifies injection of Detours-based DLLs</Description>
Expand All @@ -34,8 +34,9 @@
<PackageReference Include="ManyConsole.CommandLineUtils" Version="1.1.8-alpha"
Condition="$(TargetFramework.Contains('-windows'))" />
<!-- The following is recommended for public projects -->
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
<PackageReference Include="PInvoke.Kernel32" Version="0.7.124" />
<PackageReference Include="System.Text.Json" Version="8.0.0" />
</ItemGroup>

</Project>
5 changes: 5 additions & 0 deletions src/StartInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,18 @@
using System.Collections.ObjectModel;
using System.Diagnostics;
using System.Text.Json.Serialization;

using static PInvoke.Kernel32;

partial class ProcessDetour {
public sealed class StartInfo {
public string Executable { get; }
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
#if NETSTANDARD2_0
public Collection<string> InjectDlls { get; set; } = new();
#else
public Collection<string> InjectDlls { get; init; } = new();
#endif
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
public string? WorkingDirectory { get; set; }
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
Expand Down
10 changes: 5 additions & 5 deletions test/NDetours.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0-windows10.0.22000.0</TargetFramework>
<LangVersion>10.0</LangVersion>
<TargetFramework>net8.0-windows10.0.22000.0</TargetFramework>
<LangVersion>12.0</LangVersion>
<Nullable>enable</Nullable>

<IsPackable>false</IsPackable>
Expand All @@ -11,9 +11,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="xunit" Version="2.6.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down

0 comments on commit 6eadcdd

Please sign in to comment.