Skip to content

Commit

Permalink
Merge pull request #6676 from wli3/remove-test-for-apphost
Browse files Browse the repository at this point in the history
Revert "Test to prevent apphost not being identical"
  • Loading branch information
msftbot[bot] authored Mar 5, 2020
2 parents d402aaa + ebfbafb commit ac8cf97
Showing 1 changed file with 0 additions and 33 deletions.
33 changes: 0 additions & 33 deletions src/redist/targets/GenerateLayout.targets
Original file line number Diff line number Diff line change
Expand Up @@ -471,39 +471,6 @@

</Target>

<Target Name="VerifyApphostTemplateIsIdentifcal" Condition=" '$(HostOSName)' == 'osx' "
AfterTargets="LayoutAppHostTemplate"
DependsOnTargets="DownloadBundledComponents">

<PropertyGroup>
<NETCoreAppHostpkgPath>$(DownloadsFolder)$(DownloadedNetCoreAppHostPackInstallerFileName)</NETCoreAppHostpkgPath>
<NETCoreAppHostpkgExtractPath>$(IntermediateOutputPath)AppHostpkgExtract\</NETCoreAppHostpkgExtractPath>
</PropertyGroup>

<!-- The folder cannot exist for pkgutil to run -->
<RemoveDir Directories="$(NETCoreAppHostpkgExtractPath)" />

<Exec Command="pkgutil --expand-full '$(NETCoreAppHostpkgPath)' '$(NETCoreAppHostpkgExtractPath)'" />

<ItemGroup>
<AllFilesOfAppHostPkg Include="$(NETCoreAppHostpkgExtractPath)\**\*.*" />
<ApphostInPkg
Include="@(AllFilesOfAppHostPkg)"
Condition="'%(FileName)%(Extension)' == '$(AppHostExecutableName)'"/>
</ItemGroup>

<Error Condition="@(ApphostInPkg->Distinct()->Count()) != 1"
Text="Failed to determine the $(NETCoreAppHostPackageName) executable in @(AllFilesOfAppHostPkg)" />

<Exec Command="diff '@(NativeRestoredAppHostNETCore->Distinct())' '@(ApphostInPkg->Distinct())' " ContinueOnError='true'>
<Output TaskParameter="ExitCode" PropertyName="DiffErrorCode"/>
</Exec>

<Error Text="The apphost from .pkg package and nupkg restore are not identical. There for cannot be notarized. File paths are '@(NativeRestoredAppHostNETCore->Distinct())' and '@(ApphostInPkg->Distinct())'"
Condition="'$(DiffErrorCode)' > '0'" />

</Target>

<Target Name="GenerateLayout"
DependsOnTargets="DownloadBundledComponents;
CleanLayoutPath;
Expand Down

0 comments on commit ac8cf97

Please # to comment.