diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 12509aab2..555570d7e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,6 +10,10 @@ https://github.com/dotnet/core-setup 693ddece5df642a0a097889790b18b148b998886 + + https://github.com/dotnet/core-setup + 1cdd7e42898c0da50beb6adead1de4f1e38583a6 + https://github.com/aspnet/AspNetCore 3b32f43453eba8edf03bebb9d893af59ada0e431 diff --git a/eng/Versions.props b/eng/Versions.props index 3e7d30ba4..020bd63f5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,16 +36,6 @@ 3.0.100-preview5.19210.2 - - 3.0.0-preview5-27610-01 - $(MicrosoftNETCoreAppPackageVersion) - - - 2.1.0-prerelease.19210.1 - - $(NETStandardLibraryPackageVersion) - 1.0.2-beta5.19209.2 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) @@ -54,9 +44,12 @@ 1.6.1 + 3.0.0-preview5-27610-01 + $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) + 2.1.0-preview5-27610-01 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) diff --git a/global.json b/global.json index 67ea54e43..3bb40388e 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "3.0.100-preview-009812" + "dotnet": "3.0.100-preview4-010564" }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19209.2" diff --git a/src/redist/targets/Branding.targets b/src/redist/targets/Branding.targets index 743981cd8..ee93a70c0 100644 --- a/src/redist/targets/Branding.targets +++ b/src/redist/targets/Branding.targets @@ -6,6 +6,7 @@ .NET Standard Support for Visual Studio 2015 Microsoft .NET Core Runtime $(MicrosoftNETCoreAppPackageVersion) Microsoft .NET Core Targeting Pack $(MicrosoftNETCoreAppPackageVersion) + Microsoft .NET Standard 2.1 Targeting Pack $(MicrosoftNETCoreAppPackageVersion) Microsoft .NET Core Host $(MicrosoftNETCoreAppPackageVersion) Microsoft .NET Core Host FX Resolver $(MicrosoftNETCoreAppPackageVersion) Microsoft.NETCore.App diff --git a/src/redist/targets/DownloadPackage.csproj b/src/redist/targets/DownloadPackage.csproj index eead5639d..618f9c510 100644 --- a/src/redist/targets/DownloadPackage.csproj +++ b/src/redist/targets/DownloadPackage.csproj @@ -14,4 +14,6 @@ + + diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 44701acc7..bc172eb5a 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -232,7 +232,7 @@ Copyright (c) .NET Foundation. All rights reserved. diff --git a/src/redist/targets/GenerateDebs.targets b/src/redist/targets/GenerateDebs.targets index eb3ba5183..096596c28 100644 --- a/src/redist/targets/GenerateDebs.targets +++ b/src/redist/targets/GenerateDebs.targets @@ -48,6 +48,11 @@ dotnet-targeting-pack-$(SharedFxDebianPackageVersion) $(NetCoreAppTargetingPackDebianPackageName.ToLower()) $(DownloadsFolder)$(DownloadedNetCoreAppTargetingPackInstallerFileName) + netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion) + $(NetStandardTargetingPackDebianPackageFileName.ToLower()) + netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion.Split('.')[0]).$(NETStandardLibraryRefPackageVersion.Split('.')[1]) + $(NetStandardTargetingPackDebianPackageName.ToLower()) + $(DownloadsFolder)$(DownloadedNetStandardTargetingPackInstallerFileName) dotnet-hostfxr-$(HostFxrVersion) $(HostFxrDebianPackageFileName.ToLower()) dotnet-hostfxr-$(HostFxrMajorMinorVersion) @@ -65,7 +70,7 @@ aspnetcore-targeting-pack-$(AspNetCoreMajorMinorVersion) $(AspNetTargetingPackDebianPackageName.ToLower()) $(DownloadsFolder)$(DownloadedAspNetTargetingPackInstallerFileName) - + @@ -120,6 +125,9 @@ $(NetCoreAppTargetingPackDebianPackageName) + + $(NetStandardTargetingPackDebianPackageName) + $(AspNetTargetingPackDebianPackageName) @@ -143,6 +151,9 @@ $(MicrosoftNETCoreAppPackageVersionWithTilda) + + $(NetStandardTargetingPackPackageVersionWithTilda) + $(AspNetCoreVersionWithTilda) @@ -212,6 +223,7 @@ Outputs="$(SdkDebInstallerFile)" > + @@ -289,6 +301,8 @@ + + @@ -303,6 +317,7 @@ DependsOnTargets="GetAspNetSharedFxInstallArgs" Inputs="$(DownloadedRuntimeDepsInstallerFile); $(DownloadedNetCoreAppTargetingPackInstallerFile); + $(DownloadedNetStandardTargetingPackInstallerFile); $(DownloadedAspNetTargetingPackInstallerFile); $(DownloadedSharedHostInstallerFile); $(DownloadedHostFxrInstallerFile); @@ -315,6 +330,7 @@ + @@ -341,6 +357,7 @@ + diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 9d6cf1fbf..ba7dccd34 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -31,6 +31,8 @@ dotnet-extension-$(MicrosoftWindowsDesktopPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-targeting-pack-$(NetCoreAppTargetingPackVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) windowsdesktop-targeting-pack-$(WindowsDesktopTargetingPackVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) + netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) + netstandard$(NETStandardLibraryRefPackageVersion.Split('.')[0])$(NETStandardLibraryRefPackageVersion.Split('.')[1]) $(CoreSetupRid) @@ -82,30 +84,42 @@ Microsoft.NETCore.App.Ref $(NetCoreAppTargetingPackVersion) + $(TargetFramework) packs/%(PackageName)/%(PackageVersion) + + NETStandard.Library.Ref + $(NETStandardLibraryRefPackageVersion) + $(NetStandardTargetingPackTargetFramework) + packs/%(PackageName)/%(PackageVersion) + + Microsoft.AspNetCore.App.Ref $(AspNetTargetingPackVersion) + $(TargetFramework) packs/%(PackageName)/%(PackageVersion) Microsoft.WindowsDesktop.App.Ref $(WindowsDesktopTargetingPackVersion) + $(TargetFramework) packs/%(PackageName)/%(PackageVersion) runtime.$(SharedFrameworkRid).Microsoft.NETCore.DotNetAppHost $(NetCoreAppTargetingPackVersion) + $(TargetFramework) packs/%(PackageName)/%(PackageVersion) runtime.$(AlternateAppHostRid).Microsoft.NETCore.DotNetAppHost $(NetCoreAppTargetingPackVersion) + $(TargetFramework) packs/%(PackageName)/%(PackageVersion) @@ -144,6 +158,13 @@ $(CoreSetupBlobAccessTokenParam) + + $(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion) + $(DownloadedNetStandardTargetingPackInstallerFileName) + $(CoreSetupBlobAccessTokenParam) + + $(CoreSetupRootUrl)$(WindowsDesktopTargetingPackVersion) @@ -245,7 +266,7 @@ PackageToRestore=%(BundledLayoutPackage.PackageName); PackageVersionToRestore=%(BundledLayoutPackage.PackageVersion); - TargetFramework=$(TargetFramework); + TargetFramework=%(BundledLayoutPackage.TargetFramework); LayoutPackageDescription=%(BundledLayoutPackage.Identity) diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 07879cb13..39b25f31b 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -139,6 +139,7 @@ '$(DownloadsFolder)$(DownloadedSharedHostInstallerFileName)' ^ '$(DownloadsFolder)$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName)' ^ '$(DownloadsFolder)$(DownloadedNetCoreAppTargetingPackInstallerFileName)' ^ + '$(DownloadsFolder)$(DownloadedNetStandardTargetingPackInstallerFileName)' ^ '$(DownloadsFolder)$(DownloadedAspNetTargetingPackInstallerFileName)' ^ '$(DownloadsFolder)$(DownloadedWindowsDesktopTargetingPackInstallerFileName)' ^ '$(CombinedFrameworkSdkHostMSIInstallerFile)' ^ diff --git a/src/redist/targets/GeneratePKG.targets b/src/redist/targets/GeneratePKG.targets index 8bf79cb79..55f132b97 100644 --- a/src/redist/targets/GeneratePKG.targets +++ b/src/redist/targets/GeneratePKG.targets @@ -8,6 +8,7 @@ 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.dev.$(SdkVersion).component.osx.x64 com.microsoft.dotnet.dev.$(SdkVersion).osx.x64 @@ -26,6 +27,7 @@ $(PkgIntermediateDirectory)/$(SdkComponentId).pkg $(PkgIntermediateDirectory)/$(SharedFrameworkComponentId).pkg $(PkgIntermediateDirectory)/$(NetCoreAppTargetingPackComponentId).pkg + $(PkgIntermediateDirectory)/$(NetStandardTargetingPackComponentId).pkg $(PkgIntermediateDirectory)/$(SharedHostComponentId).pkg $(PkgIntermediateDirectory)/$(HostFxrComponentId).pkg @@ -42,6 +44,9 @@ $(NetCoreAppTargetingPackComponentId) + + $(NetStandardTargetingPackComponentId) + $(SharedHostComponentId) @@ -63,6 +68,9 @@ $(NetCoreAppTargetingPackBrandName) + + $(NetStandardTargetingPackBrandName) + $(SharedHostBrandName) @@ -99,6 +107,7 @@ + @@ -152,11 +161,13 @@ diff --git a/src/redist/targets/GenerateRPMs.targets b/src/redist/targets/GenerateRPMs.targets index 06763a223..82f54461a 100644 --- a/src/redist/targets/GenerateRPMs.targets +++ b/src/redist/targets/GenerateRPMs.targets @@ -73,6 +73,9 @@ $(MicrosoftNETCoreAppMajorMinorPatchVersion) + + $(NetStandardTargetingPackMajorMinorPatchVersion) + $(AspNetCoreMajorMinorPatchVersion) @@ -82,6 +85,9 @@ $(NetCoreAppTargetingPackRpmPackageName) + + $(NetStandardTargetingPackRpmPackageName) + $(AspNetCoreSharedFxRpmPackageName) @@ -190,6 +196,10 @@ $(NetCoreAppTargetingPackRpmPackageName.ToLower()) dotnet-targeting-pack-$(SharedFxRpmPackageFileVersion) $(NetCoreAppTargetingPackRpmPackageFileName.ToLower()) + netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion.Split('.')[0]).$(NETStandardLibraryRefPackageVersion.Split('.')[1]) + $(NetStandardTargetingPackRpmPackageName.ToLower()) + netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion) + $(NetStandardTargetingPackRpmPackageFileName.ToLower()) dotnet-hostfxr-$(SharedFxRpmPackageVersion) $(HostFxrRpmPackageName.ToLower()) dotnet-runtime-deps-$(SharedFxRpmPackageVersion) @@ -209,6 +219,7 @@ $(DownloadsFolder)$(DownloadedNetCoreAppTargetingPackInstallerFileName) + $(DownloadsFolder)$(DownloadedNetStandardTargetingPackInstallerFileName) $(DownloadsFolder)$(DownloadedAspNetTargetingPackInstallerFileName) $(DownloadsFolder)$(DownloadedRuntimeDepsInstallerFileName) $(DownloadsFolder)$(DownloadedSharedHostInstallerFileName) @@ -241,6 +252,7 @@ + @@ -277,6 +290,7 @@ + diff --git a/src/redist/targets/LinuxNativeInstallerDependencyVersions.targets b/src/redist/targets/LinuxNativeInstallerDependencyVersions.targets index ed5f6bea6..41858080c 100644 --- a/src/redist/targets/LinuxNativeInstallerDependencyVersions.targets +++ b/src/redist/targets/LinuxNativeInstallerDependencyVersions.targets @@ -14,6 +14,14 @@ $(MicrosoftNETCoreAppMajorMinorPatchVersion) $(MicrosoftNETCoreAppMajorMinorPatchVersion)~$(MicrosoftNETCoreVersionSuffix) + $(NETStandardLibraryRefPackageVersion.IndexOf('-')) + $(NETStandardLibraryRefPackageVersion) + $(NETStandardLibraryRefPackageVersion.Substring(0, $(NetStandardTargetingPackVersionPreReleaseSeparator))) + $([MSBuild]::Add($(NetStandardTargetingPackVersionPreReleaseSeparator), 1)) + $(NETStandardLibraryRefPackageVersion.Substring($(NetStandardTargetingPackVersionPreReleaseSeparatorStartIndex))) + $(NetStandardTargetingPackMajorMinorPatchVersion) + $(NetStandardTargetingPackMajorMinorPatchVersion)~$(NetStandardTargetingPackVersionSuffix) + $([MSBuild]::Add($(AspNetCoreVersion.IndexOf('.')), 1)) $(AspNetCoreVersion.IndexOf('.', $(AspNetCoreVersionPatchSeparatorIndex))) $(AspNetCoreVersion.Substring(0, $(AspNetCoreVersionPatchSeparatorIndex))) diff --git a/src/redist/targets/packaging/deb/dotnet-debian_config.json b/src/redist/targets/packaging/deb/dotnet-debian_config.json index 3ddbc6495..1c8b64dae 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%" }, + "%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 65a653fad..912876cbe 100644 --- a/src/redist/targets/packaging/osx/clisdk/Distribution-Template +++ b/src/redist/targets/packaging/osx/clisdk/Distribution-Template @@ -12,6 +12,7 @@ + @@ -20,6 +21,9 @@ + + + @@ -33,6 +37,7 @@ {NetCoreAppTargetingPackComponentId}.pkg + {NetStandardTargetingPackComponentId}.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 b51db98da..8128e9a9a 100644 --- a/src/redist/targets/packaging/rpm/dotnet-config.json +++ b/src/redist/targets/packaging/rpm/dotnet-config.json @@ -26,14 +26,18 @@ "package_name": "%SHARED_FRAMEWORK_RPM_PACKAGE_NAME%", "package_version": "%SHARED_FRAMEWORK_RPM_PACKAGE_VERSION%" }, - { - "package_name": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_NAME%", - "package_version": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_VERSION%" - }, { "package_name": "%NETCOREAPP_TARGETING_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%" + }, + { + "package_name": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_NAME%", + "package_version": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_VERSION%" + }, { "package_name": "%ASPNET_TARGETING_PACK_RPM_PACKAGE_NAME%", "package_version": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_VERSION%" diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.wxs b/src/redist/targets/packaging/windows/clisdk/bundle.wxs index 00ea77786..3225f7a5a 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 4fdd00ae4..5d1219af3 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]$NetStandardTargetingPackMSIFile, [Parameter(Mandatory=$true)][string]$AspNetTargetingPackMSIFile, [Parameter(Mandatory=$true)][string]$WindowsDesktopTargetingPackMSIFile, [Parameter(Mandatory=$true)][string]$DotnetBundleOutput, @@ -48,6 +49,7 @@ function RunCandleForBundle -dSharedHostMsiSourcePath="$SharedHostMSIFile" ` -dWinFormsAndWpfMsiSourcePath="$WinFormsAndWpfMSIFile" ` -dNetCoreAppTargetingPackMsiSourcePath="$NetCoreAppTargetingPackMSIFile" ` + -dNetStandardTargetingPackMsiSourcePath="$NetStandardTargetingPackMSIFile" ` -dAspNetTargetingPackMsiSourcePath="$AspNetTargetingPackMSIFile" ` -dWindowsDesktopTargetingPackMsiSourcePath="$WindowsDesktopTargetingPackMSIFile" ` -dWinFormsAndWpfVersion="$WindowsDesktopVersion" `