From 69fce6467314b4e17f7f64e3b89e477b4d87a9e7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Apr 2019 13:10:34 +0000 Subject: [PATCH 01/22] Update dependencies from https://github.com/dotnet/standard build 20190417.1 (#1552) - NETStandard.Library - 2.1.0-prerelease.19217.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 47998cabd..2a2c47894 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/toolset 80fbe98de888ac1e02283bdad8fa7458757ceaee - + https://github.com/dotnet/standard - 194f2eb8bcec69ab6963d4dc51fc62bcb907386b + 4ed1867803dd2fa96b671b45e1afd1c12d268627 https://github.com/dotnet/cli From 39d9791c6dff73722683b36b986bede5b56e9cea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Apr 2019 13:19:27 +0000 Subject: [PATCH 02/22] Update dependencies from https://github.com/dotnet/wpf build 20190417.1 (#1554) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview5.19217.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2a2c47894..ed19ffcdd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -62,9 +62,9 @@ https://github.com/dotnet/winforms a875e24eff58bcc7a1bb124a6f05792639a83536 - + https://github.com/dotnet/wpf - 98d8e57e2c6ee4a8844a9b8f1f279cf5025f25aa + ff08359d185505512a72165bc0a615348e39aa3e diff --git a/eng/Versions.props b/eng/Versions.props index dc94086a4..37bc75a42 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 3.0.0-preview5.19215.4 + 3.0.0-preview5.19217.1 From 31b8991bccc6906dff64239796dbb47f8e5299d9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Apr 2019 13:45:48 +0000 Subject: [PATCH 03/22] Update dependencies from https://github.com/dotnet/cli build 20190417.1 (#1555) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview5.19217.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ed19ffcdd..e52ecc850 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://github.com/dotnet/standard 4ed1867803dd2fa96b671b45e1afd1c12d268627 - + https://github.com/dotnet/cli - 9adbab0c75e49a753643c578c3e92949299d534d + 407adfcd4f3decab020d5390fba6b5339c2cf582 https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 37bc75a42..e8cdf7f60 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ - 3.0.100-preview5.19216.1 + 3.0.100-preview5.19217.1 1.0.2-beta5.19216.1 From 29fe49e89aeb3f525b30176dddafe6a23e99501c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Apr 2019 13:49:15 +0000 Subject: [PATCH 04/22] Update dependencies from https://github.com/dotnet/toolset build 20190417.6 (#1556) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview5.19217.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e52ecc850..a347fa7c2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/templating 2426d6e864763c91faa0081fae898f71477f969f - + https://github.com/dotnet/toolset - 80fbe98de888ac1e02283bdad8fa7458757ceaee + 91c8cccdec2875676c5de475c0f689e3ee23d17a https://github.com/dotnet/standard diff --git a/eng/Versions.props b/eng/Versions.props index e8cdf7f60..c6f35e8a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview5.19217.1 + 3.0.100-preview5.19217.6 From 2eecb78e08f1d3bb91480813d807bd57eedcd9e7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Apr 2019 14:55:41 +0000 Subject: [PATCH 05/22] Update dependencies from https://github.com/dotnet/core-setup build 20190417.02 (#1557) - Microsoft.NETCore.App - 3.0.0-preview5-27617-02 - NETStandard.Library.Ref - 2.1.0-preview5-27617-02 - Microsoft.WindowsDesktop.App - 3.0.0-preview5-27617-02 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a347fa7c2..45c44cc49 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 3abca437fee294811fca2f81e9e5118a5b4c45fe + 1605dd65cbc9d637d2977f5ad4a22e71b72493ef - + https://github.com/dotnet/core-setup - 3abca437fee294811fca2f81e9e5118a5b4c45fe + 1605dd65cbc9d637d2977f5ad4a22e71b72493ef - + https://github.com/dotnet/core-setup - 3abca437fee294811fca2f81e9e5118a5b4c45fe + 1605dd65cbc9d637d2977f5ad4a22e71b72493ef https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index c6f35e8a9..5cc7f04ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,16 +44,16 @@ 1.6.1 - 3.0.0-preview5-27617-01 + 3.0.0-preview5-27617-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview5-27617-01 + 2.1.0-preview5-27617-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview5-27617-01 + 3.0.0-preview5-27617-02 $(MicrosoftWindowsDesktopAppPackageVersion) From 8df8278134a67e0b1e3f56a50d9fb4543182e2e3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Apr 2019 16:11:03 +0000 Subject: [PATCH 06/22] Update dependencies from https://github.com/dotnet/core-setup build 20190417.03 (#1558) - Microsoft.NETCore.App - 3.0.0-preview5-27617-03 - NETStandard.Library.Ref - 2.1.0-preview5-27617-03 - Microsoft.WindowsDesktop.App - 3.0.0-preview5-27617-03 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 45c44cc49..806d364d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 1605dd65cbc9d637d2977f5ad4a22e71b72493ef + f28abecf151695f90d303dddc682de5fae1ec479 - + https://github.com/dotnet/core-setup - 1605dd65cbc9d637d2977f5ad4a22e71b72493ef + f28abecf151695f90d303dddc682de5fae1ec479 - + https://github.com/dotnet/core-setup - 1605dd65cbc9d637d2977f5ad4a22e71b72493ef + f28abecf151695f90d303dddc682de5fae1ec479 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 5cc7f04ca..58ca41028 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,16 +44,16 @@ 1.6.1 - 3.0.0-preview5-27617-02 + 3.0.0-preview5-27617-03 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview5-27617-02 + 2.1.0-preview5-27617-03 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview5-27617-02 + 3.0.0-preview5-27617-03 $(MicrosoftWindowsDesktopAppPackageVersion) From 535d46237e6105f46cae6da2bb5ee5ce212bf8c1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Apr 2019 16:31:36 +0000 Subject: [PATCH 07/22] Update dependencies from https://github.com/dotnet/core-setup build 20190417.04 (#1559) - Microsoft.NETCore.App - 3.0.0-preview5-27617-04 - NETStandard.Library.Ref - 2.1.0-preview5-27617-04 - Microsoft.WindowsDesktop.App - 3.0.0-preview5-27617-04 --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 806d364d0..1959aaa10 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,15 +2,15 @@ - + https://github.com/dotnet/core-setup f28abecf151695f90d303dddc682de5fae1ec479 - + https://github.com/dotnet/core-setup f28abecf151695f90d303dddc682de5fae1ec479 - + https://github.com/dotnet/core-setup f28abecf151695f90d303dddc682de5fae1ec479 diff --git a/eng/Versions.props b/eng/Versions.props index 58ca41028..a880a6ce5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,16 +44,16 @@ 1.6.1 - 3.0.0-preview5-27617-03 + 3.0.0-preview5-27617-04 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview5-27617-03 + 2.1.0-preview5-27617-04 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview5-27617-03 + 3.0.0-preview5-27617-04 $(MicrosoftWindowsDesktopAppPackageVersion) From 07b074acf7d9964103754e44584e501b6e6efee8 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Wed, 17 Apr 2019 12:53:05 -0700 Subject: [PATCH 08/22] adding .Net core AppHost pack (#1519) * adding .Net core AppHost pack --- eng/Versions.props | 1 + src/redist/targets/Branding.targets | 1 + src/redist/targets/GenerateDebs.targets | 13 ++++++++++ src/redist/targets/GenerateLayout.targets | 20 +++++++++----- src/redist/targets/GenerateMSIs.targets | 1 + src/redist/targets/GeneratePKG.targets | 15 +++++++++-- src/redist/targets/GenerateRPMs.targets | 11 ++++++++ .../packaging/deb/dotnet-debian_config.json | 1 + .../osx/clisdk/Distribution-Template | 5 ++++ .../targets/packaging/rpm/dotnet-config.json | 4 +++ .../packaging/windows/clisdk/bundle.wxs | 3 +++ .../windows/clisdk/generatebundle.ps1 | 26 ++++++++++++------- 12 files changed, 83 insertions(+), 18 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index a880a6ce5..269e096b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,6 +49,7 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) + $(MicrosoftNETCoreAppPackageVersion) 2.1.0-preview5-27617-04 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) 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 From 549a274b68938590eb3d681e1e520d6b5909b28c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Apr 2019 21:20:31 +0000 Subject: [PATCH 09/22] Update dependencies from https://github.com/dotnet/cli build 20190417.2 (#1562) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview5.19217.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1959aaa10..67c024632 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://github.com/dotnet/standard 4ed1867803dd2fa96b671b45e1afd1c12d268627 - + https://github.com/dotnet/cli - 407adfcd4f3decab020d5390fba6b5339c2cf582 + 55a68b64264a5fe1cea6a962749781da49f9b93c https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 269e096b4..877b4c054 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ - 3.0.100-preview5.19217.1 + 3.0.100-preview5.19217.2 1.0.2-beta5.19216.1 From decf90c16be7c5ad38189bba9e455179292fd368 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Apr 2019 01:37:44 +0000 Subject: [PATCH 10/22] [master] Update dependencies from aspnet/AspNetCore (#1547) * Update dependencies from https://github.com/aspnet/AspNetCore build 20190416.9 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview5-19216-09 - dotnet-dev-certs - 3.0.0-preview5-19216-09 - dotnet-sql-cache - 3.0.0-preview5-19216-09 - dotnet-user-secrets - 3.0.0-preview5-19216-09 - dotnet-watch - 3.0.0-preview5-19216-09 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview5-19216-09 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview5-19216-09 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190417.3 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview5-19217-03 - dotnet-dev-certs - 3.0.0-preview5-19217-03 - dotnet-sql-cache - 3.0.0-preview5-19217-03 - dotnet-user-secrets - 3.0.0-preview5-19217-03 - dotnet-watch - 3.0.0-preview5-19217-03 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview5-19217-03 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview5-19217-03 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 67c024632..5485c5cda 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,33 +14,33 @@ https://github.com/dotnet/core-setup f28abecf151695f90d303dddc682de5fae1ec479 - + https://github.com/aspnet/AspNetCore - 2dc5694ecd1bd95e9091f6942657ebe1da6e0bb7 + 485795ad3c52d1697c6301d9cf5e176af984e11d - + https://github.com/aspnet/AspNetCore - 2dc5694ecd1bd95e9091f6942657ebe1da6e0bb7 + 485795ad3c52d1697c6301d9cf5e176af984e11d - + https://github.com/aspnet/AspNetCore - 2dc5694ecd1bd95e9091f6942657ebe1da6e0bb7 + 485795ad3c52d1697c6301d9cf5e176af984e11d - + https://github.com/aspnet/AspNetCore - 2dc5694ecd1bd95e9091f6942657ebe1da6e0bb7 + 485795ad3c52d1697c6301d9cf5e176af984e11d - + https://github.com/aspnet/AspNetCore - 2dc5694ecd1bd95e9091f6942657ebe1da6e0bb7 + 485795ad3c52d1697c6301d9cf5e176af984e11d - + https://github.com/aspnet/AspNetCore - 2dc5694ecd1bd95e9091f6942657ebe1da6e0bb7 + 485795ad3c52d1697c6301d9cf5e176af984e11d - + https://github.com/aspnet/AspNetCore - 2dc5694ecd1bd95e9091f6942657ebe1da6e0bb7 + 485795ad3c52d1697c6301d9cf5e176af984e11d https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 877b4c054..7524088fe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,13 +24,13 @@ - 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-19217-03 + 3.0.0-preview5-19217-03 + 3.0.0-preview5-19217-03 + 3.0.0-preview5-19217-03 + 3.0.0-preview5-19217-03 + 3.0.0-preview5-19217-03 + 3.0.0-preview5-19217-03 From 530cb6e32c2c892724b90e3d20d197f169e8fbdf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Apr 2019 02:25:41 +0000 Subject: [PATCH 11/22] Update dependencies from https://github.com/dotnet/standard build 20190417.2 (#1563) - NETStandard.Library - 2.1.0-prerelease.19217.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5485c5cda..c9a5f11e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/toolset 91c8cccdec2875676c5de475c0f689e3ee23d17a - + https://github.com/dotnet/standard - 4ed1867803dd2fa96b671b45e1afd1c12d268627 + 25538d60f7f4c2c79cf098f2b808907d87b516a7 https://github.com/dotnet/cli From 3796a4920531c8711e145e746ab822b99c5e280d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Apr 2019 03:29:15 +0000 Subject: [PATCH 12/22] Update dependencies from https://github.com/aspnet/AspNetCore build 20190417.4 (#1565) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview5-19217-04 - dotnet-dev-certs - 3.0.0-preview5-19217-04 - dotnet-sql-cache - 3.0.0-preview5-19217-04 - dotnet-user-secrets - 3.0.0-preview5-19217-04 - dotnet-watch - 3.0.0-preview5-19217-04 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview5-19217-04 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview5-19217-04 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9a5f11e9..da56f82df 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,33 +14,33 @@ https://github.com/dotnet/core-setup f28abecf151695f90d303dddc682de5fae1ec479 - + https://github.com/aspnet/AspNetCore - 485795ad3c52d1697c6301d9cf5e176af984e11d + e4328b2a96564758ca12d47d07549923ce83b9a6 - + https://github.com/aspnet/AspNetCore - 485795ad3c52d1697c6301d9cf5e176af984e11d + e4328b2a96564758ca12d47d07549923ce83b9a6 - + https://github.com/aspnet/AspNetCore - 485795ad3c52d1697c6301d9cf5e176af984e11d + e4328b2a96564758ca12d47d07549923ce83b9a6 - + https://github.com/aspnet/AspNetCore - 485795ad3c52d1697c6301d9cf5e176af984e11d + e4328b2a96564758ca12d47d07549923ce83b9a6 - + https://github.com/aspnet/AspNetCore - 485795ad3c52d1697c6301d9cf5e176af984e11d + e4328b2a96564758ca12d47d07549923ce83b9a6 - + https://github.com/aspnet/AspNetCore - 485795ad3c52d1697c6301d9cf5e176af984e11d + e4328b2a96564758ca12d47d07549923ce83b9a6 - + https://github.com/aspnet/AspNetCore - 485795ad3c52d1697c6301d9cf5e176af984e11d + e4328b2a96564758ca12d47d07549923ce83b9a6 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 7524088fe..5510b574b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,13 +24,13 @@ - 3.0.0-preview5-19217-03 - 3.0.0-preview5-19217-03 - 3.0.0-preview5-19217-03 - 3.0.0-preview5-19217-03 - 3.0.0-preview5-19217-03 - 3.0.0-preview5-19217-03 - 3.0.0-preview5-19217-03 + 3.0.0-preview5-19217-04 + 3.0.0-preview5-19217-04 + 3.0.0-preview5-19217-04 + 3.0.0-preview5-19217-04 + 3.0.0-preview5-19217-04 + 3.0.0-preview5-19217-04 + 3.0.0-preview5-19217-04 From b7941d608d27b4a237a2cfe9bdc407ee29cdd5cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Apr 2019 09:22:10 +0000 Subject: [PATCH 13/22] [master] Update dependencies from aspnet/AspNetCore (#1566) * Update dependencies from https://github.com/aspnet/AspNetCore build 20190417.5 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview5-19217-05 - dotnet-dev-certs - 3.0.0-preview5-19217-05 - dotnet-sql-cache - 3.0.0-preview5-19217-05 - dotnet-user-secrets - 3.0.0-preview5-19217-05 - dotnet-watch - 3.0.0-preview5-19217-05 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview5-19217-05 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview5-19217-05 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190418.1 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview5-19218-01 - dotnet-dev-certs - 3.0.0-preview5-19218-01 - dotnet-sql-cache - 3.0.0-preview5-19218-01 - dotnet-user-secrets - 3.0.0-preview5-19218-01 - dotnet-watch - 3.0.0-preview5-19218-01 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview5-19218-01 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview5-19218-01 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index da56f82df..417b3e8f1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,33 +14,33 @@ https://github.com/dotnet/core-setup f28abecf151695f90d303dddc682de5fae1ec479 - + https://github.com/aspnet/AspNetCore - e4328b2a96564758ca12d47d07549923ce83b9a6 + 7e3c69eae0cc634e37778c4d55b19fc7c1c432db - + https://github.com/aspnet/AspNetCore - e4328b2a96564758ca12d47d07549923ce83b9a6 + 7e3c69eae0cc634e37778c4d55b19fc7c1c432db - + https://github.com/aspnet/AspNetCore - e4328b2a96564758ca12d47d07549923ce83b9a6 + 7e3c69eae0cc634e37778c4d55b19fc7c1c432db - + https://github.com/aspnet/AspNetCore - e4328b2a96564758ca12d47d07549923ce83b9a6 + 7e3c69eae0cc634e37778c4d55b19fc7c1c432db - + https://github.com/aspnet/AspNetCore - e4328b2a96564758ca12d47d07549923ce83b9a6 + 7e3c69eae0cc634e37778c4d55b19fc7c1c432db - + https://github.com/aspnet/AspNetCore - e4328b2a96564758ca12d47d07549923ce83b9a6 + 7e3c69eae0cc634e37778c4d55b19fc7c1c432db - + https://github.com/aspnet/AspNetCore - e4328b2a96564758ca12d47d07549923ce83b9a6 + 7e3c69eae0cc634e37778c4d55b19fc7c1c432db https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 5510b574b..bcf1735b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,13 +24,13 @@ - 3.0.0-preview5-19217-04 - 3.0.0-preview5-19217-04 - 3.0.0-preview5-19217-04 - 3.0.0-preview5-19217-04 - 3.0.0-preview5-19217-04 - 3.0.0-preview5-19217-04 - 3.0.0-preview5-19217-04 + 3.0.0-preview5-19218-01 + 3.0.0-preview5-19218-01 + 3.0.0-preview5-19218-01 + 3.0.0-preview5-19218-01 + 3.0.0-preview5-19218-01 + 3.0.0-preview5-19218-01 + 3.0.0-preview5-19218-01 From b546f7330fbdf352e81b6059c8425c8609e27f5d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Apr 2019 12:32:06 +0000 Subject: [PATCH 14/22] Update dependencies from https://github.com/dotnet/arcade build 20190418.1 (#1567) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19218.1 --- eng/Version.Details.xml | 4 ++-- eng/common/CheckSymbols.ps1 | 44 ++++++++++++++++++++++++++++--------- global.json | 2 +- 3 files changed, 37 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 417b3e8f1..687859cc2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,9 +68,9 @@ - + https://github.com/dotnet/arcade - 4e21d52dabbb9f5705a90f097acb1465a0354c0d + 46718d98c0fd03690a6a8c83da692a4a85a17902 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" } } From 941a326757ff29231db33a13376c17ace69db22f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Apr 2019 12:32:22 +0000 Subject: [PATCH 15/22] Update dependencies from https://github.com/dotnet/templating build 20190417.1 (#1568) - Microsoft.DotNet.Common.ItemTemplates - 1.0.2-beta5.19217.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 687859cc2..b38ce261a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/aspnet/AspNetCore 7e3c69eae0cc634e37778c4d55b19fc7c1c432db - + https://github.com/dotnet/templating - 2426d6e864763c91faa0081fae898f71477f969f + b415d1449b526338fba996d87c92a9de7f5286b8 https://github.com/dotnet/toolset diff --git a/eng/Versions.props b/eng/Versions.props index bcf1735b4..d960de743 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ 3.0.100-preview5.19217.2 - 1.0.2-beta5.19216.1 + 1.0.2-beta5.19217.1 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) 1.0.2-beta4.19155.2 0.2.0 From 8bfbc32c0a595cf30af172aaeef1adc5e8dfe3c4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Apr 2019 12:48:14 +0000 Subject: [PATCH 16/22] Update dependencies from https://github.com/dotnet/toolset build 20190418.2 (#1569) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview5.19218.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b38ce261a..a7ac6a7a6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/templating b415d1449b526338fba996d87c92a9de7f5286b8 - + https://github.com/dotnet/toolset - 91c8cccdec2875676c5de475c0f689e3ee23d17a + 9b952305b379b8b9600362a0bf425d5c0430908a https://github.com/dotnet/standard diff --git a/eng/Versions.props b/eng/Versions.props index d960de743..5c6b7d40b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview5.19217.6 + 3.0.100-preview5.19218.2 From 7d2b74c36802a38cc19b143542562f8352dde2b9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Apr 2019 13:09:30 +0000 Subject: [PATCH 17/22] [master] Update dependencies from dotnet/toolset (#1570) * Update dependencies from https://github.com/dotnet/toolset build 20190418.1 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview5.19218.1 * Update dependencies from https://github.com/dotnet/toolset build 20190418.3 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview5.19218.3 * Update dependencies from https://github.com/dotnet/toolset build 20190418.4 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview5.19218.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a7ac6a7a6..a4a27e888 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/templating b415d1449b526338fba996d87c92a9de7f5286b8 - + https://github.com/dotnet/toolset - 9b952305b379b8b9600362a0bf425d5c0430908a + 20bac9779795cdeb47704e2e3a5cbdd092ad87f3 https://github.com/dotnet/standard diff --git a/eng/Versions.props b/eng/Versions.props index 5c6b7d40b..a19d1db38 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview5.19218.2 + 3.0.100-preview5.19218.4 From 7750a85468dece2031a28d07bfd8fe2eac1193a5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Apr 2019 13:10:11 +0000 Subject: [PATCH 18/22] Update dependencies from https://github.com/dotnet/wpf build 20190417.4 (#1571) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview5.19217.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a4a27e888..e08c72e01 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -62,9 +62,9 @@ https://github.com/dotnet/winforms a875e24eff58bcc7a1bb124a6f05792639a83536 - + https://github.com/dotnet/wpf - ff08359d185505512a72165bc0a615348e39aa3e + 8beb1b2f8d5d6f7a7d85f32d09ce3fc33696e206 diff --git a/eng/Versions.props b/eng/Versions.props index a19d1db38..c5436d131 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 3.0.0-preview5.19217.1 + 3.0.0-preview5.19217.4 From e616d7311cfecb42aab30fe870f2f853d6fa9a8b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Apr 2019 13:32:07 +0000 Subject: [PATCH 19/22] Update dependencies from https://github.com/dotnet/toolset build 20190418.5 (#1572) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview5.19218.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e08c72e01..82cdc5f71 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/templating b415d1449b526338fba996d87c92a9de7f5286b8 - + https://github.com/dotnet/toolset - 20bac9779795cdeb47704e2e3a5cbdd092ad87f3 + 271a84e4c13ccfd2fcda8bc53aa45bc91e1d47e1 https://github.com/dotnet/standard diff --git a/eng/Versions.props b/eng/Versions.props index c5436d131..fa7e9300f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview5.19218.4 + 3.0.100-preview5.19218.5 From f5f27e03466028c932f2d98cc5d58d7e4d420090 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Apr 2019 13:55:34 +0000 Subject: [PATCH 20/22] Update dependencies from https://github.com/dotnet/cli build 20190418.1 (#1574) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview5.19218.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 82cdc5f71..ba84efb44 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://github.com/dotnet/standard 25538d60f7f4c2c79cf098f2b808907d87b516a7 - + https://github.com/dotnet/cli - 55a68b64264a5fe1cea6a962749781da49f9b93c + acf9ebc74c43fc242a6529c0c9f31a3a6c13e378 https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index fa7e9300f..6fbb63ad7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ - 3.0.100-preview5.19217.2 + 3.0.100-preview5.19218.1 1.0.2-beta5.19217.1 From 8f66965f8f6c3a1f70794cc3a4dbb983c609d926 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Apr 2019 17:19:40 +0000 Subject: [PATCH 21/22] Update dependencies from https://github.com/dotnet/toolset build 20190418.6 (#1573) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview5.19218.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ba84efb44..dc0ac8b84 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/templating b415d1449b526338fba996d87c92a9de7f5286b8 - + https://github.com/dotnet/toolset - 271a84e4c13ccfd2fcda8bc53aa45bc91e1d47e1 + f2edaad5577852a23a531396ddb26a0aee1f8def https://github.com/dotnet/standard diff --git a/eng/Versions.props b/eng/Versions.props index 6fbb63ad7..0d4043d2f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview5.19218.5 + 3.0.100-preview5.19218.6 From 771d1d1f6712ebfecd761209ab5e487c025b17c2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Apr 2019 17:39:32 +0000 Subject: [PATCH 22/22] Update dependencies from https://github.com/aspnet/AspNetCore build 20190418.2 (#1575) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview5-19218-02 - dotnet-dev-certs - 3.0.0-preview5-19218-02 - dotnet-sql-cache - 3.0.0-preview5-19218-02 - dotnet-user-secrets - 3.0.0-preview5-19218-02 - dotnet-watch - 3.0.0-preview5-19218-02 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview5-19218-02 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview5-19218-02 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dc0ac8b84..75f53a4bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,33 +14,33 @@ https://github.com/dotnet/core-setup f28abecf151695f90d303dddc682de5fae1ec479 - + https://github.com/aspnet/AspNetCore - 7e3c69eae0cc634e37778c4d55b19fc7c1c432db + 9c25375f0bf4b3adda1e16eda89597a49239b031 - + https://github.com/aspnet/AspNetCore - 7e3c69eae0cc634e37778c4d55b19fc7c1c432db + 9c25375f0bf4b3adda1e16eda89597a49239b031 - + https://github.com/aspnet/AspNetCore - 7e3c69eae0cc634e37778c4d55b19fc7c1c432db + 9c25375f0bf4b3adda1e16eda89597a49239b031 - + https://github.com/aspnet/AspNetCore - 7e3c69eae0cc634e37778c4d55b19fc7c1c432db + 9c25375f0bf4b3adda1e16eda89597a49239b031 - + https://github.com/aspnet/AspNetCore - 7e3c69eae0cc634e37778c4d55b19fc7c1c432db + 9c25375f0bf4b3adda1e16eda89597a49239b031 - + https://github.com/aspnet/AspNetCore - 7e3c69eae0cc634e37778c4d55b19fc7c1c432db + 9c25375f0bf4b3adda1e16eda89597a49239b031 - + https://github.com/aspnet/AspNetCore - 7e3c69eae0cc634e37778c4d55b19fc7c1c432db + 9c25375f0bf4b3adda1e16eda89597a49239b031 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 0d4043d2f..bc01af0f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,13 +24,13 @@ - 3.0.0-preview5-19218-01 - 3.0.0-preview5-19218-01 - 3.0.0-preview5-19218-01 - 3.0.0-preview5-19218-01 - 3.0.0-preview5-19218-01 - 3.0.0-preview5-19218-01 - 3.0.0-preview5-19218-01 + 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