Skip to content

Commit

Permalink
fix dotnet hooks with prefixes
Browse files Browse the repository at this point in the history
  • Loading branch information
rkm committed Dec 12, 2022
1 parent 04225fe commit 59ed2ee
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 1 deletion.
9 changes: 8 additions & 1 deletion pre_commit/languages/dotnet.py
Expand Up @@ -2,6 +2,7 @@

import contextlib
import os.path
import re
from typing import Generator
from typing import Sequence

Expand Down Expand Up @@ -58,9 +59,15 @@ def install_environment(
)

# Determine tool from the packaged file <tool_name>.<version>.nupkg
# https://learn.microsoft.com/en-us/nuget/concepts/package-versioning#version-basics
tool_name_re = re.compile(r'(.*)\.\d+\.\d+\.\d+(-.*)?\.nupkg')

build_outputs = os.listdir(os.path.join(prefix.prefix_dir, build_dir))
for output in build_outputs:
tool_name = output.split('.')[0]

tool_name_match = tool_name_re.match(output)
assert tool_name_match
tool_name = tool_name_match.group(1)

# Install to bin dir
helpers.run_setup_cmd(
Expand Down
3 changes: 3 additions & 0 deletions testing/resources/dotnet_hooks_csproj_prefix_repo/.gitignore
@@ -0,0 +1,3 @@
bin/
obj/
nupkg/
@@ -0,0 +1,5 @@
- id: dotnet-example-hook
name: dotnet example hook
entry: testeroni.tool
language: dotnet
files: ''
12 changes: 12 additions & 0 deletions testing/resources/dotnet_hooks_csproj_prefix_repo/Program.cs
@@ -0,0 +1,12 @@
using System;

namespace dotnet_hooks_repo
{
class Program
{
static void Main(string[] args)
{
Console.WriteLine("Hello from dotnet!");
}
}
}
@@ -0,0 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<PackAsTool>true</PackAsTool>
<ToolCommandName>testeroni.tool</ToolCommandName>
<PackageOutputPath>./nupkg</PackageOutputPath>
</PropertyGroup>
</Project>
1 change: 1 addition & 0 deletions tests/repository_test.py
Expand Up @@ -1031,6 +1031,7 @@ def test_local_perl_additional_dependencies(store):
'dotnet_hooks_csproj_repo',
'dotnet_hooks_sln_repo',
'dotnet_hooks_combo_repo',
'dotnet_hooks_csproj_prefix_repo',
),
)
def test_dotnet_hook(tempdir_factory, store, repo):
Expand Down

0 comments on commit 59ed2ee

Please sign in to comment.