diff --git a/build/Package.targets b/build/Package.targets index 77ea2aa33..cbb5d7152 100644 --- a/build/Package.targets +++ b/build/Package.targets @@ -4,6 +4,7 @@ + diff --git a/build/Version.props b/build/Version.props index a93a8486c..c0ef71eeb 100644 --- a/build/Version.props +++ b/build/Version.props @@ -5,6 +5,7 @@ 300 rtm + $(VersionMajor).$(VersionMinor) $(VersionMajor).$(VersionMinor).$(VersionPatch) $(CliVersionNoSuffix)-$(ReleaseSuffix) $(CliVersionNoSuffix) - $(ReleaseSuffix) diff --git a/build/package/Installer.DEB.proj b/build/package/Installer.DEB.proj index 0e516f440..3b1ad6e6e 100644 --- a/build/package/Installer.DEB.proj +++ b/build/package/Installer.DEB.proj @@ -95,11 +95,11 @@ - - + + - + - - + + - + diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets index a3800edce..bf4cde6f3 100644 --- a/build/package/Installer.DEB.targets +++ b/build/package/Installer.DEB.targets @@ -1,11 +1,8 @@ - - dotnet-sdk-$(SdkVersion) - - + DependsOnTargets="Init; + CalculateLinuxNativeInstallerDependencyVersions"> $(MSBuildThisFileDirectory)/dotnet-deb-tool-consumer @@ -26,17 +23,22 @@ $(MicrosoftNETCoreAppPackageVersion) - dotnet-runtime-deps-$(RuntimeDepsPackageVersion) - $(SdkVersion) + dotnet-runtime-deps-$(RuntimeDepsPackageVersion) + $(MajorMinorVersion) dotnet-sdk-$(SdkDebianPackageVersion) - $(MicrosoftNETCoreAppPackageVersion) + $(MicrosoftNETCoreAppPackageVersion) + $(MicrosoftNETCoreAppMajorMinorVersion) + dotnet-runtime-$(SharedFxDebianPackageFileVersion) + $(SharedFxDebianPackageFileName.ToLower()) dotnet-runtime-$(SharedFxDebianPackageVersion) $(SharedFxDebianPackageName.ToLower()) $(HostFxrVersion) dotnet-hostfxr-$(HostFxrDebianPackageVersion) $(HostFxrDebianPackageName.ToLower()) dotnet-host - aspnetcore-runtime-$(AspNetCoreVersion) + aspnetcore-runtime-$(AspNetCoreVersion) + $(AspNetCoreSharedFxDebianPackageFileName.ToLower()) + aspnetcore-runtime-$(AspNetCoreMajorMinorVersion) $(AspNetCoreSharedFxDebianPackageName.ToLower()) @@ -99,7 +101,7 @@ - $(SdkVersion) + $(MajorMinorVersion) $(SdkBrandName) diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets index 4fbc87067..820d1f2cd 100644 --- a/build/package/Installer.RPM.targets +++ b/build/package/Installer.RPM.targets @@ -68,13 +68,13 @@ - $(MicrosoftNETCoreAppPackageVersion) + $(MicrosoftNETCoreAppMajorMinorVersion) $(AspNetCoreSharedFxRpmPackageName) - $(AspNetCoreVersion) + $(AspNetCoreMajorMinorVersion) $(SharedFxRpmPackageName) @@ -143,10 +143,10 @@ - + $(MicrosoftNETCoreAppPackageVersion) - dotnet-runtime-deps-$(RuntimeDepsPackageVersion) + dotnet-runtime-deps-$(RuntimeDepsPackageVersion) $(SdkVersion) $(OutputDirectory)/sdk $(InstallerOutputDirectory)/$(DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension) @@ -168,17 +168,22 @@ - $(SdkVersion) + $(MajorMinorVersion) $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkRpmPackageVersion) - $(MicrosoftNETCoreAppPackageVersion) + $(MicrosoftNETCoreAppMajorMinorVersion) + $(MicrosoftNETCoreAppPackageVersion) dotnet-runtime-$(SharedFxRpmPackageVersion) $(SharedFxRpmPackageName.ToLower()) + dotnet-runtime-$(SharedFxRpmPackageFileVersion) + $(SharedFxRpmPackageFileName.ToLower()) $(HostFxrVersion) dotnet-hostfxr-$(HostFxrRpmPackageVersion) $(HostFxrRpmPackageName.ToLower()) dotnet-host - aspnetcore-runtime-$(AspNetCoreVersion) + aspnetcore-runtime-$(AspNetCoreMajorMinorVersion) $(AspNetCoreSharedFxRpmPackageName.ToLower()) + aspnetcore-runtime-$(AspNetCoreVersion) + $(AspNetCoreSharedFxRpmPackageFileName.ToLower()) $(ScriptsDir)/$(AfterInstallHostScriptName) $(RpmLayoutScripts)/$(AfterInstallHostScriptName) @@ -238,10 +243,10 @@ - - + + - + diff --git a/build/package/LinuxNativeInstallerDependencyVersions.targets b/build/package/LinuxNativeInstallerDependencyVersions.targets new file mode 100644 index 000000000..a2be36efb --- /dev/null +++ b/build/package/LinuxNativeInstallerDependencyVersions.targets @@ -0,0 +1,14 @@ + + + + + $([MSBuild]::Add($(MicrosoftNETCoreAppPackageVersion.IndexOf('.')), 1)) + $(MicrosoftNETCoreAppPackageVersion.IndexOf('.', $(MicrosoftNETCoreAppPatchSeparatorIndex))) + $(MicrosoftNETCoreAppPackageVersion.Substring(0, $(MicrosoftNETCoreAppPatchSeparatorIndex))) + + $([MSBuild]::Add($(AspNetCoreVersion.IndexOf('.')), 1)) + $(AspNetCoreVersion.IndexOf('.', $(AspNetCoreVersionPatchSeparatorIndex))) + $(AspNetCoreVersion.Substring(0, $(AspNetCoreVersionPatchSeparatorIndex))) + + +