Skip to content

Commit ee811c3

Browse files
authored
Ensure trailing slash (#10727)
1 parent ad0cd2e commit ee811c3

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

build/sign-binaries.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<_ProjectsToSign Condition="'$(ProjectsToSign)' == ''" Include="$(RepositoryRootDirectory)src\**\*.csproj" />
14+
<_ProjectsToSign Condition="'$(ProjectsToSign)' == ''" Include="$([MSBuild]::EnsureTrailingSlash('$(RepositoryRootDirectory)'))src\**\*.csproj" />
1515
<_ProjectsToSign Condition="'$(ProjectsToSign)' != ''" Include="$(ProjectsToSign)" />
1616
</ItemGroup>
1717

build/sign-packages.proj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<Target Name="GetOutputNupkgs">
1313
<ItemGroup>
14-
<FilesToSign Include="$(RepositoryRootDirectory)artifacts\*.nupkg">
14+
<FilesToSign Include="$([MSBuild]::EnsureTrailingSlash('$(RepositoryRootDirectory)'))artifacts\*.nupkg">
1515
<Authenticode>NuGet</Authenticode>
1616
</FilesToSign>
1717
</ItemGroup>
@@ -21,4 +21,4 @@
2121
<Target Name="AfterBuild" DependsOnTargets="$(SignTargetsDependOn)"/>
2222

2323
<Import Project="..\packages\MicroBuild.Core\build\MicroBuild.Core.targets" Condition="Exists('..\packages\MicroBuild.Core\build\MicroBuild.Core.targets')" />
24-
</Project>
24+
</Project>

build/sign.microbuild.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
there is a project reference pointing to the current project and there is a copy of this output assembly in the
6767
bin directory of another project. That assembly also needs to be signed.
6868
-->
69-
<_ManagedOutputToSign Include="$(RepositoryRootDirectory)**\$(TargetFileName)" Condition="'$(BatchSign)' == 'true' AND '$(TargetFileName)' != ''" />
69+
<_ManagedOutputToSign Include="$([MSBuild]::EnsureTrailingSlash('$(RepositoryRootDirectory)'))**\$(TargetFileName)" Condition="'$(BatchSign)' == 'true' AND '$(TargetFileName)' != ''" />
7070
<_ManagedOutputToSign Remove="$(RunCommand)" Condition="'$(RunCommand)' != ''" />
7171
<UnfilteredFilesToSign
7272
Include="$([System.IO.Path]::GetFullPath('%(_ManagedOutputToSign.Identity)'))"
@@ -94,7 +94,7 @@
9494
by default as well.
9595
-->
9696
<_UnmanagedOutputToSign Include="$(RunCommand)" KeepDuplicates="false" Condition="'$(BatchSign)' == 'true' AND '$(RunCommand)' != ''" />
97-
<_UnmanagedOutputToSign Include="$(RepositoryRootDirectory)**\apphost.exe" Condition="'$(BatchSign)' == 'true'" />
97+
<_UnmanagedOutputToSign Include="$([MSBuild]::EnsureTrailingSlash('$(RepositoryRootDirectory)'))**\apphost.exe" Condition="'$(BatchSign)' == 'true'" />
9898
<UnfilteredFilesToSign
9999
Include="$([System.IO.Path]::GetFullPath('%(_UnmanagedOutputToSign.Identity)'))"
100100
Condition="Exists('%(_UnmanagedOutputToSign.Identity)')"

0 commit comments

Comments
 (0)