Skip to content

Commit 961ed89

Browse files
authored
Add SITE_EXTENSION_SDK_VERSION override (#151)
1 parent 81eca88 commit 961ed89

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

build/repo.targets

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@
22
<Import Project="$(RepositoryRoot)\build\dependencies.props" />
33

44
<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>
68
<TestDotNetPath>$(RepositoryRoot).test-dotnet\</TestDotNetPath>
79
<AppsArtifactDirectory>$(RepositoryRoot)artifacts\apps</AppsArtifactDirectory>
810
<SiteExtensionWorkingDirectory>$(TestDotNetPath)extension\</SiteExtensionWorkingDirectory>
911
<SiteExtensionOutputDirectory>$(RepositoryRoot)artifacts\build</SiteExtensionOutputDirectory>
1012
<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>
1214
</PropertyGroup>
1315

1416
<Target Name="_AddTestRuntimes">
@@ -22,10 +24,14 @@
2224
<RemoveDir Directories="$(SiteExtensionWorkingDirectory)" Condition="Exists($(SiteExtensionWorkingDirectory))" />
2325
</Target>
2426

25-
<Target Name="_AddSiteExtensionRuntime">
26-
27+
<Target Name="_AddSiteExtensionSdk">
2728
<ItemGroup>
2829
<DotNetCoreSdk Include="$(_SdkVersion)" InstallDir="$(SiteExtensionWorkingDirectory)" Arch="x86" />
30+
</ItemGroup>
31+
</Target>
32+
33+
<Target Name="_AddSiteExtensionRuntime">
34+
<ItemGroup>
2935
<DotNetCoreRuntime
3036
Include="$(MicrosoftNETCoreApp21PackageVersion)"
3137
InstallDir="$(SiteExtensionWorkingDirectory)"
@@ -35,7 +41,7 @@
3541
</ItemGroup>
3642
</Target>
3743

38-
<Target Name="BuildSiteExtension" DependsOnTargets="_CleanSiteExtension;_AddSiteExtensionRuntime;InstallDotNet">
44+
<Target Name="ComposeSiteExtensions" Condition="'$(ComposeSdk)' == 'True'" DependsOnTargets="_AddSiteExtensionSdk;_AddSiteExtensionRuntime;InstallDotNet">
3945
<ItemGroup>
4046
<RuntimeArchiveItems Include="$(RuntimeArchives)" />
4147
<DotNetCacheArchiveItems Include="$(DotNetCacheArchives)" />
@@ -71,6 +77,10 @@
7177
<UnzipArchive File="%(RuntimeArchiveItems.Identity)" Destination="$(SiteExtensionWorkingDirectory)" Condition="'$(RuntimeArchives)' != ''" Overwrite="true" />
7278
<UnzipArchive File="%(DotNetCacheArchiveItems.Identity)" Destination="$(SiteExtensionWorkingDirectory)DotNetCache" Condition="'$(DotNetCacheArchives)' != ''" Overwrite="true" />
7379

80+
</Target>
81+
82+
<Target Name="BuildSiteExtension" DependsOnTargets="_CleanSiteExtension;ComposeSiteExtensions;_AddSiteExtensionSdk;InstallDotNet">
83+
7484
<MSBuild Projects="%(SiteExtensions.Identity)"
7585
Targets="Restore"
7686
Properties="BuildNumber=$(BuildNumber)" />

0 commit comments

Comments
 (0)