From 76a361bbf84e62d746f1d0a5a27e7c7d4d6f1209 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Tue, 24 Sep 2019 10:36:04 -0700 Subject: [PATCH 1/9] Add CrossPlatform AppHost Packs; release/3.1.1xx (#4916) * Add CrossPlatform AppHost Packs for arm & arm64. --- src/redist/targets/GenerateLayout.targets | 47 +++++++++++++++++-- src/redist/targets/GenerateMSIs.targets | 3 ++ .../packaging/windows/clisdk/bundle.wxs | 9 ++++ .../windows/clisdk/generatebundle.ps1 | 8 +++- 4 files changed, 63 insertions(+), 4 deletions(-) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 766a42b6d..b1cc71780 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -32,6 +32,8 @@ $(CoreSetupRid) x64 + x64 + x86 dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-hostfxr$(InstallerStartSuffix)-$(HostFxrVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) @@ -39,6 +41,9 @@ windowsdesktop-runtime-$(MicrosoftWindowsDesktopPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-targeting-pack-$(NetCoreAppTargetingPackVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-apphost-pack-$(NetCoreAppHostPackVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) + dotnet-apphost-pack-$(NetCoreAppHostPackVersion)-$(SharedFrameworkInstallerFileRid)_$(AlternateArchitecture)$(InstallerExtension) + dotnet-apphost-pack-$(NetCoreAppHostPackVersion)-$(SharedFrameworkInstallerFileRid)_arm$(InstallerExtension) + dotnet-apphost-pack-$(NetCoreAppHostPackVersion)-$(SharedFrameworkInstallerFileRid)_arm64$(InstallerExtension) windowsdesktop-targeting-pack-$(WindowsDesktopTargetingPackVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) netstandard$(NETStandardLibraryRefPackageVersion.Split('.')[0])$(NETStandardLibraryRefPackageVersion.Split('.')[1]) @@ -76,9 +81,10 @@ $(CoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive$(ArchiveExtension) - - win-x64 - win-x86 + + win-$(AlternateArchitecture) + win-arm + win-arm64 @@ -124,6 +130,20 @@ packs/%(PackageName)/%(PackageVersion) + + Microsoft.NETCore.App.Host.$(ArmAppHostRid) + $(NetCoreAppHostPackVersion) + $(TargetFramework) + packs/%(PackageName)/%(PackageVersion) + + + + Microsoft.NETCore.App.Host.$(Arm64AppHostRid) + $(NetCoreAppHostPackVersion) + $(TargetFramework) + packs/%(PackageName)/%(PackageVersion) + + $(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion) @@ -173,6 +193,27 @@ $(CoreSetupBlobAccessTokenParam) + + $(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion) + $(DownloadedAlternateNetCoreAppHostPackInstallerFileName) + $(CoreSetupBlobAccessTokenParam) + + + + $(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion) + $(DownloadedArmNetCoreAppHostPackInstallerFileName) + $(CoreSetupBlobAccessTokenParam) + + + + $(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion) + $(DownloadedArm64NetCoreAppHostPackInstallerFileName) + $(CoreSetupBlobAccessTokenParam) + + $(CoreSetupRootUrl)$(WindowsDesktopTargetingPackVersion) diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 82d619de0..b523ad822 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -239,6 +239,9 @@ '$(DownloadsFolder)$(DownloadedNetCoreAppTargetingPackInstallerFileName)' ^ '$(DownloadsFolder)$(DownloadedNetStandardTargetingPackInstallerFileName)' ^ '$(DownloadsFolder)$(DownloadedNetCoreAppHostPackInstallerFileName)' ^ + '$(DownloadsFolder)$(DownloadedAlternateNetCoreAppHostPackInstallerFileName)' ^ + '$(DownloadsFolder)$(DownloadedArmNetCoreAppHostPackInstallerFileName)' ^ + '$(DownloadsFolder)$(DownloadedArm64NetCoreAppHostPackInstallerFileName)' ^ '$(DownloadsFolder)$(DownloadedAspNetTargetingPackInstallerFileName)' ^ '$(DownloadsFolder)$(DownloadedWindowsDesktopTargetingPackInstallerFileName)' ^ '$(Templates30MSIInstallerFile)' ^ diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.wxs b/src/redist/targets/packaging/windows/clisdk/bundle.wxs index 27d2f03ba..2d3c31dd9 100644 --- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs +++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs @@ -133,6 +133,15 @@ + + + + + + + + + diff --git a/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 b/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 index 649fbdd5d..d4eb57dfa 100644 --- a/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 +++ b/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 @@ -9,8 +9,11 @@ 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]$NetCoreAppHostPackMSIFile, + [Parameter(Mandatory=$true)][string]$AlternateNetCoreAppHostPackMSIFile, + [Parameter(Mandatory=$true)][string]$ArmNetCoreAppHostPackMSIFile, + [Parameter(Mandatory=$true)][string]$Arm64NetCoreAppHostPackMSIFile, [Parameter(Mandatory=$true)][string]$AspNetTargetingPackMSIFile, [Parameter(Mandatory=$true)][string]$WindowsDesktopTargetingPackMSIFile, [Parameter(Mandatory=$true)][string]$TemplatesMSIFile, @@ -53,6 +56,9 @@ function RunCandleForBundle -dWinFormsAndWpfMsiSourcePath="$WinFormsAndWpfMSIFile" ` -dNetCoreAppTargetingPackMsiSourcePath="$NetCoreAppTargetingPackMSIFile" ` -dNetCoreAppHostPackMsiSourcePath="$NetCoreAppHostPackMSIFile" ` + -dAlternateNetCoreAppHostPackMsiSourcePath="$AlternateNetCoreAppHostPackMSIFile" ` + -dArmNetCoreAppHostPackMsiSourcePath="$ArmNetCoreAppHostPackMSIFile" ` + -dArm64NetCoreAppHostPackMsiSourcePath="$Arm64NetCoreAppHostPackMSIFile" ` -dNetStandardTargetingPackMsiSourcePath="$NetStandardTargetingPackMSIFile" ` -dAspNetTargetingPackMsiSourcePath="$AspNetTargetingPackMSIFile" ` -dWindowsDesktopTargetingPackMsiSourcePath="$WindowsDesktopTargetingPackMSIFile" ` From 0cc95ac36cbaa1d7cf5b18a5d0fa4879e2d14bca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 24 Sep 2019 13:59:39 -0700 Subject: [PATCH 2/9] [release/3.1.1xx] Update dependencies from dotnet/toolset (#4797) * Update dependencies from https://github.com/dotnet/toolset build 20190924.3 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19474.3 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview1.19463.2 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19474.2 (parent: Microsoft.Dotnet.Toolset.Internal) * Override PATH to let razor find stage2 dotnet --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- test/EndToEnd/ProjectBuildTests.cs | 8 +++++--- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 37ef3fe87..cd395021b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - a8d3527fb2816d377ffabda05fb43b34bb1635db + ab601116c06e74e7183920e69bc5251fe2b18d10 - + https://github.com/dotnet/sdk - b88161ed99ded0dd598779ad1afe044818422a6f + a19b734139ab62de631c31897b0ffc35f8462f3f - + https://github.com/dotnet/cli - 25e58e48c0f49360bb5a9c804ca3b2ebeae01246 + 4a9e195d7123e1c3d774cf8e6881d3ff93f47c44 diff --git a/eng/Versions.props b/eng/Versions.props index 89cfeca07..2fc6ae042 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19462.27 + 3.1.100-preview1.19474.3 @@ -33,14 +33,14 @@ - 3.1.100-preview1.19462.8 + 3.1.100-preview1.19474.2 0.2.0 - 3.0.100-rc2.19455.7 + 3.1.100-preview1.19463.2 $(MicrosoftNETSdkPackageVersion) diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index 5770d6f3a..be7f7132d 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -143,10 +143,12 @@ namespace EndToEnd.Tests .Execute(restoreArgs) .Should().Pass(); + var dotnetRoot = Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest); new BuildCommand() - .WithWorkingDirectory(projectDirectory) - .Execute() - .Should().Pass(); + .WithEnvironmentVariable("PATH", dotnetRoot) // override PATH since razor rely on PATH to find dotnet + .WithWorkingDirectory(projectDirectory) + .Execute() + .Should().Pass(); } } } From 067a78fb703621c8aa1e42c7c774895a1dfe1b10 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 24 Sep 2019 21:18:14 +0000 Subject: [PATCH 3/9] [release/3.1.1xx] Update dependencies from aspnet/AspNetCore (#4925) * Update dependencies from https://github.com/aspnet/AspNetCore build 20190924.2 - dotnet-user-secrets - 3.1.0-preview1.19474.2 - dotnet-watch - 3.1.0-preview1.19474.2 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19474.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19474.2 - dotnet-dev-certs - 3.1.0-preview1.19474.2 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19474.2 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190924.4 - dotnet-user-secrets - 3.1.0-preview1.19474.4 - dotnet-watch - 3.1.0-preview1.19474.4 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19474.4 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19474.4 - dotnet-dev-certs - 3.1.0-preview1.19474.4 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19474.4 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd395021b..f1dd11981 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 72b39b0473993b932a08c8fc24a8988d45b416a5 - + https://github.com/aspnet/AspNetCore - 26f160d1649350083fad67f45741ceb1c798b110 + ab1347ef20745187440a8bf0f857362b5089056c - + https://github.com/aspnet/AspNetCore - 26f160d1649350083fad67f45741ceb1c798b110 + ab1347ef20745187440a8bf0f857362b5089056c - + https://github.com/aspnet/AspNetCore - 26f160d1649350083fad67f45741ceb1c798b110 + ab1347ef20745187440a8bf0f857362b5089056c - + https://github.com/aspnet/AspNetCore - 26f160d1649350083fad67f45741ceb1c798b110 + ab1347ef20745187440a8bf0f857362b5089056c - + https://github.com/aspnet/AspNetCore - 26f160d1649350083fad67f45741ceb1c798b110 + ab1347ef20745187440a8bf0f857362b5089056c - + https://github.com/aspnet/AspNetCore - 26f160d1649350083fad67f45741ceb1c798b110 + ab1347ef20745187440a8bf0f857362b5089056c https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 2fc6ae042..d2f070f5b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.1.0-preview1.19473.5 - 3.1.0-preview1.19473.5 - 3.1.0-preview1.19473.5 - 3.1.0-preview1.19473.5 - 3.1.0-preview1.19473.5 - 3.1.0-preview1.19473.5 + 3.1.0-preview1.19474.4 + 3.1.0-preview1.19474.4 + 3.1.0-preview1.19474.4 + 3.1.0-preview1.19474.4 + 3.1.0-preview1.19474.4 + 3.1.0-preview1.19474.4 From de5d189275a1695c5d4a8a53727315a76a13f6da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 24 Sep 2019 23:30:36 +0000 Subject: [PATCH 4/9] Update dependencies from https://github.com/dotnet/toolset build 20190924.5 (#4929) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19474.5 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview1.19469.1 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f1dd11981..a2fe28519 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,13 +42,13 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - ab601116c06e74e7183920e69bc5251fe2b18d10 + 1cb9d48ea26f274afc89c185b640386fe4dc1d38 - + https://github.com/dotnet/sdk - a19b734139ab62de631c31897b0ffc35f8462f3f + 902380600200731914d936fca50b60e3e06dcb16 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index d2f070f5b..a55d6bfc2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19474.3 + 3.1.100-preview1.19474.5 @@ -40,7 +40,7 @@ - 3.1.100-preview1.19463.2 + 3.1.100-preview1.19469.1 $(MicrosoftNETSdkPackageVersion) From 91519346e4bdcbde9c779f4a0881627706262442 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 25 Sep 2019 00:05:42 +0000 Subject: [PATCH 5/9] Update dependencies from https://github.com/dotnet/toolset build 20190924.6 (#4930) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19474.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 a2fe28519..89d76c890 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 1cb9d48ea26f274afc89c185b640386fe4dc1d38 + 256b3e07a94d90a0585b1f8da8d3b99526272637 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index a55d6bfc2..c3f960438 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19474.5 + 3.1.100-preview1.19474.6 From 156f17d8825fe7585392d8f0df7a1eadbd80ea2d Mon Sep 17 00:00:00 2001 From: John Beisner Date: Wed, 25 Sep 2019 11:28:12 -0700 Subject: [PATCH 6/9] Add 3.1 Templates MSIs (#4931) * Adding 3.1 Templates MSI --- eng/Versions.props | 6 +++--- src/redist/targets/Branding.targets | 1 + src/redist/targets/BundledTemplates.targets | 4 ++-- src/redist/targets/GenerateMSIs.targets | 23 +++++++++++++++++++-- 4 files changed, 27 insertions(+), 7 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index c3f960438..a92042274 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,9 +64,9 @@ $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) 1.6.3 - 2.0.0-preview8.19373.1 + 3.1.0-preview1.19475.1 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) - 1.0.2-beta4.19354.2 + 1.0.2-beta4.19465.1 $(AspNetCoreVersion) 4.8.0-rc2.19462.10 @@ -75,7 +75,7 @@ 2.0.0-preview8.19373.1 $(MicrosoftDotNetCommonItemTemplates30PackageVersion) 1.0.2-beta4.19354.2 - 3.0.0-rc2.19461.12 + 3.0.0 1.6.0 1.0.2-beta4 diff --git a/src/redist/targets/Branding.targets b/src/redist/targets/Branding.targets index 4a6c57f77..a9acebcfd 100644 --- a/src/redist/targets/Branding.targets +++ b/src/redist/targets/Branding.targets @@ -13,6 +13,7 @@ Microsoft .NET Core Host FX Resolver $(MicrosoftNETCoreAppPackageVersion) Microsoft.NETCore.App $(SharedFrameworkName) + Microsoft .NET Core 3.1 Templates $(CliBrandingVersion) Microsoft .NET Core 3.0 Templates $(CliBrandingVersion) Microsoft .NET Core 2.2 Templates $(CliBrandingVersion) Microsoft .NET Core 2.1 Templates $(CliBrandingVersion) diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 495d1d453..5c5c545ca 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -46,8 +46,8 @@ - - + + diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index b523ad822..e7ba57667 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -39,6 +39,7 @@ $(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionSdk)$(InstallerExtension) Dotnet_CLI + $(ArtifactsShippingPackagesDir)dotnet-31templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension) $(ArtifactsShippingPackagesDir)dotnet-30templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension) $(ArtifactsShippingPackagesDir)dotnet-22templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension) $(ArtifactsShippingPackagesDir)dotnet-21templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension) @@ -59,7 +60,7 @@ DependsOnTargets="GenerateLayout;SetupWixProperties;GetCoreSdkGitCommitInfo"> - + + + + + @@ -192,6 +198,14 @@ + + $(Templates31LayoutPath.TrimEnd('\')) + $(Templates31MSIInstallerFile) + $(BundledTemplates31BrandName) + $(BundledTemplates31MsiVersion) + $(Templates31InstallerUpgradeCode) + NetCore_Templates_3.1 + $(Templates30LayoutPath.TrimEnd('\')) $(Templates30MSIInstallerFile) @@ -244,7 +258,7 @@ '$(DownloadsFolder)$(DownloadedArm64NetCoreAppHostPackInstallerFileName)' ^ '$(DownloadsFolder)$(DownloadedAspNetTargetingPackInstallerFileName)' ^ '$(DownloadsFolder)$(DownloadedWindowsDesktopTargetingPackInstallerFileName)' ^ - '$(Templates30MSIInstallerFile)' ^ + '$(Templates31MSIInstallerFile)' ^ '$(CombinedFrameworkSdkHostMSIInstallerFile)' ^ '$(WixRoot)' ^ '$(SdkBrandName)' ^ @@ -321,6 +335,11 @@ + + $(Templates31MSIInstallerFile) + $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates31MajorMinorVersion).$(FullNugetVersion).nupkg + $(BundledTemplates31MajorMinorVersion) + $(Templates30MSIInstallerFile) $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates30MajorMinorVersion).$(FullNugetVersion).nupkg From 59212cdc431c7c644446dc3c88d3a304cf58cfb4 Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 26 Sep 2019 14:15:25 -0700 Subject: [PATCH 7/9] Remove opensuse (#4960) --- .vsts-ci.yml | 7 ------- eng/dockerrun.sh | 6 ------ netci.groovy | 3 +-- src/redist/targets/GetRuntimeInformation.targets | 6 ++---- src/redist/targets/SetBuildDefaults.targets | 2 -- 5 files changed, 3 insertions(+), 21 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 31dff1c60..c80b375e9 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -120,13 +120,6 @@ jobs: _RuntimeIdentifier: '' _BuildArchitecture: 'x64' _DropSuffix: '' - Build_OpenSUSE_42_3_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker opensuse.42.3' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _DropSuffix: '' Build_CentOS_7_1_Debug_x64: _BuildConfig: Debug _DockerParameter: '--docker centos' diff --git a/eng/dockerrun.sh b/eng/dockerrun.sh index 15ecbffe3..1d5cb4618 100755 --- a/eng/dockerrun.sh +++ b/eng/dockerrun.sh @@ -79,12 +79,6 @@ if [ -z "$DOCKERFILE" ]; then echo "using 'fedora.23' image" export DOCKERFILE=eng/docker/fedora.23 fi - elif [ "$(cat /etc/*-release | grep -cim1 opensuse)" -eq 1 ]; then - echo "Detected current OS as openSUSE, determining openSUSE version to use..." - if [ "$(cat /etc/*-release | grep -cim1 13.2)" -eq 1 ]; then - echo "using 'openSUSE.13.2' image" - export DOCKERFILE=eng/docker/opensuse.13.2 - fi else echo "Unknown Linux Distro. Using 'ubuntu' image" export DOCKERFILE=eng/docker/ubuntu diff --git a/netci.groovy b/netci.groovy index 31d73f078..e964e99bb 100644 --- a/netci.groovy +++ b/netci.groovy @@ -21,7 +21,6 @@ def platformList = [ 'Linux:x64:Release', 'Linux_NoSuffix:arm:Release', 'Linux_NoSuffix:x64:Release', - 'opensuse.42.3:x64:Debug', 'OSX10.12:x64:Release', 'RHEL6:x64:Debug', 'RHEL7.2:x64:Release', @@ -95,7 +94,7 @@ ${buildCommand} osUsedForMachineAffinity = 'Ubuntu16.04'; buildCommand = "${baseShellBuildCommand} --runtime-id rhel.6-x64 --docker rhel.6" } - else if (os == 'ubuntu.18.04' || os == 'fedora.27' || os == 'opensuse.42.3') { + else if (os == 'ubuntu.18.04' || os == 'fedora.27') { osUsedForMachineAffinity = 'Ubuntu16.04' osVersionUsedForMachineAffinity = 'latest-docker' buildCommand = "${baseShellBuildCommand} --docker ${os} --linux-portable" diff --git a/src/redist/targets/GetRuntimeInformation.targets b/src/redist/targets/GetRuntimeInformation.targets index ff9ee1781..9248c46c8 100644 --- a/src/redist/targets/GetRuntimeInformation.targets +++ b/src/redist/targets/GetRuntimeInformation.targets @@ -28,15 +28,13 @@ $(Rid) + '$(Rid)' == 'linux-musl-x64' ">$(Rid) $(OSName)-$(Architecture) $(HostRid) + '$(HostRid)' == 'linux-musl-x64' ">$(HostRid) $(HostOSName)-$(Architecture) $(HostMonikerRid) $(Architecture) diff --git a/src/redist/targets/SetBuildDefaults.targets b/src/redist/targets/SetBuildDefaults.targets index 8d035b09f..b31e5350d 100644 --- a/src/redist/targets/SetBuildDefaults.targets +++ b/src/redist/targets/SetBuildDefaults.targets @@ -10,7 +10,6 @@ OR $(Rid.StartsWith('freebsd')) OR $(Rid.StartsWith('linux-musl')) OR $(Rid.StartsWith('fedora.27')) - OR $(Rid.StartsWith('opensuse.42.3')) OR $(Rid.StartsWith('ubuntu.18.04')))">true false @@ -20,7 +19,6 @@ AND '$(Rid)' != 'rhel.6-x64' AND '$(Rid)' != 'linux-musl-x64' AND '$(Rid)' != 'fedora.27-x64' - AND '$(Rid)' != 'opensuse.42.3-x64' AND '$(Rid)' != 'ubuntu.18.04-x64'">true--> true From f5b03134526b9bd7b1c7536e49507f748ddeada8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 26 Sep 2019 21:46:06 +0000 Subject: [PATCH 8/9] Update dependencies from https://github.com/aspnet/AspNetCore build 20190925.24 (#4942) - dotnet-user-secrets - 3.1.0-preview1.19475.24 - dotnet-watch - 3.1.0-preview1.19475.24 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19475.24 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19475.24 - dotnet-dev-certs - 3.1.0-preview1.19475.24 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19475.24 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 89d76c890..424c47a58 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 72b39b0473993b932a08c8fc24a8988d45b416a5 - + https://github.com/aspnet/AspNetCore - ab1347ef20745187440a8bf0f857362b5089056c + 1937c804fa83ee3adddc7e648c610f880c24188e - + https://github.com/aspnet/AspNetCore - ab1347ef20745187440a8bf0f857362b5089056c + 1937c804fa83ee3adddc7e648c610f880c24188e - + https://github.com/aspnet/AspNetCore - ab1347ef20745187440a8bf0f857362b5089056c + 1937c804fa83ee3adddc7e648c610f880c24188e - + https://github.com/aspnet/AspNetCore - ab1347ef20745187440a8bf0f857362b5089056c + 1937c804fa83ee3adddc7e648c610f880c24188e - + https://github.com/aspnet/AspNetCore - ab1347ef20745187440a8bf0f857362b5089056c + 1937c804fa83ee3adddc7e648c610f880c24188e - + https://github.com/aspnet/AspNetCore - ab1347ef20745187440a8bf0f857362b5089056c + 1937c804fa83ee3adddc7e648c610f880c24188e https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index a92042274..aaa077b37 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.1.0-preview1.19474.4 - 3.1.0-preview1.19474.4 - 3.1.0-preview1.19474.4 - 3.1.0-preview1.19474.4 - 3.1.0-preview1.19474.4 - 3.1.0-preview1.19474.4 + 3.1.0-preview1.19475.24 + 3.1.0-preview1.19475.24 + 3.1.0-preview1.19475.24 + 3.1.0-preview1.19475.24 + 3.1.0-preview1.19475.24 + 3.1.0-preview1.19475.24 From 67e623e6d24e8d9068836936ab40c876ee0a2e76 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 26 Sep 2019 21:51:12 +0000 Subject: [PATCH 9/9] Update dependencies from https://github.com/dotnet/core-setup build 20190925.6 (#4943) - Microsoft.NETCore.App - 3.1.0-preview1.19475.6 - NETStandard.Library.Ref - 2.1.0-preview1.19475.6 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19475.6 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.1-preview1.19474.4 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-preview1.19475.5 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 424c47a58..0f49bbee6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 72b39b0473993b932a08c8fc24a8988d45b416a5 + 5fa4772596a1c18d62a179f39704160c7f6dc223 - + https://github.com/dotnet/core-setup - 72b39b0473993b932a08c8fc24a8988d45b416a5 + 5fa4772596a1c18d62a179f39704160c7f6dc223 - + https://github.com/dotnet/core-setup - 72b39b0473993b932a08c8fc24a8988d45b416a5 + 5fa4772596a1c18d62a179f39704160c7f6dc223 https://github.com/aspnet/AspNetCore @@ -55,13 +55,13 @@ 4a9e195d7123e1c3d774cf8e6881d3ff93f47c44 - + https://github.com/dotnet/winforms - 93ae5ab5d366dc65495de6abb938f6d647eaf291 + 066b5db8f092c09d8e2d46c27d355e29d1d28d69 - + https://github.com/dotnet/wpf - acd0da083a426b222a54201c9f37860da50a906a + 4d424cad44e237f1607c2a61485aa6ee2df5ce43 diff --git a/eng/Versions.props b/eng/Versions.props index aaa077b37..daede0299 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.1-preview1.19462.8 + 4.8.1-preview1.19474.4 - 3.1.0-preview1.19462.15 + 3.1.0-preview1.19475.5 @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19470.9 + 3.1.0-preview1.19475.6 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview1.19470.9 + 2.1.0-preview1.19475.6 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19470.9 + 3.1.0-preview1.19475.6 $(MicrosoftWindowsDesktopAppPackageVersion)