Re-enable templates tests on CI (#874)
This commit is contained in:
parent
934b20ee25
commit
f4585bdbfd
|
|
@ -181,8 +181,7 @@
|
|||
</Target>
|
||||
|
||||
<Target Name="CopyToPublishArtifacts" DependsOnTargets="_CheckFilesToPublish">
|
||||
<MakeDir Directories="$(ArtifactsDir)files\" />
|
||||
<Copy SourceFiles="@(FilesToPublish)" DestinationFolder="$(ArtifactsDir)files\" />
|
||||
<Copy SourceFiles="%(FilesToPublish.Identity)" DestinationFiles="$(ArtifactsDir)%(FilesToPublish.RelativeBlobPath)" Condition="'%(FilesToPublish.RelativeBlobPath)' != ''" />
|
||||
</Target>
|
||||
|
||||
<Target Name="PublishToMyGet"
|
||||
|
|
@ -271,8 +270,6 @@
|
|||
Condition=" '%(FilesToPublish.IsDuplicateUpload)' != 'true' " />
|
||||
</ItemGroup>
|
||||
|
||||
<Message Text="Publishing %(PackageToPublishToTransport.FullPath)" Importance="high" />
|
||||
<Message Text="@(FilesToPublishToTransport -> '%(FullPath) -> %(RelativeBlobPath)','%0A')" Importance="high" />
|
||||
|
||||
<PushToBlobFeed ExpectedFeedUrl="$(PublishBlobFeedUrl)"
|
||||
AccountKey="$(PublishBlobFeedKey)"
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@
|
|||
<PropertyGroup>
|
||||
<TemplatingProjectRoot>$(MSBuildThisFileDirectory)..\modules\Templating\</TemplatingProjectRoot>
|
||||
<GetArtifactInfoDependsOn>$(GetArtifactInfoDependsOn);GetTemplateArtifactInfo</GetArtifactInfoDependsOn>
|
||||
<TestDependsOn>$(TestDependsOn);TestTemplates</TestDependsOn>
|
||||
<InstallSharedRuntimeFromPreviousBuild>false</InstallSharedRuntimeFromPreviousBuild>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
|
|
@ -43,4 +45,34 @@
|
|||
<Copy SourceFiles="@(TemplateArtifacts)" DestinationFolder="$(BuildDir)" />
|
||||
</Target>
|
||||
|
||||
<!--
|
||||
aspnet/Universe doesn't support building the shared framework on one machine, so these tests must be manually enabled on CI by copying
|
||||
the output of the SharedFx.targets build to test machines.
|
||||
-->
|
||||
<Target Name="InstallSharedRuntimeFromPreviousBuild" Condition="'$(InstallSharedRuntimeFromPreviousBuild)' == 'true'" BeforeTargets="InstallDotNet">
|
||||
<ItemGroup>
|
||||
<AspNetCoreRuntime Include="$(PackageVersion)" Feed="$(AspNetCoreFxFeed)" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<Target Name="TestTemplates" DependsOnTargets="InstallDotNet;BuildTemplates">
|
||||
<!-- To enable this test, either publish the shared runtime to https://dotnetcli.blob.core.windows.net/dotnet, or override the install location by setting AspNetCoreFxFeed. -->
|
||||
<Warning Text="Skipping template tests because InstallSharedRuntimeFromPreviousBuild != 'true'." Condition="'$(InstallSharedRuntimeFromPreviousBuild)' != 'true'"/>
|
||||
|
||||
<PropertyGroup>
|
||||
<_BuildTemplateProjProperties>
|
||||
$(TemplateProjProperties);
|
||||
SkipAspNetCoreRuntimeInstall=true;
|
||||
DotNetRestoreSourcesPropsPath=$(GeneratedRestoreSourcesPropsPath);
|
||||
DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath);
|
||||
NoBuild=true;
|
||||
</_BuildTemplateProjProperties>
|
||||
</PropertyGroup>
|
||||
|
||||
<MSBuild Projects="$(MSBuildProjectFullPath)"
|
||||
Targets="Build"
|
||||
Properties="$(_BuildTemplateProjProperties)"
|
||||
Condition="'$(InstallSharedRuntimeFromPreviousBuild)' == 'true'" />
|
||||
</Target>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
Loading…
Reference in New Issue