projects / platform / upstream / dotnet / runtime.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b585cef)
Fix typo
authorRakesh Ranjan Singh <raksingh@microsoft.com>
Wed, 11 Apr 2018 22:47:03 +0000 (15:47 -0700)
committerRakesh Ranjan Singh <raksingh@microsoft.com>
Thu, 12 Apr 2018 01:17:54 +0000 (18:17 -0700)
Commit migrated from https://github.com/dotnet/core-setup/commit/320217e5afbd123ee40ae39d0c1bc376ad76b904

src/installer/pkg/packaging/deb/package.props patch | blob | history
src/installer/pkg/packaging/rpm/package.targets patch | blob | history

diff --git a/src/installer/pkg/packaging/deb/package.props b/src/installer/pkg/packaging/deb/package.props
index 0f3022f..4afc479 100644 (file)
--- a/src/installer/pkg/packaging/deb/package.props
+++ b/src/installer/pkg/packaging/deb/package.props
@@ -10,7 +10,7 @@
   <PropertyGroup Condition="'$(BuildUpgradeableLinuxPackages)' == 'true' AND '$(InstallerExtension)' == '.deb'">
     
     <HostPackageVersion Condition="'$(UseShippedHostPackage)' != 'true'">$(ProductionVersion)</HostPackageVersion>
-    <HostPackageRelease Condition="'$(IncludePreReleaseLabelInPackageVersion)' == 'true'">~$(VersionSuffix)</HostPackageReleaseVersion>
+    <HostPackageRelease Condition="'$(IncludePreReleaseLabelInPackageVersion)' == 'true'">~$(VersionSuffix)</HostPackageRelease>
     
     <HostResolverPackageVersion Condition="'$(UseShippedHostResolverPackage)' != 'true'">$(ProductionVersion)</HostResolverPackageVersion>
     <HostResolverPackageRelease Condition="'$(IncludePreReleaseLabelInPackageVersion)' == 'true'">~$(VersionSuffix)</HostResolverPackageRelease>
diff --git a/src/installer/pkg/packaging/rpm/package.targets b/src/installer/pkg/packaging/rpm/package.targets
index 65497b8..1e8e735 100644 (file)
--- a/src/installer/pkg/packaging/rpm/package.targets
+++ b/src/installer/pkg/packaging/rpm/package.targets
@@ -339,12 +339,11 @@
       <RuntimeDependenciesTokenValue Include="%RUNTIME_DEPS_VERSION%">
         <ReplacementString>$(RuntimeDepsRpmPackageVersion)</ReplacementString> 
       </RuntimeDependenciesTokenValue>
-      <SharedFrameworkTokenValue Include="%RUNTIME_DEPS_REVISION%">
+      <RuntimeDependenciesTokenValue Include="%RUNTIME_DEPS_REVISION%">
         <ReplacementString>$(RuntimeDepsRpmPackageRelease)</ReplacementString>
-      </SharedFrameworkTokenValue>
-    </ItemGroup>
+      </RuntimeDependenciesTokenValue>
     </ItemGroup>
-
+    
     <ReplaceFileContents InputFile="$(ConfigJsonFile)"
                          DestinationFile="$(RpmLayoutDirectory)$(rpmConfigJsonName)"
                          ReplacementItems="@(RuntimeDependenciesTokenValue)" />
Domain: Dotnet / Core;