diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c2a542b5fc6307..491ea7d9159e84 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -62,7 +62,7 @@ https://github.com/dotnet/arcade 2e26f9ebee3ac27803aa5f2df50192a46393d108 - + https://github.com/dotnet/arcade 2e26f9ebee3ac27803aa5f2df50192a46393d108 diff --git a/global.json b/global.json index eaf5a9021e28ab..5af2beb97853f2 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "msbuild-sdks": { "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.21427.7", "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21427.7", - "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.21427.7", + "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.21473.2", "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21427.7", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4", diff --git a/src/installer/Directory.Build.targets b/src/installer/Directory.Build.targets index 7a859d808b2295..3b9bafe29f0c0e 100644 --- a/src/installer/Directory.Build.targets +++ b/src/installer/Directory.Build.targets @@ -190,6 +190,13 @@ $(SharedFrameworkInstallerStart)$(SharedFrameworkNugetVersion)-$(TargetArchitecture)$(InstallerExtension) + + <_CblMarinerVersionSuffix>cm.1 + $(SharedHostInstallerStart)$(SharedFrameworkNugetVersion)-$(_CblMarinerVersionSuffix)-$(TargetArchitecture)$(InstallerExtension) + $(HostFxrInstallerStart)$(HostResolverVersion)-$(_CblMarinerVersionSuffix)-$(TargetArchitecture)$(InstallerExtension) + $(SharedFrameworkInstallerStart)$(SharedFrameworkNugetVersion)-$(_CblMarinerVersionSuffix)-$(TargetArchitecture)$(InstallerExtension) + + $(DotnetRuntimeDependenciesPackageInstallerStart)$(SharedFrameworkNugetVersion)-$(TargetArchitecture)$(InstallerExtension) diff --git a/src/installer/pkg/packaging/rpm/package.targets b/src/installer/pkg/packaging/rpm/package.targets index 85cbbb5795fa68..8bd6d8e0a18c80 100644 --- a/src/installer/pkg/packaging/rpm/package.targets +++ b/src/installer/pkg/packaging/rpm/package.targets @@ -27,6 +27,7 @@ $(HostPackageVersion) $(SharedHostPublishRoot) $(SharedHostInstallerFile) + $(SharedHostInstallerFileCblMariner) dotnet-sharedhost-rpm_config.json $(rpmPackagingConfigPath)$(ConfigJsonName) $(PackagesIntermediateDir)$(RpmPackageName)/$(RpmPackageVersion) @@ -122,6 +123,12 @@ SkipUnchangedFiles="False" UseHardlinksIfPossible="False" /> + +