From 0f52aed34c765c54fbb7affad075313ae2390e2f Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Thu, 3 Oct 2019 10:33:20 -0700 Subject: [PATCH 1/2] Prepare for 3.0.1xx servicing We were bumping targeting pack, framework-dependent default runtime version, and self-contained default (latest) runtime version in unison. This only works for previews where these versions are all the same always. Now that we're servicing 3.0, we: 1. Pin targeting packs to 3.0.0 2. Fix default framework-dependent runtime version at 3.0.0 This change also: * Removes dependencies on legacy/internal netcoreapp packages. We now use Microsoft.NETCore.App.Internal version exclusively to calculate the blob storage path for core-setup. * Uses PackageDownload for all templates, including latest. PackageReference had been used for latest only because it hid another bug with the netcoreapp reference of redist.csproj that is fixed here. That reference is now a FrameworkReference as it should be. * Removes a bunch of shenanigans from GenerateBundledVersions.props that were causing issues with above. One casualty of that is that we hard code the RID lists for runtime pack, which I don't think is too bad, and actually will make it easier to merge in source build patches. * Cleans up how runtime and targeting pack versions are referenced throughout, removing incorrect assumptions about them being the same. * Incorporates a prior closed PR to use suffixed version for blob storage, even when assets coming from blob storage are stabilized. It needed changes to merge with this. Note: * A similar theoretical servicing issue exists for the versions of apphost, hostfxr, shared host, which are still assumed to be the same as the runtime version in several places. If we choose to service those independently, more work is required. * There will be a 3.0.1 ASP.NET targeting pack, and so we will have to unpin that once it is ready. This change establishes the baseline of all targeting packs being pinnned, and they can be unpinned in the (hopefully rare) cases where they need to be serviced. --- eng/Version.Details.xml | 54 ++++---- eng/Versions.props | 48 ++++--- eng/configure-toolset.ps1 | 4 + eng/configure-toolset.sh | 3 + ...tLinuxNativeInstallerDependencyVersions.cs | 43 ++++++ src/redist/redist.csproj | 9 +- src/redist/targets/Branding.targets | 8 +- src/redist/targets/BuildCoreSdkTasks.targets | 1 + src/redist/targets/BundledTemplates.targets | 16 ++- src/redist/targets/Crossgen.targets | 16 +-- .../targets/GenerateBundledVersions.targets | 122 +++++++----------- src/redist/targets/GenerateDebs.targets | 24 ++-- src/redist/targets/GenerateLayout.targets | 96 +++++++------- src/redist/targets/GenerateMSIs.targets | 6 +- src/redist/targets/GeneratePKG.targets | 8 +- src/redist/targets/GenerateRPMs.targets | 20 ++- ...xNativeInstallerDependencyVersions.targets | 57 ++++---- .../packaging/deb/dotnet-debian_config.json | 4 +- .../targets/packaging/rpm/dotnet-config.json | 4 +- 19 files changed, 289 insertions(+), 254 deletions(-) create mode 100644 eng/configure-toolset.ps1 create mode 100644 eng/configure-toolset.sh create mode 100644 src/core-sdk-tasks/GetLinuxNativeInstallerDependencyVersions.cs diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 274e3efb5..1087b48b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,45 +1,47 @@ - - + + https://github.com/dotnet/core-setup - 0bdbe6b3a7caf32a4f594196effe56a941980d7b + 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - 0bdbe6b3a7caf32a4f594196effe56a941980d7b + 93abb6b3a675b44ee35698d9640a42779b18e004 - + + https://github.com/dotnet/core-setup - 0bdbe6b3a7caf32a4f594196effe56a941980d7b + 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - 0bdbe6b3a7caf32a4f594196effe56a941980d7b + 93abb6b3a675b44ee35698d9640a42779b18e004 - + https://github.com/dotnet/core-setup - 0bdbe6b3a7caf32a4f594196effe56a941980d7b + 93abb6b3a675b44ee35698d9640a42779b18e004 - + https://github.com/dotnet/core-setup - 0bdbe6b3a7caf32a4f594196effe56a941980d7b + 93abb6b3a675b44ee35698d9640a42779b18e004 - + https://github.com/dotnet/core-setup - 0bdbe6b3a7caf32a4f594196effe56a941980d7b + 93abb6b3a675b44ee35698d9640a42779b18e004 - + + https://github.com/dotnet/core-setup - 0bdbe6b3a7caf32a4f594196effe56a941980d7b + 7d57652f33493fa022125b7f63aad0d70c52d810 - - + https://github.com/dotnet/corefx 54d63c3e283e0c3937a35ab4e99f391c84ff119e - + + https://github.com/aspnet/AspNetCore aee5e4080331553ea9dfb7fb388b6d72f715bf6a @@ -67,24 +69,24 @@ https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - d62b7c37ab654e5019131ec3c0418d0a23639a31 + 78da18674ad084d58311d36b5354925a8bef62fc https://github.com/dotnet/sdk 3819a21a612cd8bc15b6f6c4e361d18490469577 - + https://github.com/dotnet/cli - 850536d605a5a84ee573760b755608ab596146de + 11f4a837a9d746af3b7d72767ab06c5a64c772f9 - + https://github.com/dotnet/winforms af088e57775b7b9f28322511bc5be8ddb356b8a8 - + https://github.com/dotnet/wpf d4121027999cb01b941481c774b42a2193775b93 diff --git a/eng/Versions.props b/eng/Versions.props index ca242e0e9..32bb8cc4e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.101-servicing.19503.4 + 3.0.101-servicing.19502.7 @@ -33,7 +33,7 @@ - 3.0.101-servicing.19503.1 + 3.0.101-servicing.19502.3 0.2.0 @@ -44,23 +44,31 @@ $(MicrosoftNETSdkPackageVersion) - 3.0.1-servicing-19502-09 - 3.0.1-servicing-19502-09 - $(MicrosoftNETCoreAppPackageVersion) - 3.0.1-servicing-19502-09 - 3.0.1-servicing-19502-09 - $(MicrosoftNETCoreDotNetHostResolverPackageVersion) - $(MicrosoftNETCoreDotNetAppHostPackageVersion) - 3.0.1-servicing-19502-09 - $(MicrosoftNETCoreAppRefPackageVersion) - $(MicrosoftNETCoreDotNetAppHostPackageVersion) - 2.1.0-servicing-19502-09 - $(MicrosoftNETCoreAppRefPackageVersion) - $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) - $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.1-servicing-19502-09 - 3.0.1-servicing-19502-09 - $(MicrosoftWindowsDesktopAppPackageVersion) + + 3.0.1-servicing.19501.4 + + + + 3.0.1-servicing-19502-01 + 3.0.1-servicing-19502-01 + 3.0.1-servicing-19502-01 + 3.0.0 + 3.0.1-servicing-19502-01 + 3.0.1-servicing-19502-01 + 3.0.0 + 2.1.0 + + + + + $(MicrosoftNETCoreAppHostwinx64PackageVersion) + $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) + $(MicrosoftAspNetCoreAppRuntimewinx64PackageVersion) + $(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion) + + + $(MicrosoftNETCoreAppRuntimePackageVersion) + $(MicrosoftNETCoreAppRuntimePackageVersion) @@ -70,7 +78,7 @@ 2.0.0-preview8.19373.1 $(MicrosoftDotNetCommonItemTemplates30PackageVersion) 1.0.2-beta4.19354.2 - $(AspNetCoreVersion) + $(MicrosoftAspNetCoreAppRuntimePackageVersion) 1.6.0 1.0.2-beta4 diff --git a/eng/configure-toolset.ps1 b/eng/configure-toolset.ps1 new file mode 100644 index 000000000..87375243e --- /dev/null +++ b/eng/configure-toolset.ps1 @@ -0,0 +1,4 @@ +# SdkTests do not currently work with globally installed CLI as they use dotnet-install.ps1 to install more runtimes + +$script:useInstalledDotNetCli = $false + diff --git a/eng/configure-toolset.sh b/eng/configure-toolset.sh new file mode 100644 index 000000000..d890b1b02 --- /dev/null +++ b/eng/configure-toolset.sh @@ -0,0 +1,3 @@ +# SdkTests do not currently work with globally installed CLI as they use dotnet-install.ps1 to install more runtimes + +useInstalledDotNetCli="false" \ No newline at end of file diff --git a/src/core-sdk-tasks/GetLinuxNativeInstallerDependencyVersions.cs b/src/core-sdk-tasks/GetLinuxNativeInstallerDependencyVersions.cs new file mode 100644 index 000000000..195ac196b --- /dev/null +++ b/src/core-sdk-tasks/GetLinuxNativeInstallerDependencyVersions.cs @@ -0,0 +1,43 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using Microsoft.Build.Framework; +using Microsoft.Build.Utilities; +using Newtonsoft.Json.Linq; + +namespace Microsoft.DotNet.Cli.Build +{ + public class GetLinuxNativeInstallerDependencyVersions : Task + { + [Required] + public string PackageVersion { get; set; } + + [Output] + public string MajorMinorVersion { get; private set; } + + [Output] + public string MajorMinorPatchVersion { get; private set; } + + [Output] + public string VersionWithTilde { get; private set; } + + public override bool Execute() + { + string[] dotSplit = PackageVersion.Split('.'); + MajorMinorVersion = dotSplit[0] + "." + dotSplit[1]; + + string[] prereleaseSplit = PackageVersion.Split(new[] { '-' }, count: 2); + MajorMinorPatchVersion = prereleaseSplit[0]; + VersionWithTilde = MajorMinorPatchVersion; + + if (prereleaseSplit.Length > 1) + { + VersionWithTilde += "~" + prereleaseSplit[1]; + } + + return true; + } + } +} diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index e9f84e078..8792e3898 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -3,14 +3,13 @@ $(CoreSdkTargetFramework) true false - true - - + diff --git a/src/redist/targets/Branding.targets b/src/redist/targets/Branding.targets index 6045307e6..d87ba8f96 100644 --- a/src/redist/targets/Branding.targets +++ b/src/redist/targets/Branding.targets @@ -4,12 +4,12 @@ cli Microsoft .NET Core SDK $(CliBrandingVersion) .NET Standard Support for Visual Studio 2015 - Microsoft .NET Core Runtime $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) + Microsoft .NET Core Runtime $(MicrosoftNETCoreAppRuntimePackageVersion) Microsoft .NET Core Targeting Pack $(MicrosoftNETCoreAppRefPackageVersion) Microsoft .NET Standard 2.1 Targeting Pack $(NETStandardLibraryRefPackageVersion) - Microsoft .NET AppHost Pack $(MicrosoftNETCoreDotNetAppHostPackageVersion) - Microsoft .NET Core Host $(MicrosoftNETCoreDotNetAppHostPackageVersion) - Microsoft .NET Core Host FX Resolver $(MicrosoftNETCoreDotNetAppHostPackageVersion) + Microsoft .NET AppHost Pack $(MicrosoftNETCoreAppHostHostPackageVersion) + Microsoft .NET Core Host $(SharedHostVersion) + Microsoft .NET Core Host FX Resolver $(HostFxrVersion) Microsoft.NETCore.App $(SharedFrameworkName) Microsoft .NET Core 3.0 Templates diff --git a/src/redist/targets/BuildCoreSdkTasks.targets b/src/redist/targets/BuildCoreSdkTasks.targets index fb6aa70bb..7ffb389a9 100644 --- a/src/redist/targets/BuildCoreSdkTasks.targets +++ b/src/redist/targets/BuildCoreSdkTasks.targets @@ -38,5 +38,6 @@ + diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 1407022c5..0bc21a0b1 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -91,13 +91,21 @@ + - + + @@ -105,14 +113,10 @@ - - - - - diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets index 3f9abbe7b..47adeabea 100644 --- a/src/redist/targets/Crossgen.targets +++ b/src/redist/targets/Crossgen.targets @@ -4,17 +4,17 @@ DependsOnTargets="SetSdkBrandingInfo"> - runtime.$(SharedFrameworkRid).microsoft.netcore.app + microsoft.netcore.app.runtime.$(SharedFrameworkRid) <_crossDir Condition="'$(Architecture)' == 'arm64'">/x64_arm64 <_crossDir Condition="'$(Architecture)' == 'arm' And '$(OSName)' == 'win'">/x86_arm <_crossDir Condition="'$(Architecture)' == 'arm' And '$(OSName)' == 'linux'">/x64_arm - $(NuGetPackageRoot)/$(RuntimeNETCoreAppPackageName)/$(MicrosoftNETCoreAppPackageVersion)/tools$(_crossDir)/crossgen$(ExeExtension) + $(NuGetPackageRoot)/$(RuntimeNETCoreAppPackageName)/$(MicrosoftNETCoreAppRuntimePackageVersion)/tools$(_crossDir)/crossgen$(ExeExtension) $(SharedFrameworkRid) x64_arm64 x86_arm x64_arm - $(NuGetPackageRoot)/$(RuntimeNETCoreAppPackageName)/$(MicrosoftNETCoreAppPackageVersion)/runtimes/$(LibCLRJitRid)/native/$(DynamicLibPrefix)clrjit$(DynamicLibExtension) - $(RedistLayoutPath)shared/$(SharedFrameworkName)/$(MicrosoftNETCoreAppRuntimewinx64PackageVersion) + $(NuGetPackageRoot)/$(RuntimeNETCoreAppPackageName)/$(MicrosoftNETCoreAppRuntimePackageVersion)/runtimes/$(LibCLRJitRid)/native/$(DynamicLibPrefix)clrjit$(DynamicLibExtension) + $(RedistLayoutPath)shared/$(SharedFrameworkName)/$(MicrosoftNETCoreAppRuntimePackageVersion) * x86 @@ -24,7 +24,7 @@ PackageToRestore=$(RuntimeNETCoreAppPackageName); - PackageVersionToRestore=$(MicrosoftNETCoreAppPackageVersion); + PackageVersionToRestore=$(MicrosoftNETCoreAppRuntimePackageVersion); TargetFramework=$(TargetFramework) @@ -89,12 +89,6 @@ - - - - true diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index b440f78e1..996017818 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -3,72 +3,41 @@ - + Microsoft.NETCoreSdk.BundledVersions.props - - - <_NETStandardLibraryPackageVersions Include="@(PackageDefinitions->'%(Version)')" - Condition="%(PackageDefinitions.Name) == 'NetStandard.Library'" /> - <_NETCorePlatformsPackageVersions Include="@(PackageDefinitions->'%(Version)')" - Condition="%(PackageDefinitions.Name) == 'Microsoft.NETCore.Platforms'" /> - - - - - - <_NETCoreAppPackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - <_NETStandardLibraryPackageVersion>@(_NETStandardLibraryPackageVersions->Distinct()) - <_NETCorePlatformsPackageVersion>@(_NETCorePlatformsPackageVersions->Distinct()) + <_NETCoreAppPackageVersion>$(MicrosoftNETCoreAppRuntimePackageVersion) + <_NETStandardLibraryPackageVersion>$(NETStandardLibraryRefPackageVersion) + <_NETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion) <_NETCoreAppTargetFrameworkVersion>$(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1]) <_NETStandardTargetFrameworkVersion>$(_NETStandardLibraryPackageVersion.Split('.')[0]).$(_NETStandardLibraryPackageVersion.Split('.')[1]) - true + <_NETCoreSdkBeingBuiltIsPreview Condition=" '$(DropSuffix)' != 'true' ">true + <_NETCoreSdkBeingBuiltIsPreview Condition=" '$(DropSuffix)' == 'true' ">false - - - - PackageToRestore=Microsoft.NETCore.App.Internal; - PackageVersionToRestore=$(MicrosoftNETCoreAppInternalPackageVersion); - TargetFramework=$(TargetFramework) - - - - - PackageToRestore=Microsoft.WindowsDesktop.App; - PackageVersionToRestore=$(MicrosoftWindowsDesktopPackageVersion); - TargetFramework=$(TargetFramework) - - - + - - - - - - - - - - - + linux-arm64; + " /> + + - @@ -65,12 +63,12 @@ $(DownloadsFolder)$(DownloadedHostFxrInstallerFileName) dotnet-host $(DownloadsFolder)$(DownloadedSharedHostInstallerFileName) - aspnetcore-runtime-$(AspNetCoreVersion) + aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion) $(AspNetCoreSharedFxDebianPackageFileName.ToLower()) aspnetcore-runtime-$(AspNetCoreMajorMinorVersion) $(AspNetCoreSharedFxDebianPackageName.ToLower()) $(DownloadsFolder)$(DownloadedAspNetCoreSharedFxInstallerFileName) - aspnetcore-targeting-pack-$(AspNetCoreVersion) + aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion) $(AspNetTargetingPackDebianPackageFileName.ToLower()) aspnetcore-targeting-pack-$(AspNetCoreMajorMinorVersion) $(AspNetTargetingPackDebianPackageName.ToLower()) @@ -159,15 +157,20 @@ $(SdkBrandName) - $(MicrosoftNETCoreAppPackageVersionWithTilde) + $(MicrosoftNETCoreAppRuntimePackageVersionWithTilde) + + + $(MicrosoftNETCoreAppRefPackageVersionWithTilde) $(NetStandardTargetingPackPackageVersionWithTilde) - $(AspNetCoreVersionWithTilde) + $(AspNetCoreRuntimeVersionWithTilde) + + + $(AspNetCoreRefVersionWithTilde) - $(SdkVersion) @@ -191,7 +194,8 @@ GenerateDebsInner"/> - - - - $(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion) + + $(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion) + $(MicrosoftNETCoreAppInternalPackageVersion) + + + 3.0.0 + 3.0.0 + 3.0.0 + 3.0.0 - + $(RedistLayoutPath)sdk\$(SdkVersion)\ @@ -49,12 +54,12 @@ dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-hostfxr$(InstallerStartSuffix)-$(HostFxrVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) - dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) + dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppRuntimePackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-runtime-deps-$(SharedHostVersion)-$(RuntimeDepsInstallerFileRid)$(InstallerExtension) - windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) - dotnet-targeting-pack-$(NetCoreAppTargetingPackVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) - dotnet-apphost-pack-$(NetCoreAppHostPackVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) - windowsdesktop-targeting-pack-$(WindowsDesktopTargetingPackVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) + windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) + dotnet-targeting-pack-$(MicrosoftNETCoreAppRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) + dotnet-apphost-pack-$(MicrosoftNETCoreAppHostPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) + windowsdesktop-targeting-pack-$(MicrosoftWindowsDesktopAppRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) netstandard$(NETStandardLibraryRefPackageVersion.Split('.')[0])$(NETStandardLibraryRefPackageVersion.Split('.')[1]) @@ -62,21 +67,21 @@ $(CoreSetupRid) $(ProductMonikerRid) linux-$(Architecture) - dotnet-runtime-$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) + dotnet-runtime-$(MicrosoftNETCoreAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) $(SharedFrameworkRid) linux-x64 $(AspNetCoreSharedFxInstallerRid) x64 - aspnetcore-runtime-$(AspNetCoreVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) + aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) - aspnetcore-runtime-internal-$(AspNetCoreVersion)-$(AspNetCoreSharedFxInstallerRid).wixlib - aspnetcore-targeting-pack-$(AspNetTargetingPackVersion)$(InstallerExtension) - aspnetcore-targeting-pack-$(AspNetTargetingPackVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) - aspnetcore-targeting-pack-$(AspNetCoreVersion)$(ArchiveExtension) - aspnetcore-runtime-internal-$(AspNetCoreVersion)-$(AspNetCoreSharedFxArchiveRid)$(ArchiveExtension) - windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) + aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid).wixlib + aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(InstallerExtension) + aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) + aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(ArchiveExtension) + aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxArchiveRid)$(ArchiveExtension) + windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) aspnetcore_base_runtime.version @@ -86,7 +91,7 @@ $(CoreSetupBlobRootUrl)Runtime/ $(CoreSetupBlobRootUrl)aspnetcore/Runtime/ $(CoreSetupRootUrl) - $(IntermediateDirectory)/coreSetupDownload/$(MicrosoftNETCoreAppRuntimewinx64PackageVersion) + $(IntermediateDirectory)/coreSetupDownload/$(MicrosoftNETCoreAppRuntimePackageVersion) $(CoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive$(ArchiveExtension) @@ -97,7 +102,7 @@ - $(CoreSetupRootUrl)$(MicrosoftNETCoreAppRuntimewinx64PackageVersion) + $(CoreSetupRootUrl)$(MicrosoftNETCoreAppRuntimePackageVersion) $(CombinedFrameworkHostCompressedFileName) $(CoreSetupBlobAccessTokenParam) @@ -105,7 +110,7 @@ Microsoft.NETCore.App.Ref - $(NetCoreAppTargetingPackVersion) + $(MicrosoftNETCoreAppRefPackageVersion) $(TargetFramework) packs/%(PackageName)/%(PackageVersion) @@ -119,77 +124,77 @@ Microsoft.AspNetCore.App.Ref - $(AspNetTargetingPackVersion) + $(MicrosoftAspNetCoreAppRefPackageVersion) $(TargetFramework) packs/%(PackageName)/%(PackageVersion) Microsoft.NETCore.App.Host.$(SharedFrameworkRid) - $(NetCoreAppHostPackVersion) + $(MicrosoftNETCoreAppHostPackageVersion) $(TargetFramework) packs/%(PackageName)/%(PackageVersion) Microsoft.NETCore.App.Host.$(AlternateAppHostRid) - $(NetCoreAppHostPackVersion) + $(MicrosoftNETCoreAppHostPackageVersion) $(TargetFramework) packs/%(PackageName)/%(PackageVersion) - $(CoreSetupRootUrl)$(MicrosoftNETCoreAppRuntimewinx64PackageVersion) + $(CoreSetupRootUrl)$(CoreSetupBlobVersion) $(DownloadedRuntimeDepsInstallerFileName) $(CoreSetupBlobAccessTokenParam) - $(CoreSetupRootUrl)$(MicrosoftNETCoreAppRuntimewinx64PackageVersion) + $(CoreSetupRootUrl)$(CoreSetupBlobVersion) $(DownloadedSharedFrameworkInstallerFileName) $(CoreSetupBlobAccessTokenParam) - $(CoreSetupRootUrl)$(SharedHostVersion) + $(CoreSetupRootUrl)$(CoreSetupBlobVersion) $(DownloadedSharedHostInstallerFileName) $(CoreSetupBlobAccessTokenParam) - $(CoreSetupRootUrl)$(HostFxrVersion) + $(CoreSetupRootUrl)$(CoreSetupBlobVersion) $(DownloadedHostFxrInstallerFileName) $(CoreSetupBlobAccessTokenParam) - $(CoreSetupRootUrl)$(NetCoreAppTargetingPackVersion) + $(CoreSetupRootUrl)$(NETCoreAppTargetingPackBlobVersion) $(DownloadedNetCoreAppTargetingPackInstallerFileName) $(CoreSetupBlobAccessTokenParam) - $(CoreSetupRootUrl)$(MicrosoftNETCoreAppRuntimewinx64PackageVersion) + $(CoreSetupRootUrl)$(NETStandardTargetingPackBlobVersion) $(DownloadedNetStandardTargetingPackInstallerFileName) $(CoreSetupBlobAccessTokenParam) - $(CoreSetupRootUrl)$(MicrosoftNETCoreAppRuntimewinx64PackageVersion) + $(CoreSetupRootUrl)$(CoreSetupBlobVersion) $(DownloadedNetCoreAppHostPackInstallerFileName) $(CoreSetupBlobAccessTokenParam) - $(CoreSetupRootUrl)$(WindowsDesktopTargetingPackVersion) + $(CoreSetupRootUrl)$(WindowsDesktopTargetingPackBlobVersion) $(DownloadedWindowsDesktopTargetingPackInstallerFileName) $(CoreSetupBlobAccessTokenParam) @@ -204,7 +209,7 @@ - $(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobDirectory) + $(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobVersion) $(AspNetCoreSharedFxArchiveFileName) $(CoreSetupBlobAccessTokenParam) @@ -214,7 +219,7 @@ https://github.com/aspnet/AspNetCore/issues/8806 --> - $(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobDirectory) + $(AspNetCoreSharedFxRootUrl)$(AspNetCoreTargetingPackBlobVersion) $(AspNetTargetingPackArchiveFileName) $(CoreSetupBlobAccessTokenParam) @@ -222,21 +227,22 @@ - $(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobDirectory) + $(AspNetCoreSharedFxRootUrl)$(MicrosoftAspNetCoreAppRefPackageVersion) + $(AspNetCoreSharedFxRootUrl)$(MicrosoftAspNetCoreAppRefPackageVersion) $(DownloadedAspNetTargetingPackInstallerFileName) $(CoreSetupBlobAccessTokenParam) - $(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobDirectory) + $(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobVersion) $(DownloadedAspNetCoreSharedFxInstallerFileName) $(CoreSetupBlobAccessTokenParam) - $(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobDirectory) + $(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobVersion) $(AspNetCoreSharedFxBaseRuntimeVersionFileName) $(CoreSetupBlobAccessTokenParam) @@ -251,20 +257,20 @@ Microsoft.WindowsDesktop.App.Ref - $(WindowsDesktopTargetingPackVersion) + $(MicrosoftWindowsDesktopAppRefPackageVersion) $(TargetFramework) packs/%(PackageName)/%(PackageVersion) - $(WinFormsAndWpfSharedFxRootUrl)$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion) + $(WinFormsAndWpfSharedFxRootUrl)$(CoreSetupBlobVersion) $(WinFormsAndWpfSharedFxArchiveFileName) $(CoreSetupBlobAccessTokenParam) - $(WinFormsAndWpfSharedFxRootUrl)$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion) + $(WinFormsAndWpfSharedFxRootUrl)$(CoreSetupBlobVersion) $(DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName) $(CoreSetupBlobAccessTokenParam) @@ -356,7 +362,7 @@ "version": ".*" - "version": "$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)" + "version": "$(MicrosoftNETCoreAppRuntimePackageVersion)" @@ -377,7 +383,7 @@ - Microsoft.NETCore.App.Host.$(SharedFrameworkRid) + Microsoft.NETCore.App.Host.$(SharedFrameworkRid) $(IntermediateOutputPath)AppHostRestore\ $(SdkOutputDirectory)AppHostTemplate @@ -388,8 +394,8 @@ - PackageToRestore=$(NETCoreDotNetAppHostPackageName); - PackageVersionToRestore=$(MicrosoftNETCoreDotNetAppHostPackageVersion); + PackageToRestore=$(NETCoreAppHostPackageName); + PackageVersionToRestore=$(MicrosoftNETCoreAppHostPackageVersion); TargetFramework=$(TargetFramework); RestorePackagesPath=$(AppHostRestorePath); RuntimeIdentifier=$(Rid) @@ -414,7 +420,7 @@ + Text="Failed to determine the $(NETCoreAppHostPackageName) executable in @(AllFileOfRestoredAppHostPackage)" /> diff --git a/src/redist/targets/GeneratePKG.targets b/src/redist/targets/GeneratePKG.targets index 6c88d2edb..1234883a7 100644 --- a/src/redist/targets/GeneratePKG.targets +++ b/src/redist/targets/GeneratePKG.targets @@ -7,8 +7,8 @@ com.microsoft.dotnet.sharedhost.$(SharedHostVersion).component.osx.x64 com.microsoft.dotnet.hostfxr.$(HostFxrVersion).component.osx.x64 com.microsoft.dotnet.sharedframework.$(SharedFrameworkNugetName).$(MicrosoftNETCoreAppPackageVersion).component.osx.x64 - com.microsoft.dotnet.pack.targeting.$(NetCoreAppTargetingPackVersion).component.osx.x64 - com.microsoft.dotnet.pack.apphost.$(NetCoreAppHostPackVersion).component.osx.x64 + com.microsoft.dotnet.pack.targeting.$(MicrosoftNETCoreAppRefPackageVersion).component.osx.x64 + com.microsoft.dotnet.pack.apphost.$(MicrosoftNETCoreAppHostPackageVersion).component.osx.x64 com.microsoft.standard.pack.targeting.$(NETStandardLibraryRefPackageVersion).component.osx.x64 com.microsoft.dotnet.dev.$(SdkVersion).component.osx.x64 com.microsoft.dotnet.dev.$(SdkVersion).osx.x64 @@ -94,10 +94,10 @@ $(SdkVersion) - $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) + $(MicrosoftNETCoreAppRuntimePackageVersion) - $(AspNetCoreVersion) + $(MicrosoftAspNetCoreAppRuntimePackageVersion) diff --git a/src/redist/targets/GenerateRPMs.targets b/src/redist/targets/GenerateRPMs.targets index 3f5a07e08..bc8250c62 100644 --- a/src/redist/targets/GenerateRPMs.targets +++ b/src/redist/targets/GenerateRPMs.targets @@ -78,13 +78,19 @@ - $(MicrosoftNETCoreAppMajorMinorPatchVersion) + $(MicrosoftNETCoreAppRuntimeMajorMinorPatchVersion) + + + $(MicrosoftNETCoreAppRefMajorMinorPatchVersion) $(NetStandardTargetingPackMajorMinorPatchVersion) - $(AspNetCoreMajorMinorPatchVersion) + $(AspNetCoreRuntimeMajorMinorPatchVersion) + + + $(AspNetCoreRefMajorMinorPatchVersion) $(SharedFxRpmPackageName) @@ -199,20 +205,20 @@ $(MicrosoftNETCoreAppMajorMinorVersion) - $(MicrosoftNETCoreAppPackageVersion) + $(MicrosoftNETCoreAppRuntimePackageVersion) dotnet-runtime-$(SharedFxRpmPackageVersion) $(SharedFxRpmPackageName.ToLower()) dotnet-runtime-$(SharedFxRpmPackageFileVersion) $(SharedFxRpmPackageFileName.ToLower()) dotnet-targeting-pack-$(SharedFxRpmPackageVersion) $(NetCoreAppTargetingPackRpmPackageName.ToLower()) - dotnet-targeting-pack-$(SharedFxRpmPackageFileVersion) + dotnet-targeting-pack-$(MicrosoftNETCoreAppRefPackageVersion) $(NetCoreAppTargetingPackRpmPackageFileName.ToLower()) dotnet-apphost-pack-$(SharedFxRpmPackageVersion) $(NetCoreAppHostPackRpmPackageName.ToLower()) dotnet-apphost-pack-$(SharedFxRpmPackageFileVersion) $(NetCoreAppHostPackRpmPackageFileName.ToLower()) - netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion.Split('.')[0]).$(NETStandardLibraryRefPackageVersion.Split('.')[1]) + netstandard-targeting-pack-$(NetStandardTargetingPackMajorMinorVersion) $(NetStandardTargetingPackRpmPackageName.ToLower()) netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion) $(NetStandardTargetingPackRpmPackageFileName.ToLower()) @@ -223,11 +229,11 @@ dotnet-host aspnetcore-runtime-$(AspNetCoreMajorMinorVersion) $(AspNetCoreSharedFxRpmPackageName.ToLower()) - aspnetcore-runtime-$(AspNetCoreVersion) + aspnetcore-runtime-$(MicrosoftAspNetCoreRuntimePackageVersion) $(AspNetCoreSharedFxRpmPackageFileName.ToLower()) aspnetcore-targeting-pack-$(AspNetCoreMajorMinorVersion) $(AspNetTargetingPackRpmPackageName.ToLower()) - aspnetcore-targeting-pack-$(AspNetCoreVersion) + aspnetcore-targeting-pack-$(MicrosoftAspNetCoreRefPackageVersion) $(AspNetTargetingPackRpmPackageFileName.ToLower()) $(ScriptsDir)/$(AfterInstallHostScriptName) $(RpmLayoutScripts)/$(AfterInstallHostScriptName) diff --git a/src/redist/targets/LinuxNativeInstallerDependencyVersions.targets b/src/redist/targets/LinuxNativeInstallerDependencyVersions.targets index 324bcdc37..82482b22a 100644 --- a/src/redist/targets/LinuxNativeInstallerDependencyVersions.targets +++ b/src/redist/targets/LinuxNativeInstallerDependencyVersions.targets @@ -1,43 +1,34 @@ - - $([MSBuild]::Add($(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion.IndexOf('.')), 1)) - $(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion.IndexOf('.', $(MicrosoftNETCoreAppPatchSeparatorIndex))) - $(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion.Substring(0, $(MicrosoftNETCoreAppPatchSeparatorIndex))) + + + + + - $(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion.IndexOf('-')) - $(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion) - $(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion.Substring(0, $(MicrosoftNETCoreAppVersionPreReleaseSeparator))) - $([MSBuild]::Add($(MicrosoftNETCoreAppVersionPreReleaseSeparator), 1)) - $(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion.Substring($(MicrosoftNETCoreAppVersionPreReleaseSeparatorStartIndex))) - $(MicrosoftNETCoreAppMajorMinorPatchVersion) - $(MicrosoftNETCoreAppMajorMinorPatchVersion)~$(MicrosoftNETCoreVersionSuffix) + + + - $(NETStandardLibraryRefPackageVersion.IndexOf('-')) - $(NETStandardLibraryRefPackageVersion) - $(NETStandardLibraryRefPackageVersion.Substring(0, $(NetStandardTargetingPackVersionPreReleaseSeparator))) - $([MSBuild]::Add($(NetStandardTargetingPackVersionPreReleaseSeparator), 1)) - $(NETStandardLibraryRefPackageVersion.Substring($(NetStandardTargetingPackVersionPreReleaseSeparatorStartIndex))) - $(NetStandardTargetingPackMajorMinorPatchVersion) - $(NetStandardTargetingPackMajorMinorPatchVersion)~$(NetStandardTargetingPackVersionSuffix) + + + + + - $([MSBuild]::Add($(AspNetCoreVersion.IndexOf('.')), 1)) - $(AspNetCoreVersion.IndexOf('.', $(AspNetCoreVersionPatchSeparatorIndex))) - $(AspNetCoreVersion.Substring(0, $(AspNetCoreVersionPatchSeparatorIndex))) + + + - $(AspNetCoreVersion.IndexOf('-')) - $(AspNetCoreVersion) - $(AspNetCoreVersion.Substring(0, $(AspNetCoreVersionPreReleaseSeparator))) - $([MSBuild]::Add($(AspNetCoreVersionPreReleaseSeparator), 1)) - $(AspNetCoreVersion.Substring($(AspNetCoreVersionPreReleaseSeparatorStartIndex))) - $(AspNetCoreMajorMinorPatchVersion) - $(AspNetCoreMajorMinorPatchVersion)~$(AspNetCoreVersionSuffix) + + + - $([MSBuild]::Add($(HostFxrVersion.IndexOf('.')), 1)) - $(HostFxrVersion.IndexOf('.', $(HostFxrVersionPatchSeparatorIndex))) - $(HostFxrVersion.Substring(0, $(HostFxrVersionPatchSeparatorIndex))) - - + + + + + diff --git a/src/redist/targets/packaging/deb/dotnet-debian_config.json b/src/redist/targets/packaging/deb/dotnet-debian_config.json index 35a0f433f..bb4432fe8 100644 --- a/src/redist/targets/packaging/deb/dotnet-debian_config.json +++ b/src/redist/targets/packaging/deb/dotnet-debian_config.json @@ -30,10 +30,10 @@ "debian_dependencies":{ "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%": { "package_version": "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_VERSION%" }%SHARED_FRAMEWORK_DEBIAN_PACKAGE_ADDITIONAL_DEPENDENCY%, - "%NETCOREAPP_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_VERSION%" }, + "%NETCOREAPP_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%NETCOREAPP_TARGETING_PACK_DEBIAN_PACKAGE_VERSION%" }, "%NETCORE_APPHOST_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_VERSION%" }, "%NETSTANDARD_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%NET_STANDARD_DEBIAN_PACKAGE_VERSION%" }, "%ASPNETCORE_SHAREDFX_DEBIAN_PACKAGE_NAME%": { "package_version": "%ASPNETCORE_SHAREDFX_DEBIAN_PACKAGE_VERSION%" }, - "%ASPNET_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%ASPNETCORE_SHAREDFX_DEBIAN_PACKAGE_VERSION%" } + "%ASPNET_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%ASPNET_TARGETING_PACK_DEBIAN_PACKAGE_VERSION%" } } } diff --git a/src/redist/targets/packaging/rpm/dotnet-config.json b/src/redist/targets/packaging/rpm/dotnet-config.json index fd090e2d8..c7fb4d267 100644 --- a/src/redist/targets/packaging/rpm/dotnet-config.json +++ b/src/redist/targets/packaging/rpm/dotnet-config.json @@ -28,7 +28,7 @@ }, { "package_name": "%NETCOREAPP_TARGETING_PACK_RPM_PACKAGE_NAME%", - "package_version": "%SHARED_FRAMEWORK_RPM_PACKAGE_VERSION%" + "package_version": "%NETCOREAPP_TARGETING_PACK_RPM_PACKAGE_VERSION%" }, { "package_name": "%NETCORE_APPHOST_PACK_RPM_PACKAGE_NAME%", @@ -44,7 +44,7 @@ }, { "package_name": "%ASPNET_TARGETING_PACK_RPM_PACKAGE_NAME%", - "package_version": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_VERSION%" + "package_version": "%ASPNET_TARGETING_PACK_RPM_PACKAGE_VERSION%" } ], "directories": [ From 1a42271c693243952f583bb9306a4996087f712b Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Thu, 3 Oct 2019 12:41:42 -0700 Subject: [PATCH 2/2] Update dependencies from .NET Core 3 Release --- NuGet.config | 2 +- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++++----------- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/NuGet.config b/NuGet.config index 947b1b278..7317a32a4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1087b48b6..00e3359ae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,30 +6,30 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - 93abb6b3a675b44ee35698d9640a42779b18e004 + d34d1570bfdf669ed94b4c939b2f39a1650e2320 https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - 93abb6b3a675b44ee35698d9640a42779b18e004 + d34d1570bfdf669ed94b4c939b2f39a1650e2320 - + https://github.com/dotnet/core-setup - 93abb6b3a675b44ee35698d9640a42779b18e004 + d34d1570bfdf669ed94b4c939b2f39a1650e2320 - + https://github.com/dotnet/core-setup - 93abb6b3a675b44ee35698d9640a42779b18e004 + d34d1570bfdf669ed94b4c939b2f39a1650e2320 - + https://github.com/dotnet/core-setup - 93abb6b3a675b44ee35698d9640a42779b18e004 + d34d1570bfdf669ed94b4c939b2f39a1650e2320 @@ -45,41 +45,41 @@ https://github.com/aspnet/AspNetCore aee5e4080331553ea9dfb7fb388b6d72f715bf6a - + https://github.com/aspnet/AspNetCore - aee5e4080331553ea9dfb7fb388b6d72f715bf6a + a3fd9237f6f104081db1ae3e9727d0f88029bda6 - + https://github.com/aspnet/AspNetCore - aee5e4080331553ea9dfb7fb388b6d72f715bf6a + a3fd9237f6f104081db1ae3e9727d0f88029bda6 - + https://github.com/aspnet/AspNetCore - aee5e4080331553ea9dfb7fb388b6d72f715bf6a + a3fd9237f6f104081db1ae3e9727d0f88029bda6 - + https://github.com/aspnet/AspNetCore - aee5e4080331553ea9dfb7fb388b6d72f715bf6a + a3fd9237f6f104081db1ae3e9727d0f88029bda6 - + https://github.com/aspnet/AspNetCore - aee5e4080331553ea9dfb7fb388b6d72f715bf6a + a3fd9237f6f104081db1ae3e9727d0f88029bda6 https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - 78da18674ad084d58311d36b5354925a8bef62fc + d62b7c37ab654e5019131ec3c0418d0a23639a31 https://github.com/dotnet/sdk 3819a21a612cd8bc15b6f6c4e361d18490469577 - + https://github.com/dotnet/cli - 11f4a837a9d746af3b7d72767ab06c5a64c772f9 + 850536d605a5a84ee573760b755608ab596146de diff --git a/eng/Versions.props b/eng/Versions.props index 32bb8cc4e..1542e1260 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.101-servicing.19502.7 + 3.0.101-servicing.19503.4 @@ -24,16 +24,16 @@ - 3.0.0 + 3.0.1-servicing.19502.3 3.0.0 - 3.0.0-rc2.19465.2 - 3.0.0-rc2.19465.2 - 3.0.0-rc2.19465.2 - 3.0.0-rc2.19465.2 + 3.0.1-servicing.19502.3 + 3.0.1-servicing.19502.3 + 3.0.1-servicing.19502.3 + 3.0.1-servicing.19502.3 - 3.0.101-servicing.19502.3 + 3.0.101-servicing.19503.1 0.2.0 @@ -49,12 +49,12 @@ - 3.0.1-servicing-19502-01 - 3.0.1-servicing-19502-01 - 3.0.1-servicing-19502-01 + 3.0.1-servicing-19502-23 + 3.0.1 + 3.0.1 3.0.0 - 3.0.1-servicing-19502-01 - 3.0.1-servicing-19502-01 + 3.0.1 + 3.0.1 3.0.0 2.1.0