Runtime package should exhibits dependency on Runtime-deps .

Commit migrated from https://github.com/dotnet/core-setup/commit/798da4c5daeba5939ef806b0640afeb3d076c620

diff --git a/src/installer/pkg/packaging/deb/dotnet-hostfxr-debian_config.json b/src/installer/pkg/packaging/deb/dotnet-hostfxr-debian_config.json
index 77f620e..bee1226 100644 (file)
--- a/src/installer/pkg/packaging/deb/dotnet-hostfxr-debian_config.json
+++ b/src/installer/pkg/packaging/deb/dotnet-hostfxr-debian_config.json
@@ -31,6 +31,9 @@
     "debian_dependencies":{
         "dotnet-host" : {
             "package_version": "%SHARED_HOST_DEBIAN_VERSION%"
-        }
+        },
+        "libc6":{},
+        "libgcc1":{},
+        "libstdc++6":{}
     }
 }

diff --git a/src/installer/pkg/packaging/deb/dotnet-sharedframework-debian_config.json b/src/installer/pkg/packaging/deb/dotnet-sharedframework-debian_config.json
index 848d5bb..8620eb6 100644 (file)
--- a/src/installer/pkg/packaging/deb/dotnet-sharedframework-debian_config.json
+++ b/src/installer/pkg/packaging/deb/dotnet-sharedframework-debian_config.json
@@ -31,6 +31,9 @@
     "debian_dependencies":{
         "%HOSTFXR_DEBIAN_PACKAGE_NAME%" : {
            "package_version": "%HOSTFXR_NUGET_VERSION%"
-         }
+         },
+         "%RUNTIME_DEPS_DEBIAN_PACKAGE_NAME%" : {
+            "package_version": "%RUNTIME_DEPS_VERSION%"
+        } 
     }
 }

diff --git a/src/installer/pkg/packaging/deb/dotnet-sharedhost-debian_config.json b/src/installer/pkg/packaging/deb/dotnet-sharedhost-debian_config.json
index 923fe17..c9d613b 100644 (file)
--- a/src/installer/pkg/packaging/deb/dotnet-sharedhost-debian_config.json
+++ b/src/installer/pkg/packaging/deb/dotnet-sharedhost-debian_config.json
@@ -29,9 +29,9 @@
     },
 
     "debian_dependencies":{
-        "%RUNTIME_DEPS_DEBIAN_PACKAGE_NAME%" : {
-            "package_version": "%RUNTIME_DEPS_VERSION%"
-        } 
+        "libc6":{},
+        "libgcc1":{},
+        "libstdc++6":{}
      },
 
     "package_conflicts" : [

diff --git a/src/installer/pkg/packaging/deb/package.targets b/src/installer/pkg/packaging/deb/package.targets
index 6411891..44f97ab 100644 (file)
--- a/src/installer/pkg/packaging/deb/package.targets
+++ b/src/installer/pkg/packaging/deb/package.targets
@@ -96,12 +96,6 @@
       <SharedHostTokenValue Include="%SHARED_HOST_BRAND_NAME%">
         <ReplacementString>$(SharedHostBrandName)</ReplacementString>
       </SharedHostTokenValue>
-     <SharedHostTokenValue Include="%RUNTIME_DEPS_DEBIAN_PACKAGE_NAME%">
-        <ReplacementString>$(RuntimeDependenciesDebPkgName)</ReplacementString>
-      </SharedHostTokenValue>
-      <SharedHostTokenValue Include="%RUNTIME_DEPS_VERSION%">
-        <ReplacementString>$(RuntimeDepsDebVersion)</ReplacementString>
-      </SharedHostTokenValue>
     </ItemGroup>
 
     <ReplaceFileContents InputFile="$(ConfigJsonFile)"
@@ -261,6 +255,12 @@
       <SharedFrameworkTokenValue Include="%SHARED_FRAMEWORK_BRAND_NAME%">
         <ReplacementString>$(SharedFrameworkBrandName)</ReplacementString>
       </SharedFrameworkTokenValue>
+      <SharedFrameworkTokenValue Include="%RUNTIME_DEPS_DEBIAN_PACKAGE_NAME%">
+        <ReplacementString>$(RuntimeDependenciesDebPkgName)</ReplacementString>
+      </SharedFrameworkTokenValue>
+      <SharedFrameworkTokenValue Include="%RUNTIME_DEPS_VERSION%">
+        <ReplacementString>$(RuntimeDepsDebVersion)</ReplacementString>
+      </SharedFrameworkTokenValue>
     </ItemGroup>
 
     <ReplaceFileContents InputFile="$(ConfigJsonFile)"

diff --git a/src/installer/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json b/src/installer/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json
index acde507..1a6d698 100644 (file)
--- a/src/installer/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json
+++ b/src/installer/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json
@@ -33,7 +33,11 @@
   "rpm_dependencies": [{
       "package_name": "%HOSTFXR_RPM_PACKAGE_NAME%",
       "package_version": "%HOSTFXR_NUGET_VERSION%"
-    }],
+      },
+      {
+       "package_name": "%RUNTIME_DEPS_RPM_PACKAGE_NAME%",
+       "package_version": "%RUNTIME_DEPS_VERSION%"
+      }],
    
     "directories" : [
         "/usr/share/dotnet/shared",

diff --git a/src/installer/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json b/src/installer/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json
index 7f95e65..eda4b67 100644 (file)
--- a/src/installer/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json
+++ b/src/installer/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json
@@ -35,11 +35,6 @@
         "dotnet",
         "dotnet-nightly"
     ],
-    
-    "rpm_dependencies": [{
-        "package_name": "%RUNTIME_DEPS_RPM_PACKAGE_NAME%",
-        "package_version": "%RUNTIME_DEPS_VERSION%"
-    }],
 
     "directories" : [
         "/usr/share/dotnet",

diff --git a/src/installer/pkg/packaging/rpm/package.targets b/src/installer/pkg/packaging/rpm/package.targets
index c1b14b7..111aeea 100644 (file)
--- a/src/installer/pkg/packaging/rpm/package.targets
+++ b/src/installer/pkg/packaging/rpm/package.targets
@@ -72,12 +72,6 @@
       <SharedHostTokenValue Include="%SHARED_HOST_BRAND_NAME%">
         <ReplacementString>$(SharedHostBrandName)</ReplacementString>
       </SharedHostTokenValue>
-      <SharedHostTokenValue Include="%RUNTIME_DEPS_RPM_PACKAGE_NAME%">
-        <ReplacementString>$(RuntimeDependenciesRpmPkgName)</ReplacementString>
-      </SharedHostTokenValue>
-      <SharedHostTokenValue Include="%RUNTIME_DEPS_VERSION%">
-        <ReplacementString>$(RuntimeDepsRpmVersion)</ReplacementString> 
-      </SharedHostTokenValue>
     </ItemGroup>
 
     <ReplaceFileContents InputFile="$(ConfigJsonFile)"
@@ -240,6 +234,12 @@
       <SharedFrameworkTokenValue Include="%HOSTFXR_NUGET_VERSION%">
         <ReplacementString>$(HostResolverVersion)</ReplacementString>
       </SharedFrameworkTokenValue>
+      <SharedFrameworkTokenValue Include="%RUNTIME_DEPS_RPM_PACKAGE_NAME%">
+        <ReplacementString>$(RuntimeDependenciesRpmPkgName)</ReplacementString>
+      </SharedFrameworkTokenValue>
+      <SharedFrameworkTokenValue Include="%RUNTIME_DEPS_VERSION%">
+        <ReplacementString>$(RuntimeDepsRpmVersion)</ReplacementString> 
+      </SharedFrameworkTokenValue>
       <SharedFrameworkTokenValue Include="%SHARED_FRAMEWORK_RPM_PACKAGE_NAME%">
         <ReplacementString>$(SharedFxRpmPkgName)</ReplacementString>
       </SharedFrameworkTokenValue>