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

Refactor DEB.proj

Browse source
This commit is contained in:
Piotr Puszkiewicz 2016-08-27 17:49:21 -07:00
parent 8eecff0112
commit 3a2632f6d5
4 changed files with 99 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
build/Microsoft.DotNet.Cli.Package.targets
View file

@ -16,23 +16,26 @@
BuildInParallel="False" BuildInParallel="False"
Projects="$(RepoRoot)/build/package/Microsoft.DotNet.Cli.Installer.DEB.proj" Projects="$(RepoRoot)/build/package/Microsoft.DotNet.Cli.Installer.DEB.proj"
Properties="ArtifactNameWithVersionSdk=$(ArtifactNameWithVersionSdk); Properties="ArtifactNameWithVersionSdk=$(ArtifactNameWithVersionSdk);
OSName=$(OSName);
CLIBuildDll=$(CLIBuildDll); CLIBuildDll=$(CLIBuildDll);
CliSdkRoot=$(Stage2Directory)/sdk; CLISdkRoot=$(Stage2Directory)/sdk;
DownloadedSharedHostInstallerFile=$(DownloadedSharedHostInstallerFile);
DownloadedHostFxrInstallerFile=$(DownloadedHostFxrInstallerFile); DownloadedHostFxrInstallerFile=$(DownloadedHostFxrInstallerFile);
DownloadedSharedFrameworkInstallerFile=$(DownloadedSharedFrameworkInstallerFile); DownloadedSharedFrameworkInstallerFile=$(DownloadedSharedFrameworkInstallerFile);
RepoRoot=$(RepoRoot); DownloadedSharedHostInstallerFile=$(DownloadedSharedHostInstallerFile);
PackagesDirectory=$(PackagesDirectory);
IntermediateDirectory=$(IntermediateDirectory);
InstallerExtension=$(InstallerExtension);
HostFxrVersion=$(HostFxrVersion); HostFxrVersion=$(HostFxrVersion);
InstallerExtension=$(InstallerExtension);
IntermediateDirectory=$(IntermediateDirectory);
OSName=$(OSName);
PackagesDirectory=$(PackagesDirectory);
RepoRoot=$(RepoRoot);
SdkBrandName=$(SdkBrandName);
SdkVersion=$(SdkVersion); SdkVersion=$(SdkVersion);
SharedFrameworkBrandName=$(SharedFrameworkBrandName);
SharedFrameworkName=$(SharedFrameworkName); SharedFrameworkName=$(SharedFrameworkName);
SharedFrameworkVersion=$(SharedFrameworkVersion); SharedFrameworkVersion=$(SharedFrameworkVersion);
SharedFrameworkBrandName=$(SharedFrameworkBrandName); ToolPath=$(Stage2Directory);">
SdkBrandName=$(SdkBrandName); <Output TaskParameter="GeneratedInstallers"
ToolPath=$(Stage2Directory);"/> ItemName="GeneratedInstallers" />
</MSBuild>
</Target> </Target>
<Target Name="Package" <Target Name="Package"

96
build/package/Microsoft.DotNet.Cli.Installer.DEB.proj
View file

@ -1,5 +1,5 @@
<?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="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"
DefaultTarget="GenerateDebs"> DefaultTarget="GenerateDebs">
<PropertyGroup> <PropertyGroup>
@ -15,55 +15,54 @@
<Target Name="GenerateDebs" <Target Name="GenerateDebs"
DependsOnTargets="TestDebuild; DependsOnTargets="TestDebuild;
GenerateSdkDeb; BuildSdkDeb;
TestSdkDeb;" TestSdkDeb;"
Condition=" '$(OSName)' == 'ubuntu' " /> Condition=" '$(OSName)' == 'ubuntu' " />
<Target Name="GenerateSdkDeb" <Target Name="BuildSdkDeb"
Condition=" '$(OSName)' == 'ubuntu' and '$(DebuildPresent)' == 'true' " Condition=" '$(OSName)' == 'ubuntu' and '$(DebuildPresent)' == 'true' "
DependsOnTargets="PrepareDotnetDebDirectories; DependsOnTargets="PrepareDotnetDebDirectories;
PrepareDotnetDebTool;" PrepareDotnetDebTool;"
Inputs="@(SdkDebInputFiles)" Inputs="@(CLISdkFiles)"
Outputs="$(SdkInstallerFile)" > Outputs="$(SdkInstallerFile)" >
<!-- Install Packages --> <!-- Install Shared Framework Packages -->
<Exec Command="sudo dpkg -i $(DownloadedSharedHostInstallerFile)" /> <Exec Command="sudo dpkg -i $(DownloadedSharedHostInstallerFile)" />
<Exec Command="sudo dpkg -i $(DownloadedHostFxrInstallerFile)" /> <Exec Command="sudo dpkg -i $(DownloadedHostFxrInstallerFile)" />
<Exec Command="sudo dpkg -i $(DownloadedSharedFrameworkInstallerFile)" /> <Exec Command="sudo dpkg -i $(DownloadedSharedFrameworkInstallerFile)" />
<!-- Create layout --> <!-- Create layout: Binaries -->
<Copy <Copy
DestinationFiles="@(SdkDebInputFiles->'$(DebLayoutPackageRootDir)/sdk/%(RecursiveDir)%(Filename)%(Extension)')" DestinationFiles="@(CLISdkFiles->'$(LayoutPackageRootDir)/sdk/%(RecursiveDir)%(Filename)%(Extension)')"
SourceFiles="@(SdkDebInputFiles)" SourceFiles="@(CLISdkFiles)"
OverwriteReadOnlyFiles="True" OverwriteReadOnlyFiles="True"
SkipUnchangedFiles="False" SkipUnchangedFiles="False"
UseHardlinksIfPossible="False"> UseHardlinksIfPossible="False" />
</Copy>
<!-- Create layout: Man Pages -->
<Copy <Copy
DestinationFiles="@(SdkDebManPageFiles->'$(DebLayoutDocsDir)/%(RecursiveDir)%(Filename)-$(SdkVersion)%(Extension)')" DestinationFiles="@(SdkDebManPageFiles->'$(LayoutDocsDir)/%(RecursiveDir)%(Filename)-$(SdkVersion)%(Extension)')"
SourceFiles="@(SdkDebManPageFiles)" SourceFiles="@(SdkDebManPageFiles)"
OverwriteReadOnlyFiles="True" OverwriteReadOnlyFiles="True"
SkipUnchangedFiles="False" SkipUnchangedFiles="False"
UseHardlinksIfPossible="False"> UseHardlinksIfPossible="False" />
</Copy>
<!-- Create layout: Generate and Place debian_config.json -->
<ReplaceFileContents <ReplaceFileContents
InputFile="$(DebianConfigTemplateFile)" InputFile="$(DebianConfigTemplateFile)"
DestinationFile="$(DebianConfigJsonFile)" DestinationFile="$(DebianConfigJsonFile)"
ReplacementPatterns="@(SdkDebianPackageTemplateReplacement -> '%(Identity)')" ReplacementPatterns="@(DebianConfigTokenValues -> '%(Identity)')"
ReplacementStrings="@(SdkDebianPackageTemplateReplacement -> '%(ReplacementString)')" /> ReplacementStrings="@(DebianConfigTokenValues -> '%(ReplacementString)')" />
<MakeDir Directories="$(DotNetDebToolOutputDirectory)" />
<!-- Build SDK Deb package -->
<DotNetDebTool ToolPath="$(ToolPath)" <DotNetDebTool ToolPath="$(ToolPath)"
InputDir="$(SdkDebianLayoutOutputDirectory)" InputDirectory="$(LayoutDirectory)"
OutputFile="$(DotNetDebToolOutputDirectory)" OutputDirectory="$(DotNetDebToolOutputDirectory)"
PackageName="$(SdkDebianPackageName)" PackageName="$(SdkDebianPackageName)"
PackageVersion="$(SdkVersion)" PackageVersion="$(SdkVersion)"
WorkingDirectory="$(DotnetDebToolDir)" /> WorkingDirectory="$(DotnetDebToolDir)" />
<!-- Copy package to output --> <!-- Copy SDK package to output -->
<ItemGroup> <ItemGroup>
<GeneratedDebFiles Include="$(DotNetDebToolOutputDirectory)/*.deb" /> <GeneratedDebFiles Include="$(DotNetDebToolOutputDirectory)/*.deb" />
</ItemGroup> </ItemGroup>
@ -77,11 +76,11 @@
SkipUnchangedFiles="False" SkipUnchangedFiles="False"
UseHardlinksIfPossible="False" /> UseHardlinksIfPossible="False" />
<!-- Remove Packages --> <!-- Remove Shared Framework and Debian Packages -->
<Exec Command="sudo dpkg -r $(SdkDebianPackageName)" /> <Exec Command="sudo dpkg -r $(SdkDebianPackageName)" />
<Exec Command="sudo dpkg -r $(SharedFrameworkDebianPackageName)" /> <Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" />
<Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" /> <Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" />
<Exec Command="sudo dpkg -r $(SharedHostDebianPackageName)" /> <Exec Command="sudo dpkg -r $(HostDebianPackageName)" />
</Target> </Target>
<Target Name="TestSdkDeb" <Target Name="TestSdkDeb"
@ -92,7 +91,7 @@
$(SdkInstallerFile);" $(SdkInstallerFile);"
Outputs="$(DebianTestResultsXmlFile)" > Outputs="$(DebianTestResultsXmlFile)" >
<!-- Install v(N-1) Packages --> <!-- Install Dependencies and SDK Packages -->
<Exec Command="sudo dpkg -i $(DownloadedSharedHostInstallerFile)" /> <Exec Command="sudo dpkg -i $(DownloadedSharedHostInstallerFile)" />
<Exec Command="sudo dpkg -i $(DownloadedHostFxrInstallerFile)" /> <Exec Command="sudo dpkg -i $(DownloadedHostFxrInstallerFile)" />
<Exec Command="sudo dpkg -i $(DownloadedSharedFrameworkInstallerFile)" /> <Exec Command="sudo dpkg -i $(DownloadedSharedFrameworkInstallerFile)" />
@ -104,36 +103,39 @@
ToolPath="$(DebianInstalledDirectory)" ToolPath="$(DebianInstalledDirectory)"
Xml="$(DebianTestResultsXmlFile)" /> Xml="$(DebianTestResultsXmlFile)" />
<!-- Remove Packages --> <!-- Clean up Packages -->
<Exec Command="sudo dpkg -r $(SdkDebianPackageName)" /> <Exec Command="sudo dpkg -r $(SdkDebianPackageName)" />
<Exec Command="sudo dpkg -r $(SharedFrameworkDebianPackageName)" /> <Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" />
<Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" /> <Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" />
<Exec Command="sudo dpkg -r $(SharedHostDebianPackageName)" /> <Exec Command="sudo dpkg -r $(HostDebianPackageName)" />
</Target> </Target>
<Target Name="PrepareDotnetDebDirectories"> <Target Name="PrepareDotnetDebDirectories">
<!-- Clean the workspace --> <!-- Clean the workspace -->
<ItemGroup> <ItemGroup>
<SdkDebianFilesToClean Remove="*" /> <FilesToClean Remove="*" />
<SdkDebianFilesToClean Include="$(SdkInstallerFile)" /> <FilesToClean Include="$(SdkInstallerFile)" />
<SdkDebianDirectoriesToClean Remove="*" /> <WorkspaceDirectories Remove="*" />
<SdkDebianDirectoriesToClean Include="$(SdkDebianIntermediateDirectory); <WorkspaceDirectories Include="$(SdkDebianIntermediateDirectory);
$(SdkDebianLayoutOutputDirectory)" /> $(LayoutDirectory)" />
<SdkDebianLayoutSubDirectories Remove="*" /> <LayoutSubDirectories Remove="*" />
<SdkDebianLayoutSubDirectories Include="$(DebLayoutPackageRootDir); <LayoutSubDirectories Include="$(LayoutPackageRootDir);
$(DebLayoutAbsolutePlacementDir); $(LayoutAbsolutePlacementDir);
$(DebLayoutSamplesDir); $(LayoutSamplesDir);
$(DebLayoutDocsDir); $(LayoutDocsDir);
$(DebLayoutDebianFilesDir)" /> $(LayoutDebianFilesDir)" />
</ItemGroup> </ItemGroup>
<Delete Files="@(SdkDebianFilesToClean)" /> <Delete Files="@(FilesToClean)" />
<RemoveDir Directories="@(SdkDebianDirectoriesToClean)" /> <RemoveDir Directories="@(WorkspaceDirectories)" />
<MakeDir Directories="@(SdkDebianDirectoriesToClean)" />
<MakeDir Directories="@(SdkDebianLayoutSubDirectories)" /> <!-- Rebuild the workspace -->
<MakeDir Directories="@(WorkspaceDirectories)" />
<MakeDir Directories="@(LayoutSubDirectories)" />
<MakeDir Directories="$(DotNetDebToolOutputDirectory)" />
</Target> </Target>
<Target Name="PrepareDotnetDebTool" <Target Name="PrepareDotnetDebTool"
@ -147,7 +149,9 @@
<Target Name="WriteDotnetDebToolProjectJson" <Target Name="WriteDotnetDebToolProjectJson"
Inputs="$(MSBuildThisFile);$(MSBuildThisFileDirectory)/Microsoft.DotNet.Cli.Installer.DEB.props" Inputs="$(MSBuildThisFile);$(MSBuildThisFileDirectory)/Microsoft.DotNet.Cli.Installer.DEB.props"
Outputs="$(DotnetDebToolDir)/project.json"> Outputs="$(DotnetDebToolDir)/project.json">
<MakeDir Condition=" !Exists($(DotnetDebToolDir)) " Directories="$(DotnetDebToolDir)" />
<MakeDir Condition=" !Exists($(DotnetDebToolDir)) "
Directories="$(DotnetDebToolDir)" />
<WriteLinesToFile File="$(DotnetDebToolDir)/project.json" <WriteLinesToFile File="$(DotnetDebToolDir)/project.json"
Lines="@(DotnetDebToolProjectJsonLines)" Lines="@(DotnetDebToolProjectJsonLines)"
@ -155,11 +159,13 @@
</Target> </Target>
<Target Name="TestDebuild"> <Target Name="TestDebuild">
<!-- run Debuild -->
<Exec Command="/usr/bin/env debuild -h" ContinueOnError="true"> <Exec Command="/usr/bin/env debuild -h" ContinueOnError="true">
<Output TaskParameter="ExitCode" PropertyName="DebuildExitCode" /> <Output TaskParameter="ExitCode" PropertyName="DebuildExitCode" />
</Exec> </Exec>
<!-- Debuild --> <!-- Check if it returned 0 -->
<PropertyGroup> <PropertyGroup>
<DebuildPresent>false</DebuildPresent> <DebuildPresent>false</DebuildPresent>
<DebuildPresent Condition=" '$(DebuildExitCode)' == '0' ">true</DebuildPresent> <DebuildPresent Condition=" '$(DebuildExitCode)' == '0' ">true</DebuildPresent>

64
build/package/Microsoft.DotNet.Cli.Installer.DEB.props
View file

@ -22,24 +22,24 @@
<PropertyGroup> <PropertyGroup>
<DebianInstalledDirectory>/usr/share/dotnet</DebianInstalledDirectory> <DebianInstalledDirectory>/usr/share/dotnet</DebianInstalledDirectory>
<DebLayoutPackageRootDirName>package_root</DebLayoutPackageRootDirName> <LayoutPackageRootDirName>package_root</LayoutPackageRootDirName>
<DebLayoutAbsolutePlacementDirName>$</DebLayoutAbsolutePlacementDirName> <LayoutAbsolutePlacementDirName>$</LayoutAbsolutePlacementDirName>
<DebLayoutSamplesDirName>samples</DebLayoutSamplesDirName> <LayoutSamplesDirName>samples</LayoutSamplesDirName>
<DebLayoutDocsDirName>docs</DebLayoutDocsDirName> <LayoutDocsDirName>docs</LayoutDocsDirName>
<DebLayoutDebianFilesDirName>debian</DebLayoutDebianFilesDirName> <LayoutDebianFilesDirName>debian</LayoutDebianFilesDirName>
</PropertyGroup> </PropertyGroup>
<!-- Package Identities --> <!-- Package Identities -->
<PropertyGroup> <PropertyGroup>
<SdkDebianPackageVersion>$(SdkVersion)</SdkDebianPackageVersion> <SdkDebianPackageVersion>$(SdkVersion)</SdkDebianPackageVersion>
<SdkDebianPackageName>dotnet-dev-$(SdkDebianPackageVersion)</SdkDebianPackageName> <SdkDebianPackageName>dotnet-dev-$(SdkDebianPackageVersion)</SdkDebianPackageName>
<SharedFrameworkDebianPackageVersion>$(SharedFrameworkVersion)</SharedFrameworkDebianPackageVersion> <SharedFxDebianPackageVersion>$(SharedFrameworkVersion)</SharedFxDebianPackageVersion>
<SharedFrameworkDebianPackageName>dotnet-sharedframework-$(SharedFrameworkName)-$(SharedFrameworkDebianPackageVersion)</SharedFrameworkDebianPackageName> <SharedFxDebianPackageName>dotnet-sharedframework-$(SharedFrameworkName)-$(SharedFxDebianPackageVersion)</SharedFxDebianPackageName>
<SharedFrameworkDebianPackageName>$(SharedFrameworkDebianPackageName.ToLower())</SharedFrameworkDebianPackageName> <SharedFxDebianPackageName>$(SharedFxDebianPackageName.ToLower())</SharedFxDebianPackageName>
<HostFxrDebianPackageVersion>$(HostFxrVersion)</HostFxrDebianPackageVersion> <HostFxrDebianPackageVersion>$(HostFxrVersion)</HostFxrDebianPackageVersion>
<HostFxrDebianPackageName>dotnet-hostfxr-$(HostFxrDebianPackageVersion)</HostFxrDebianPackageName> <HostFxrDebianPackageName>dotnet-hostfxr-$(HostFxrDebianPackageVersion)</HostFxrDebianPackageName>
<HostFxrDebianPackageName>$(HostFxrDebianPackageName.ToLower())</HostFxrDebianPackageName> <HostFxrDebianPackageName>$(HostFxrDebianPackageName.ToLower())</HostFxrDebianPackageName>
<SharedHostDebianPackageName>dotnet-host</SharedHostDebianPackageName> <HostDebianPackageName>dotnet-host</HostDebianPackageName>
</PropertyGroup> </PropertyGroup>
<!-- Inputs --> <!-- Inputs -->
@ -49,7 +49,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<SdkDebInputFiles Include="$(CliSdkRoot)/**/*" /> <CLISdkFiles Include="$(CLISdkRoot)/**/*" />
<SdkDebManPageFiles Include="$(ManpagesDirectory)/**/*" /> <SdkDebManPageFiles Include="$(ManpagesDirectory)/**/*" />
</ItemGroup> </ItemGroup>
@ -65,41 +65,39 @@
<!-- Layout Directories --> <!-- Layout Directories -->
<PropertyGroup> <PropertyGroup>
<SdkDebianLayoutOutputDirectory>$(SdkDebianIntermediateDirectory)/debianLayoutDirectory</SdkDebianLayoutOutputDirectory> <LayoutDirectory>$(SdkDebianIntermediateDirectory)/debianLayoutDirectory</LayoutDirectory>
<DebLayoutPackageRootDir>$(SdkDebianLayoutOutputDirectory)/$(DebLayoutPackageRootDirName)</DebLayoutPackageRootDir> <LayoutPackageRootDir>$(LayoutDirectory)/$(LayoutPackageRootDirName)</LayoutPackageRootDir>
<DebLayoutAbsolutePlacementDir>$(SdkDebianLayoutOutputDirectory)/$(DebLayoutAbsolutePlacementDirName)</DebLayoutAbsolutePlacementDir> <LayoutAbsolutePlacementDir>$(LayoutDirectory)/$(LayoutAbsolutePlacementDirName)</LayoutAbsolutePlacementDir>
<DebLayoutSamplesDir>$(SdkDebianLayoutOutputDirectory)/$(DebLayoutSamplesDirName)</DebLayoutSamplesDir> <LayoutSamplesDir>$(LayoutDirectory)/$(LayoutSamplesDirName)</LayoutSamplesDir>
<DebLayoutDocsDir>$(SdkDebianLayoutOutputDirectory)/$(DebLayoutDocsDirName)</DebLayoutDocsDir> <LayoutDocsDir>$(LayoutDirectory)/$(LayoutDocsDirName)</LayoutDocsDir>
<DebLayoutDebianFilesDir>$(SdkDebianLayoutOutputDirectory)/$(DebLayoutDebianFilesDirName)</DebLayoutDebianFilesDir> <LayoutDebianFilesDir>$(LayoutDirectory)/$(LayoutDebianFilesDirName)</LayoutDebianFilesDir>
</PropertyGroup> </PropertyGroup>
<!-- debian_config.json --> <!-- debian_config.json -->
<PropertyGroup> <PropertyGroup>
<DebianConfigTemplateFileName>dotnet-debian_config.json</DebianConfigTemplateFileName> <DebianConfigTemplateFile>$(RepoRoot)/packaging/deb/dotnet-debian_config.json</DebianConfigTemplateFile>
<DebianConfigTemplateFile>$(RepoRoot)/packaging/deb/$(DebianConfigTemplateFileName)</DebianConfigTemplateFile> <DebianConfigJsonFile>$(LayoutDirectory)/debian_config.json</DebianConfigJsonFile>
<DebianConfigJsonFileName>debian_config.json</DebianConfigJsonFileName>
<DebianConfigJsonFile>$(SdkDebianLayoutOutputDirectory)/$(DebianConfigJsonFileName)</DebianConfigJsonFile>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<SdkDebianPackageTemplateReplacement Include="%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%"> <DebianConfigTokenValues Include="%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%">
<ReplacementString>$(SharedFrameworkDebianPackageName)</ReplacementString> <ReplacementString>$(SharedFxDebianPackageName)</ReplacementString>
</SdkDebianPackageTemplateReplacement> </DebianConfigTokenValues>
<SdkDebianPackageTemplateReplacement Include="%SHARED_FRAMEWORK_NUGET_NAME%"> <DebianConfigTokenValues Include="%SHARED_FRAMEWORK_NUGET_NAME%">
<ReplacementString>$(SharedFrameworkName)</ReplacementString> <ReplacementString>$(SharedFrameworkName)</ReplacementString>
</SdkDebianPackageTemplateReplacement> </DebianConfigTokenValues>
<SdkDebianPackageTemplateReplacement Include="%SHARED_FRAMEWORK_NUGET_VERSION%"> <DebianConfigTokenValues Include="%SHARED_FRAMEWORK_NUGET_VERSION%">
<ReplacementString>$(SharedFrameworkVersion)</ReplacementString> <ReplacementString>$(SharedFrameworkVersion)</ReplacementString>
</SdkDebianPackageTemplateReplacement> </DebianConfigTokenValues>
<SdkDebianPackageTemplateReplacement Include="%SHARED_FRAMEWORK_BRAND_NAME%"> <DebianConfigTokenValues Include="%SHARED_FRAMEWORK_BRAND_NAME%">
<ReplacementString>$(SharedFrameworkBrandName)</ReplacementString> <ReplacementString>$(SharedFrameworkBrandName)</ReplacementString>
</SdkDebianPackageTemplateReplacement> </DebianConfigTokenValues>
<SdkDebianPackageTemplateReplacement Include="%SDK_NUGET_VERSION%"> <DebianConfigTokenValues Include="%SDK_NUGET_VERSION%">
<ReplacementString>$(SdkVersion)</ReplacementString> <ReplacementString>$(SdkVersion)</ReplacementString>
</SdkDebianPackageTemplateReplacement> </DebianConfigTokenValues>
<SdkDebianPackageTemplateReplacement Include="%CLI_SDK_BRAND_NAME%"> <DebianConfigTokenValues Include="%CLI_SDK_BRAND_NAME%">
<ReplacementString>$(SdkBrandName)</ReplacementString> <ReplacementString>$(SdkBrandName)</ReplacementString>
</SdkDebianPackageTemplateReplacement> </DebianConfigTokenValues>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

8
build_projects/dotnet-cli-build/DotNetDebTool.cs
View file

@ -19,10 +19,10 @@ namespace Microsoft.DotNet.Cli.Build
} }
[Required] [Required]
public string InputDir { get; set; } public string InputDirectory { get; set; }
[Required] [Required]
public string OutputFile { get; set; } public string OutputDirectory { get; set; }
[Required] [Required]
public string PackageName { get; set; } public string PackageName { get; set; }
@ -32,12 +32,12 @@ namespace Microsoft.DotNet.Cli.Build
private string GetInputDir() private string GetInputDir()
{ {
return $"-i {InputDir}"; return $"-i {InputDirectory}";
} }
private string GetOutputFile() private string GetOutputFile()
{ {
return $"-o {OutputFile}"; return $"-o {OutputDirectory}";
} }
private string GetPackageName() private string GetPackageName()