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

Re-enable templates tests on CI (#874)

This commit is contained in:
Nate McMaster 2018-02-12 15:43:40 -08:00 committed by GitHub
parent 934b20ee25
commit f4585bdbfd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/Publish.targets
View File

@ -181,8 +181,7 @@
</Target> </Target>
<Target Name="CopyToPublishArtifacts" DependsOnTargets="_CheckFilesToPublish"> <Target Name="CopyToPublishArtifacts" DependsOnTargets="_CheckFilesToPublish">
<MakeDir Directories="$(ArtifactsDir)files\" /> <Copy SourceFiles="%(FilesToPublish.Identity)" DestinationFiles="$(ArtifactsDir)%(FilesToPublish.RelativeBlobPath)" Condition="'%(FilesToPublish.RelativeBlobPath)' != ''" />
<Copy SourceFiles="@(FilesToPublish)" DestinationFolder="$(ArtifactsDir)files\" />
</Target> </Target>
<Target Name="PublishToMyGet" <Target Name="PublishToMyGet"
@ -271,8 +270,6 @@
Condition=" '%(FilesToPublish.IsDuplicateUpload)' != 'true' " /> Condition=" '%(FilesToPublish.IsDuplicateUpload)' != 'true' " />
</ItemGroup> </ItemGroup>
<Message Text="Publishing %(PackageToPublishToTransport.FullPath)" Importance="high" />
<Message Text="@(FilesToPublishToTransport -> '%(FullPath) -> %(RelativeBlobPath)','%0A')" Importance="high" />
<PushToBlobFeed ExpectedFeedUrl="$(PublishBlobFeedUrl)" <PushToBlobFeed ExpectedFeedUrl="$(PublishBlobFeedUrl)"
AccountKey="$(PublishBlobFeedKey)" AccountKey="$(PublishBlobFeedKey)"

32
build/Templating.targets
View File

@ -2,6 +2,8 @@
<PropertyGroup> <PropertyGroup>
<TemplatingProjectRoot>$(MSBuildThisFileDirectory)..\modules\Templating\</TemplatingProjectRoot> <TemplatingProjectRoot>$(MSBuildThisFileDirectory)..\modules\Templating\</TemplatingProjectRoot>
<GetArtifactInfoDependsOn>$(GetArtifactInfoDependsOn);GetTemplateArtifactInfo</GetArtifactInfoDependsOn> <GetArtifactInfoDependsOn>$(GetArtifactInfoDependsOn);GetTemplateArtifactInfo</GetArtifactInfoDependsOn>
<TestDependsOn>$(TestDependsOn);TestTemplates</TestDependsOn>
<InstallSharedRuntimeFromPreviousBuild>false</InstallSharedRuntimeFromPreviousBuild>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
@ -43,4 +45,34 @@
<Copy SourceFiles="@(TemplateArtifacts)" DestinationFolder="$(BuildDir)" /> <Copy SourceFiles="@(TemplateArtifacts)" DestinationFolder="$(BuildDir)" />
</Target> </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> </Project>