Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Commit 4701bcb

Browse files
authored
Produce Debian 8 native package (#6604)
* Produce Debian 8 native package Since Debian is a branch from Ubuntu threat them the same Tested on Debian 8 VM * fix file path * Fix name field in Publish Deb packages * publish debian 8 native to Azure
1 parent 8c1dacb commit 4701bcb

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

build/FileExtensions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
<InstallerExtension Condition=" '$(OSName)' == 'win' ">.msi</InstallerExtension>
88
<InstallerExtension Condition=" '$(OSName)' == 'osx' ">.pkg</InstallerExtension>
9-
<InstallerExtension Condition=" '$(OSName)' == 'ubuntu' ">.deb</InstallerExtension>
9+
<InstallerExtension Condition=" '$(OSName)' == 'ubuntu' OR '$(OSName)' == 'debian' ">.deb</InstallerExtension>
1010

1111
<BundleExtension Condition=" '$(OSName)' == 'win' ">.exe</BundleExtension>
1212
<BundleExtension Condition=" '$(OSName)' == 'osx' ">$(InstallerExtension)</BundleExtension>
13-
<BundleExtension Condition=" '$(OSName)' == 'ubuntu' ">$(InstallerExtension)</BundleExtension>
13+
<BundleExtension Condition=" '$(OSName)' == 'ubuntu' OR '$(OSName)' == 'debian' ">$(InstallerExtension)</BundleExtension>
1414

1515
<DynamicLibPrefix>lib</DynamicLibPrefix>
1616
<DynamicLibPrefix Condition=" '$(OSName)' == 'win' "></DynamicLibPrefix>

build/InstallerInfo.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<CombinedFrameworkSdkHostInstallerFile>$(InstallerOutputDirectory)/$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(BundleExtension)</CombinedFrameworkSdkHostInstallerFile>
66

77
<SdkDebianIntermediateDirectory>$(IntermediateDirectory)/debian/sdk</SdkDebianIntermediateDirectory>
8-
<LayoutDirectory Condition=" '$(OSName)' == 'ubuntu' ">$(SdkDebianIntermediateDirectory)/debianLayoutDirectory</LayoutDirectory>
9-
<LayoutDirectory Condition=" '$(OSName)' != 'ubuntu' ">$(IntermediateDirectory)/layouts</LayoutDirectory>
8+
<LayoutDirectory Condition=" '$(OSName)' == 'ubuntu' OR '$(OSName)' == 'debian' ">$(SdkDebianIntermediateDirectory)/debianLayoutDirectory</LayoutDirectory>
9+
<LayoutDirectory Condition=" '$(OSName)' != 'ubuntu' AND '$(OSName)' != 'debian' ">$(IntermediateDirectory)/layouts</LayoutDirectory>
1010
<SdkLayoutOutputDirectory>$(LayoutDirectory)/$(ArtifactNameSdk)</SdkLayoutOutputDirectory>
1111
</PropertyGroup>
1212
</Project>

build/package/Installer.DEB.proj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
TestDebuild;
1111
BuildSdkDeb;
1212
TestSdkDeb;"
13-
Condition=" '$(OSName)' == 'ubuntu' "
13+
Condition=" '$(OSName)' == 'ubuntu' OR '$(OSName)' == 'debian' "
1414
Outputs="@(GeneratedInstallers)"/>
1515

1616
<Target Name="BuildSdkDeb"
17-
Condition=" '$(OSName)' == 'ubuntu' and '$(DebuildPresent)' == 'true' "
17+
Condition=" ('$(OSName)' == 'ubuntu' OR '$(OSName)' == 'debian') AND '$(DebuildPresent)' == 'true' "
1818
DependsOnTargets="PrepareDotnetDebDirectories;
1919
PrepareDotnetDebTool;"
2020
Inputs="@(CLISdkFiles)"
@@ -98,7 +98,7 @@
9898
</Target>
9999

100100
<Target Name="TestSdkDeb"
101-
Condition=" '$(OSName)' == 'ubuntu' and '$(DebuildPresent)' == 'true' "
101+
Condition=" ('$(OSName)' == 'ubuntu' OR '$(OSName)' == 'debian') and '$(DebuildPresent)' == 'true' "
102102
Inputs="$(DownloadedSharedHostInstallerFile);
103103
$(DownloadedHostFxrInstallerFile);
104104
$(DownloadedSharedFrameworkInstallerFile);

build/publish/PublishDebian.targets

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<ItemGroup>
4-
<SdkInstallerFileItemGroup Include="$(SdkInstallerFile)" />
5-
</ItemGroup>
3+
<PropertyGroup>
4+
<SdkDebianPackageName>dotnet-dev-$(SdkVersion)</SdkDebianPackageName>
5+
</PropertyGroup>
66

77
<PropertyGroup>
8-
<SdkDebianUploadUrl>$(DotnetBlobRootUrl)/$(Product)/$(FullNugetVersion)/%(SdkInstallerFileItemGroup.Filename)%(SdkInstallerFileItemGroup.Extension)</SdkDebianUploadUrl>
8+
<SdkDebianUploadUrl>$(DotnetBlobRootUrl)/$(Product)/$(FullNugetVersion)/$(ArtifactNameWithVersionSdk)$(InstallerExtension)</SdkDebianUploadUrl>
99
<DebianUploadJsonFile>$(SdkDebianIntermediateDirectory)/package_upload.json</DebianUploadJsonFile>
1010
<DebianRevisionNumber>1</DebianRevisionNumber>
1111

@@ -19,7 +19,7 @@
1919
</DebianUploadJsonContent>
2020
</PropertyGroup>
2121

22-
<Target Name="PublishDebFilesToDebianRepo" Condition=" '$(OSName)' == 'ubuntu' AND '$(SkipPublishToDebianRepo)' != 'true' ">
22+
<Target Name="PublishDebFilesToDebianRepo" Condition=" ('$(OSName)' == 'ubuntu' OR '$(OSName)' == 'debian') AND '$(SkipPublishToDebianRepo)' != 'true' ">
2323
<Error Condition="'$(REPO_ID)' == ''" Text="REPO_ID must be set as an environment variable for debian publishing." />
2424
<Error Condition="'$(REPO_USER)' == ''" Text="REPO_USER must be set as an environment variable for debian publishing." />
2525
<Error Condition="'$(REPO_PASS)' == ''" Text="REPO_PASS must be set as an environment variable for debian publishing." />

0 commit comments

Comments
 (0)