huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Stop producing old-style rpm/deb installers (#1191)

This commit is contained in:
Nate McMaster 2018-05-31 15:01:28 -07:00 committed by GitHub
parent b55ec6f5b7
commit c801671fbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/SharedFx.props
View File

@ -41,7 +41,7 @@
<DotnetRuntimeInstallerPrefix>$(DotnetRuntimePackageName)-$(MicrosoftNETCoreApp21PackageVersion)</DotnetRuntimeInstallerPrefix> <DotnetRuntimeInstallerPrefix>$(DotnetRuntimePackageName)-$(MicrosoftNETCoreApp21PackageVersion)</DotnetRuntimeInstallerPrefix>
<MicrosoftNETCoreApp21IdVersion>2.1</MicrosoftNETCoreApp21IdVersion> <MicrosoftNETCoreApp21IdVersion>2.1</MicrosoftNETCoreApp21IdVersion>
<MicrosoftNETCoreApp21InstallerVersion>$(MicrosoftNETCoreApp21PackageVersion.Split('-')[0])</MicrosoftNETCoreApp21InstallerVersion> <MicrosoftNETCoreApp21InstallerVersion>$(MicrosoftNETCoreApp21PackageVersion.Split('-')[0])</MicrosoftNETCoreApp21InstallerVersion>
<DotnetRuntimeUpgradeableInstallerPrefix>$(DotnetRuntimePackageName)-$(MicrosoftNETCoreApp21IdVersion)</DotnetRuntimeUpgradeableInstallerPrefix> <DotnetRuntimeInstallerPrefix>$(DotnetRuntimePackageName)-$(MicrosoftNETCoreApp21IdVersion)</DotnetRuntimeInstallerPrefix>
<RuntimeArchiveLinkPrefix>$(DotNetAssetRootUrl)Runtime/$(MicrosoftNETCoreApp21PackageVersion)/$(DotnetRuntimeInstallerPrefix)</RuntimeArchiveLinkPrefix> <RuntimeArchiveLinkPrefix>$(DotNetAssetRootUrl)Runtime/$(MicrosoftNETCoreApp21PackageVersion)/$(DotnetRuntimeInstallerPrefix)</RuntimeArchiveLinkPrefix>
<SharedFxIntermediateArchiveFilePrefix>$(_SharedFxSourceDir)$(SharedFxIntermediateArchiveBaseName)-$(PackageVersion)</SharedFxIntermediateArchiveFilePrefix> <SharedFxIntermediateArchiveFilePrefix>$(_SharedFxSourceDir)$(SharedFxIntermediateArchiveBaseName)-$(PackageVersion)</SharedFxIntermediateArchiveFilePrefix>

31
build/SharedFxInstaller.targets
View File

@ -148,17 +148,13 @@
<MSBuild Projects="$(MSBuildProjectFullPath)" Targets="_BuildDockerImage" Properties="Image=$(Image)" /> <MSBuild Projects="$(MSBuildProjectFullPath)" Targets="_BuildDockerImage" Properties="Image=$(Image)" />
<ItemGroup> <ItemGroup>
<RpmNonUpgradeableSharedFxDependencies Include="$(DotnetRuntimeInstallerPrefix)" Version="$(MicrosoftNETCoreApp21PackageVersion)" /> <RpmSharedFxDependencies Include="$(DotnetRuntimeInstallerPrefix)" Version="$(MicrosoftNETCoreApp21InstallerVersion)" />
<RpmSharedFxDependencies Include="$(DotnetRuntimeUpgradeableInstallerPrefix)" Version="$(MicrosoftNETCoreApp21InstallerVersion)" />
<RpmRHSharedFxDirectories Include="$(RHInstallRoot)/shared" /> <RpmRHSharedFxDirectories Include="$(RHInstallRoot)/shared" />
<RpmGenericSharedFxDirectories Include="$(InstallRoot)/shared" /> <RpmGenericSharedFxDirectories Include="$(InstallRoot)/shared" />
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>
<RpmNonUpgradeableSharedFxArguments>@(RpmNonUpgradeableSharedFxDependencies->' -d &quot;%(Identity) &gt;= %(Version)&quot;', ' ')</RpmNonUpgradeableSharedFxArguments>
<RpmSharedFxArguments>@(RpmSharedFxDependencies->' -d &quot;%(Identity) &gt;= %(Version)&quot;', ' ')</RpmSharedFxArguments> <RpmSharedFxArguments>@(RpmSharedFxDependencies->' -d &quot;%(Identity) &gt;= %(Version)&quot;', ' ')</RpmSharedFxArguments>
<RpmNonUpgradeableRHSharedFxArguments>$(RpmNonUpgradeableSharedFxArguments) @(RpmRHSharedFxDirectories->' --directories &quot;%(FullPath)&quot;', ' ')</RpmNonUpgradeableRHSharedFxArguments>
<RpmNonUpgradeableGenericSharedFxArguments>$(RpmNonUpgradeableSharedFxArguments) @(RpmGenericSharedFxDirectories->' --directories &quot;%(FullPath)&quot;', ' ')</RpmNonUpgradeableGenericSharedFxArguments>
<RpmRHSharedFxArguments>$(RpmSharedFxArguments) @(RpmRHSharedFxDirectories->' --directories &quot;%(FullPath)&quot;', ' ')</RpmRHSharedFxArguments> <RpmRHSharedFxArguments>$(RpmSharedFxArguments) @(RpmRHSharedFxDirectories->' --directories &quot;%(FullPath)&quot;', ' ')</RpmRHSharedFxArguments>
<RpmGenericSharedFxArguments>$(RpmSharedFxArguments) @(RpmGenericSharedFxDirectories->' --directories &quot;%(FullPath)&quot;', ' ')</RpmGenericSharedFxArguments> <RpmGenericSharedFxArguments>$(RpmSharedFxArguments) @(RpmGenericSharedFxDirectories->' --directories &quot;%(FullPath)&quot;', ' ')</RpmGenericSharedFxArguments>
@ -170,24 +166,15 @@
<RpmCommonProps>$(RpmCommonProps);RpmMSummary=$(SharedFxSummary);RpmDescription=$(SharedFxDescription)</RpmCommonProps> <RpmCommonProps>$(RpmCommonProps);RpmMSummary=$(SharedFxSummary);RpmDescription=$(SharedFxDescription)</RpmCommonProps>
<RpmGenericProps>RpmInstallRoot=$(InstallRoot)</RpmGenericProps> <RpmGenericProps>RpmInstallRoot=$(InstallRoot)</RpmGenericProps>
<RpmRHProps>RpmInstallRoot=$(RHInstallRoot)</RpmRHProps> <RpmRHProps>RpmInstallRoot=$(RHInstallRoot)</RpmRHProps>
<RpmNonUpgradeableProps>RpmIdVersion=$(PackageVersion);RpmPackageVersion=$(PackageVersion);RpmFileVersion=$(PackageVersion)</RpmNonUpgradeableProps> <RpmProps>RpmIdVersion=$(InstallerIdVersion);RpmPackageVersion=$(InstallerPackageVersion);RpmFileVersion=$(PackageVersion)</RpmProps>
<RpmProps>RpmIdVersion=$(InstallerIdVersion);RpmPackageVersion=$(InstallerPackageVersion);RpmFileVersion=$(PackageVersion);RpmUpgradeableSuffix=-upgradeable</RpmProps>
<RpmNonUpgradeableSharedFxProps>$(RpmCommonProps);$(RpmGenericProps);$(RpmNonUpgradeableProps);RpmArguments=$(RpmNonUpgradeableGenericSharedFxArguments);RpmFileSuffix=x64.rpm</RpmNonUpgradeableSharedFxProps> <RpmSharedFxProps>$(RpmCommonProps);$(RpmGenericProps);$(RpmProps);RpmArguments=$(RpmGenericSharedFxArguments);RpmFileSuffix=x64.rpm</RpmSharedFxProps>
<RpmNonUpgradeableRHSharedFxProps>$(RpmCommonProps);$(RpmRHProps);$(RpmNonUpgradeableProps);RpmArguments=$(RpmNonUpgradeableRHSharedFxArguments);RpmFileSuffix=rh.rhel.7-x64.rpm</RpmNonUpgradeableRHSharedFxProps> <RpmRHSharedFxProps>$(RpmCommonProps);$(RpmRHProps);$(RpmProps);RpmArguments=$(RpmRHSharedFxArguments);RpmFileSuffix=rh.rhel.7-x64.rpm</RpmRHSharedFxProps>
<RpmSharedFxProps>$(RpmCommonProps);$(RpmGenericProps);$(RpmProps);RpmArguments=$(RpmGenericSharedFxArguments);RpmFileSuffix=x64-upgrade.rpm</RpmSharedFxProps>
<RpmRHSharedFxProps>$(RpmCommonProps);$(RpmRHProps);$(RpmProps);RpmArguments=$(RpmRHSharedFxArguments);RpmFileSuffix=rh.rhel.7-x64-upgrade.rpm</RpmRHSharedFxProps>
</PropertyGroup> </PropertyGroup>
<!-- NonUpgradeable Generic installer-->
<MSBuild Projects="$(MSBuildProjectFullPath)" Targets="_GenerateRpm" Properties="$(RpmNonUpgradeableSharedFxProps)" />
<!-- Generic installer--> <!-- Generic installer-->
<MSBuild Projects="$(MSBuildProjectFullPath)" Targets="_GenerateRpm" Properties="$(RpmSharedFxProps)" /> <MSBuild Projects="$(MSBuildProjectFullPath)" Targets="_GenerateRpm" Properties="$(RpmSharedFxProps)" />
<!-- NonUpgradeable RH installer-->
<MSBuild Projects="$(MSBuildProjectFullPath)" Targets="_GenerateRpm" Properties="$(RpmNonUpgradeableRHSharedFxProps)" />
<!-- RH installer--> <!-- RH installer-->
<MSBuild Projects="$(MSBuildProjectFullPath)" Targets="_GenerateRpm" Properties="$(RpmRHSharedFxProps)" /> <MSBuild Projects="$(MSBuildProjectFullPath)" Targets="_GenerateRpm" Properties="$(RpmRHSharedFxProps)" />
@ -250,7 +237,7 @@
<Error Text="@(GeneratedDebFiles->Count()) deb installer files generated." Condition="'@(GeneratedDebFiles->Count())' != 1" /> <Error Text="@(GeneratedDebFiles->Count()) deb installer files generated." Condition="'@(GeneratedDebFiles->Count())' != 1" />
<Copy <Copy
DestinationFiles="$(_InstallersOutputDir)$(DebPrefix)-$(DebFileVersion)-x64$(DebUpgradeSuffix).deb" DestinationFiles="$(_InstallersOutputDir)$(DebPrefix)-$(DebFileVersion)-x64.deb"
SourceFiles="@(GeneratedDebFiles)" SourceFiles="@(GeneratedDebFiles)"
OverwriteReadOnlyFiles="True" OverwriteReadOnlyFiles="True"
SkipUnchangedFiles="False" SkipUnchangedFiles="False"
@ -265,28 +252,24 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<_DebNonUpgradeableSharedFxDependencies Include="$(DotnetRuntimeInstallerPrefix)"/> <_DebSharedFxDependencies Include="$(DotnetRuntimeInstallerPrefix)" Version="$(NETCoreApp21DebVersion)"/>
<_DebSharedFxDependencies Include="$(DotnetRuntimeUpgradeableInstallerPrefix)" Version="$(NETCoreApp21DebVersion)"/>
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>
<Image>ubuntu.14.04</Image> <Image>ubuntu.14.04</Image>
<DebNonUpgradeableSharedFxDependencies>@(_DebNonUpgradeableSharedFxDependencies->'"%(Identity)": { }', ', ')</DebNonUpgradeableSharedFxDependencies>
<DebSharedFxDependencies>@(_DebSharedFxDependencies->'"%(Identity)": { "package_version": "%(Version)" }', ', ')</DebSharedFxDependencies> <DebSharedFxDependencies>@(_DebSharedFxDependencies->'"%(Identity)": { "package_version": "%(Version)" }', ', ')</DebSharedFxDependencies>
<DebCommonProps>Image=$(Image);DebPrefix=$(SharedFxInstallerName)</DebCommonProps> <DebCommonProps>Image=$(Image);DebPrefix=$(SharedFxInstallerName)</DebCommonProps>
<DebCommonProps>$(DebCommonProps);DebSummary=$(SharedFxSummary);DebDescription=$(SharedFxDescription)</DebCommonProps> <DebCommonProps>$(DebCommonProps);DebSummary=$(SharedFxSummary);DebDescription=$(SharedFxDescription)</DebCommonProps>
<DebCommonProps>$(DebCommonProps);SharedFxArchive=$(SharedFxIntermediateArchiveFilePrefix)-linux-x64.tar.gz</DebCommonProps> <DebCommonProps>$(DebCommonProps);SharedFxArchive=$(SharedFxIntermediateArchiveFilePrefix)-linux-x64.tar.gz</DebCommonProps>
<DebNonUpgradeableProps>DebIdVersion=$(PackageVersion);DebPackageVersion=$(PackageVersion);DebFileVersion=$(PackageVersion);DebDependencies=$(DebNonUpgradeableSharedFxDependencies)</DebNonUpgradeableProps> <DebProps>DebIdVersion=$(InstallerIdVersion);DebPackageVersion=$(DebInstallerPackageVersion);DebFileVersion=$(PackageVersion);DebDependencies=$(DebSharedFxDependencies)</DebProps>
<DebProps>DebIdVersion=$(InstallerIdVersion);DebPackageVersion=$(DebInstallerPackageVersion);DebFileVersion=$(PackageVersion);DebDependencies=$(DebSharedFxDependencies);DebUpgradeSuffix=-upgrade</DebProps>
</PropertyGroup> </PropertyGroup>
<!-- Build Docker Image --> <!-- Build Docker Image -->
<MSBuild Projects="$(MSBuildProjectFullPath)" Targets="_BuildDockerImage" Properties="Image=$(Image)" /> <MSBuild Projects="$(MSBuildProjectFullPath)" Targets="_BuildDockerImage" Properties="Image=$(Image)" />
<MSBuild Projects="$(MSBuildProjectFullPath)" Targets="_GenerateDeb" Properties="$(DebCommonProps);$(DebNonUpgradeableProps)" />
<MSBuild Projects="$(MSBuildProjectFullPath)" Targets="_GenerateDeb" Properties="$(DebCommonProps);$(DebProps)" /> <MSBuild Projects="$(MSBuildProjectFullPath)" Targets="_GenerateDeb" Properties="$(DebCommonProps);$(DebProps)" />
<!-- Remove Docker Image to save disk space --> <!-- Remove Docker Image to save disk space -->

3
build/repo.props
View File

@ -36,9 +36,6 @@
<NativeInstaller Include="x64" FileExt=".deb" /> <NativeInstaller Include="x64" FileExt=".deb" />
<NativeInstaller Include="x64" FileExt=".rpm" /> <NativeInstaller Include="x64" FileExt=".rpm" />
<NativeInstaller Include="rh.rhel.7-x64" FileExt=".rpm" /> <NativeInstaller Include="rh.rhel.7-x64" FileExt=".rpm" />
<NativeInstaller Include="x64-upgrade" FileExt=".deb" />
<NativeInstaller Include="x64-upgrade" FileExt=".rpm" />
<NativeInstaller Include="rh.rhel.7-x64-upgrade" FileExt=".rpm" />
<SharedFrameworkName Include="Microsoft.AspNetCore.All" /> <SharedFrameworkName Include="Microsoft.AspNetCore.All" />
<SharedFrameworkName Include="Microsoft.AspNetCore.App" /> <SharedFrameworkName Include="Microsoft.AspNetCore.App" />