mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #6676 from wli3/remove-test-for-apphost

Browse source 
Revert "Test to prevent apphost not being identical"
This commit is contained in:
msftbot[bot] 2020-03-05 02:30:33 +00:00 • committed by GitHub
commit ac8cf97070
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/redist/targets/GenerateLayout.targets
View file

@ -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;