diff --git a/build/SharedFx.props b/build/SharedFx.props
index 4b9509a288..1176ef7828 100644
--- a/build/SharedFx.props
+++ b/build/SharedFx.props
@@ -41,7 +41,7 @@
$(DotnetRuntimePackageName)-$(MicrosoftNETCoreApp21PackageVersion)
2.1
$(MicrosoftNETCoreApp21PackageVersion.Split('-')[0])
- $(DotnetRuntimePackageName)-$(MicrosoftNETCoreApp21IdVersion)
+ $(DotnetRuntimePackageName)-$(MicrosoftNETCoreApp21IdVersion)
$(DotNetAssetRootUrl)Runtime/$(MicrosoftNETCoreApp21PackageVersion)/$(DotnetRuntimeInstallerPrefix)
$(_SharedFxSourceDir)$(SharedFxIntermediateArchiveBaseName)-$(PackageVersion)
diff --git a/build/SharedFxInstaller.targets b/build/SharedFxInstaller.targets
index edd3b61bac..cddf29df0f 100644
--- a/build/SharedFxInstaller.targets
+++ b/build/SharedFxInstaller.targets
@@ -148,17 +148,13 @@
-
-
+
- @(RpmNonUpgradeableSharedFxDependencies->' -d "%(Identity) >= %(Version)"', ' ')
@(RpmSharedFxDependencies->' -d "%(Identity) >= %(Version)"', ' ')
- $(RpmNonUpgradeableSharedFxArguments) @(RpmRHSharedFxDirectories->' --directories "%(FullPath)"', ' ')
- $(RpmNonUpgradeableSharedFxArguments) @(RpmGenericSharedFxDirectories->' --directories "%(FullPath)"', ' ')
$(RpmSharedFxArguments) @(RpmRHSharedFxDirectories->' --directories "%(FullPath)"', ' ')
$(RpmSharedFxArguments) @(RpmGenericSharedFxDirectories->' --directories "%(FullPath)"', ' ')
@@ -170,24 +166,15 @@
$(RpmCommonProps);RpmMSummary=$(SharedFxSummary);RpmDescription=$(SharedFxDescription)
RpmInstallRoot=$(InstallRoot)
RpmInstallRoot=$(RHInstallRoot)
- RpmIdVersion=$(PackageVersion);RpmPackageVersion=$(PackageVersion);RpmFileVersion=$(PackageVersion)
- RpmIdVersion=$(InstallerIdVersion);RpmPackageVersion=$(InstallerPackageVersion);RpmFileVersion=$(PackageVersion);RpmUpgradeableSuffix=-upgradeable
+ RpmIdVersion=$(InstallerIdVersion);RpmPackageVersion=$(InstallerPackageVersion);RpmFileVersion=$(PackageVersion)
- $(RpmCommonProps);$(RpmGenericProps);$(RpmNonUpgradeableProps);RpmArguments=$(RpmNonUpgradeableGenericSharedFxArguments);RpmFileSuffix=x64.rpm
- $(RpmCommonProps);$(RpmRHProps);$(RpmNonUpgradeableProps);RpmArguments=$(RpmNonUpgradeableRHSharedFxArguments);RpmFileSuffix=rh.rhel.7-x64.rpm
- $(RpmCommonProps);$(RpmGenericProps);$(RpmProps);RpmArguments=$(RpmGenericSharedFxArguments);RpmFileSuffix=x64-upgrade.rpm
- $(RpmCommonProps);$(RpmRHProps);$(RpmProps);RpmArguments=$(RpmRHSharedFxArguments);RpmFileSuffix=rh.rhel.7-x64-upgrade.rpm
+ $(RpmCommonProps);$(RpmGenericProps);$(RpmProps);RpmArguments=$(RpmGenericSharedFxArguments);RpmFileSuffix=x64.rpm
+ $(RpmCommonProps);$(RpmRHProps);$(RpmProps);RpmArguments=$(RpmRHSharedFxArguments);RpmFileSuffix=rh.rhel.7-x64.rpm
-
-
-
-
-
-
@@ -250,7 +237,7 @@
- <_DebNonUpgradeableSharedFxDependencies Include="$(DotnetRuntimeInstallerPrefix)"/>
- <_DebSharedFxDependencies Include="$(DotnetRuntimeUpgradeableInstallerPrefix)" Version="$(NETCoreApp21DebVersion)"/>
+ <_DebSharedFxDependencies Include="$(DotnetRuntimeInstallerPrefix)" Version="$(NETCoreApp21DebVersion)"/>
ubuntu.14.04
- @(_DebNonUpgradeableSharedFxDependencies->'"%(Identity)": { }', ', ')
@(_DebSharedFxDependencies->'"%(Identity)": { "package_version": "%(Version)" }', ', ')
Image=$(Image);DebPrefix=$(SharedFxInstallerName)
$(DebCommonProps);DebSummary=$(SharedFxSummary);DebDescription=$(SharedFxDescription)
$(DebCommonProps);SharedFxArchive=$(SharedFxIntermediateArchiveFilePrefix)-linux-x64.tar.gz
- DebIdVersion=$(PackageVersion);DebPackageVersion=$(PackageVersion);DebFileVersion=$(PackageVersion);DebDependencies=$(DebNonUpgradeableSharedFxDependencies)
- DebIdVersion=$(InstallerIdVersion);DebPackageVersion=$(DebInstallerPackageVersion);DebFileVersion=$(PackageVersion);DebDependencies=$(DebSharedFxDependencies);DebUpgradeSuffix=-upgrade
+ DebIdVersion=$(InstallerIdVersion);DebPackageVersion=$(DebInstallerPackageVersion);DebFileVersion=$(PackageVersion);DebDependencies=$(DebSharedFxDependencies)
-
diff --git a/build/repo.props b/build/repo.props
index 296beb9480..eab83a9e31 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -36,9 +36,6 @@
-
-
-