Remove SDK from runtim site extension (#237)
This commit is contained in:
parent
ec6adaa65a
commit
77669ddfc2
|
|
@ -27,12 +27,6 @@
|
||||||
<RemoveDir Directories="$(SiteExtensionWorkingDirectory)" Condition="Exists($(SiteExtensionWorkingDirectory))" />
|
<RemoveDir Directories="$(SiteExtensionWorkingDirectory)" Condition="Exists($(SiteExtensionWorkingDirectory))" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Target Name="_AddSiteExtensionSdk">
|
|
||||||
<ItemGroup>
|
|
||||||
<DotNetCoreSdk Include="$(_SdkVersion)" Feed="$(_SdkFeed)" InstallDir="$(SiteExtensionWorkingDirectory)" Arch="$(SiteExtensionArch)" />
|
|
||||||
</ItemGroup>
|
|
||||||
</Target>
|
|
||||||
|
|
||||||
<Target Name="_AddSiteExtensionRuntime">
|
<Target Name="_AddSiteExtensionRuntime">
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<DotNetCoreRuntime
|
<DotNetCoreRuntime
|
||||||
|
|
@ -44,46 +38,7 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Target Name="ComposeSiteExtensions" Condition="'$(ComposeSdk)' == 'True'" DependsOnTargets="_AddSiteExtensionSdk;_AddSiteExtensionRuntime;InstallDotNet">
|
<Target Name="PrepareSiteExtensionSdk" DependsOnTargets="_AddSiteExtensionRuntime;InstallDotNet">
|
||||||
<ItemGroup>
|
|
||||||
<RuntimeArchiveItems Include="$(RuntimeArchives)" />
|
|
||||||
<DotNetCacheArchiveItems Include="$(DotNetCacheArchives)" />
|
|
||||||
|
|
||||||
<_CleanupFiles
|
|
||||||
Include="$(SiteExtensionWorkingDirectory)additionalDeps;$(SiteExtensionWorkingDirectory)store" />
|
|
||||||
|
|
||||||
<_CleanupFiles
|
|
||||||
Include="$([System.IO.Directory]::GetDirectories('$(SiteExtensionWorkingDirectory)shared\Microsoft.NETCore.App\'))"
|
|
||||||
Exclude="$(SiteExtensionWorkingDirectory)shared\Microsoft.NETCore.App\$(SiteExtensionNETCoreAppPackageVersion)" />
|
|
||||||
|
|
||||||
<_CleanupFiles
|
|
||||||
Condition="Exists('$(SiteExtensionWorkingDirectory)shared\Microsoft.AspNetCore.App\')"
|
|
||||||
Include="$([System.IO.Directory]::GetDirectories('$(SiteExtensionWorkingDirectory)shared\Microsoft.AspNetCore.App\'))"
|
|
||||||
Exclude="$(SiteExtensionWorkingDirectory)shared\Microsoft.AspNetCore.App\$(PackageVersion)" />
|
|
||||||
|
|
||||||
<_CleanupFiles
|
|
||||||
Include="$([System.IO.Directory]::GetDirectories('$(SiteExtensionWorkingDirectory)shared\Microsoft.AspNetCore.All\'))"
|
|
||||||
Exclude="$(SiteExtensionWorkingDirectory)shared\Microsoft.AspNetCore.All\$(PackageVersion)" />
|
|
||||||
|
|
||||||
<_CleanupFiles
|
|
||||||
Include="$([System.IO.Directory]::GetDirectories('$(SiteExtensionWorkingDirectory)host\fxr'))"
|
|
||||||
Exclude="$(SiteExtensionWorkingDirectory)host\fxr\$(SiteExtensionNETCoreAppPackageVersion)" />
|
|
||||||
|
|
||||||
<BundledTemplate Include="Microsoft.DotNet.Web.ItemTemplates" Version="$(PackageVersion)" />
|
|
||||||
<BundledTemplate Include="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="$(PackageVersion)" />
|
|
||||||
<BundledTemplate Include="Microsoft.DotNet.Web.Spa.ProjectTemplates" Version="$(PackageVersion)" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<Message Text="Removing %(_CleanupFiles.Identity)" Importance="High" />
|
|
||||||
<RemoveDir Directories="@(_CleanupFiles)" />
|
|
||||||
|
|
||||||
<UnzipArchive File="$(ArtifactDependencyLocation)\aspnetcore-runtime-internal-$(PackageVersion)-win-$(SiteExtensionArch).zip" Destination="$(SiteExtensionWorkingDirectory)" Overwrite="true" />
|
|
||||||
<UnzipArchive File="%(RuntimeArchiveItems.Identity)" Destination="$(SiteExtensionWorkingDirectory)" Condition="'$(RuntimeArchives)' != ''" Overwrite="true" />
|
|
||||||
<UnzipArchive File="%(DotNetCacheArchiveItems.Identity)" Destination="$(SiteExtensionWorkingDirectory)DotNetCache" Condition="'$(DotNetCacheArchives)' != ''" Overwrite="true" />
|
|
||||||
|
|
||||||
</Target>
|
|
||||||
|
|
||||||
<Target Name="PrepareSiteExtensionSdk" DependsOnTargets="ComposeSiteExtensions;_AddSiteExtensionSdk;InstallDotNet">
|
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Target Name="PrepareSiteExtensionSdks">
|
<Target Name="PrepareSiteExtensionSdks">
|
||||||
|
|
@ -92,11 +47,6 @@
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Target Name="BuildSiteExtension" DependsOnTargets="_CleanSiteExtension;PrepareSiteExtensionSdks">
|
<Target Name="BuildSiteExtension" DependsOnTargets="_CleanSiteExtension;PrepareSiteExtensionSdks">
|
||||||
<ItemGroup>
|
|
||||||
<LZMAFiles Include="$(SiteExtensionWorkingDirectory)**\sdk\$(_SdkVersion)\nuGetPackagesArchive.lzma" />
|
|
||||||
</ItemGroup>
|
|
||||||
<!-- Strip LZMA from sdk -->
|
|
||||||
<Delete Files="%(LZMAFiles.Identity)" />
|
|
||||||
<MSBuild Projects="%(SiteExtensions.Identity)"
|
<MSBuild Projects="%(SiteExtensions.Identity)"
|
||||||
Targets="Restore"
|
Targets="Restore"
|
||||||
Properties="BuildNumber=$(BuildNumber)" />
|
Properties="BuildNumber=$(BuildNumber)" />
|
||||||
|
|
@ -104,7 +54,6 @@
|
||||||
<MSBuild Projects="%(SiteExtensions.Identity)"
|
<MSBuild Projects="%(SiteExtensions.Identity)"
|
||||||
Targets="Pack"
|
Targets="Pack"
|
||||||
Properties="%(SiteExtensions.BuildProperties);DotnetHomeDirectory=$(SiteExtensionWorkingDirectory);BuildNumber=$(BuildNumber);PackageOutputPath=$(SiteExtensionOutputDirectory)" />
|
Properties="%(SiteExtensions.BuildProperties);DotnetHomeDirectory=$(SiteExtensionWorkingDirectory);BuildNumber=$(BuildNumber);PackageOutputPath=$(SiteExtensionOutputDirectory)" />
|
||||||
|
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Target Name="PushSiteExtension" DependsOnTargets="BuildSiteExtension">
|
<Target Name="PushSiteExtension" DependsOnTargets="BuildSiteExtension">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue