Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Commit e60d0a7

Browse files
livarcocclivarcocc
committed
Making the CLI package name be only major.minor version and updating the version of the runtime packages that we depend on.
1 parent 5325210 commit e60d0a7

File tree

6 files changed

+49
-26
lines changed

6 files changed

+49
-26
lines changed

‎build/Package.targets‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<Import Project="$(MSBuildThisFileDirectory)/package/Symbols.targets" />
55
<Import Project="$(MSBuildThisFileDirectory)/package/Archive.targets" />
66
<Import Project="$(MSBuildThisFileDirectory)/package/Nupkg.targets" />
7+
<Import Project="$(MSBuildThisFileDirectory)/package/LinuxNativeInstallerDependencyVersions.targets" />
78
<Import Project="$(MSBuildThisFileDirectory)/package/Installer.DEB.proj" />
89
<Import Project="$(MSBuildThisFileDirectory)/package/Installer.MSI.targets" />
910
<Import Project="$(MSBuildThisFileDirectory)/package/Installer.PKG.targets" />

‎build/Version.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<VersionPatch>300</VersionPatch>
66
<ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">rtm</ReleaseSuffix>
77

8+
<MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
89
<CliVersionNoSuffix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</CliVersionNoSuffix>
910
<CliVersionPrefix>$(CliVersionNoSuffix)-$(ReleaseSuffix)</CliVersionPrefix>
1011
<CliBrandingVersion>$(CliVersionNoSuffix) - $(ReleaseSuffix)</CliBrandingVersion>

‎build/package/Installer.DEB.proj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,11 @@
9595

9696
<!-- Remove Shared Framework and Debian Packages -->
9797
<Exec Command="sudo dpkg -r $(SdkDebianPackageName)" />
98-
<Exec Command="sudo dpkg -r $(AspNetCoreSharedFxDebianPackageName)" />
99-
<Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" />
98+
<Exec Command="sudo dpkg -r $(AspNetCoreSharedFxDebianPackageFileName)" />
99+
<Exec Command="sudo dpkg -r $(SharedFxDebianPackageFileName)" />
100100
<Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" />
101101
<Exec Command="sudo dpkg -r $(HostDebianPackageName)" />
102-
<Exec Command="sudo dpkg -r $(RuntimeDepsPackageName)" />
102+
<Exec Command="sudo dpkg -r $(RuntimeDepsPackageFileName)" />
103103
</Target>
104104

105105
<Target Name="TestSdkDeb"
@@ -130,11 +130,11 @@
130130

131131
<!-- Clean up Packages -->
132132
<Exec Command="sudo dpkg -r $(SdkDebianPackageName)" />
133-
<Exec Command="sudo dpkg -r $(AspNetCoreSharedFxDebianPackageName)" />
134-
<Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" />
133+
<Exec Command="sudo dpkg -r $(AspNetCoreSharedFxDebianPackageFileName)" />
134+
<Exec Command="sudo dpkg -r $(SharedFxDebianPackageFileName)" />
135135
<Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" />
136136
<Exec Command="sudo dpkg -r $(HostDebianPackageName)" />
137-
<Exec Command="sudo dpkg -r $(RuntimeDepsPackageName)" />
137+
<Exec Command="sudo dpkg -r $(RuntimeDepsPackageFileName)" />
138138
</Target>
139139

140140
<Target Name="PrepareDotnetDebDirectories">

‎build/package/Installer.DEB.targets‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Target Name="SetupDebProps"
4-
DependsOnTargets="Init">
5-
<PropertyGroup>
6-
<SdkDebianPackageName>dotnet-sdk-$(SdkVersion)</SdkDebianPackageName>
7-
</PropertyGroup>
8-
4+
DependsOnTargets="Init;
5+
CalculateLinuxNativeInstallerDependencyVersions">
96
<!-- dotnet deb-tool -->
107
<PropertyGroup>
118
<DotnetDebToolDir>$(MSBuildThisFileDirectory)/dotnet-deb-tool-consumer</DotnetDebToolDir>
@@ -26,17 +23,22 @@
2623
<!-- Package Identities -->
2724
<PropertyGroup>
2825
<RuntimeDepsPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</RuntimeDepsPackageVersion>
29-
<RuntimeDepsPackageName>dotnet-runtime-deps-$(RuntimeDepsPackageVersion)</RuntimeDepsPackageName>
30-
<SdkDebianPackageVersion>$(SdkVersion)</SdkDebianPackageVersion>
26+
<RuntimeDepsPackageFileName>dotnet-runtime-deps-$(RuntimeDepsPackageVersion)</RuntimeDepsPackageFileName>
27+
<SdkDebianPackageVersion>$(MajorMinorVersion)</SdkDebianPackageVersion>
3128
<SdkDebianPackageName>dotnet-sdk-$(SdkDebianPackageVersion)</SdkDebianPackageName>
32-
<SharedFxDebianPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</SharedFxDebianPackageVersion>
29+
<SharedFxDebianPackageFileVersion>$(MicrosoftNETCoreAppPackageVersion)</SharedFxDebianPackageFileVersion>
30+
<SharedFxDebianPackageVersion>$(MicrosoftNETCoreAppMajorMinorVersion)</SharedFxDebianPackageVersion>
31+
<SharedFxDebianPackageFileName>dotnet-runtime-$(SharedFxDebianPackageFileVersion)</SharedFxDebianPackageFileName>
32+
<SharedFxDebianPackageFileName>$(SharedFxDebianPackageFileName.ToLower())</SharedFxDebianPackageFileName>
3333
<SharedFxDebianPackageName>dotnet-runtime-$(SharedFxDebianPackageVersion)</SharedFxDebianPackageName>
3434
<SharedFxDebianPackageName>$(SharedFxDebianPackageName.ToLower())</SharedFxDebianPackageName>
3535
<HostFxrDebianPackageVersion>$(HostFxrVersion)</HostFxrDebianPackageVersion>
3636
<HostFxrDebianPackageName>dotnet-hostfxr-$(HostFxrDebianPackageVersion)</HostFxrDebianPackageName>
3737
<HostFxrDebianPackageName>$(HostFxrDebianPackageName.ToLower())</HostFxrDebianPackageName>
3838
<HostDebianPackageName>dotnet-host</HostDebianPackageName>
39-
<AspNetCoreSharedFxDebianPackageName>aspnetcore-runtime-$(AspNetCoreVersion)</AspNetCoreSharedFxDebianPackageName>
39+
<AspNetCoreSharedFxDebianPackageFileName>aspnetcore-runtime-$(AspNetCoreVersion)</AspNetCoreSharedFxDebianPackageFileName>
40+
<AspNetCoreSharedFxDebianPackageFileName>$(AspNetCoreSharedFxDebianPackageFileName.ToLower())</AspNetCoreSharedFxDebianPackageFileName>
41+
<AspNetCoreSharedFxDebianPackageName>aspnetcore-runtime-$(AspNetCoreMajorMinorVersion)</AspNetCoreSharedFxDebianPackageName>
4042
<AspNetCoreSharedFxDebianPackageName>$(AspNetCoreSharedFxDebianPackageName.ToLower())</AspNetCoreSharedFxDebianPackageName>
4143
</PropertyGroup>
4244

@@ -99,7 +101,7 @@
99101
<ReplacementString></ReplacementString>
100102
</DebianConfigTokenValues>
101103
<DebianConfigTokenValues Include="%SDK_NUGET_VERSION%">
102-
<ReplacementString>$(SdkVersion)</ReplacementString>
104+
<ReplacementString>$(MajorMinorVersion)</ReplacementString>
103105
</DebianConfigTokenValues>
104106
<DebianConfigTokenValues Include="%CLI_SDK_BRAND_NAME%">
105107
<ReplacementString>$(SdkBrandName)</ReplacementString>

‎build/package/Installer.RPM.targets‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,13 @@
6868
<!-- Replace config json variables -->
6969
<ItemGroup>
7070
<SDKTokenValue Include="%SHARED_HOST_RPM_VERSION%">
71-
<ReplacementString>$(MicrosoftNETCoreAppPackageVersion)</ReplacementString>
71+
<ReplacementString>$(MicrosoftNETCoreAppMajorMinorVersion)</ReplacementString>
7272
</SDKTokenValue>
7373
<SDKTokenValue Include="%ASPNETCORE_SHAREDFX_RPM_PACKAGE_NAME%">
7474
<ReplacementString>$(AspNetCoreSharedFxRpmPackageName)</ReplacementString>
7575
</SDKTokenValue>
7676
<SDKTokenValue Include="%ASPNETCORE_SHAREDFX_RPM_PACKAGE_VERSION%">
77-
<ReplacementString>$(AspNetCoreVersion)</ReplacementString>
77+
<ReplacementString>$(AspNetCoreMajorMinorVersion)</ReplacementString>
7878
</SDKTokenValue>
7979
<SDKTokenValue Include="%SHARED_HOST_RPM_NAME%">
8080
<ReplacementString>$(SharedFxRpmPackageName)</ReplacementString>
@@ -143,10 +143,10 @@
143143

144144
</Target>
145145

146-
<Target Name="SetupRpmProps">
146+
<Target Name="SetupRpmProps" DependsOnTargets="CalculateLinuxNativeInstallerDependencyVersions">
147147
<PropertyGroup>
148148
<RuntimeDepsPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</RuntimeDepsPackageVersion>
149-
<RuntimeDepsPackageName>dotnet-runtime-deps-$(RuntimeDepsPackageVersion)</RuntimeDepsPackageName>
149+
<RuntimeDepsPackageFileName>dotnet-runtime-deps-$(RuntimeDepsPackageVersion)</RuntimeDepsPackageFileName>
150150
<RpmPackageVersion>$(SdkVersion)</RpmPackageVersion>
151151
<InputRoot>$(OutputDirectory)/sdk</InputRoot>
152152
<SdkInstallerFile>$(InstallerOutputDirectory)/$(DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension)</SdkInstallerFile>
@@ -168,17 +168,22 @@
168168
</PropertyGroup>
169169

170170
<PropertyGroup>
171-
<SdkRpmPackageVersion>$(SdkVersion)</SdkRpmPackageVersion>
171+
<SdkRpmPackageVersion>$(MajorMinorVersion)</SdkRpmPackageVersion>
172172
<SdkRpmPackageName>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkRpmPackageVersion)</SdkRpmPackageName>
173-
<SharedFxRpmPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</SharedFxRpmPackageVersion>
173+
<SharedFxRpmPackageVersion>$(MicrosoftNETCoreAppMajorMinorVersion)</SharedFxRpmPackageVersion>
174+
<SharedFxRpmPackageFileVersion>$(MicrosoftNETCoreAppPackageVersion)</SharedFxRpmPackageFileVersion>
174175
<SharedFxRpmPackageName>dotnet-runtime-$(SharedFxRpmPackageVersion)</SharedFxRpmPackageName>
175176
<SharedFxRpmPackageName>$(SharedFxRpmPackageName.ToLower())</SharedFxRpmPackageName>
177+
<SharedFxRpmPackageFileName>dotnet-runtime-$(SharedFxRpmPackageFileVersion)</SharedFxRpmPackageFileName>
178+
<SharedFxRpmPackageFileName>$(SharedFxRpmPackageFileName.ToLower())</SharedFxRpmPackageFileName>
176179
<HostFxrRpmPackageVersion>$(HostFxrVersion)</HostFxrRpmPackageVersion>
177180
<HostFxrRpmPackageName>dotnet-hostfxr-$(HostFxrRpmPackageVersion)</HostFxrRpmPackageName>
178181
<HostFxrRpmPackageName>$(HostFxrRpmPackageName.ToLower())</HostFxrRpmPackageName>
179182
<HostRpmPackageName>dotnet-host</HostRpmPackageName>
180-
<AspNetCoreSharedFxRpmPackageName>aspnetcore-runtime-$(AspNetCoreVersion)</AspNetCoreSharedFxRpmPackageName>
183+
<AspNetCoreSharedFxRpmPackageName>aspnetcore-runtime-$(AspNetCoreMajorMinorVersion)</AspNetCoreSharedFxRpmPackageName>
181184
<AspNetCoreSharedFxRpmPackageName>$(AspNetCoreSharedFxRpmPackageName.ToLower())</AspNetCoreSharedFxRpmPackageName>
185+
<AspNetCoreSharedFxRpmPackageFileName>aspnetcore-runtime-$(AspNetCoreVersion)</AspNetCoreSharedFxRpmPackageFileName>
186+
<AspNetCoreSharedFxRpmPackageFileName>$(AspNetCoreSharedFxRpmPackageFileName.ToLower())</AspNetCoreSharedFxRpmPackageFileName>
182187
<AfterInstallHostScriptTemplateFile>$(ScriptsDir)/$(AfterInstallHostScriptName)</AfterInstallHostScriptTemplateFile>
183188
<AfterInstallHostScriptDestinationFile>$(RpmLayoutScripts)/$(AfterInstallHostScriptName)</AfterInstallHostScriptDestinationFile>
184189
</PropertyGroup>
@@ -238,10 +243,10 @@
238243
<!-- Clean up Packages -->
239244
<Exec Command="sudo yum remove -y $(SdkRpmPackageName)" />
240245

241-
<Exec Command="sudo yum remove -y $(AspNetCoreSharedFxRpmPackageName)" />
242-
<Exec Command="sudo yum remove -y $(SharedFxRpmPackageName)" />
246+
<Exec Command="sudo yum remove -y $(AspNetCoreSharedFxRpmPackageFileName)" />
247+
<Exec Command="sudo yum remove -y $(SharedFxRpmPackageFileName)" />
243248
<Exec Command="sudo yum remove -y $(HostFxrRpmPackageName)" />
244249
<Exec Command="sudo yum remove -y $(HostRpmPackageName)" />
245-
<Exec Command="sudo yum remove -y $(RuntimeDepsPackageName)" />
250+
<Exec Command="sudo yum remove -y $(RuntimeDepsPackageFileName)" />
246251
</Target>
247252
</Project>

‎build/package/LinuxNativeInstallerDependencyVersions.targets‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="14.0" DefaultTargets="Layout" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Target Name="CalculateLinuxNativeInstallerDependencyVersions">
4+
<PropertyGroup>
5+
<MicrosoftNETCoreAppPatchSeparatorIndex>$([MSBuild]::Add($(MicrosoftNETCoreAppPackageVersion.IndexOf('.')), 1))</MicrosoftNETCoreAppPatchSeparatorIndex>
6+
<MicrosoftNETCoreAppPatchSeparatorIndex>$(MicrosoftNETCoreAppPackageVersion.IndexOf('.', $(MicrosoftNETCoreAppPatchSeparatorIndex)))</MicrosoftNETCoreAppPatchSeparatorIndex>
7+
<MicrosoftNETCoreAppMajorMinorVersion>$(MicrosoftNETCoreAppPackageVersion.Substring(0, $(MicrosoftNETCoreAppPatchSeparatorIndex)))</MicrosoftNETCoreAppMajorMinorVersion>
8+
9+
<AspNetCoreVersionPatchSeparatorIndex>$([MSBuild]::Add($(AspNetCoreVersion.IndexOf('.')), 1))</AspNetCoreVersionPatchSeparatorIndex>
10+
<AspNetCoreVersionPatchSeparatorIndex>$(AspNetCoreVersion.IndexOf('.', $(AspNetCoreVersionPatchSeparatorIndex)))</AspNetCoreVersionPatchSeparatorIndex>
11+
<AspNetCoreMajorMinorVersion>$(AspNetCoreVersion.Substring(0, $(AspNetCoreVersionPatchSeparatorIndex)))</AspNetCoreMajorMinorVersion>
12+
</PropertyGroup>
13+
</Target>
14+
</Project>

0 commit comments

Comments
 (0)