mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move remaining Publish actions to redist.csproj

Browse source
This commit is contained in:
Piotr Puszkiewicz 2017-03-01 00:30:02 -08:00
parent 7bdd7befd8
commit 12fde69e86
5 changed files with 52 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
build/Compile.targets
View file

@ -1,17 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="compile/LzmaArchive.targets" />
<ItemGroup>
<PublishOutputExtensions Include="$(ExeExtension);.dll;.pdb;.deps.json;.runtimeconfig.json" />
</ItemGroup>
<Target Name="Compile" DependsOnTargets="Prepare; <Target Name="Compile" DependsOnTargets="Prepare;
CompileCLI; CompileCLI;
PublishSdks; BuildProjectsForNuGetPackages;" />
PublishTemplates;
BuildProjectsForNuGetPackages;
GetNuGetPackagesArchive;" />
<Target Name="CompileCLI"> <Target Name="CompileCLI">
<RemoveDir Directories="$(OutputDirectory)" /> <RemoveDir Directories="$(OutputDirectory)" />
@ -21,46 +13,5 @@
<DotNetPublish ToolPath="$(Stage0Directory)" <DotNetPublish ToolPath="$(Stage0Directory)"
Configuration="$(Configuration)" Configuration="$(Configuration)"
ProjectPath="$(RootProject)" /> ProjectPath="$(RootProject)" />
</Target>
<Target Name="PublishSdks"
DependsOnTargets="Prepare">
<ItemGroup>
<SdksToBundle Include="build/BundledSdks.proj">
<Properties>
CLIBuildDll=$(CLIBuildDll);
NuGetPackagesDir=$(NuGetPackagesDir);
SdkLayoutDirectory=$(SdkOutputDirectory)/Sdks/%(BundledSdk.Identity);
SdkPackageName=%(BundledSdk.Identity);
SdkPackageVersion=%(BundledSdk.Version);
Stage0Directory=$(Stage0Directory)
</Properties>
</SdksToBundle>
</ItemGroup>
<MSBuild
BuildInParallel="False"
Projects="@(SdksToBundle)">
</MSBuild>
</Target>
<Target Name="PublishTemplates"
DependsOnTargets="Prepare">
<ItemGroup>
<TemplatesToBundle Include="build/BundledTemplates.proj">
<Properties>
TemplateLayoutDirectory=$(SdkOutputDirectory)/Templates;
TemplatePackageName=%(BundledTemplate.Identity);
TemplatePackageVersion=%(BundledTemplate.Version);
Stage0Directory=$(Stage0Directory)
</Properties>
</TemplatesToBundle>
</ItemGroup>
<MSBuild
BuildInParallel="False"
Projects="@(TemplatesToBundle)">
</MSBuild>
</Target> </Target>
</Project> </Project>

2
build/Prepare.targets
View file

@ -2,8 +2,6 @@
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="Microsoft.DotNet.Cli.tasks" /> <Import Project="Microsoft.DotNet.Cli.tasks" />
<Import Project="prepare/CheckPrereqs.targets" /> <Import Project="prepare/CheckPrereqs.targets" />
<Import Project="BundledSdks.props" />
<Import Project="BundledTemplates.props" />
<Target Name="Prepare" <Target Name="Prepare"
DependsOnTargets="Init;DownloadHostAndSharedFxArtifacts;RestoreSrcPackages;RestoreToolsPackages" /> DependsOnTargets="Init;DownloadHostAndSharedFxArtifacts;RestoreSrcPackages;RestoreToolsPackages" />

3
build/compile/LzmaArchive.targets
View file

@ -111,8 +111,7 @@
<Exec Command="$(DotnetInOutputDirectory) $(ArchiverDll) -a $(IntermediateArchive) $(NuGetPackagesArchiveFolder)" /> <Exec Command="$(DotnetInOutputDirectory) $(ArchiverDll) -a $(IntermediateArchive) $(NuGetPackagesArchiveFolder)" />
</Target> </Target>
<Target Name="SetupNuGetPackagesArchiveInputsOutputs" <Target Name="SetupNuGetPackagesArchiveInputsOutputs">
DependsOnTargets="Prepare">
<GenerateNuGetPackagesArchiveVersion ToolPath="$(OutputDirectory)"> <GenerateNuGetPackagesArchiveVersion ToolPath="$(OutputDirectory)">
<Output TaskParameter="Version" PropertyName="NuGetPackagesArchiveVersion"/> <Output TaskParameter="Version" PropertyName="NuGetPackagesArchiveVersion"/>
</GenerateNuGetPackagesArchiveVersion> </GenerateNuGetPackagesArchiveVersion>

2
dir.props
View file

@ -20,6 +20,8 @@
<Import Project="build/BranchInfo.props" /> <Import Project="build/BranchInfo.props" />
<Import Project="build/BundledTools.props" /> <Import Project="build/BundledTools.props" />
<Import Project="build/BundledSdks.props" />
<Import Project="build/BundledTemplates.props" />
<Import Project="build/DependencyVersions.props" /> <Import Project="build/DependencyVersions.props" />
<Import Project="build/Version.props" /> <Import Project="build/Version.props" />
<Import Project="build/Branding.props" /> <Import Project="build/Branding.props" />

50
src/redist/redist.csproj
View file

@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0"> <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.tasks" /> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.tasks" />
<Import Project="$(RepoRoot)/build/compile/LzmaArchive.targets" />
<PropertyGroup> <PropertyGroup>
<VersionPrefix>$(CliVersionPrefix)</VersionPrefix> <VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
<TargetFramework>netcoreapp2.0</TargetFramework> <TargetFramework>netcoreapp2.0</TargetFramework>
@ -110,6 +111,51 @@
AssetPath="%(NuPkgContentForMSBuildExtensionsRelativePaths.Identity)" /> AssetPath="%(NuPkgContentForMSBuildExtensionsRelativePaths.Identity)" />
</Target> </Target>
<Target Name="PublishSdks"
AfterTargets="Publish">
<ItemGroup>
<SdksToBundle Include="$(RepoRoot)/build/BundledSdks.proj">
<Properties>
CLIBuildDll=$(CLIBuildDll);
NuGetPackagesDir=$(NuGetPackagesDir);
SdkLayoutDirectory=$(SdkOutputDirectory)/Sdks/%(BundledSdk.Identity);
SdkPackageName=%(BundledSdk.Identity);
SdkPackageVersion=%(BundledSdk.Version);
Stage0Directory=$(Stage0Directory);
</Properties>
</SdksToBundle>
</ItemGroup>
<MSBuild
BuildInParallel="False"
Projects="@(SdksToBundle)">
</MSBuild>
</Target>
<Target Name="PublishTemplates"
AfterTargets="Publish">
<ItemGroup>
<TemplatesToBundle Include="$(RepoRoot)/build/BundledTemplates.proj">
<Properties>
TemplateLayoutDirectory=$(SdkOutputDirectory)/Templates;
TemplatePackageName=%(BundledTemplate.Identity);
TemplatePackageVersion=%(BundledTemplate.Version);
Stage0Directory=$(Stage0Directory);
</Properties>
</TemplatesToBundle>
</ItemGroup>
<MSBuild
BuildInParallel="False"
Projects="@(TemplatesToBundle)">
</MSBuild>
</Target>
<Target Name="PublishLzmaArchive"
DependsOnTargets="GetNuGetPackagesArchive"
AfterTargets="Publish">
</Target>
<Target Name="CrossgenPublishDir" <Target Name="CrossgenPublishDir"
Condition=" '$(DISABLE_CROSSGEN)' == '' " Condition=" '$(DISABLE_CROSSGEN)' == '' "
AfterTargets="PublishMSBuildExtensions"> AfterTargets="PublishMSBuildExtensions">
@ -164,7 +210,7 @@
<Target Name="RemoveVbc" <Target Name="RemoveVbc"
AfterTargets="CrossgenPublishDir"> AfterTargets="CrossgenPublishDir">
<ItemGroup> <ItemGroup>
<_VbcPath Include="$(PublishDir)/sdk/**/vbc.exe" /> <_VbcPath Include="$(PublishDir)/**/vbc.exe" />
</ItemGroup> </ItemGroup>
<Delete Files="@(_VbcPath)" /> <Delete Files="@(_VbcPath)" />