This repository was archived by the owner on Apr 20, 2023. It is now read-only.
File tree Expand file tree Collapse file tree 4 files changed +12
-12
lines changed
Expand file tree Collapse file tree 4 files changed +12
-12
lines changed Original file line number Diff line number Diff line change 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 >
Original file line number Diff line number Diff line change 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 >
Original file line number Diff line number Diff line change 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)"
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);
Original file line number Diff line number Diff line change 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
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." />
You can’t perform that action at this time.
0 commit comments