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

Merge pull request #1748 from dsplaisted/use-internal-netcoreapp-package

Browse source 
Switch to  .Internal insertion package for .NET Core
This commit is contained in:
Daniel Plaisted 2019-04-25 11:18:30 -07:00 committed by GitHub
commit f21fc9c2ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
eng/Version.Details.xml
View file

@ -2,17 +2,17 @@
<Dependencies>
<ProductDependencies>
<!-- Winforms / WPF -->
<Dependency Name="Microsoft.WindowsDesktop.App" Version="3.0.0-preview6-27623-08">
<Dependency Name="Microsoft.WindowsDesktop.App" Version="3.0.0-preview6-27625-04">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>0c0420903263f4d1812bab6c5bd6e5d1fff54adc</Sha>
<Sha>a765e76a14bfd012c9efb8dbb5eba624a0f2efe8</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview6-27623-08">
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview6-27625-04">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>0c0420903263f4d1812bab6c5bd6e5d1fff54adc</Sha>
<Sha>a765e76a14bfd012c9efb8dbb5eba624a0f2efe8</Sha>
</Dependency>
<Dependency Name="NETStandard.Library.Ref" Version="2.1.0-preview6-27623-08">
<Dependency Name="NETStandard.Library.Ref" Version="2.1.0-preview6-27625-04">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>0c0420903263f4d1812bab6c5bd6e5d1fff54adc</Sha>
<Sha>a765e76a14bfd012c9efb8dbb5eba624a0f2efe8</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0-preview6-19225-02">
<Uri>https://github.com/aspnet/AspNetCore</Uri>

8
eng/Versions.props
View file

@ -48,17 +48,19 @@
<MicrosoftNETSdkPackageVersion>3.0.100-preview6.19225.1</MicrosoftNETSdkPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview6-27623-08</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview6-27625-04</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreDotNetAppHostPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetAppHostPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<SharedHostVersion>$(MicrosoftNETCoreAppPackageVersion)</SharedHostVersion>
<HostFxrVersion>$(MicrosoftNETCoreAppPackageVersion)</HostFxrVersion>
<NetCoreAppTargetingPackVersion>$(MicrosoftNETCoreAppPackageVersion)</NetCoreAppTargetingPackVersion>
<NetCoreAppHostPackVersion>$(MicrosoftNETCoreAppPackageVersion)</NetCoreAppHostPackVersion>
<NETStandardLibraryRefPackageVersion>2.1.0-preview6-27623-08</NETStandardLibraryRefPackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0-preview6-27625-04</NETStandardLibraryRefPackageVersion>
<WindowsDesktopTargetingPackVersion>$(MicrosoftNETCoreAppPackageVersion)</WindowsDesktopTargetingPackVersion>
<AspNetCoreVersion>$(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion)</AspNetCoreVersion>
<AspNetTargetingPackVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)</AspNetTargetingPackVersion>
<MicrosoftWindowsDesktopAppPackageVersion>3.0.0-preview6-27623-08</MicrosoftWindowsDesktopAppPackageVersion>
<MicrosoftWindowsDesktopAppPackageVersion>3.0.0-preview6-27625-04</MicrosoftWindowsDesktopAppPackageVersion>
<MicrosoftWindowsDesktopPackageVersion>$(MicrosoftWindowsDesktopAppPackageVersion)</MicrosoftWindowsDesktopPackageVersion>
</PropertyGroup>
<!-- infrastructure and test only dependencies -->

2
src/redist/targets/Crossgen.targets
View file

@ -4,7 +4,7 @@
DependsOnTargets="SetSdkBrandingInfo">
<PropertyGroup>
<RuntimeNETCoreAppPackageName>runtime.$(SharedFrameworkRid).microsoft.netcore.app</RuntimeNETCoreAppPackageName>
<RuntimeNETCoreAppPackageName>runtime.$(SharedFrameworkRid).microsoft.netcore.app.internal</RuntimeNETCoreAppPackageName>
<_crossDir Condition="'$(Architecture)' == 'arm64'">/x64_arm64</_crossDir>
<_crossDir Condition="'$(Architecture)' == 'arm' And '$(OSName)' == 'win'">/x86_arm</_crossDir>
<_crossDir Condition="'$(Architecture)' == 'arm' And '$(OSName)' == 'linux'">/x64_arm</_crossDir>

8
src/redist/targets/GenerateBundledVersions.targets
View file

@ -42,8 +42,8 @@
<ItemGroup>
<MetaPackageDownload Include="$(MSBuildThisFileDirectory)DownloadPackage.csproj">
<Properties>
PackageToRestore=Microsoft.NETCore.App;
PackageVersionToRestore=$(MicrosoftNETCoreAppPackageVersion);
PackageToRestore=Microsoft.NETCore.App.Internal;
PackageVersionToRestore=$(MicrosoftNETCoreAppInternalPackageVersion);
TargetFramework=$(TargetFramework)
</Properties>
</MetaPackageDownload>
@ -61,7 +61,7 @@
Projects="@(MetaPackageDownload)">
</MSBuild>
<GetRuntimePackRids MetapackagePath="$(NuGetPackageRoot)/microsoft.netcore.app/$(MicrosoftNETCoreAppPackageVersion)">
<GetRuntimePackRids MetapackagePath="$(NuGetPackageRoot)/microsoft.netcore.app.internal/$(MicrosoftNETCoreAppPackageVersion)">
<Output TaskParameter="AvailableRuntimePackRuntimeIdentifiers" ItemName="NetCoreRuntimePackRids" />
</GetRuntimePackRids>
<GetRuntimePackRids MetapackagePath="$(NuGetPackageRoot)/microsoft.windowsdesktop.app/$(MicrosoftWindowsDesktopPackageVersion)">
@ -188,7 +188,7 @@ Copyright (c) .NET Foundation. All rights reserved.
TargetingPackVersion="$(NetCoreAppTargetingPackVersion)"
AppHostPackNamePattern="runtime.**RID**.Microsoft.NETCore.DotNetAppHost"
AppHostRuntimeIdentifiers="@(NetCoreRuntimePackRids, '%3B')"
RuntimePackNamePatterns="runtime.**RID**.Microsoft.NETCore.App%3Bruntime.**RID**.Microsoft.NETCore.DotNetHostResolver%3Bruntime.**RID**.Microsoft.NETCore.DotNetHostPolicy"
RuntimePackNamePatterns="runtime.**RID**.Microsoft.NETCore.App.Internal%3Bruntime.**RID**.Microsoft.NETCore.DotNetHostResolver%3Bruntime.**RID**.Microsoft.NETCore.DotNetHostPolicy"
RuntimePackRuntimeIdentifiers="@(NetCoreRuntimePackRids, '%3B')"
/>

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

@ -363,25 +363,12 @@
<RemoveDir Directories="$(AppHostRestorePath)" />
<MakeDir Directories="$(AppHostRestorePath)" />
<ItemGroup>
<NETCoreDotNetAppHostPackageVersions Include="@(PackageDefinitions->'%(Version)')"
Condition="%(PackageDefinitions.Name) == $(NETCoreDotNetAppHostPackageName)" />
</ItemGroup>
<Error Condition="@(NETCoreDotNetAppHostPackageVersions->Distinct()->Count()) != 1"
Text="Failed to determine the $(NETCoreDotNetAppHostPackageName) version pulled in Microsoft.NETCore.App" />
<PropertyGroup>
<_NETCoreDotNetAppHostPackageVersion>@(NETCoreDotNetAppHostPackageVersions->Distinct())</_NETCoreDotNetAppHostPackageVersion>
</PropertyGroup>
<ItemGroup>
<AppHostTemplateDownloadPackageProject Include="$(MSBuildThisFileDirectory)DownloadPackage.csproj">
<Properties>
PackageToRestore=$(NETCoreDotNetAppHostPackageName);
PackageVersionToRestore=$(_NETCoreDotNetAppHostPackageVersion);
PackageVersionToRestore=$(MicrosoftNETCoreDotNetAppHostPackageVersion);
TargetFramework=$(TargetFramework);
RestorePackagesPath=$(AppHostRestorePath);
RuntimeIdentifier=$(Rid)