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

Commit a01ab8f

Browse files
author
William Li
committed
Fix Debian VSTS/packing failure
One place missing replacement of OsName => HostOsName. But the root cause is $(HostOSName)' == 'ubuntu' OR '$(HostOSName)' == 'debian' is duplicated too much. Extract IsDebianBaseDistro for it
1 parent 3419a87 commit a01ab8f

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

build/FileExtensions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<Project>
22
<PropertyGroup>
3-
3+
<IsDebianBaseDistro Condition=" '$(HostOSName)' == 'ubuntu' OR '$(HostOSName)' == 'debian' ">True</IsDebianBaseDistro>
44
<IsRPMBasedDistro Condition=" $(HostRid.StartsWith('rhel')) ">True</IsRPMBasedDistro>
55

66
<ArchiveExtension Condition=" '$(HostOSName)' == 'win' ">.zip</ArchiveExtension>
77
<ArchiveExtension Condition=" '$(HostOSName)' != 'win' ">.tar.gz</ArchiveExtension>
88

99
<InstallerExtension Condition=" '$(HostOSName)' == 'win' ">.msi</InstallerExtension>
1010
<InstallerExtension Condition=" '$(HostOSName)' == 'osx' ">.pkg</InstallerExtension>
11-
<InstallerExtension Condition=" '$(HostOSName)' == 'ubuntu' OR '$(OSName)' == 'debian' ">.deb</InstallerExtension>
11+
<InstallerExtension Condition=" '$(IsDebianBaseDistro)' == 'True' ">.deb</InstallerExtension>
1212
<InstallerExtension Condition=" '$(IsRPMBasedDistro)' == True ">.rpm</InstallerExtension>
1313

1414
<BundleExtension Condition=" '$(HostOSName)' == 'win' ">.exe</BundleExtension>
1515
<BundleExtension Condition=" '$(HostOSName)' == 'osx' ">$(InstallerExtension)</BundleExtension>
16-
<BundleExtension Condition=" '$(HostOSName)' == 'ubuntu' OR '$(OSName)' == 'debian' ">$(InstallerExtension)</BundleExtension>
17-
<BundleExtension Condition=" '$(IsRPMBasedDistro)' == True ">.rpm</BundleExtension>
16+
<BundleExtension Condition=" '$(IsDebianBaseDistro)' == 'True' ">$(InstallerExtension)</BundleExtension>
17+
<BundleExtension Condition=" '$(IsRPMBasedDistro)' == True ">$(InstallerExtension)</BundleExtension>
1818

1919
<DynamicLibPrefix>lib</DynamicLibPrefix>
2020
<DynamicLibPrefix Condition=" '$(HostOSName)' == 'win' "></DynamicLibPrefix>

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=" '$(HostOSName)' == 'ubuntu' OR '$(HostOSName)' == 'debian' "
13+
Condition=" '$(IsDebianBaseDistro)' == 'True' "
1414
Outputs="@(GeneratedInstallers)"/>
1515

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

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

build/publish/PublishDebian.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</DebianUploadJsonContent>
2020
</PropertyGroup>
2121

22-
<Target Name="PublishDebFilesToDebianRepo" Condition=" ('$(HostOSName)' == 'ubuntu' OR '$(HostOSName)' == 'debian') AND '$(SkipPublishToDebianRepo)' != 'true' ">
22+
<Target Name="PublishDebFilesToDebianRepo" Condition=" '$(IsDebianBaseDistro)' == 'True' 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)