|
2 | 2 | <Import Project="$(RepositoryRoot)\build\dependencies.props" />
|
3 | 3 |
|
4 | 4 | <PropertyGroup>
|
5 |
| - <_SdkVersion>$([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName('$(MSBuildExtensionsPath)'))))</_SdkVersion> |
| 5 | + <ComposeSdk Condition="$(SITE_EXTENSION_SDK_VERSION) == ''">True</ComposeSdk> |
| 6 | + <_SdkVersion>$(SITE_EXTENSION_SDK_VERSION)</_SdkVersion> |
| 7 | + <_SdkVersion Condition="'$(_SdkVersion)' == ''">$([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName('$(MSBuildExtensionsPath)'))))</_SdkVersion> |
6 | 8 | <TestDotNetPath>$(RepositoryRoot).test-dotnet\</TestDotNetPath>
|
7 | 9 | <AppsArtifactDirectory>$(RepositoryRoot)artifacts\apps</AppsArtifactDirectory>
|
8 | 10 | <SiteExtensionWorkingDirectory>$(TestDotNetPath)extension\</SiteExtensionWorkingDirectory>
|
9 | 11 | <SiteExtensionOutputDirectory>$(RepositoryRoot)artifacts\build</SiteExtensionOutputDirectory>
|
10 | 12 | <TestProjectDirectory>$(RepositoryRoot)\test\Microsoft.AspNetCore.AzureAppServices.FunctionalTests\</TestProjectDirectory>
|
11 |
| - <SiteExtensionFeed Condition="$(SiteExtensionFeed) == ''">https://dotnet.myget.org/F/aspnetcore-ci-dev/</SiteExtensionFeed> |
| 13 | + <SiteExtensionFeed Condition="$(SiteExtensionFeed) == ''">https://dotnet.myget.org/F/aspnetcore-release/</SiteExtensionFeed> |
12 | 14 | </PropertyGroup>
|
13 | 15 |
|
14 | 16 | <Target Name="_AddTestRuntimes">
|
|
22 | 24 | <RemoveDir Directories="$(SiteExtensionWorkingDirectory)" Condition="Exists($(SiteExtensionWorkingDirectory))" />
|
23 | 25 | </Target>
|
24 | 26 |
|
25 |
| - <Target Name="_AddSiteExtensionRuntime"> |
26 |
| - |
| 27 | + <Target Name="_AddSiteExtensionSdk"> |
27 | 28 | <ItemGroup>
|
28 | 29 | <DotNetCoreSdk Include="$(_SdkVersion)" InstallDir="$(SiteExtensionWorkingDirectory)" Arch="x86" />
|
| 30 | + </ItemGroup> |
| 31 | + </Target> |
| 32 | + |
| 33 | + <Target Name="_AddSiteExtensionRuntime"> |
| 34 | + <ItemGroup> |
29 | 35 | <DotNetCoreRuntime
|
30 | 36 | Include="$(MicrosoftNETCoreApp21PackageVersion)"
|
31 | 37 | InstallDir="$(SiteExtensionWorkingDirectory)"
|
|
35 | 41 | </ItemGroup>
|
36 | 42 | </Target>
|
37 | 43 |
|
38 |
| - <Target Name="BuildSiteExtension" DependsOnTargets="_CleanSiteExtension;_AddSiteExtensionRuntime;InstallDotNet"> |
| 44 | + <Target Name="ComposeSiteExtensions" Condition="'$(ComposeSdk)' == 'True'" DependsOnTargets="_AddSiteExtensionSdk;_AddSiteExtensionRuntime;InstallDotNet"> |
39 | 45 | <ItemGroup>
|
40 | 46 | <RuntimeArchiveItems Include="$(RuntimeArchives)" />
|
41 | 47 | <DotNetCacheArchiveItems Include="$(DotNetCacheArchives)" />
|
|
71 | 77 | <UnzipArchive File="%(RuntimeArchiveItems.Identity)" Destination="$(SiteExtensionWorkingDirectory)" Condition="'$(RuntimeArchives)' != ''" Overwrite="true" />
|
72 | 78 | <UnzipArchive File="%(DotNetCacheArchiveItems.Identity)" Destination="$(SiteExtensionWorkingDirectory)DotNetCache" Condition="'$(DotNetCacheArchives)' != ''" Overwrite="true" />
|
73 | 79 |
|
| 80 | + </Target> |
| 81 | + |
| 82 | + <Target Name="BuildSiteExtension" DependsOnTargets="_CleanSiteExtension;ComposeSiteExtensions;_AddSiteExtensionSdk;InstallDotNet"> |
| 83 | + |
74 | 84 | <MSBuild Projects="%(SiteExtensions.Identity)"
|
75 | 85 | Targets="Restore"
|
76 | 86 | Properties="BuildNumber=$(BuildNumber)" />
|
|
0 commit comments