diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe2df51da..75f53a4bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,75 +2,75 @@ - + https://github.com/dotnet/core-setup - 3abca437fee294811fca2f81e9e5118a5b4c45fe + f28abecf151695f90d303dddc682de5fae1ec479 - + https://github.com/dotnet/core-setup - 3abca437fee294811fca2f81e9e5118a5b4c45fe + f28abecf151695f90d303dddc682de5fae1ec479 - + https://github.com/dotnet/core-setup - 3abca437fee294811fca2f81e9e5118a5b4c45fe + f28abecf151695f90d303dddc682de5fae1ec479 - + https://github.com/aspnet/AspNetCore - 2dc5694ecd1bd95e9091f6942657ebe1da6e0bb7 + 9c25375f0bf4b3adda1e16eda89597a49239b031 - + https://github.com/aspnet/AspNetCore - 2dc5694ecd1bd95e9091f6942657ebe1da6e0bb7 + 9c25375f0bf4b3adda1e16eda89597a49239b031 - + https://github.com/aspnet/AspNetCore - 2dc5694ecd1bd95e9091f6942657ebe1da6e0bb7 + 9c25375f0bf4b3adda1e16eda89597a49239b031 - + https://github.com/aspnet/AspNetCore - 2dc5694ecd1bd95e9091f6942657ebe1da6e0bb7 + 9c25375f0bf4b3adda1e16eda89597a49239b031 - + https://github.com/aspnet/AspNetCore - 2dc5694ecd1bd95e9091f6942657ebe1da6e0bb7 + 9c25375f0bf4b3adda1e16eda89597a49239b031 - + https://github.com/aspnet/AspNetCore - 2dc5694ecd1bd95e9091f6942657ebe1da6e0bb7 + 9c25375f0bf4b3adda1e16eda89597a49239b031 - + https://github.com/aspnet/AspNetCore - 2dc5694ecd1bd95e9091f6942657ebe1da6e0bb7 + 9c25375f0bf4b3adda1e16eda89597a49239b031 - + https://github.com/dotnet/templating - 2426d6e864763c91faa0081fae898f71477f969f + b415d1449b526338fba996d87c92a9de7f5286b8 - + https://github.com/dotnet/toolset - f7288caac1b1fd1c460a28c1909f110c6a1dae64 + f2edaad5577852a23a531396ddb26a0aee1f8def - + https://github.com/dotnet/standard - 194f2eb8bcec69ab6963d4dc51fc62bcb907386b + 25538d60f7f4c2c79cf098f2b808907d87b516a7 - + https://github.com/dotnet/cli - 9adbab0c75e49a753643c578c3e92949299d534d + acf9ebc74c43fc242a6529c0c9f31a3a6c13e378 https://github.com/dotnet/winforms a875e24eff58bcc7a1bb124a6f05792639a83536 - + https://github.com/dotnet/wpf - 98d8e57e2c6ee4a8844a9b8f1f279cf5025f25aa + 8beb1b2f8d5d6f7a7d85f32d09ce3fc33696e206 - + https://github.com/dotnet/arcade - 4e21d52dabbb9f5705a90f097acb1465a0354c0d + 46718d98c0fd03690a6a8c83da692a4a85a17902 diff --git a/eng/Versions.props b/eng/Versions.props index 61a023add..bc01af0f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview5.19217.5 + 3.0.100-preview5.19218.6 @@ -20,40 +20,41 @@ - 3.0.0-preview5.19215.4 + 3.0.0-preview5.19217.4 - 3.0.0-preview5-19216-08 - 3.0.0-preview5-19216-08 - 3.0.0-preview5-19216-08 - 3.0.0-preview5-19216-08 - 3.0.0-preview5-19216-08 - 3.0.0-preview5-19216-08 - 3.0.0-preview5-19216-08 + 3.0.0-preview5-19218-02 + 3.0.0-preview5-19218-02 + 3.0.0-preview5-19218-02 + 3.0.0-preview5-19218-02 + 3.0.0-preview5-19218-02 + 3.0.0-preview5-19218-02 + 3.0.0-preview5-19218-02 - 3.0.100-preview5.19216.1 + 3.0.100-preview5.19218.1 - 1.0.2-beta5.19216.1 + 1.0.2-beta5.19217.1 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) 1.0.2-beta4.19155.2 0.2.0 1.6.1 - 3.0.0-preview5-27617-01 + 3.0.0-preview5-27617-04 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview5-27617-01 + $(MicrosoftNETCoreAppPackageVersion) + 2.1.0-preview5-27617-04 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview5-27617-01 + 3.0.0-preview5-27617-04 $(MicrosoftWindowsDesktopAppPackageVersion) diff --git a/eng/common/CheckSymbols.ps1 b/eng/common/CheckSymbols.ps1 index 074b42324..b8d84607b 100644 --- a/eng/common/CheckSymbols.ps1 +++ b/eng/common/CheckSymbols.ps1 @@ -9,7 +9,8 @@ Add-Type -AssemblyName System.IO.Compression.FileSystem function FirstMatchingSymbolDescriptionOrDefault { param( [string] $FullPath, # Full path to the module that has to be checked - [string] $TargetServerParam # Parameter to pass to `Symbol Tool` indicating the server to lookup for symbols + [string] $TargetServerParam, # Parameter to pass to `Symbol Tool` indicating the server to lookup for symbols + [string] $SymbolsPath ) $FileName = [System.IO.Path]::GetFileName($FullPath) @@ -33,9 +34,9 @@ function FirstMatchingSymbolDescriptionOrDefault { # DWARF file for a .dylib $DylibDwarf = $SymbolPath.Replace($Extension, ".dylib.dwarf") - - .\dotnet-symbol.exe --symbols --modules $TargetServerParam $FullPath -o $SymbolsPath -d | Out-Null - + + .\dotnet-symbol.exe --symbols --modules --windows-pdbs $TargetServerParam $FullPath -o $SymbolsPath | Out-Null + if (Test-Path $PdbPath) { return "PDB" } @@ -73,8 +74,9 @@ function CountMissingSymbols { $MissingSymbols = 0 $PackageId = [System.IO.Path]::GetFileNameWithoutExtension($PackagePath) - $ExtractPath = $ExtractPath + $PackageId; - $SymbolsPath = $ExtractPath + $PackageId + ".Symbols"; + $PackageGuid = New-Guid + $ExtractPath = Join-Path -Path $ExtractPath -ChildPath $PackageGuid + $SymbolsPath = Join-Path -Path $ExtractPath -ChildPath "Symbols" [System.IO.Compression.ZipFile]::ExtractToDirectory($PackagePath, $ExtractPath) @@ -84,10 +86,15 @@ function CountMissingSymbols { Get-ChildItem -Recurse $ExtractPath | Where-Object {$RelevantExtensions -contains $_.Extension} | ForEach-Object { - Write-Host -NoNewLine "`t Checking file" $_.FullName "... " + if ($_.FullName -Match "\\ref\\") { + Write-Host "`t Ignoring reference assembly file" $_.FullName + return + } - $SymbolsOnMSDL = FirstMatchingSymbolDescriptionOrDefault $_.FullName "--microsoft-symbol-server" - $SymbolsOnSymWeb = FirstMatchingSymbolDescriptionOrDefault $_.FullName "--internal-server" + $SymbolsOnMSDL = FirstMatchingSymbolDescriptionOrDefault $_.FullName "--microsoft-symbol-server" $SymbolsPath + $SymbolsOnSymWeb = FirstMatchingSymbolDescriptionOrDefault $_.FullName "--internal-server" $SymbolsPath + + Write-Host -NoNewLine "`t Checking file" $_.FullName "... " if ($SymbolsOnMSDL -ne $null -and $SymbolsOnSymWeb -ne $null) { Write-Host "Symbols found on MSDL (" $SymbolsOnMSDL ") and SymWeb (" $SymbolsOnSymWeb ")" @@ -116,18 +123,35 @@ function CountMissingSymbols { function CheckSymbolsAvailable { if (Test-Path $ExtractPath) { - Remove-Item -recurse $ExtractPath + Remove-Item $ExtractPath -Force -Recurse -ErrorAction SilentlyContinue } Get-ChildItem "$InputPath\*.nupkg" | ForEach-Object { $FileName = $_.Name + + # These packages from Arcade-Services include some native libraries that + # our current symbol uploader can't handle. Below is a workaround until + # we get issue: https://github.com/dotnet/arcade/issues/2457 sorted. + if ($FileName -Match "Microsoft\.DotNet\.Darc\.") { + Write-Host "Ignoring Arcade-services file: $FileName" + Write-Host + return + } + elseif ($FileName -Match "Microsoft\.DotNet\.Maestro\.Tasks\.") { + Write-Host "Ignoring Arcade-services file: $FileName" + Write-Host + return + } + Write-Host "Validating $FileName " $Status = CountMissingSymbols "$InputPath\$FileName" if ($Status -ne 0) { Write-Error "Missing symbols for $Status modules in the package $FileName" } + + Write-Host } } diff --git a/global.json b/global.json index 89c58fecf..3bc8b2b3e 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview4-010564" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19217.1" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19218.1" } } diff --git a/src/redist/targets/Branding.targets b/src/redist/targets/Branding.targets index ee93a70c0..9f81239cd 100644 --- a/src/redist/targets/Branding.targets +++ b/src/redist/targets/Branding.targets @@ -7,6 +7,7 @@ Microsoft .NET Core Runtime $(MicrosoftNETCoreAppPackageVersion) Microsoft .NET Core Targeting Pack $(MicrosoftNETCoreAppPackageVersion) Microsoft .NET Standard 2.1 Targeting Pack $(MicrosoftNETCoreAppPackageVersion) + Microsoft .NET AppHost Pack $(MicrosoftNETCoreAppPackageVersion) Microsoft .NET Core Host $(MicrosoftNETCoreAppPackageVersion) Microsoft .NET Core Host FX Resolver $(MicrosoftNETCoreAppPackageVersion) Microsoft.NETCore.App diff --git a/src/redist/targets/GenerateDebs.targets b/src/redist/targets/GenerateDebs.targets index 096596c28..5b9254aa2 100644 --- a/src/redist/targets/GenerateDebs.targets +++ b/src/redist/targets/GenerateDebs.targets @@ -53,6 +53,11 @@ netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion.Split('.')[0]).$(NETStandardLibraryRefPackageVersion.Split('.')[1]) $(NetStandardTargetingPackDebianPackageName.ToLower()) $(DownloadsFolder)$(DownloadedNetStandardTargetingPackInstallerFileName) + dotnet-apphost-pack-$(SharedFxDebianPackageFileVersion) + $(NetCoreAppHostPackDebianPackageFileName.ToLower()) + dotnet-apphost-pack-$(SharedFxDebianPackageVersion) + $(NetCoreAppHostPackDebianPackageName.ToLower()) + $(DownloadsFolder)$(DownloadedNetCoreAppHostPackInstallerFileName) dotnet-hostfxr-$(HostFxrVersion) $(HostFxrDebianPackageFileName.ToLower()) dotnet-hostfxr-$(HostFxrMajorMinorVersion) @@ -125,6 +130,9 @@ $(NetCoreAppTargetingPackDebianPackageName) + + $(NetCoreAppHostPackDebianPackageName) + $(NetStandardTargetingPackDebianPackageName) @@ -222,6 +230,7 @@ Inputs="@(CLISdkFiles)" Outputs="$(SdkDebInstallerFile)" > + @@ -305,6 +314,7 @@ + @@ -316,6 +326,7 @@ Condition=" '$(CLIBUILD_SKIP_TESTS)' != 'true' and '$(IsDebianBaseDistro)' == 'True' and '$(DebuildPresent)' == 'true' " DependsOnTargets="GetAspNetSharedFxInstallArgs" Inputs="$(DownloadedRuntimeDepsInstallerFile); + $(DownloadedNetCoreAppHostPackInstallerFile); $(DownloadedNetCoreAppTargetingPackInstallerFile); $(DownloadedNetStandardTargetingPackInstallerFile); $(DownloadedAspNetTargetingPackInstallerFile); @@ -329,6 +340,7 @@ + @@ -359,6 +371,7 @@ + diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index b0afc9f1a..50b4e54c8 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -29,6 +29,7 @@ dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) windowsdesktop-runtime-$(MicrosoftWindowsDesktopPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-targeting-pack-$(NetCoreAppTargetingPackVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) + dotnet-apphost-pack-$(NetCoreAppHostPackVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) windowsdesktop-targeting-pack-$(WindowsDesktopTargetingPackVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) netstandard$(NETStandardLibraryRefPackageVersion.Split('.')[0])$(NETStandardLibraryRefPackageVersion.Split('.')[1]) @@ -71,7 +72,7 @@ win-x64 win-x86 - + $(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion) @@ -109,15 +110,15 @@ - runtime.$(SharedFrameworkRid).Microsoft.NETCore.DotNetAppHost - $(NetCoreAppTargetingPackVersion) + Microsoft.NETCore.App.Host.$(SharedFrameworkRid) + $(NetCoreAppHostPackVersion) $(TargetFramework) packs/%(PackageName)/%(PackageVersion) - - runtime.$(AlternateAppHostRid).Microsoft.NETCore.DotNetAppHost - $(NetCoreAppTargetingPackVersion) + + Microsoft.NETCore.App.Host.$(AlternateAppHostRid) + $(NetCoreAppHostPackVersion) $(TargetFramework) packs/%(PackageName)/%(PackageVersion) @@ -163,6 +164,13 @@ $(DownloadedNetStandardTargetingPackInstallerFileName) $(CoreSetupBlobAccessTokenParam) + + + $(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion) + $(DownloadedNetCoreAppHostPackInstallerFileName) + $(CoreSetupBlobAccessTokenParam) + diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 39b25f31b..77a06cef1 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -140,6 +140,7 @@ '$(DownloadsFolder)$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName)' ^ '$(DownloadsFolder)$(DownloadedNetCoreAppTargetingPackInstallerFileName)' ^ '$(DownloadsFolder)$(DownloadedNetStandardTargetingPackInstallerFileName)' ^ + '$(DownloadsFolder)$(DownloadedNetCoreAppHostPackInstallerFileName)' ^ '$(DownloadsFolder)$(DownloadedAspNetTargetingPackInstallerFileName)' ^ '$(DownloadsFolder)$(DownloadedWindowsDesktopTargetingPackInstallerFileName)' ^ '$(CombinedFrameworkSdkHostMSIInstallerFile)' ^ diff --git a/src/redist/targets/GeneratePKG.targets b/src/redist/targets/GeneratePKG.targets index 55f132b97..9add88c7f 100644 --- a/src/redist/targets/GeneratePKG.targets +++ b/src/redist/targets/GeneratePKG.targets @@ -7,8 +7,9 @@ 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.$(MicrosoftNETCoreAppPackageVersion).component.osx.x64 - com.microsoft.standard.pack.targeting.$(MicrosoftNETCoreAppPackageVersion).component.osx.x64 + com.microsoft.dotnet.pack.targeting.$(NetCoreAppTargetingPackVersion).component.osx.x64 + com.microsoft.dotnet.pack.apphost.$(NetCoreAppHostPackVersion).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 @@ -27,6 +28,7 @@ $(PkgIntermediateDirectory)/$(SdkComponentId).pkg $(PkgIntermediateDirectory)/$(SharedFrameworkComponentId).pkg $(PkgIntermediateDirectory)/$(NetCoreAppTargetingPackComponentId).pkg + $(PkgIntermediateDirectory)/$(NetCoreAppHostPackComponentId).pkg $(PkgIntermediateDirectory)/$(NetStandardTargetingPackComponentId).pkg $(PkgIntermediateDirectory)/$(SharedHostComponentId).pkg $(PkgIntermediateDirectory)/$(HostFxrComponentId).pkg @@ -47,6 +49,9 @@ $(NetStandardTargetingPackComponentId) + + $(NetCoreAppHostPackComponentId) + $(SharedHostComponentId) @@ -68,6 +73,9 @@ $(NetCoreAppTargetingPackBrandName) + + $(NetCoreAppHostPackBrandName) + $(NetStandardTargetingPackBrandName) @@ -107,6 +115,7 @@ + @@ -161,12 +170,14 @@ diff --git a/src/redist/targets/GenerateRPMs.targets b/src/redist/targets/GenerateRPMs.targets index 82f54461a..bfec4fdc4 100644 --- a/src/redist/targets/GenerateRPMs.targets +++ b/src/redist/targets/GenerateRPMs.targets @@ -85,6 +85,9 @@ $(NetCoreAppTargetingPackRpmPackageName) + + $(NetCoreAppHostPackRpmPackageName) + $(NetStandardTargetingPackRpmPackageName) @@ -196,6 +199,10 @@ $(NetCoreAppTargetingPackRpmPackageName.ToLower()) dotnet-targeting-pack-$(SharedFxRpmPackageFileVersion) $(NetCoreAppTargetingPackRpmPackageFileName.ToLower()) + dotnet-apphost-pack-$(SharedFxRpmPackageVersion) + $(NetCoreAppHostPackRpmPackageName.ToLower()) + dotnet-apphost-pack-$(SharedFxRpmPackageFileVersion) + $(NetCoreAppHostPackRpmPackageFileName.ToLower()) netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion.Split('.')[0]).$(NETStandardLibraryRefPackageVersion.Split('.')[1]) $(NetStandardTargetingPackRpmPackageName.ToLower()) netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion) @@ -220,6 +227,7 @@ $(DownloadsFolder)$(DownloadedNetCoreAppTargetingPackInstallerFileName) $(DownloadsFolder)$(DownloadedNetStandardTargetingPackInstallerFileName) + $(DownloadsFolder)$(DownloadedNetCoreAppHostPackInstallerFileName) $(DownloadsFolder)$(DownloadedAspNetTargetingPackInstallerFileName) $(DownloadsFolder)$(DownloadedRuntimeDepsInstallerFileName) $(DownloadsFolder)$(DownloadedSharedHostInstallerFileName) @@ -253,6 +261,7 @@ Condition=" '$(CLIBUILD_SKIP_TESTS)' != 'true' and '$(IsRPMBasedDistro)' == 'True' and '$(FPMPresent)' == 'True' " Inputs="$(DownloadedNetCoreAppTargetingPackInstallerFile); $(DownloadedNetStandardTargetingPackInstallerFile); + $(DownloadedNetCoreAppHostPackInstallerFile); $(DownloadedAspNetTargetingPackInstallerFile); $(DownloadedRuntimeDepsInstallerFile); $(DownloadedSharedHostInstallerFile); @@ -265,6 +274,7 @@ + @@ -292,6 +302,7 @@ + diff --git a/src/redist/targets/packaging/deb/dotnet-debian_config.json b/src/redist/targets/packaging/deb/dotnet-debian_config.json index 1c8b64dae..35a0f433f 100644 --- a/src/redist/targets/packaging/deb/dotnet-debian_config.json +++ b/src/redist/targets/packaging/deb/dotnet-debian_config.json @@ -31,6 +31,7 @@ "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%" }, + "%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%" } diff --git a/src/redist/targets/packaging/osx/clisdk/Distribution-Template b/src/redist/targets/packaging/osx/clisdk/Distribution-Template index 912876cbe..036710240 100644 --- a/src/redist/targets/packaging/osx/clisdk/Distribution-Template +++ b/src/redist/targets/packaging/osx/clisdk/Distribution-Template @@ -13,6 +13,7 @@ + @@ -24,6 +25,9 @@ + + + @@ -38,6 +42,7 @@ {NetCoreAppTargetingPackComponentId}.pkg {NetStandardTargetingPackComponentId}.pkg + {NetCoreAppHostPackComponentId}.pkg {SharedFxComponentId}.pkg {HostFxrComponentId}.pkg {SharedHostComponentId}.pkg diff --git a/src/redist/targets/packaging/rpm/dotnet-config.json b/src/redist/targets/packaging/rpm/dotnet-config.json index 8128e9a9a..fd090e2d8 100644 --- a/src/redist/targets/packaging/rpm/dotnet-config.json +++ b/src/redist/targets/packaging/rpm/dotnet-config.json @@ -30,6 +30,10 @@ "package_name": "%NETCOREAPP_TARGETING_PACK_RPM_PACKAGE_NAME%", "package_version": "%SHARED_FRAMEWORK_RPM_PACKAGE_VERSION%" }, + { + "package_name": "%NETCORE_APPHOST_PACK_RPM_PACKAGE_NAME%", + "package_version": "%SHARED_FRAMEWORK_RPM_PACKAGE_VERSION%" + }, { "package_name": "%NETSTANDARD_TARGETING_PACK_RPM_PACKAGE_NAME%", "package_version": "%NETSTANDARD_TARGETING_PACK_RPM_PACKAGE_VERSION%" diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.wxs b/src/redist/targets/packaging/windows/clisdk/bundle.wxs index 3225f7a5a..e7f2020c7 100644 --- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs +++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs @@ -130,6 +130,9 @@ + + + diff --git a/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 b/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 index 5d1219af3..94910f6e6 100644 --- a/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 +++ b/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 @@ -9,6 +9,7 @@ param( [Parameter(Mandatory=$true)][string]$SharedHostMSIFile, [Parameter(Mandatory=$true)][string]$WinFormsAndWpfMSIFile, [Parameter(Mandatory=$true)][string]$NetCoreAppTargetingPackMSIFile, + [Parameter(Mandatory=$true)][string]$NetCoreAppHostPackMSIFile, [Parameter(Mandatory=$true)][string]$NetStandardTargetingPackMSIFile, [Parameter(Mandatory=$true)][string]$AspNetTargetingPackMSIFile, [Parameter(Mandatory=$true)][string]$WindowsDesktopTargetingPackMSIFile, @@ -31,10 +32,10 @@ function RunCandleForBundle $result = $true pushd "$WixRoot" - Write-Output Running candle for bundle.. + Write-Information "Running candle for bundle.." $AuthWsxRoot = $PSScriptRoot - .\candle.exe -nologo ` + $candleOutput = .\candle.exe -nologo ` -dDotnetSrc="$inputDir" ` -dMicrosoftEula="$PSScriptRoot\dummyeula.rtf" ` -dProductMoniker="$ProductMoniker" ` @@ -49,6 +50,7 @@ function RunCandleForBundle -dSharedHostMsiSourcePath="$SharedHostMSIFile" ` -dWinFormsAndWpfMsiSourcePath="$WinFormsAndWpfMSIFile" ` -dNetCoreAppTargetingPackMsiSourcePath="$NetCoreAppTargetingPackMSIFile" ` + -dNetCoreAppHostPackMsiSourcePath="$NetCoreAppHostPackMSIFile" ` -dNetStandardTargetingPackMsiSourcePath="$NetStandardTargetingPackMSIFile" ` -dAspNetTargetingPackMsiSourcePath="$AspNetTargetingPackMSIFile" ` -dWindowsDesktopTargetingPackMsiSourcePath="$WindowsDesktopTargetingPackMSIFile" ` @@ -62,12 +64,14 @@ function RunCandleForBundle -ext WixBalExtension.dll ` -ext WixUtilExtension.dll ` -ext WixTagExtension.dll ` - "$AuthWsxRoot\bundle.wxs" | Out-Host + "$AuthWsxRoot\bundle.wxs" + + Write-Information "Candle output: $candleOutput" if($LastExitCode -ne 0) { $result = $false - Write-Output "Candle failed with exit code $LastExitCode." + Write-Information "Candle failed with exit code $LastExitCode." } popd @@ -79,10 +83,10 @@ function RunLightForBundle $result = $true pushd "$WixRoot" - Write-Output Running light for bundle.. + Write-Information "Running light for bundle.." $AuthWsxRoot = $PSScriptRoot - .\light.exe -nologo ` + $lightOutput = .\light.exe -nologo ` -cultures:en-us ` bundle.wixobj ` $ASPNETRuntimeWixlibFile ` @@ -90,12 +94,14 @@ function RunLightForBundle -ext WixUtilExtension.dll ` -ext WixTagExtension.dll ` -b "$AuthWsxRoot" ` - -out $DotnetBundleOutput | Out-Host + -out $DotnetBundleOutput + + Write-Information "Light output: $lightOutput" if($LastExitCode -ne 0) { $result = $false - Write-Output "Light failed with exit code $LastExitCode." + Write-Information "Light failed with exit code $LastExitCode." } popd @@ -113,7 +119,7 @@ if(!(Test-Path $ASPNETRuntimeWixLibFile)) throw "$ASPNETRuntimeWixLibFile not found" } -Write-Output "Creating dotnet Bundle at $DotnetBundleOutput" +Write-Information "Creating dotnet Bundle at $DotnetBundleOutput" if([string]::IsNullOrEmpty($WixRoot)) { @@ -136,6 +142,6 @@ if(!(Test-Path $DotnetBundleOutput)) Exit -1 } -Write-Output "Successfully created dotnet bundle - $DotnetBundleOutput" +Write-Information "Successfully created dotnet bundle - $DotnetBundleOutput" exit $LastExitCode