diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 6b1c79247..ed0b46fd8 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -130,13 +130,6 @@ stages: _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/Version.Details.xml b/eng/Version.Details.xml index bda8c1c17..e4fd26e26 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,21 +2,19 @@ - + https://github.com/dotnet/core-setup - 72b39b0473993b932a08c8fc24a8988d45b416a5 + 5fa4772596a1c18d62a179f39704160c7f6dc223 https://github.com/dotnet/core-setup 72b39b0473993b932a08c8fc24a8988d45b416a5 - + https://github.com/dotnet/core-setup - 72b39b0473993b932a08c8fc24a8988d45b416a5 + 5fa4772596a1c18d62a179f39704160c7f6dc223 - https://github.com/dotnet/core-setup - 72b39b0473993b932a08c8fc24a8988d45b416a5 https://github.com/dotnet/core-setup @@ -40,54 +38,54 @@ https://github.com/dotnet/corefx d0f0bfa5b123b4c1183c889cf4017bb529675502 - + https://github.com/aspnet/AspNetCore - 26f160d1649350083fad67f45741ceb1c798b110 + 1937c804fa83ee3adddc7e648c610f880c24188e - + https://github.com/aspnet/AspNetCore - 26f160d1649350083fad67f45741ceb1c798b110 + 1937c804fa83ee3adddc7e648c610f880c24188e - + https://github.com/aspnet/AspNetCore - 26f160d1649350083fad67f45741ceb1c798b110 + 1937c804fa83ee3adddc7e648c610f880c24188e - + https://github.com/aspnet/AspNetCore - 26f160d1649350083fad67f45741ceb1c798b110 + 1937c804fa83ee3adddc7e648c610f880c24188e - + https://github.com/aspnet/AspNetCore - 26f160d1649350083fad67f45741ceb1c798b110 + 1937c804fa83ee3adddc7e648c610f880c24188e - + https://github.com/aspnet/AspNetCore - 26f160d1649350083fad67f45741ceb1c798b110 + 1937c804fa83ee3adddc7e648c610f880c24188e https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - a8d3527fb2816d377ffabda05fb43b34bb1635db + 256b3e07a94d90a0585b1f8da8d3b99526272637 - + https://github.com/dotnet/sdk - b3a343bf8ed65f5208c5bb86c632856c5d107b1d + 902380600200731914d936fca50b60e3e06dcb16 - + https://github.com/dotnet/cli - 25e58e48c0f49360bb5a9c804ca3b2ebeae01246 + 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 de992e493..9ba7f872a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,40 +12,40 @@ preview - 3.1.100-preview1.19462.27 + 3.1.100-preview1.19474.6 - 4.8.1-preview1.19462.8 + 4.8.1-preview1.19474.4 - 3.1.0-preview1.19462.15 + 3.1.0-preview1.19475.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.19473.5 + 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 - 3.1.100-preview1.19462.8 + 3.1.100-preview1.19474.2 0.2.0 - 3.0.100-rc2.19467.3 + 3.1.100-preview1.19469.1 $(MicrosoftNETSdkPackageVersion) 3.1.0-preview1.19470.9 - 3.1.0-preview1.19470.9 + 3.1.0-preview1.19475.6 $(MicrosoftNETCoreAppPackageVersion) 3.1.0-preview1.19470.9 3.1.0-preview1.19470.9 @@ -59,7 +59,7 @@ $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) 3.1.0-preview1.19470.9 - 3.1.0-preview1.19470.9 + 3.1.0-preview1.19475.6 $(MicrosoftWindowsDesktopAppPackageVersion) @@ -67,9 +67,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 diff --git a/eng/dockerrun.sh b/eng/dockerrun.sh index ef41e2fa8..b42852d87 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/Branding.targets b/src/redist/targets/Branding.targets index f536cebb1..08cbf6be8 100644 --- a/src/redist/targets/Branding.targets +++ b/src/redist/targets/Branding.targets @@ -13,6 +13,7 @@ Microsoft .NET Core Host FX Resolver $(MicrosoftNETCoreDotNetAppHostPackageVersion) 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 83a9efcdb..84d1df417 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -46,8 +46,8 @@ - - + + diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 5eb50126b..85a861083 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -39,6 +39,8 @@ $(CoreSetupRid) x64 + x64 + x86 dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-hostfxr$(InstallerStartSuffix)-$(HostFxrVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) @@ -46,6 +48,9 @@ windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)-$(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]) @@ -83,9 +88,10 @@ $(CoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive$(ArchiveExtension) - - win-x64 - win-x86 + + win-$(AlternateArchitecture) + win-arm + win-arm64 @@ -131,6 +137,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)$(MicrosoftNETCoreAppRuntimewinx64PackageVersion) @@ -181,6 +201,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 0ee1f06f3..d8d3fed72 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) @@ -239,9 +253,12 @@ '$(DownloadsFolder)$(DownloadedNetCoreAppTargetingPackInstallerFileName)' ^ '$(DownloadsFolder)$(DownloadedNetStandardTargetingPackInstallerFileName)' ^ '$(DownloadsFolder)$(DownloadedNetCoreAppHostPackInstallerFileName)' ^ + '$(DownloadsFolder)$(DownloadedAlternateNetCoreAppHostPackInstallerFileName)' ^ + '$(DownloadsFolder)$(DownloadedArmNetCoreAppHostPackInstallerFileName)' ^ + '$(DownloadsFolder)$(DownloadedArm64NetCoreAppHostPackInstallerFileName)' ^ '$(DownloadsFolder)$(DownloadedAspNetTargetingPackInstallerFileName)' ^ '$(DownloadsFolder)$(DownloadedWindowsDesktopTargetingPackInstallerFileName)' ^ - '$(Templates30MSIInstallerFile)' ^ + '$(Templates31MSIInstallerFile)' ^ '$(CombinedFrameworkSdkHostMSIInstallerFile)' ^ '$(WixRoot)' ^ '$(SdkBrandName)' ^ @@ -318,6 +335,11 @@ + + $(Templates31MSIInstallerFile) + $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates31MajorMinorVersion).$(FullNugetVersion).nupkg + $(BundledTemplates31MajorMinorVersion) + $(Templates30MSIInstallerFile) $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates30MajorMinorVersion).$(FullNugetVersion).nupkg 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 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" ` 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(); } } }