Skip to content

Commit

Permalink
Address comments
Browse files Browse the repository at this point in the history
  • Loading branch information
skylarnam committed Feb 23, 2023
1 parent 0f6f40c commit a515e78
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 51 deletions.
18 changes: 0 additions & 18 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,4 @@
<Version>3.5.119</Version>
</PackageReference>
</ItemGroup>

<Target Name="SignPublishFiles"
Condition=" '$(MicroBuild_SigningEnabled)' == 'true' "
AfterTargets="Publish">
<ItemGroup>
<FilesToSign Include="$(PublishDir)$(TargetName)$(TargetExt)">
<PublishOnly>true</PublishOnly>
</FilesToSign>
</ItemGroup>
<SignFiles Files="@(FilesToSign)"
Type="$(SignType)"
BinariesDirectory="$(OutDir)"
IntermediatesDirectory="$(IntermediateOutputPath)"
Condition=" '%(FilesToSign.PublishOnly)' == 'true' " />
<ItemGroup>
<FilesToSign Remove="@(FilesToSign)" Condition=" '%(FilesToSign.PublishOnly)' == 'true' " />
</ItemGroup>
</Target>
</Project>
25 changes: 25 additions & 0 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Target Name="SignPublishFiles"
Condition=" '$(MicroBuild_SigningEnabled)' == 'true' "
AfterTargets="Publish">
<ItemGroup>
<FilesToSign Include="$(PublishDir)$(TargetName)$(TargetExt)">
<PublishOnly>true</PublishOnly>
<Authenticode>Microsoft400</Authenticode>
</FilesToSign>
</ItemGroup>
<SignFiles Files="@(FilesToSign)"
Type="$(SignType)"
BinariesDirectory="$(OutDir)"
IntermediatesDirectory="$(IntermediateOutputPath)"
Condition=" '%(FilesToSign.PublishOnly)' == 'true' " />
<ItemGroup>
<FilesToSign Remove="@(FilesToSign)" Condition=" '%(FilesToSign.PublishOnly)' == 'true' " />
</ItemGroup>
</Target>

<Target Name="SignThirdPartyFiles" BeforeTargets="PackBuildOutputs" DependsOnTargets="Publish">
<SignFiles Files="@(PublishThirdPartyFilesToSign)" Type="$(SignType)" BinariesDirectory="$(PublishDir)" IntermediatesDirectory="$(IntermediateOutputPath)" ESRPSigning="" UseBearerToken="" Condition=" '@(PublishThirdPartyFilesToSign)' != '' " />
</Target>
</Project>
69 changes: 36 additions & 33 deletions VSConfigFinder/VSConfigFinder.csproj
Original file line number Diff line number Diff line change
@@ -1,39 +1,42 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<PublishSingleFile>true</PublishSingleFile>
<SelfContained>true</SelfContained>
<PublishTrimmed>true</PublishTrimmed>
<PublishPath>$(OutputPath)$(RuntimeIdentifier)\publish\</PublishPath>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.9.1" />
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="1.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<FilesToSign Include="$(PublishPath)VSConfigFinder.dll">
<Authenticode>Microsoft400</Authenticode>
</FilesToSign>
<FilesToSign Include="$(PublishPath)VSConfigFinder.exe" Condition=" Exists('$(PublishPath)VSConfigFinder.exe') ">
<Authenticode>Microsoft400</Authenticode>
</FilesToSign>

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<PublishSingleFile>true</PublishSingleFile>
<SelfContained>true</SelfContained>
<PublishTrimmed>true</PublishTrimmed>
<PublishPath>$(OutputPath)$(RuntimeIdentifier)\publish\</PublishPath>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.9.1" />
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="1.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<FilesToSign Include="$(PublishPath)VSConfigFinder.dll">
<Authenticode>Microsoft400</Authenticode>
</FilesToSign>
<FilesToSign Include="$(PublishPath)VSConfigFinder.exe" Condition=" Exists('$(PublishPath)VSConfigFinder.exe') ">
<Authenticode>Microsoft400</Authenticode>
</FilesToSign>
<PublishThirdPartyFilesToSign Include="$(PublishPath)\CommandLine.dll" >
<Authenticode>3PartySHA2</Authenticode>
</PublishThirdPartyFilesToSign>
</ItemGroup>

<ItemGroup>
<EditorConfigFiles Remove="C:\Users\sknam\source\repos\VSConfigFinder\VSConfigFinder\.editorconfig" />
</ItemGroup>
<ItemGroup>
<EditorConfigFiles Remove="C:\Users\sknam\source\repos\VSConfigFinder\VSConfigFinder\.editorconfig" />
</ItemGroup>

<ItemGroup>
<None Include="C:\Users\sknam\source\repos\VSConfigFinder\VSConfigFinder\.editorconfig" />
</ItemGroup>
<ItemGroup>
<None Include="C:\Users\sknam\source\repos\VSConfigFinder\VSConfigFinder\.editorconfig" />
</ItemGroup>

</Project>

0 comments on commit a515e78

Please sign in to comment.