mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into darc-master-80d0d800-f982-444c-81fd-263771246472

Browse source
This commit is contained in:
William Li 2019-04-04 12:04:02 -07:00
commit f5ed1b0812
22 changed files with 103 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
eng/Version.Details.xml
View file

@ -2,45 +2,41 @@
<Dependencies>
<ProductDependencies>
<!-- Winforms / WPF -->
<Dependency Name="Microsoft.WindowsDesktop.App" Version="3.0.0-preview4-27529-17">
<Dependency Name="Microsoft.WindowsDesktop.App" Version="3.0.0-preview4-27603-22">
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/DotNet-Trusted</Uri>
<Sha>f516ddd1b560cf851ff14e7b03512f1be4ccaf5d</Sha>
<Sha>43807bc8ad3263d263b58c3d012bd8ce14c42d81</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview4-27601-05">
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview4-27604-01">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>97567a0e5f854c29aa44c92aed83aa980a05aadc</Sha>
<Sha>80622592a4e993200cb5b495b802abc1ee2fe96d</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0-preview4-19201-04">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0-preview4-19204-02">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>6a6a870f0847d347e72443eda843969d0b46da94</Sha>
<Sha>518b879895d1c2e2b5bac716c8c4f9806e92dcfc</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.0.0-preview4-19201-04">
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.0.0-preview4-19204-02">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>6a6a870f0847d347e72443eda843969d0b46da94</Sha>
<Sha>518b879895d1c2e2b5bac716c8c4f9806e92dcfc</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.0.0-preview4-19201-04">
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.0.0-preview4-19204-02">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>6a6a870f0847d347e72443eda843969d0b46da94</Sha>
<Sha>518b879895d1c2e2b5bac716c8c4f9806e92dcfc</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="3.0.0-preview4-19201-04">
<Dependency Name="dotnet-dev-certs" Version="3.0.0-preview4-19204-02">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>6a6a870f0847d347e72443eda843969d0b46da94</Sha>
<Sha>518b879895d1c2e2b5bac716c8c4f9806e92dcfc</Sha>
</Dependency>
<Dependency Name="dotnet-sql-cache" Version="3.0.0-preview4-19201-04">
<Dependency Name="dotnet-sql-cache" Version="3.0.0-preview4-19204-02">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>6a6a870f0847d347e72443eda843969d0b46da94</Sha>
<Sha>518b879895d1c2e2b5bac716c8c4f9806e92dcfc</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="3.0.0-preview4-19201-04">
<Dependency Name="dotnet-user-secrets" Version="3.0.0-preview4-19204-02">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>6a6a870f0847d347e72443eda843969d0b46da94</Sha>
<Sha>518b879895d1c2e2b5bac716c8c4f9806e92dcfc</Sha>
</Dependency>
<Dependency Name="dotnet-watch" Version="3.0.0-preview4-19201-04">
<Dependency Name="dotnet-watch" Version="3.0.0-preview4-19204-02">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>6a6a870f0847d347e72443eda843969d0b46da94</Sha>
</Dependency>
<Dependency Name="dotnet-ef" Version="3.0.0-preview4.19180.1">
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
<Sha>86bc0b64b36d3d8f49c993772a4b569ee4ed28bd</Sha>
<Sha>518b879895d1c2e2b5bac716c8c4f9806e92dcfc</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="1.0.2-beta5.19115.3">
<Uri>https://github.com/dotnet/templating</Uri>
@ -50,20 +46,24 @@
<Uri>https://github.com/dotnet/toolset</Uri>
<Sha>9479e5c5682d46b4cb4bb49ac66f43a1dad58f3b</Sha>
</Dependency>
<Dependency Name="NETStandard.Library" Version="2.1.0-prerelease.19180.1">
<Dependency Name="NETStandard.Library" Version="2.1.0-prerelease.19204.1">
<Uri>https://github.com/dotnet/standard</Uri>
<Sha>68dd5612cdd5f9204a832b1e0db9a4628d4337ad</Sha>
<Sha>0362f55e37d73b7e607b2f256279caaac82c8725</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.0.100-preview4.19111.1">
<Uri>https://github.com/dotnet/cli</Uri>
<Sha>
</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.0.0-preview4.19203.6">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>a48d98b2b09a45e2828ae28e4d57e99261dde666</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19179.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19203.10">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>31abd61b43b115a6af83c92ce35ed4e8efd01dfd</Sha>
<Sha>811fda44a88dcfe3e42a17bb34467f5764836c65</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>

26
eng/Versions.props
View file

@ -13,31 +13,28 @@
</PropertyGroup>
<PropertyGroup>
<MicrosoftDotnetToolsetInternalPackageVersion>3.0.100-preview4.19203.5</MicrosoftDotnetToolsetInternalPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/EntityFrameworkCore -->
<dotnetefPackageVersion>3.0.0-preview4.19180.1</dotnetefPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.0.0-preview4.19203.6</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.0.0-preview4-19201-04</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>3.0.0-preview4-19201-04</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.0.0-preview4-19201-04</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<dotnetdevcertsPackageVersion>3.0.0-preview4-19201-04</dotnetdevcertsPackageVersion>
<dotnetsqlcachePackageVersion>3.0.0-preview4-19201-04</dotnetsqlcachePackageVersion>
<dotnetusersecretsPackageVersion>3.0.0-preview4-19201-04</dotnetusersecretsPackageVersion>
<dotnetwatchPackageVersion>3.0.0-preview4-19201-04</dotnetwatchPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.0.0-preview4-19204-02</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>3.0.0-preview4-19204-02</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.0.0-preview4-19204-02</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<dotnetdevcertsPackageVersion>3.0.0-preview4-19204-02</dotnetdevcertsPackageVersion>
<dotnetsqlcachePackageVersion>3.0.0-preview4-19204-02</dotnetsqlcachePackageVersion>
<dotnetusersecretsPackageVersion>3.0.0-preview4-19204-02</dotnetusersecretsPackageVersion>
<dotnetwatchPackageVersion>3.0.0-preview4-19204-02</dotnetwatchPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/cli -->
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.0.100-preview4.19111.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview4-27601-05</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview4-27604-01</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
</PropertyGroup>
<PropertyGroup>
<NETStandardLibraryPackageVersion>2.1.0-prerelease.19180.1</NETStandardLibraryPackageVersion>
<NETStandardLibraryPackageVersion>2.1.0-prerelease.19204.1</NETStandardLibraryPackageVersion>
<!-- Use a different property name here, as NETStandardLibraryPackageVersion is also set by targets in the NETStandard.Library package,
which ends up overriding the value set here. -->
<NETSTandardTargetingPackVersion>$(NETStandardLibraryPackageVersion)</NETSTandardTargetingPackVersion>
@ -56,9 +53,8 @@
<WindowsDesktopTargetingPackVersion>$(MicrosoftNETCoreAppPackageVersion)</WindowsDesktopTargetingPackVersion>
<AspNetCoreVersion>$(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion)</AspNetCoreVersion>
<AspNetTargetingPackVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)</AspNetTargetingPackVersion>
<MicrosoftWindowsDesktopAppPackageVersion>3.0.0-preview4-27529-17</MicrosoftWindowsDesktopAppPackageVersion>
<MicrosoftWindowsDesktopAppPackageVersion>3.0.0-preview4-27603-22</MicrosoftWindowsDesktopAppPackageVersion>
<MicrosoftWindowsDesktopPackageVersion>$(MicrosoftWindowsDesktopAppPackageVersion)</MicrosoftWindowsDesktopPackageVersion>
<MicrosoftDotnetWpfProjectTemplatesPackageVersion>$(MicrosoftWindowsDesktopPackageVersion)</MicrosoftDotnetWpfProjectTemplatesPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>$(MicrosoftWindowsDesktopPackageVersion)</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup>
<!-- infrastructure and test only dependencies -->

2
global.json
View file

@ -3,6 +3,6 @@
"dotnet": "3.0.100-preview-009812"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19179.2"
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19203.10"
}
}

9
src/redist/targets/Branding.targets
View file

@ -4,11 +4,10 @@
<BuildName>cli</BuildName>
<SdkBrandName>Microsoft .NET Core SDK $(CliBrandingVersion)</SdkBrandName>
<MSBuildExtensionsBrandName>.NET Standard Support for Visual Studio 2015</MSBuildExtensionsBrandName>
<!-- TODO: "Preview" shouldn't be hardcoded in these properties -->
<SharedFrameworkBrandName>Microsoft .NET Core Runtime $(CliVersionNoSuffix) - Preview</SharedFrameworkBrandName>
<SharedHostBrandName>Microsoft .NET Core Host $(CliVersionNoSuffix) - Preview</SharedHostBrandName>
<HostFxrBrandName>Microsoft .NET Core Host FX Resolver $(CliVersionNoSuffix) - Preview</HostFxrBrandName>
<SharedFrameworkBrandName>Microsoft .NET Core Runtime $(MicrosoftNETCoreAppPackageVersion)</SharedFrameworkBrandName>
<NetCoreAppTargetingPackBrandName>Microsoft .NET Core Targeting Pack $(MicrosoftNETCoreAppPackageVersion)</NetCoreAppTargetingPackBrandName>
<SharedHostBrandName>Microsoft .NET Core Host $(MicrosoftNETCoreAppPackageVersion)</SharedHostBrandName>
<HostFxrBrandName>Microsoft .NET Core Host FX Resolver $(MicrosoftNETCoreAppPackageVersion)</HostFxrBrandName>
<SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName>
<SharedFrameworkNugetName>$(SharedFrameworkName)</SharedFrameworkNugetName>
</PropertyGroup>

1
src/redist/targets/BundledDotnetTools.targets
View file

@ -1,7 +1,6 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Condition=" '$(IncludeAspNetCoreRuntime)' != 'false' ">
<BundledDotnetTool Include="dotnet-dev-certs" Version="$(DotnetDevCertsPackageVersion)" />
<BundledDotnetTool Include="dotnet-ef" Version="$(DotnetEfPackageVersion)" ObsoletesCliTool="Microsoft.EntityFrameworkCore.Tools.DotNet" />
<BundledDotnetTool Include="dotnet-sql-cache" Version="$(DotnetSqlCachePackageVersion)" ObsoletesCliTool="Microsoft.Extensions.Caching.SqlConfig.Tools" />
<BundledDotnetTool Include="dotnet-user-secrets" Version="$(DotnetUserSecretsPackageVersion)" ObsoletesCliTool="Microsoft.Extensions.SecretManager.Tools" />
<BundledDotnetTool Include="dotnet-watch" Version="$(DotnetWatchPackageVersion)" ObsoletesCliTool="Microsoft.DotNet.Watcher.Tools" />

19
src/redist/targets/GenerateLayout.targets
View file

@ -47,9 +47,10 @@
<!-- Note: we use the "-internal" archives and installers that contain only the aspnetcore shared framework, and shouldn't overlap with Microsoft.NETCore.App. -->
<DownloadedAspNetCoreSharedFxInstallerFileName Condition=" '$(InstallerExtension)' == '.msi' ">aspnetcore-runtime-internal-$(AspNetCoreVersion)-$(AspNetCoreSharedFxInstallerRid).wixlib</DownloadedAspNetCoreSharedFxInstallerFileName>
<DownloadedAspNetTargetingPackInstallerFileName Condition=" '$(InstallerExtension)' != '' ">aspnetcore-targeting-pack-$(AspNetTargetingPackVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension)</DownloadedAspNetTargetingPackInstallerFileName>
<!-- The AspNetTargetingPackInstallerFileName is misnamed for DEB types at this time.
https://github.com/aspnet/AspNetCore/issues/8835 when resolved, remove the 'IsDebianBaseDistro' special contitioned line below. -->
<!-- AspNet targeting pack assets have unexpected asset names for DEB and tar.gz types:
https://github.com/aspnet/AspNetCore/issues/8835 -->
<DownloadedAspNetTargetingPackInstallerFileName Condition=" '$(IsDebianBaseDistro)' == 'true' ">aspnetcore-targeting-pack-$(AspNetTargetingPackVersion)$(InstallerExtension)</DownloadedAspNetTargetingPackInstallerFileName>
<AspNetTargetingPackArchiveFileName>aspnetcore-targeting-pack-$(AspNetCoreVersion)$(ArchiveExtension)</AspNetTargetingPackArchiveFileName>
<AspNetCoreSharedFxArchiveFileName>aspnetcore-runtime-internal-$(AspNetCoreVersion)-$(AspNetCoreSharedFxArchiveRid)$(ArchiveExtension)</AspNetCoreSharedFxArchiveFileName>
<WinFormsAndWpfSharedFxArchiveFileName>dotnet-extension-$(MicrosoftWindowsDesktopPackageVersion)-$(Architecture)$(ArchiveExtension)</WinFormsAndWpfSharedFxArchiveFileName>
@ -159,15 +160,23 @@
</ItemGroup>
<ItemGroup Condition=" '$(IncludeAspNetCoreRuntime)' != 'false' ">
<BundledLayoutComponent Include="AspNetCoreSharedFxArchiveFile">
<BundledLayoutComponent Include="DownloadedAspNetCoreSharedFxArchiveFile">
<BaseUrl>$(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion)</BaseUrl>
<DownloadFileName>$(AspNetCoreSharedFxArchiveFileName)</DownloadFileName>
<AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
<RelativeLayoutPath></RelativeLayoutPath>
</BundledLayoutComponent>
<!-- The AspNetTargetingPackInstallerFile for PKG types does not exist at this time.
https://github.com/aspnet/AspNetCore/issues/8806 when resolved, change the 'Condition' below. -->
<!-- The AspNet does not provide native MacOS PKG installers at this time; we use AspNet archives.
https://github.com/aspnet/AspNetCore/issues/8806 -->
<BundledLayoutComponent Include="DownloadedAspNetTargetingPackArchiveFile"
Condition="'$(InstallerExtension)' == '.pkg' And '$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
<BaseUrl>$(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion)</BaseUrl>
<DownloadFileName>$(AspNetTargetingPackArchiveFileName)</DownloadFileName>
<AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
<RelativeLayoutPath></RelativeLayoutPath>
</BundledLayoutComponent>
<BundledInstallerComponent Include="DownloadedAspNetTargetingPackInstallerFile"
Condition="'$(InstallerExtension)' != '.pkg' And '$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
<BaseUrl>$(AspNetCoreSharedFxRootUrl)$(AspNetTargetingPackVersion)</BaseUrl>

15
src/redist/targets/GeneratePKG.targets
View file

@ -7,6 +7,7 @@
<SharedHostComponentId>com.microsoft.dotnet.sharedhost.$(SharedHostVersion).component.osx.x64</SharedHostComponentId>
<HostFxrComponentId>com.microsoft.dotnet.hostfxr.$(HostFxrVersion).component.osx.x64</HostFxrComponentId>
<SharedFrameworkComponentId>com.microsoft.dotnet.sharedframework.$(SharedFrameworkNugetName).$(MicrosoftNETCoreAppPackageVersion).component.osx.x64</SharedFrameworkComponentId>
<NetCoreAppTargetingPackComponentId>com.microsoft.dotnet.pack.targeting.$(MicrosoftNETCoreAppPackageVersion).component.osx.x64</NetCoreAppTargetingPackComponentId>
<SdkComponentId>com.microsoft.dotnet.dev.$(SdkVersion).component.osx.x64</SdkComponentId>
<SdkProductArchiveId>com.microsoft.dotnet.dev.$(SdkVersion).osx.x64</SdkProductArchiveId>
@ -24,6 +25,7 @@
<SdkPkgIntermediatePath>$(PkgIntermediateDirectory)/$(SdkComponentId).pkg</SdkPkgIntermediatePath>
<SharedFrameworkPkgIntermediatePath>$(PkgIntermediateDirectory)/$(SharedFrameworkComponentId).pkg</SharedFrameworkPkgIntermediatePath>
<NetCoreAppTargetingPackPkgIntermediatePath>$(PkgIntermediateDirectory)/$(NetCoreAppTargetingPackComponentId).pkg</NetCoreAppTargetingPackPkgIntermediatePath>
<SharedHostPkgIntermediatePath>$(PkgIntermediateDirectory)/$(SharedHostComponentId).pkg</SharedHostPkgIntermediatePath>
<HostFxrPkgIntermediatePath>$(PkgIntermediateDirectory)/$(HostFxrComponentId).pkg</HostFxrPkgIntermediatePath>
@ -37,6 +39,9 @@
<DistributionTemplateReplacement Include="{SharedFxComponentId}">
<ReplacementString>$(SharedFrameworkComponentId)</ReplacementString>
</DistributionTemplateReplacement>
<DistributionTemplateReplacement Include="{NetCoreAppTargetingPackComponentId}">
<ReplacementString>$(NetCoreAppTargetingPackComponentId)</ReplacementString>
</DistributionTemplateReplacement>
<DistributionTemplateReplacement Include="{SharedHostComponentId}">
<ReplacementString>$(SharedHostComponentId)</ReplacementString>
</DistributionTemplateReplacement>
@ -55,6 +60,9 @@
<DistributionTemplateReplacement Include="{SharedFxBrandName}">
<ReplacementString>$(SharedFrameworkBrandName)</ReplacementString>
</DistributionTemplateReplacement>
<DistributionTemplateReplacement Include="{NetCoreAppTargetingPackBrandName}">
<ReplacementString>$(NetCoreAppTargetingPackBrandName)</ReplacementString>
</DistributionTemplateReplacement>
<DistributionTemplateReplacement Include="{SharedHostBrandName}">
<ReplacementString>$(SharedHostBrandName)</ReplacementString>
</DistributionTemplateReplacement>
@ -90,6 +98,7 @@
<GenerateSdkProductArchiveInputs Include="$(SdkPKGInstallerFile)" />
<GenerateSdkProductArchiveInputs Include="$(DownloadedSharedFrameworkInstallerFile)" />
<GenerateSdkProductArchiveInputs Include="$(DownloadedNetCoreAppTargetingPackInstallerFile)" />
<GenerateSdkProductArchiveInputs Include="$(DownloadedHostFxrInstallerFile)" />
<GenerateSdkProductArchiveInputs Include="$(DownloadedSharedHostInstallerFile)" />
<GenerateSdkProductArchiveInputs Include="$(SdkProductArchiveDistributionTemplateFile)" />
@ -103,9 +112,11 @@
DependsOnTargets="GenerateLayout;SetupPkgInputsOutputs"
Condition=" '$(OSName)' == 'osx' ">
<!-- Copy ASP.NET runtime to internal layout, as we don't currently chain that in with a pkg dependency -->
<!-- Copy ASP.NET runtime and targeting pack to internal layout, as we don't currently chain that in with a pkg dependency -->
<ExtractArchiveToDirectory SourceArchive="$(DownloadsFolder)$(AspNetCoreSharedFxArchiveFileName)"
DestinationDirectory="$(SdkInternalLayoutPath)" />
<ExtractArchiveToDirectory SourceArchive="$(DownloadsFolder)$(AspNetTargetingPackArchiveFileName)"
DestinationDirectory="$(SdkInternalLayoutPath)" />
<ReplaceFileContents
InputFiles="$(SdkPkgScriptTemplateFile)"
@ -140,10 +151,12 @@
<ItemGroup>
<PkgComponentsSourceFiles Include="$(SdkPKGInstallerFile);
$(DownloadsFolder)$(DownloadedSharedFrameworkInstallerFileName);
$(DownloadsFolder)$(DownloadedNetCoreAppTargetingPackInstallerFileName);
$(DownloadsFolder)$(DownloadedHostFxrInstallerFileName);
$(DownloadsFolder)$(DownloadedSharedHostInstallerFileName)" />
<PkgComponentsDestinationFiles Include="$(SdkPkgIntermediatePath);
$(SharedFrameworkPkgIntermediatePath);
$(NetCoreAppTargetingPackPkgIntermediatePath);
$(HostFxrPkgIntermediatePath);
$(SharedHostPkgIntermediatePath)" />
</ItemGroup>

5
src/redist/targets/packaging/osx/clisdk/Distribution-Template
View file

@ -11,11 +11,15 @@
</allowed-os-versions>
</volume-check>
<choices-outline>
<line choice="{NetCoreAppTargetingPackComponentId}.pkg" />
<line choice="{SharedFxComponentId}.pkg" />
<line choice="{HostFxrComponentId}.pkg" />
<line choice="{SharedHostComponentId}.pkg" />
<line choice="{CLISdkComponentId}.pkg"/>
</choices-outline>
<choice id="{NetCoreAppTargetingPackComponentId}.pkg" visible="true" title="{NetCoreAppTargetingPackBrandName} (x64)" description="The .NET Core Targeting Pack">
<pkg-ref id="{NetCoreAppTargetingPackComponentId}.pkg" />
</choice>
<choice id="{SharedFxComponentId}.pkg" visible="true" title="{SharedFxBrandName} (x64)" description="The .NET Core Shared Framework">
<pkg-ref id="{SharedFxComponentId}.pkg" />
</choice>
@ -28,6 +32,7 @@
<choice id="{CLISdkComponentId}.pkg" visible="true" title="{CLISdkBrandName} (x64)" description="The .NET Core SDK">
<pkg-ref id="{CLISdkComponentId}.pkg"/>
</choice>
<pkg-ref id="{NetCoreAppTargetingPackComponentId}.pkg">{NetCoreAppTargetingPackComponentId}.pkg</pkg-ref>
<pkg-ref id="{SharedFxComponentId}.pkg">{SharedFxComponentId}.pkg</pkg-ref>
<pkg-ref id="{HostFxrComponentId}.pkg">{HostFxrComponentId}.pkg</pkg-ref>
<pkg-ref id="{SharedHostComponentId}.pkg">{SharedHostComponentId}.pkg</pkg-ref>

4
src/redist/targets/packaging/osx/clisdk/resources/cs.lproj/conclusion.html
View file

@ -1,4 +1,4 @@
<!DOCTYPE html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
@ -25,7 +25,7 @@
<ul>
<li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
<li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
<li><a href="https://aka.ms/20-p2-rel-notes">Release Notes</a></li>
<li><a href="https://aka.ms/netcore3releasenotes">Release Notes</a></li>
<li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
</ul>
</div>

4
src/redist/targets/packaging/osx/clisdk/resources/de.lproj/conclusion.html
View file

@ -1,4 +1,4 @@
<!DOCTYPE html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
@ -25,7 +25,7 @@
<ul>
<li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
<li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
<li><a href="https://aka.ms/20-p2-rel-notes">Release Notes</a></li>
<li><a href="https://aka.ms/netcore3releasenotes">Release Notes</a></li>
<li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
</ul>
</div>

4
src/redist/targets/packaging/osx/clisdk/resources/en.lproj/conclusion.html
View file

@ -1,4 +1,4 @@
<!DOCTYPE html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
@ -25,7 +25,7 @@
<ul>
<li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
<li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
<li><a href="https://aka.ms/20-p2-rel-notes">Release Notes</a></li>
<li><a href="https://aka.ms/netcore3releasenotes">Release Notes</a></li>
<li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
</ul>
</div>

4
src/redist/targets/packaging/osx/clisdk/resources/es.lproj/conclusion.html
View file

@ -1,4 +1,4 @@
<!DOCTYPE html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
@ -25,7 +25,7 @@
<ul>
<li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
<li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
<li><a href="https://aka.ms/20-p2-rel-notes">Release Notes</a></li>
<li><a href="https://aka.ms/netcore3releasenotes">Release Notes</a></li>
<li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
</ul>
</div>

4
src/redist/targets/packaging/osx/clisdk/resources/fr.lproj/conclusion.html
View file

@ -1,4 +1,4 @@
<!DOCTYPE html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
@ -25,7 +25,7 @@
<ul>
<li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
<li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
<li><a href="https://aka.ms/20-p2-rel-notes">Release Notes</a></li>
<li><a href="https://aka.ms/netcore3releasenotes">Release Notes</a></li>
<li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
</ul>
</div>

4
src/redist/targets/packaging/osx/clisdk/resources/it.lproj/conclusion.html
View file

@ -1,4 +1,4 @@
<!DOCTYPE html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
@ -25,7 +25,7 @@
<ul>
<li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
<li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
<li><a href="https://aka.ms/20-p2-rel-notes">Release Notes</a></li>
<li><a href="https://aka.ms/netcore3releasenotes">Release Notes</a></li>
<li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
</ul>
</div>

4
src/redist/targets/packaging/osx/clisdk/resources/ja.lproj/conclusion.html
View file

@ -1,4 +1,4 @@
<!DOCTYPE html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
@ -25,7 +25,7 @@
<ul>
<li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
<li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
<li><a href="https://aka.ms/20-p2-rel-notes">Release Notes</a></li>
<li><a href="https://aka.ms/netcore3releasenotes">Release Notes</a></li>
<li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
</ul>
</div>

4
src/redist/targets/packaging/osx/clisdk/resources/ko.lproj/conclusion.html
View file

@ -1,4 +1,4 @@
<!DOCTYPE html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
@ -25,7 +25,7 @@
<ul>
<li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
<li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
<li><a href="https://aka.ms/20-p2-rel-notes">Release Notes</a></li>
<li><a href="https://aka.ms/netcore3releasenotes">Release Notes</a></li>
<li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
</ul>
</div>

4
src/redist/targets/packaging/osx/clisdk/resources/pl.lproj/conclusion.html
View file

@ -1,4 +1,4 @@
<!DOCTYPE html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
@ -25,7 +25,7 @@
<ul>
<li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
<li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
<li><a href="https://aka.ms/20-p2-rel-notes">Release Notes</a></li>
<li><a href="https://aka.ms/netcore3releasenotes">Release Notes</a></li>
<li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
</ul>
</div>

4
src/redist/targets/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html
View file

@ -1,4 +1,4 @@
<!DOCTYPE html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
@ -25,7 +25,7 @@
<ul>
<li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
<li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
<li><a href="https://aka.ms/20-p2-rel-notes">Release Notes</a></li>
<li><a href="https://aka.ms/netcore3releasenotes">Release Notes</a></li>
<li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
</ul>
</div>

4
src/redist/targets/packaging/osx/clisdk/resources/ru.lproj/conclusion.html
View file

@ -1,4 +1,4 @@
<!DOCTYPE html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
@ -25,7 +25,7 @@
<ul>
<li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
<li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
<li><a href="https://aka.ms/20-p2-rel-notes">Release Notes</a></li>
<li><a href="https://aka.ms/netcore3releasenotes">Release Notes</a></li>
<li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
</ul>
</div>

4
src/redist/targets/packaging/osx/clisdk/resources/tr.lproj/conclusion.html
View file

@ -1,4 +1,4 @@
<!DOCTYPE html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
@ -25,7 +25,7 @@
<ul>
<li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
<li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
<li><a href="https://aka.ms/20-p2-rel-notes">Release Notes</a></li>
<li><a href="https://aka.ms/netcore3releasenotes">Release Notes</a></li>
<li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
</ul>
</div>

4
src/redist/targets/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html
View file

@ -1,4 +1,4 @@
<!DOCTYPE html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
@ -25,7 +25,7 @@
<ul>
<li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
<li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
<li><a href="https://aka.ms/20-p2-rel-notes">Release Notes</a></li>
<li><a href="https://aka.ms/netcore3releasenotes">Release Notes</a></li>
<li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
</ul>
</div>

4
src/redist/targets/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html
View file

@ -1,4 +1,4 @@
<!DOCTYPE html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
@ -25,7 +25,7 @@
<ul>
<li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
<li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
<li><a href="https://aka.ms/20-p2-rel-notes">Release Notes</a></li>
<li><a href="https://aka.ms/netcore3releasenotes">Release Notes</a></li>
<li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
</ul>
</div>