huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add SITE_EXTENSION_SDK_VERSION override (#151)

This commit is contained in:
Pavel Krymets 2018-02-14 16:30:35 -08:00 committed by GitHub
parent 81eca88270
commit 961ed8992c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
build/repo.targets
View File

@ -2,13 +2,15 @@
<Import Project="$(RepositoryRoot)\build\dependencies.props" /> <Import Project="$(RepositoryRoot)\build\dependencies.props" />
<PropertyGroup> <PropertyGroup>
<_SdkVersion>$([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName('$(MSBuildExtensionsPath)'))))</_SdkVersion> <ComposeSdk Condition="$(SITE_EXTENSION_SDK_VERSION) == ''">True</ComposeSdk>
<_SdkVersion>$(SITE_EXTENSION_SDK_VERSION)</_SdkVersion>
<_SdkVersion Condition="'$(_SdkVersion)' == ''">$([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName('$(MSBuildExtensionsPath)'))))</_SdkVersion>
<TestDotNetPath>$(RepositoryRoot).test-dotnet\</TestDotNetPath> <TestDotNetPath>$(RepositoryRoot).test-dotnet\</TestDotNetPath>
<AppsArtifactDirectory>$(RepositoryRoot)artifacts\apps</AppsArtifactDirectory> <AppsArtifactDirectory>$(RepositoryRoot)artifacts\apps</AppsArtifactDirectory>
<SiteExtensionWorkingDirectory>$(TestDotNetPath)extension\</SiteExtensionWorkingDirectory> <SiteExtensionWorkingDirectory>$(TestDotNetPath)extension\</SiteExtensionWorkingDirectory>
<SiteExtensionOutputDirectory>$(RepositoryRoot)artifacts\build</SiteExtensionOutputDirectory> <SiteExtensionOutputDirectory>$(RepositoryRoot)artifacts\build</SiteExtensionOutputDirectory>
<TestProjectDirectory>$(RepositoryRoot)\test\Microsoft.AspNetCore.AzureAppServices.FunctionalTests\</TestProjectDirectory> <TestProjectDirectory>$(RepositoryRoot)\test\Microsoft.AspNetCore.AzureAppServices.FunctionalTests\</TestProjectDirectory>
<SiteExtensionFeed Condition="$(SiteExtensionFeed) == ''">https://dotnet.myget.org/F/aspnetcore-ci-dev/</SiteExtensionFeed> <SiteExtensionFeed Condition="$(SiteExtensionFeed) == ''">https://dotnet.myget.org/F/aspnetcore-release/</SiteExtensionFeed>
</PropertyGroup> </PropertyGroup>
<Target Name="_AddTestRuntimes"> <Target Name="_AddTestRuntimes">
@ -22,10 +24,14 @@
<RemoveDir Directories="$(SiteExtensionWorkingDirectory)" Condition="Exists($(SiteExtensionWorkingDirectory))" /> <RemoveDir Directories="$(SiteExtensionWorkingDirectory)" Condition="Exists($(SiteExtensionWorkingDirectory))" />
</Target> </Target>
<Target Name="_AddSiteExtensionRuntime"> <Target Name="_AddSiteExtensionSdk">
<ItemGroup> <ItemGroup>
<DotNetCoreSdk Include="$(_SdkVersion)" InstallDir="$(SiteExtensionWorkingDirectory)" Arch="x86" /> <DotNetCoreSdk Include="$(_SdkVersion)" InstallDir="$(SiteExtensionWorkingDirectory)" Arch="x86" />
</ItemGroup>
</Target>
<Target Name="_AddSiteExtensionRuntime">
<ItemGroup>
<DotNetCoreRuntime <DotNetCoreRuntime
Include="$(MicrosoftNETCoreApp21PackageVersion)" Include="$(MicrosoftNETCoreApp21PackageVersion)"
InstallDir="$(SiteExtensionWorkingDirectory)" InstallDir="$(SiteExtensionWorkingDirectory)"
@ -35,7 +41,7 @@
</ItemGroup> </ItemGroup>
</Target> </Target>
<Target Name="BuildSiteExtension" DependsOnTargets="_CleanSiteExtension;_AddSiteExtensionRuntime;InstallDotNet"> <Target Name="ComposeSiteExtensions" Condition="'$(ComposeSdk)' == 'True'" DependsOnTargets="_AddSiteExtensionSdk;_AddSiteExtensionRuntime;InstallDotNet">
<ItemGroup> <ItemGroup>
<RuntimeArchiveItems Include="$(RuntimeArchives)" /> <RuntimeArchiveItems Include="$(RuntimeArchives)" />
<DotNetCacheArchiveItems Include="$(DotNetCacheArchives)" /> <DotNetCacheArchiveItems Include="$(DotNetCacheArchives)" />
@ -71,6 +77,10 @@
<UnzipArchive File="%(RuntimeArchiveItems.Identity)" Destination="$(SiteExtensionWorkingDirectory)" Condition="'$(RuntimeArchives)' != ''" Overwrite="true" /> <UnzipArchive File="%(RuntimeArchiveItems.Identity)" Destination="$(SiteExtensionWorkingDirectory)" Condition="'$(RuntimeArchives)' != ''" Overwrite="true" />
<UnzipArchive File="%(DotNetCacheArchiveItems.Identity)" Destination="$(SiteExtensionWorkingDirectory)DotNetCache" Condition="'$(DotNetCacheArchives)' != ''" Overwrite="true" /> <UnzipArchive File="%(DotNetCacheArchiveItems.Identity)" Destination="$(SiteExtensionWorkingDirectory)DotNetCache" Condition="'$(DotNetCacheArchives)' != ''" Overwrite="true" />
</Target>
<Target Name="BuildSiteExtension" DependsOnTargets="_CleanSiteExtension;ComposeSiteExtensions;_AddSiteExtensionSdk;InstallDotNet">
<MSBuild Projects="%(SiteExtensions.Identity)" <MSBuild Projects="%(SiteExtensions.Identity)"
Targets="Restore" Targets="Restore"
Properties="BuildNumber=$(BuildNumber)" /> Properties="BuildNumber=$(BuildNumber)" />