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

Addressing code review comments

Browse source
This commit is contained in:
Livar Cunha 2016-07-15 13:44:11 -07:00
parent 03a17a9b76
commit 01b4981461
4 changed files with 30 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build.proj
View file

@ -18,7 +18,7 @@
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot> <RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
<ToolsDir>$(RepoRoot)/build_tools</ToolsDir> <BuildToolsDir>$(RepoRoot)/build_tools</BuildToolsDir>
<CoreSetupChannel>preview</CoreSetupChannel> <CoreSetupChannel>preview</CoreSetupChannel>
<SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName> <SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName>

46
build/Microsoft.DotNet.Cli.Publish.targets
View file

@ -1,34 +1,36 @@
<?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="$(ToolsDir)/PublishContent.targets" /> <Import Project="$(BuildToolsDir)/PublishContent.targets" />
<Import Project="$(MSBuildThisFileDirectory)/publish/Microsoft.DotNet.Cli.Badge.targets" /> <Import Project="$(MSBuildThisFileDirectory)/publish/Microsoft.DotNet.Cli.Badge.targets" />
<UsingTask TaskName="UploadToAzure" AssemblyFile="$(BuildToolsTaskDir)/Microsoft.DotNet.Build.CloudTestTasks.dll"/> <UsingTask TaskName="UploadToAzure" AssemblyFile="$(BuildToolsTaskDir)/Microsoft.DotNet.Build.CloudTestTasks.dll"/>
<UsingTask TaskName="FinalizeBuildTask" AssemblyFile="$(CLIBuildDll)" /> <UsingTask TaskName="FinalizeBuild" AssemblyFile="$(CLIBuildDll)" />
<UsingTask TaskName="SetBlobPropertiesBasedOnFileTypeTask" AssemblyFile="$(CLIBuildDll)" /> <UsingTask TaskName="SetBlobPropertiesBasedOnFileType" AssemblyFile="$(CLIBuildDll)" />
<!-- PUBLISH_TO_AZURE_BLOB env variable set by CI --> <!-- PUBLISH_TO_AZURE_BLOB env variable set by CI -->
<Target Name="Publish" <Target Name="Publish"
Condition=" '$(PUBLISH_TO_AZURE_BLOB)' != '' " Condition=" '$(PUBLISH_TO_AZURE_BLOB)' != '' "
DependsOnTargets="Prepare; DependsOnTargets="Init;
Package; Package;
PublishArtifacts; PublishArtifacts;
FinalizeBuild" /> FinishBuild" />
<Target Name="PublishArtifacts" DependsOnTargets="SetupAzureBlobInformation; <!-- UploadToAzure target comes from Build Tools -->
GenerateVersionBadge; <Target Name="PublishArtifacts"
GatherItemsForPattern; DependsOnTargets="SetupAzureBlobInformation;
UploadToAzure; GenerateVersionBadge;
PublishDebFilesToDebianRepo; GatherItemsForPattern;
PublishCliVersionBadge" /> UploadToAzure;
PublishDebFilesToDebianRepo;
PublishCliVersionBadge" />
<Target Name="FinalizeBuild"> <Target Name="FinishBuild">
<FinalizeBuildTask AccountName="$(CloudDropAccountName)" <FinalizeBuild AccountName="$(CloudDropAccountName)"
AccountKey="$(CloudDropAccessToken)" AccountKey="$(CloudDropAccessToken)"
NugetVersion="$(NugetVersion)" NugetVersion="$(NugetVersion)"
Channel="$(Channel)" Channel="$(Channel)"
CommitHash="$(CommitHash)" CommitHash="$(CommitHash)"
BranchName="$(BranchName)" /> BranchName="$(BranchName)" />
</Target> </Target>
<Target Name="SetupAzureBlobInformation"> <Target Name="SetupAzureBlobInformation">
@ -56,14 +58,16 @@
<Target Name="PublishDebFilesToDebianRepo" Condition=" '$(OSName)' == 'ubuntu' "> <Target Name="PublishDebFilesToDebianRepo" Condition=" '$(OSName)' == 'ubuntu' ">
<Error Condition="'$(REPO_ID)' == ''" Text="REPO_ID must be set as an environment variable for debian publishing." /> <Error Condition="'$(REPO_ID)' == ''" Text="REPO_ID must be set as an environment variable for debian publishing." />
<Error Condition="'$(REPO_USER)' == ''" Text="REPO_USER must be set as an environment variable for debian publishing." />
<Error Condition="'$(REPO_PASS)' == ''" Text="REPO_PASS must be set as an environment variable for debian publishing." />
<Error Condition="'$(REPO_SERVER)' == ''" Text="REPO_SERVER must be set as an environment variable for debian publishing." />
<ItemGroup> <ItemGroup>
<SdkInstallerFileItemGroup Include="$(SdkInstallerFile)" /> <SdkInstallerFileItemGroup Include="$(SdkInstallerFile)" />
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>
<SdkDebianPackageName>dotnet-dev-$(NugetVersion)</SdkDebianPackageName>
<SdkDebianUploadUrl>$(DotnetBlobRootUrl)/$(Product)/$(NugetVersion)/%(SdkInstallerFileItemGroup.Filename)%(SdkInstallerFileItemGroup.Extension)</SdkDebianUploadUrl> <SdkDebianUploadUrl>$(DotnetBlobRootUrl)/$(Product)/$(NugetVersion)/%(SdkInstallerFileItemGroup.Filename)%(SdkInstallerFileItemGroup.Extension)</SdkDebianUploadUrl>
<DebianUploadJsonFile>$(PackageDirectory)/package_upload.json</DebianUploadJsonFile> <DebianUploadJsonFile>$(SdkDebianIntermediateDirectory)/package_upload.json</DebianUploadJsonFile>
<DebianRevisionNumber>1</DebianRevisionNumber> <DebianRevisionNumber>1</DebianRevisionNumber>
<DebianUploadJsonContent> <DebianUploadJsonContent>
@ -99,7 +103,7 @@
ContainerName="$(ContainerName)" ContainerName="$(ContainerName)"
Items="@(CliVersionBadgeToUpload)" /> Items="@(CliVersionBadgeToUpload)" />
<SetBlobPropertiesBasedOnFileTypeTask <SetBlobPropertiesBasedOnFileType
AccountKey="$(CloudDropAccessToken)" AccountKey="$(CloudDropAccessToken)"
AccountName="$(CloudDropAccountName)" AccountName="$(CloudDropAccountName)"
Items="@(CliVersionBadgeToUpload)" /> Items="@(CliVersionBadgeToUpload)" />

6
build_projects/dotnet-cli-build/FinalizeBuildTask.cs
View file

@ -8,7 +8,7 @@ using Microsoft.Build.Utilities;
namespace Microsoft.DotNet.Cli.Build namespace Microsoft.DotNet.Cli.Build
{ {
public class FinalizeBuildTask : Task public class FinalizeBuild : Task
{ {
private AzurePublisher _azurePublisher; private AzurePublisher _azurePublisher;
@ -45,12 +45,12 @@ namespace Microsoft.DotNet.Cli.Build
public override bool Execute() public override bool Execute()
{ {
FinalizeBuild(); DoFinalizeBuild();
return true; return true;
} }
private void FinalizeBuild() private void DoFinalizeBuild()
{ {
if (CheckIfAllBuildsHavePublished()) if (CheckIfAllBuildsHavePublished())
{ {

2
build_projects/dotnet-cli-build/SetBlobPropertiesBasedOnFileTypeTask.cs
View file

@ -8,7 +8,7 @@ using Microsoft.Build.Utilities;
namespace Microsoft.DotNet.Cli.Build namespace Microsoft.DotNet.Cli.Build
{ {
public class SetBlobPropertiesBasedOnFileTypeTask : Task public class SetBlobPropertiesBasedOnFileType : Task
{ {
private AzurePublisher _azurePublisher; private AzurePublisher _azurePublisher;