Skip to content

Commit 57b551f

Browse files
committed
removed support for signing as deprecated by MS, unsealed a bunch of methods in universal aspect
1 parent 2a4a154 commit 57b551f

File tree

3 files changed

+26
-48
lines changed

3 files changed

+26
-48
lines changed

.devcontainer/devcontainer.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"name": "C# (.NET)",
3+
"image": "mcr.microsoft.com/devcontainers/dotnet:1-8.0",
4+
"workspaceMount": "source=${localWorkspaceFolder},target=/workspace,type=bind,Z",
5+
"workspaceFolder": "/workspace",
6+
"runArgs": [
7+
"--userns=keep-id:uid=1000,gid=1000"
8+
],
9+
"updateRemoteUserUID": false,
10+
"securityOpt": [
11+
"label=type:container_t"
12+
],
13+
"containerEnv": {
14+
"HOME": "/home/vscode"
15+
},
16+
"containerUser": "vscode",
17+
"customizations": {
18+
"vscode": {
19+
"extensions": [
20+
"ms-dotnettools.csdevkit"
21+
]
22+
}
23+
}
24+
}

aspects/Universal/Attributes/BaseMethodPointsAspectAttribute.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace Aspects.Universal.Attributes
66
{
77
public abstract class BaseMethodPointsAspectAttribute : BaseUniversalWrapperAttribute
88
{
9-
protected internal sealed override T WrapSync<T>(Func<object[], T> target, object[] args, AspectEventArgs eventArgs)
9+
protected internal override T WrapSync<T>(Func<object[], T> target, object[] args, AspectEventArgs eventArgs)
1010
{
1111
OnBefore(eventArgs);
1212

@@ -23,7 +23,7 @@ protected internal sealed override T WrapSync<T>(Func<object[], T> target, objec
2323
}
2424
}
2525

26-
protected internal sealed override async Task<T> WrapAsync<T>(Func<object[], Task<T>> target, object[] args, AspectEventArgs eventArgs)
26+
protected internal override async Task<T> WrapAsync<T>(Func<object[], Task<T>> target, object[] args, AspectEventArgs eventArgs)
2727
{
2828
await OnBeforeAsync(eventArgs);
2929

src/AspectInjector/build/AspectInjector.targets

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515

1616
<PropertyGroup>
1717
<_InjectAspectsDependsOn>
18-
AspectInjector_Custom_Target;
1918
AspectInjector_InjectAspectsCore;
20-
AspectInjector_ResignAssembly;
2119
</_InjectAspectsDependsOn>
2220
</PropertyGroup>
2321

@@ -42,49 +40,5 @@
4240
<Touch Files="%(IntermediateAssembly.FullPath).aspectsinjected" AlwaysCreate="true" Time="%(IntermediateAssembly.ModifiedTime)"/>
4341
</Target>
4442

45-
<Target Name="AspectInjector_ResignAssembly"
46-
Condition="'$(SignAssembly)' == 'true' AND '$(DelaySign)' != 'true'"
47-
DependsOnTargets="GetSnToolForUnix;GetSnToolForWindows"
48-
Inputs="@(IntermediateAssembly->'%(FullPath)')"
49-
Outputs="%(IntermediateAssembly.FullPath).aspectssigned"
50-
>
51-
<PropertyGroup>
52-
<_SignCommand Condition="'$(KeyContainerName)' != ''">&quot;$(SnTool)&quot; -Rc &quot;$(ProjectDir)$(IntermediateOutputPath)$(TargetFileName)&quot; $(KeyContainerName)</_SignCommand>
53-
<_SignCommand Condition="'$(KeyContainerName)' == '' AND '$(KeyOriginatorFile)' != ''">&quot;$(SnTool)&quot; -R &quot;$(ProjectDir)$(IntermediateOutputPath)$(TargetFileName)&quot; $(KeyOriginatorFile)</_SignCommand>
54-
</PropertyGroup>
55-
<Exec Command="$(_SignCommand)" Condition="'$(_SignCommand)' != ''" EchoOff="true" IgnoreExitCode="true">
56-
<Output TaskParameter="ExitCode" PropertyName="_SignExitCode" />
57-
</Exec>
58-
<Error Text="Aspect Injector cannot re-sing assembly. Try rebuid solution." Condition="'$(_SignExitCode)' != '0'" Code="AI_ERR0" File="AspectInjector"/>
59-
<Touch Files="%(IntermediateAssembly.FullPath).aspectsinjected" AlwaysCreate="true" Time="%(IntermediateAssembly.ModifiedTime)"/>
60-
<Touch Files="%(IntermediateAssembly.FullPath).aspectssigned" AlwaysCreate="true" Time="%(IntermediateAssembly.ModifiedTime)"/>
61-
</Target>
62-
63-
<Target Name="GetSnToolForUnix" Condition=" '$(OS)' == 'Unix' ">
64-
<PropertyGroup>
65-
<SnTool>sn</SnTool>
66-
</PropertyGroup>
67-
<Message Text="SnTool found: $(SnTool)"/>
68-
</Target>
69-
70-
<Target Name="GetSnToolForWindows" Condition=" '$(OS)' != 'Unix' ">
71-
<GetFrameworkSdkPath>
72-
<Output TaskParameter="Path" PropertyName="WindowsSdkPath" />
73-
</GetFrameworkSdkPath>
74-
<ItemGroup>
75-
<SnTools Include="$(WindowsSdkPath)**\sn.exe" />
76-
</ItemGroup>
77-
<PropertyGroup>
78-
<SnToolsRaw>@(SnTools)</SnToolsRaw>
79-
</PropertyGroup>
80-
<PropertyGroup>
81-
<SnTool>$(SnToolsRaw.Split(';')[0])</SnTool>
82-
</PropertyGroup>
83-
<Message Text="SnTool found: $(SnTool)"/>
84-
</Target>
85-
86-
<Target Name="AspectInjector_Custom_Target">
87-
</Target>
88-
8943
</Project>
9044

0 commit comments

Comments
 (0)