Prepare for 3.0.1xx servicing
We were bumping targeting pack, framework-dependent default runtime version, and self-contained default (latest) runtime version in unison. This only works for previews where these versions are all the same always. Now that we're servicing 3.0, we: 1. Pin targeting packs to 3.0.0 2. Fix default framework-dependent runtime version at 3.0.0 This change also: * Removes dependencies on legacy/internal netcoreapp packages. We now use Microsoft.NETCore.App.Internal version exclusively to calculate the blob storage path for core-setup. * Uses PackageDownload for all templates, including latest. PackageReference had been used for latest only because it hid another bug with the netcoreapp reference of redist.csproj that is fixed here. That reference is now a FrameworkReference as it should be. * Removes a bunch of shenanigans from GenerateBundledVersions.props that were causing issues with above. One casualty of that is that we hard code the RID lists for runtime pack, which I don't think is too bad, and actually will make it easier to merge in source build patches. * Cleans up how runtime and targeting pack versions are referenced throughout, removing incorrect assumptions about them being the same. * Incorporates a prior closed PR to use suffixed version for blob storage, even when assets coming from blob storage are stabilized. It needed changes to merge with this. Note: * A similar theoretical servicing issue exists for the versions of apphost, hostfxr, shared host, which are still assumed to be the same as the runtime version in several places. If we choose to service those independently, more work is required. * There will be a 3.0.1 ASP.NET targeting pack, and so we will have to unpin that once it is ready. This change establishes the baseline of all targeting packs being pinnned, and they can be unpinned in the (hopefully rare) cases where they need to be serviced.
This commit is contained in:
Nick Guerrera
parent
9749981e6f
commit
0f52aed34c
19 changed files with 289 additions and 254 deletions
|
|
@ -1,45 +1,47 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Dependencies>
|
||||
<ProductDependencies>
|
||||
<!-- Winforms / WPF -->
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App" Version="3.0.1-servicing-19502-09">
|
||||
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="3.0.0" Pinned="true">
|
||||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>0bdbe6b3a7caf32a4f594196effe56a941980d7b</Sha>
|
||||
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="3.0.1-servicing-19502-09">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="3.0.1-servicing-19502-01">
|
||||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>0bdbe6b3a7caf32a4f594196effe56a941980d7b</Sha>
|
||||
<Sha>93abb6b3a675b44ee35698d9640a42779b18e004</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App" Version="3.0.1-servicing-19502-09">
|
||||
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.0.0" Pinned="true">
|
||||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>0bdbe6b3a7caf32a4f594196effe56a941980d7b</Sha>
|
||||
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.0.1-servicing-19502-09">
|
||||
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.0.1-servicing-19502-01">
|
||||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>0bdbe6b3a7caf32a4f594196effe56a941980d7b</Sha>
|
||||
<Sha>93abb6b3a675b44ee35698d9640a42779b18e004</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.DotNetAppHost" Version="3.0.1-servicing-19502-09">
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.0.1-servicing-19502-01">
|
||||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>0bdbe6b3a7caf32a4f594196effe56a941980d7b</Sha>
|
||||
<Sha>93abb6b3a675b44ee35698d9640a42779b18e004</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="3.0.1-servicing-19502-09">
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="3.0.1-servicing-19502-01">
|
||||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>0bdbe6b3a7caf32a4f594196effe56a941980d7b</Sha>
|
||||
<Sha>93abb6b3a675b44ee35698d9640a42779b18e004</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.0.1-servicing-19502-09">
|
||||
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="3.0.1-servicing-19502-01">
|
||||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>0bdbe6b3a7caf32a4f594196effe56a941980d7b</Sha>
|
||||
<Sha>93abb6b3a675b44ee35698d9640a42779b18e004</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="NETStandard.Library.Ref" Version="2.1.0-servicing-19502-09">
|
||||
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
|
||||
<Dependency Name="NETStandard.Library.Ref" Version="2.1.0" Pinned="true">
|
||||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>0bdbe6b3a7caf32a4f594196effe56a941980d7b</Sha>
|
||||
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
|
||||
</Dependency>
|
||||
<!-- Used to pull in the feed for Microsoft.NETCore.Platforms, but not referenced directly -->
|
||||
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.1-servicing.19501.4" CoherentParentDependency="Microsoft.NetCore.App">
|
||||
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.1-servicing.19501.4" CoherentParentDependency="Microsoft.NETCore.App.Internal">
|
||||
<Uri>https://github.com/dotnet/corefx</Uri>
|
||||
<Sha>54d63c3e283e0c3937a35ab4e99f391c84ff119e</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0">
|
||||
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0" Pinned="true">
|
||||
<Uri>https://github.com/aspnet/AspNetCore</Uri>
|
||||
<Sha>aee5e4080331553ea9dfb7fb388b6d72f715bf6a</Sha>
|
||||
</Dependency>
|
||||
|
|
@ -67,24 +69,24 @@
|
|||
<Uri>https://github.com/dotnet/templating</Uri>
|
||||
<Sha>a776e417c83c52908298b3767e462feae8b18b98</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.101-servicing.19503.4">
|
||||
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.101-servicing.19502.7">
|
||||
<Uri>https://github.com/dotnet/toolset</Uri>
|
||||
<Sha>d62b7c37ab654e5019131ec3c0418d0a23639a31</Sha>
|
||||
<Sha>78da18674ad084d58311d36b5354925a8bef62fc</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="3.0.101-servicing.19477.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>3819a21a612cd8bc15b6f6c4e361d18490469577</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.0.101-servicing.19503.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.0.101-servicing.19502.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
|
||||
<Uri>https://github.com/dotnet/cli</Uri>
|
||||
<Sha>850536d605a5a84ee573760b755608ab596146de</Sha>
|
||||
<Sha>11f4a837a9d746af3b7d72767ab06c5a64c772f9</Sha>
|
||||
</Dependency>
|
||||
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via core setup -->
|
||||
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="4.8.0-servicing.19480.1" CoherentParentDependency="Microsoft.WindowsDesktop.App">
|
||||
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="4.8.0-servicing.19480.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/winforms</Uri>
|
||||
<Sha>af088e57775b7b9f28322511bc5be8ddb356b8a8</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.0.1-servicing.19480.1" CoherentParentDependency="Microsoft.WindowsDesktop.App">
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.0.1-servicing.19480.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/wpf</Uri>
|
||||
<Sha>d4121027999cb01b941481c774b42a2193775b93</Sha>
|
||||
</Dependency>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>3.0.101-servicing.19503.4</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>3.0.101-servicing.19502.7</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/cli -->
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.0.101-servicing.19503.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.0.101-servicing.19502.3</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
|
||||
|
|
@ -44,23 +44,31 @@
|
|||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.0.1-servicing-19502-09</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppPackageVersion>3.0.1-servicing-19502-09</MicrosoftNETCoreAppPackageVersion>
|
||||
<MicrosoftNETCoreAppInternalPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreAppInternalPackageVersion>
|
||||
<MicrosoftNETCoreDotNetAppHostPackageVersion>3.0.1-servicing-19502-09</MicrosoftNETCoreDotNetAppHostPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>3.0.1-servicing-19502-09</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<SharedHostVersion>$(MicrosoftNETCoreDotNetHostResolverPackageVersion)</SharedHostVersion>
|
||||
<HostFxrVersion>$(MicrosoftNETCoreDotNetAppHostPackageVersion)</HostFxrVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>3.0.1-servicing-19502-09</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<NetCoreAppTargetingPackVersion>$(MicrosoftNETCoreAppRefPackageVersion)</NetCoreAppTargetingPackVersion>
|
||||
<NetCoreAppHostPackVersion>$(MicrosoftNETCoreDotNetAppHostPackageVersion)</NetCoreAppHostPackVersion>
|
||||
<NETStandardLibraryRefPackageVersion>2.1.0-servicing-19502-09</NETStandardLibraryRefPackageVersion>
|
||||
<WindowsDesktopTargetingPackVersion>$(MicrosoftNETCoreAppRefPackageVersion)</WindowsDesktopTargetingPackVersion>
|
||||
<AspNetCoreVersion>$(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion)</AspNetCoreVersion>
|
||||
<AspNetTargetingPackVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)</AspNetTargetingPackVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>3.0.1-servicing-19502-09</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppPackageVersion>3.0.1-servicing-19502-09</MicrosoftWindowsDesktopAppPackageVersion>
|
||||
<MicrosoftWindowsDesktopPackageVersion>$(MicrosoftWindowsDesktopAppPackageVersion)</MicrosoftWindowsDesktopPackageVersion>
|
||||
<!-- Dependencies from https://github.com/dotnet/corefx -->
|
||||
<MicrosoftNETCorePlatformsPackageVersion>3.0.1-servicing.19501.4</MicrosoftNETCorePlatformsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/core-setup -->
|
||||
<MicrosoftNETCoreAppInternalPackageVersion>3.0.1-servicing-19502-01</MicrosoftNETCoreAppInternalPackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.0.1-servicing-19502-01</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>3.0.1-servicing-19502-01</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>3.0.0</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>3.0.1-servicing-19502-01</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>3.0.1-servicing-19502-01</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>3.0.0</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->
|
||||
<!-- version above and create aliases without the winx64 here for clarity elsewhere. -->
|
||||
<MicrosoftNETCoreAppHostPackageVersion>$(MicrosoftNETCoreAppHostwinx64PackageVersion)</MicrosoftNETCoreAppHostPackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
|
||||
<MicrosoftAspNetCoreAppRuntimePackageVersion>$(MicrosoftAspNetCoreAppRuntimewinx64PackageVersion)</MicrosoftAspNetCoreAppRuntimePackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimePackageVersion>$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)</MicrosoftWindowsDesktopAppRuntimePackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<HostFxrVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</HostFxrVersion>
|
||||
<SharedHostVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</SharedHostVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- 3.0 Template versions -->
|
||||
|
|
@ -70,7 +78,7 @@
|
|||
<MicrosoftDotNetCommonItemTemplates30PackageVersion>2.0.0-preview8.19373.1</MicrosoftDotNetCommonItemTemplates30PackageVersion>
|
||||
<MicrosoftDotNetCommonProjectTemplates30PackageVersion>$(MicrosoftDotNetCommonItemTemplates30PackageVersion)</MicrosoftDotNetCommonProjectTemplates30PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates30PackageVersion>1.0.2-beta4.19354.2</MicrosoftDotNetTestProjectTemplates30PackageVersion>
|
||||
<AspNetCorePackageVersionFor30Templates>$(AspNetCoreVersion)</AspNetCorePackageVersionFor30Templates>
|
||||
<AspNetCorePackageVersionFor30Templates>$(MicrosoftAspNetCoreAppRuntimePackageVersion)</AspNetCorePackageVersionFor30Templates>
|
||||
<!-- 2.2 Template versions -->
|
||||
<NUnit3Templates22PackageVersion>1.6.0</NUnit3Templates22PackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplates22PackageVersion>1.0.2-beta4</MicrosoftDotNetCommonItemTemplates22PackageVersion>
|
||||
|
|
|
|||
4
eng/configure-toolset.ps1
Normal file
4
eng/configure-toolset.ps1
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
# SdkTests do not currently work with globally installed CLI as they use dotnet-install.ps1 to install more runtimes
|
||||
|
||||
$script:useInstalledDotNetCli = $false
|
||||
|
||||
3
eng/configure-toolset.sh
Normal file
3
eng/configure-toolset.sh
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
# SdkTests do not currently work with globally installed CLI as they use dotnet-install.ps1 to install more runtimes
|
||||
|
||||
useInstalledDotNetCli="false"
|
||||
|
|
@ -0,0 +1,43 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using Microsoft.Build.Framework;
|
||||
using Microsoft.Build.Utilities;
|
||||
using Newtonsoft.Json.Linq;
|
||||
|
||||
namespace Microsoft.DotNet.Cli.Build
|
||||
{
|
||||
public class GetLinuxNativeInstallerDependencyVersions : Task
|
||||
{
|
||||
[Required]
|
||||
public string PackageVersion { get; set; }
|
||||
|
||||
[Output]
|
||||
public string MajorMinorVersion { get; private set; }
|
||||
|
||||
[Output]
|
||||
public string MajorMinorPatchVersion { get; private set; }
|
||||
|
||||
[Output]
|
||||
public string VersionWithTilde { get; private set; }
|
||||
|
||||
public override bool Execute()
|
||||
{
|
||||
string[] dotSplit = PackageVersion.Split('.');
|
||||
MajorMinorVersion = dotSplit[0] + "." + dotSplit[1];
|
||||
|
||||
string[] prereleaseSplit = PackageVersion.Split(new[] { '-' }, count: 2);
|
||||
MajorMinorPatchVersion = prereleaseSplit[0];
|
||||
VersionWithTilde = MajorMinorPatchVersion;
|
||||
|
||||
if (prereleaseSplit.Length > 1)
|
||||
{
|
||||
VersionWithTilde += "~" + prereleaseSplit[1];
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -3,14 +3,13 @@
|
|||
<TargetFramework>$(CoreSdkTargetFramework)</TargetFramework>
|
||||
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
|
||||
<CopyBuildOutputToPublishDirectory>false</CopyBuildOutputToPublishDirectory>
|
||||
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<!-- Explicitlty reference Microsoft.NETCore.App package here, using the version from Version.props, instead
|
||||
of the version from the stage 0 SDK. -->
|
||||
<PackageReference Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreAppPackageVersion)"
|
||||
PrivateAssets="All" Publish="true"/>
|
||||
<FrameworkReference Update="Microsoft.NETCore.App"
|
||||
TargetingPackVersion="$(MicrosoftNETCoreAppRefPackageVersion)"
|
||||
RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
|
||||
/>
|
||||
|
||||
<ProjectReference Include="..\SdkResolver\SdkResolver.csproj" ReferenceOutputAssembly="false" />
|
||||
</ItemGroup>
|
||||
|
|
|
|||
|
|
@ -4,12 +4,12 @@
|
|||
<BuildName>cli</BuildName>
|
||||
<SdkBrandName>Microsoft .NET Core SDK $(CliBrandingVersion)</SdkBrandName>
|
||||
<MSBuildExtensionsBrandName>.NET Standard Support for Visual Studio 2015</MSBuildExtensionsBrandName>
|
||||
<SharedFrameworkBrandName>Microsoft .NET Core Runtime $(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</SharedFrameworkBrandName>
|
||||
<SharedFrameworkBrandName>Microsoft .NET Core Runtime $(MicrosoftNETCoreAppRuntimePackageVersion)</SharedFrameworkBrandName>
|
||||
<NetCoreAppTargetingPackBrandName>Microsoft .NET Core Targeting Pack $(MicrosoftNETCoreAppRefPackageVersion)</NetCoreAppTargetingPackBrandName>
|
||||
<NetStandardTargetingPackBrandName>Microsoft .NET Standard 2.1 Targeting Pack $(NETStandardLibraryRefPackageVersion)</NetStandardTargetingPackBrandName>
|
||||
<NetCoreAppHostPackBrandName>Microsoft .NET AppHost Pack $(MicrosoftNETCoreDotNetAppHostPackageVersion)</NetCoreAppHostPackBrandName>
|
||||
<SharedHostBrandName>Microsoft .NET Core Host $(MicrosoftNETCoreDotNetAppHostPackageVersion)</SharedHostBrandName>
|
||||
<HostFxrBrandName>Microsoft .NET Core Host FX Resolver $(MicrosoftNETCoreDotNetAppHostPackageVersion)</HostFxrBrandName>
|
||||
<NetCoreAppHostPackBrandName>Microsoft .NET AppHost Pack $(MicrosoftNETCoreAppHostHostPackageVersion)</NetCoreAppHostPackBrandName>
|
||||
<SharedHostBrandName>Microsoft .NET Core Host $(SharedHostVersion)</SharedHostBrandName>
|
||||
<HostFxrBrandName>Microsoft .NET Core Host FX Resolver $(HostFxrVersion)</HostFxrBrandName>
|
||||
<SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName>
|
||||
<SharedFrameworkNugetName>$(SharedFrameworkName)</SharedFrameworkNugetName>
|
||||
<BundledTemplates30BrandName>Microsoft .NET Core 3.0 Templates</BundledTemplates30BrandName>
|
||||
|
|
|
|||
|
|
@ -38,5 +38,6 @@
|
|||
<UsingTask TaskName="GenerateChecksums" AssemblyFile="$(CoreSdkTaskDll)"/>
|
||||
<UsingTask TaskName="GetRuntimePackRids" AssemblyFile="$(CoreSdkTaskDll)"/>
|
||||
<UsingTask TaskName="GenerateMSBuildExtensionsSWR" AssemblyFile="$(CoreSdkTaskDll)"/>
|
||||
<UsingTask TaskName="GetLinuxNativeInstallerDependencyVersions" AssemblyFile="$(CoreSdkTaskDll)"/>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -91,13 +91,21 @@
|
|||
|
||||
<PackageDownload Include="@(Bundled21Templates)" Exclude="@(PackageDownload)" />
|
||||
<PackageDownload Include="@(Bundled22Templates)" Exclude="@(PackageDownload)" />
|
||||
<PackageDownload Include="@(Bundled30Templates)" Exclude="@(PackageDownload)" />
|
||||
|
||||
<PackageDownload Update="Microsoft.DotNet.Common.ItemTemplates"
|
||||
Version="[$(MicrosoftDotNetCommonItemTemplates21PackageVersion)];
|
||||
[$(MicrosoftDotNetCommonItemTemplates22PackageVersion)];
|
||||
[$(MicrosoftDotNetCommonItemTemplates30PackageVersion)];
|
||||
" />
|
||||
|
||||
<PackageDownload Update="Microsoft.DotNet.Web.ItemTemplates;Microsoft.DotNet.Web.Spa.ProjectTemplates"
|
||||
<PackageDownload Update="Microsoft.DotNet.Web.ItemTemplates"
|
||||
Version="[$(AspNetCorePackageVersionFor21Templates)];
|
||||
[$(AspNetCorePackageVersionFor22Templates)];
|
||||
[$(AspNetCorePackageVersionFor30Templates)];
|
||||
" />
|
||||
|
||||
<PackageDownload Update="Microsoft.DotNet.Web.Spa.ProjectTemplates"
|
||||
Version="[$(AspNetCorePackageVersionFor21Templates)];
|
||||
[$(AspNetCorePackageVersionFor22Templates)];
|
||||
" />
|
||||
|
|
@ -105,14 +113,10 @@
|
|||
<PackageDownload Update="NUnit3.DotNetNew.Template"
|
||||
Version="[$(NUnit3Templates21PackageVersion)];
|
||||
[$(NUnit3Templates22PackageVersion)];
|
||||
[$(NUnit3Templates30PackageVersion)];
|
||||
" />
|
||||
</ItemGroup>
|
||||
|
||||
<!-- Restore bundled templates via PackageReference -->
|
||||
<ItemGroup>
|
||||
<PackageReference Include="@(Bundled30Templates)" />
|
||||
</ItemGroup>
|
||||
|
||||
<Target Name="LayoutTemplates"
|
||||
DependsOnTargets="LayoutTemplatesForSDK;LayoutTemplatesFor30MSI;LayoutTemplatesFor22MSI;LayoutTemplatesFor21MSI" />
|
||||
|
||||
|
|
|
|||
|
|
@ -4,17 +4,17 @@
|
|||
DependsOnTargets="SetSdkBrandingInfo">
|
||||
|
||||
<PropertyGroup>
|
||||
<RuntimeNETCoreAppPackageName>runtime.$(SharedFrameworkRid).microsoft.netcore.app</RuntimeNETCoreAppPackageName>
|
||||
<RuntimeNETCoreAppPackageName>microsoft.netcore.app.runtime.$(SharedFrameworkRid)</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>
|
||||
<CrossgenPath>$(NuGetPackageRoot)/$(RuntimeNETCoreAppPackageName)/$(MicrosoftNETCoreAppPackageVersion)/tools$(_crossDir)/crossgen$(ExeExtension)</CrossgenPath>
|
||||
<CrossgenPath>$(NuGetPackageRoot)/$(RuntimeNETCoreAppPackageName)/$(MicrosoftNETCoreAppRuntimePackageVersion)/tools$(_crossDir)/crossgen$(ExeExtension)</CrossgenPath>
|
||||
<LibCLRJitRid Condition="!$(Architecture.StartsWith('arm'))">$(SharedFrameworkRid)</LibCLRJitRid>
|
||||
<LibCLRJitRid Condition="'$(Architecture)' == 'arm64'">x64_arm64</LibCLRJitRid>
|
||||
<LibCLRJitRid Condition="'$(Architecture)' == 'arm' And '$(OSName)' == 'win'">x86_arm</LibCLRJitRid>
|
||||
<LibCLRJitRid Condition="'$(Architecture)' == 'arm' And '$(OSName)' == 'linux'">x64_arm</LibCLRJitRid>
|
||||
<LibCLRJitPath>$(NuGetPackageRoot)/$(RuntimeNETCoreAppPackageName)/$(MicrosoftNETCoreAppPackageVersion)/runtimes/$(LibCLRJitRid)/native/$(DynamicLibPrefix)clrjit$(DynamicLibExtension)</LibCLRJitPath>
|
||||
<SharedFrameworkNameVersionPath>$(RedistLayoutPath)shared/$(SharedFrameworkName)/$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</SharedFrameworkNameVersionPath>
|
||||
<LibCLRJitPath>$(NuGetPackageRoot)/$(RuntimeNETCoreAppPackageName)/$(MicrosoftNETCoreAppRuntimePackageVersion)/runtimes/$(LibCLRJitRid)/native/$(DynamicLibPrefix)clrjit$(DynamicLibExtension)</LibCLRJitPath>
|
||||
<SharedFrameworkNameVersionPath>$(RedistLayoutPath)shared/$(SharedFrameworkName)/$(MicrosoftNETCoreAppRuntimePackageVersion)</SharedFrameworkNameVersionPath>
|
||||
<DIASymReaderCrossgenFilter>*</DIASymReaderCrossgenFilter>
|
||||
<DIASymReaderCrossgenFilter Condition="'$(Architecture)' == 'arm' And '$(OSName)' == 'win'">x86</DIASymReaderCrossgenFilter>
|
||||
</PropertyGroup>
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
<CrossGenDownloadPackageProject Include="$(MSBuildThisFileDirectory)DownloadPackage.csproj">
|
||||
<Properties>
|
||||
PackageToRestore=$(RuntimeNETCoreAppPackageName);
|
||||
PackageVersionToRestore=$(MicrosoftNETCoreAppPackageVersion);
|
||||
PackageVersionToRestore=$(MicrosoftNETCoreAppRuntimePackageVersion);
|
||||
TargetFramework=$(TargetFramework)
|
||||
</Properties>
|
||||
</CrossGenDownloadPackageProject>
|
||||
|
|
@ -89,12 +89,6 @@
|
|||
<RemainingFolders Remove="$(PublishDir)FSharp\**\*" />
|
||||
</ItemGroup>
|
||||
|
||||
<!-- Ensure crossgen tool is executable. See https://github.com/NuGet/Home/issues/4424 -->
|
||||
<!-- Probably not needed anymore -->
|
||||
<!--<Chmod Condition=" '$(OSName)' != 'win' "
|
||||
Glob="$(CrossgenPath)"
|
||||
Mode="u+x" />-->
|
||||
|
||||
<!-- Crossgen does not support generating symbols on Mac -->
|
||||
<PropertyGroup Condition="'$(CreateCrossgenSymbols)' == ''">
|
||||
<CreateCrossgenSymbols>true</CreateCrossgenSymbols>
|
||||
|
|
|
|||
|
|
@ -3,72 +3,41 @@
|
|||
<Target Name="GenerateBundledVersions"
|
||||
DependsOnTargets="GenerateBundledVersionsProps;GenerateBundledCliToolsProps" />
|
||||
|
||||
<Target Name="GenerateBundledVersionsProps" DependsOnTargets="RunResolvePackageDependencies;SetupBundledComponents">
|
||||
<Target Name="GenerateBundledVersionsProps" DependsOnTargets="SetupBundledComponents">
|
||||
<PropertyGroup>
|
||||
<BundledVersionsPropsFileName>Microsoft.NETCoreSdk.BundledVersions.props</BundledVersionsPropsFileName>
|
||||
</PropertyGroup>
|
||||
|
||||
<!--
|
||||
The bundled version of Microsoft.NETCore.App is determined statically from DependencyVersions.props whereas the bundled version
|
||||
of NETStandard.Library is defined by what Microsoft.NETCore.App pulls in. This digs in to the package resolution items of
|
||||
of our build against Microsoft.NETCore.App to find the correct NETStandard.Library version
|
||||
-->
|
||||
<ItemGroup>
|
||||
<_NETStandardLibraryPackageVersions Include="@(PackageDefinitions->'%(Version)')"
|
||||
Condition="%(PackageDefinitions.Name) == 'NetStandard.Library'" />
|
||||
<_NETCorePlatformsPackageVersions Include="@(PackageDefinitions->'%(Version)')"
|
||||
Condition="%(PackageDefinitions.Name) == 'Microsoft.NETCore.Platforms'" />
|
||||
</ItemGroup>
|
||||
|
||||
<Error Condition="@(_NETStandardLibraryPackageVersions->Distinct()->Count()) != 1"
|
||||
Text="Failed to determine the NETStandard.Library version pulled in Microsoft.NETCore.App" />
|
||||
<Error Condition="@(_NETCorePlatformsPackageVersions->Distinct()->Count()) != 1"
|
||||
Text="Failed to determine the Microsoft.NETCore.Platforms version pulled in Microsoft.NETCore.App" />
|
||||
|
||||
<PropertyGroup>
|
||||
<_NETCoreAppPackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</_NETCoreAppPackageVersion>
|
||||
<_NETStandardLibraryPackageVersion>@(_NETStandardLibraryPackageVersions->Distinct())</_NETStandardLibraryPackageVersion>
|
||||
<_NETCorePlatformsPackageVersion>@(_NETCorePlatformsPackageVersions->Distinct())</_NETCorePlatformsPackageVersion>
|
||||
<_NETCoreAppPackageVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</_NETCoreAppPackageVersion>
|
||||
<_NETStandardLibraryPackageVersion>$(NETStandardLibraryRefPackageVersion)</_NETStandardLibraryPackageVersion>
|
||||
<_NETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion)</_NETCorePlatformsPackageVersion>
|
||||
|
||||
<!-- Use only major and minor in target framework version -->
|
||||
<_NETCoreAppTargetFrameworkVersion>$(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1])</_NETCoreAppTargetFrameworkVersion>
|
||||
<_NETStandardTargetFrameworkVersion>$(_NETStandardLibraryPackageVersion.Split('.')[0]).$(_NETStandardLibraryPackageVersion.Split('.')[1])</_NETStandardTargetFrameworkVersion>
|
||||
|
||||
<NETCoreSdkIsPreview Condition=" '$(DropSuffix)' != 'true' ">true</NETCoreSdkIsPreview>
|
||||
<_NETCoreSdkBeingBuiltIsPreview Condition=" '$(DropSuffix)' != 'true' ">true</_NETCoreSdkBeingBuiltIsPreview>
|
||||
<_NETCoreSdkBeingBuiltIsPreview Condition=" '$(DropSuffix)' == 'true' ">false</_NETCoreSdkBeingBuiltIsPreview>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- Download "metapackages" for each shared framework in order to get the list of runtime identifers
|
||||
for which there are runtime packs (from the runtime.json in the metapackage) -->
|
||||
<ItemGroup>
|
||||
<MetaPackageDownload Include="$(MSBuildThisFileDirectory)DownloadPackage.csproj">
|
||||
<Properties>
|
||||
PackageToRestore=Microsoft.NETCore.App.Internal;
|
||||
PackageVersionToRestore=$(MicrosoftNETCoreAppInternalPackageVersion);
|
||||
TargetFramework=$(TargetFramework)
|
||||
</Properties>
|
||||
</MetaPackageDownload>
|
||||
<MetaPackageDownload Include="$(MSBuildThisFileDirectory)DownloadPackage.csproj">
|
||||
<Properties>
|
||||
PackageToRestore=Microsoft.WindowsDesktop.App;
|
||||
PackageVersionToRestore=$(MicrosoftWindowsDesktopPackageVersion);
|
||||
TargetFramework=$(TargetFramework)
|
||||
</Properties>
|
||||
</MetaPackageDownload>
|
||||
</ItemGroup>
|
||||
<NetCoreRuntimePackRids Include="
|
||||
linux-arm;
|
||||
linux-arm64;
|
||||
linux-musl-arm64;
|
||||
linux-musl-x64;
|
||||
linux-x64;
|
||||
osx-x64;
|
||||
rhel.6-x64;
|
||||
tizen.4.0.0-armel;
|
||||
tizen.5.0.0-armel;
|
||||
win-arm;
|
||||
win-arm64;
|
||||
win-x64;
|
||||
win-x86;
|
||||
" />
|
||||
|
||||
<MSBuild
|
||||
BuildInParallel="False"
|
||||
Projects="@(MetaPackageDownload)">
|
||||
</MSBuild>
|
||||
|
||||
<GetRuntimePackRids MetapackagePath="$(NuGetPackageRoot)/microsoft.netcore.app.internal/$(MicrosoftNETCoreAppPackageVersion)">
|
||||
<Output TaskParameter="AvailableRuntimePackRuntimeIdentifiers" ItemName="NetCoreRuntimePackRids" />
|
||||
</GetRuntimePackRids>
|
||||
<GetRuntimePackRids MetapackagePath="$(NuGetPackageRoot)/microsoft.windowsdesktop.app/$(MicrosoftWindowsDesktopPackageVersion)">
|
||||
<Output TaskParameter="AvailableRuntimePackRuntimeIdentifiers" ItemName="WindowsDesktopRuntimePackRids" />
|
||||
</GetRuntimePackRids>
|
||||
|
||||
<ItemGroup>
|
||||
<AspNetCoreRuntimePackRids Include="
|
||||
win-x64;
|
||||
win-x86;
|
||||
|
|
@ -78,7 +47,13 @@
|
|||
linux-musl-arm64;
|
||||
linux-x64;
|
||||
linux-arm;
|
||||
linux-arm64" />
|
||||
linux-arm64;
|
||||
" />
|
||||
|
||||
<WindowsDesktopRuntimePackRids Include="
|
||||
win-x64;
|
||||
win-x86;
|
||||
"/>
|
||||
</ItemGroup>
|
||||
|
||||
<!--
|
||||
|
|
@ -112,11 +87,6 @@
|
|||
TargetFrameworkVersion="2.2"
|
||||
DefaultVersion="2.2.0"
|
||||
LatestVersion="2.2.7" />
|
||||
<ImplicitPackageVariable Include="Microsoft.NETCore.App"
|
||||
TargetFrameworkVersion="3.0"
|
||||
DefaultVersion="$(_NETCoreAppPackageVersion)"
|
||||
LatestVersion="$(_NETCoreAppPackageVersion)" />
|
||||
|
||||
<ImplicitPackageVariable Include="Microsoft.AspNetCore.App"
|
||||
TargetFrameworkVersion="2.1"
|
||||
DefaultVersion="2.1.1"
|
||||
|
|
@ -165,7 +135,7 @@ Copyright (c) .NET Foundation. All rights reserved.
|
|||
<BundledRuntimeIdentifierGraphFile>%24(MSBuildThisFileDirectory)RuntimeIdentifierGraph.json</BundledRuntimeIdentifierGraphFile>
|
||||
<NETCoreSdkVersion>$(SdkVersion)</NETCoreSdkVersion>
|
||||
<NETCoreSdkRuntimeIdentifier>$(ProductMonikerRid)</NETCoreSdkRuntimeIdentifier>
|
||||
<_NETCoreSdkIsPreview>$(NETCoreSdkIsPreview)</_NETCoreSdkIsPreview>
|
||||
<_NETCoreSdkIsPreview>$(_NETCoreSdkBeingBuiltIsPreview)</_NETCoreSdkIsPreview>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
@(ImplicitPackageVariable->'<ImplicitPackageReferenceVersion Include="%(Identity)" TargetFrameworkVersion="%(TargetFrameworkVersion)" DefaultVersion="%(DefaultVersion)" LatestVersion="%(LatestVersion)"/>', '
|
||||
|
|
@ -174,10 +144,10 @@ Copyright (c) .NET Foundation. All rights reserved.
|
|||
<KnownFrameworkReference Include="Microsoft.NETCore.App"
|
||||
TargetFramework="netcoreapp3.0"
|
||||
RuntimeFrameworkName="Microsoft.NETCore.App"
|
||||
DefaultRuntimeFrameworkVersion="$(_NETCoreAppPackageVersion)"
|
||||
LatestRuntimeFrameworkVersion="$(_NETCoreAppPackageVersion)"
|
||||
DefaultRuntimeFrameworkVersion="3.0.0"
|
||||
LatestRuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
|
||||
TargetingPackName="Microsoft.NETCore.App.Ref"
|
||||
TargetingPackVersion="$(NetCoreAppTargetingPackVersion)"
|
||||
TargetingPackVersion="$(MicrosoftNETCoreAppRefPackageVersion)"
|
||||
RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.**RID**"
|
||||
RuntimePackRuntimeIdentifiers="@(NetCoreRuntimePackRids, '%3B')"
|
||||
IsTrimmable="true"
|
||||
|
|
@ -193,10 +163,10 @@ Copyright (c) .NET Foundation. All rights reserved.
|
|||
<KnownFrameworkReference Include="Microsoft.WindowsDesktop.App"
|
||||
TargetFramework="netcoreapp3.0"
|
||||
RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
|
||||
DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)"
|
||||
LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)"
|
||||
DefaultRuntimeFrameworkVersion="3.0.0"
|
||||
LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppRuntimePackageVersion)"
|
||||
TargetingPackName="Microsoft.WindowsDesktop.App.Ref"
|
||||
TargetingPackVersion="$(WindowsDesktopTargetingPackVersion)"
|
||||
TargetingPackVersion="$(MicrosoftWindowsDesktopAppRefPackageVersion)"
|
||||
RuntimePackNamePatterns="Microsoft.WindowsDesktop.App.Runtime.**RID**"
|
||||
RuntimePackRuntimeIdentifiers="@(WindowsDesktopRuntimePackRids, '%3B')"
|
||||
IsWindowsOnly="true"
|
||||
|
|
@ -205,10 +175,10 @@ Copyright (c) .NET Foundation. All rights reserved.
|
|||
<KnownFrameworkReference Include="Microsoft.WindowsDesktop.App.WPF"
|
||||
TargetFramework="netcoreapp3.0"
|
||||
RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
|
||||
DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)"
|
||||
LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)"
|
||||
DefaultRuntimeFrameworkVersion="3.0.0"
|
||||
LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppRuntimePackageVersion)"
|
||||
TargetingPackName="Microsoft.WindowsDesktop.App.Ref"
|
||||
TargetingPackVersion="$(WindowsDesktopTargetingPackVersion)"
|
||||
TargetingPackVersion="$(MicrosoftWindowsDesktopAppRefPackageVersion)"
|
||||
RuntimePackNamePatterns="Microsoft.WindowsDesktop.App.Runtime.**RID**"
|
||||
RuntimePackRuntimeIdentifiers="@(WindowsDesktopRuntimePackRids, '%3B')"
|
||||
IsWindowsOnly="true"
|
||||
|
|
@ -218,10 +188,10 @@ Copyright (c) .NET Foundation. All rights reserved.
|
|||
<KnownFrameworkReference Include="Microsoft.WindowsDesktop.App.WindowsForms"
|
||||
TargetFramework="netcoreapp3.0"
|
||||
RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
|
||||
DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)"
|
||||
LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)"
|
||||
DefaultRuntimeFrameworkVersion="3.0.0"
|
||||
LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppRuntimePackageVersion)"
|
||||
TargetingPackName="Microsoft.WindowsDesktop.App.Ref"
|
||||
TargetingPackVersion="$(WindowsDesktopTargetingPackVersion)"
|
||||
TargetingPackVersion="$(MicrosoftWindowsDesktopAppRefPackageVersion)"
|
||||
RuntimePackNamePatterns="Microsoft.WindowsDesktop.App.Runtime.**RID**"
|
||||
RuntimePackRuntimeIdentifiers="@(WindowsDesktopRuntimePackRids, '%3B')"
|
||||
IsWindowsOnly="true"
|
||||
|
|
@ -231,10 +201,10 @@ Copyright (c) .NET Foundation. All rights reserved.
|
|||
<KnownFrameworkReference Include="Microsoft.AspNetCore.App"
|
||||
TargetFramework="netcoreapp3.0"
|
||||
RuntimeFrameworkName="Microsoft.AspNetCore.App"
|
||||
DefaultRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion)"
|
||||
LatestRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion)"
|
||||
DefaultRuntimeFrameworkVersion="3.0.0"
|
||||
LatestRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppRuntimePackageVersion)"
|
||||
TargetingPackName="Microsoft.AspNetCore.App.Ref"
|
||||
TargetingPackVersion="$(AspNetTargetingPackVersion)"
|
||||
TargetingPackVersion="$(MicrosoftAspNetCoreAppRefPackageVersion)"
|
||||
RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**"
|
||||
RuntimePackRuntimeIdentifiers="@(AspNetCoreRuntimePackRids, '%3B')"
|
||||
/>
|
||||
|
|
@ -289,6 +259,10 @@ Copyright (c) .NET Foundation. All rights reserved.
|
|||
Overwrite="true" />
|
||||
</Target>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageDownload Include="Microsoft.NETCore.Platforms" Version="[$(MicrosoftNETCorePlatformsPackageVersion)]" />
|
||||
</ItemGroup>
|
||||
|
||||
<Target Name="LayoutRuntimeGraph"
|
||||
DependsOnTargets="GenerateBundledVersionsProps">
|
||||
|
||||
|
|
|
|||
|
|
@ -14,8 +14,6 @@
|
|||
SetSdkBrandingInfo">
|
||||
<PropertyGroup>
|
||||
<DotnetDebToolDir>$(MSBuildProjectDirectory)</DotnetDebToolDir>
|
||||
<!--<DotnetDebToolDir>$(MSBuildThisFileDirectory)/dotnet-deb-tool-consumer</DotnetDebToolDir>-->
|
||||
<!--<PackageTool>$(NuGetPackagesDir)/dotnet-deb-tool/$(DotnetDebToolVersion)/lib/netcoreapp2.0/tool/package_tool</PackageTool>-->
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- constants -->
|
||||
|
|
@ -65,12 +63,12 @@
|
|||
<DownloadedHostFxrInstallerFile>$(DownloadsFolder)$(DownloadedHostFxrInstallerFileName)</DownloadedHostFxrInstallerFile>
|
||||
<SharedHostDebianPackageName>dotnet-host</SharedHostDebianPackageName>
|
||||
<DownloadedSharedHostInstallerFile>$(DownloadsFolder)$(DownloadedSharedHostInstallerFileName)</DownloadedSharedHostInstallerFile>
|
||||
<AspNetCoreSharedFxDebianPackageFileName>aspnetcore-runtime-$(AspNetCoreVersion)</AspNetCoreSharedFxDebianPackageFileName>
|
||||
<AspNetCoreSharedFxDebianPackageFileName>aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion)</AspNetCoreSharedFxDebianPackageFileName>
|
||||
<AspNetCoreSharedFxDebianPackageFileName>$(AspNetCoreSharedFxDebianPackageFileName.ToLower())</AspNetCoreSharedFxDebianPackageFileName>
|
||||
<AspNetCoreSharedFxDebianPackageName>aspnetcore-runtime-$(AspNetCoreMajorMinorVersion)</AspNetCoreSharedFxDebianPackageName>
|
||||
<AspNetCoreSharedFxDebianPackageName>$(AspNetCoreSharedFxDebianPackageName.ToLower())</AspNetCoreSharedFxDebianPackageName>
|
||||
<DownloadedAspNetCoreSharedFxInstallerFile>$(DownloadsFolder)$(DownloadedAspNetCoreSharedFxInstallerFileName)</DownloadedAspNetCoreSharedFxInstallerFile>
|
||||
<AspNetTargetingPackDebianPackageFileName>aspnetcore-targeting-pack-$(AspNetCoreVersion)</AspNetTargetingPackDebianPackageFileName>
|
||||
<AspNetTargetingPackDebianPackageFileName>aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)</AspNetTargetingPackDebianPackageFileName>
|
||||
<AspNetTargetingPackDebianPackageFileName>$(AspNetTargetingPackDebianPackageFileName.ToLower())</AspNetTargetingPackDebianPackageFileName>
|
||||
<AspNetTargetingPackDebianPackageName>aspnetcore-targeting-pack-$(AspNetCoreMajorMinorVersion)</AspNetTargetingPackDebianPackageName>
|
||||
<AspNetTargetingPackDebianPackageName>$(AspNetTargetingPackDebianPackageName.ToLower())</AspNetTargetingPackDebianPackageName>
|
||||
|
|
@ -159,15 +157,20 @@
|
|||
<ReplacementString>$(SdkBrandName)</ReplacementString>
|
||||
</DebianConfigTokenValues>
|
||||
<DebianConfigTokenValues Include="%SHARED_FRAMEWORK_DEBIAN_PACKAGE_VERSION%">
|
||||
<ReplacementString>$(MicrosoftNETCoreAppPackageVersionWithTilde)</ReplacementString>
|
||||
<ReplacementString>$(MicrosoftNETCoreAppRuntimePackageVersionWithTilde)</ReplacementString>
|
||||
</DebianConfigTokenValues>
|
||||
<DebianConfigTokenValues Include="%NETCOREAPP_TARGETING_PACK_DEBIAN_PACKAGE_VERSION%">
|
||||
<ReplacementString>$(MicrosoftNETCoreAppRefPackageVersionWithTilde)</ReplacementString>
|
||||
</DebianConfigTokenValues>
|
||||
<DebianConfigTokenValues Include="%NET_STANDARD_DEBIAN_PACKAGE_VERSION%">
|
||||
<ReplacementString>$(NetStandardTargetingPackPackageVersionWithTilde)</ReplacementString>
|
||||
</DebianConfigTokenValues>
|
||||
<DebianConfigTokenValues Include="%ASPNETCORE_SHAREDFX_DEBIAN_PACKAGE_VERSION%">
|
||||
<ReplacementString>$(AspNetCoreVersionWithTilde)</ReplacementString>
|
||||
<ReplacementString>$(AspNetCoreRuntimeVersionWithTilde)</ReplacementString>
|
||||
</DebianConfigTokenValues>
|
||||
<DebianConfigTokenValues Include="%ASPNET_TARGETING_PACK_DEBIAN_PACKAGE_VERSION%">
|
||||
<ReplacementString>$(AspNetCoreRefVersionWithTilde)</ReplacementString>
|
||||
</DebianConfigTokenValues>
|
||||
|
||||
<DebianPostInstTokenValues Include="%SDK_VERSION%">
|
||||
<ReplacementString>$(SdkVersion)</ReplacementString>
|
||||
</DebianPostInstTokenValues>
|
||||
|
|
@ -191,7 +194,8 @@
|
|||
GenerateDebsInner"/>
|
||||
|
||||
<Target Name="GenerateDebsInner"
|
||||
DependsOnTargets="SetupDebProps;
|
||||
DependsOnTargets="SetupBundledComponents;
|
||||
SetupDebProps;
|
||||
TestDebuild;
|
||||
BuildSdkDeb;
|
||||
TestSdkDeb"
|
||||
|
|
@ -282,10 +286,6 @@
|
|||
DestinationFiles="$(DebianConfigJsonFile)"
|
||||
ReplacementItems="@(DebianConfigTokenValues)" />
|
||||
|
||||
<!--<Chmod
|
||||
Glob="$(PackageTool)"
|
||||
Mode="u+x" />-->
|
||||
|
||||
<!-- Build SDK Deb package -->
|
||||
<DotNetDebTool ToolPath="$([System.IO.Path]::GetDirectoryName($(DotNetTool)))"
|
||||
InputDirectory="$(LayoutDirectory)"
|
||||
|
|
|
|||
|
|
@ -9,12 +9,17 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<!-- The aspnetcore blobs will get uploaded to a directory that is not
|
||||
stabilized. There is not a great package that can be used to identify this version at
|
||||
the moment. For a workaround, use Microsoft.AspNetCore.DeveloperCertificates.XPlat's version. -->
|
||||
<AspNetCoreBlobDirectory>$(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion)</AspNetCoreBlobDirectory>
|
||||
<!-- Blob storage directories are not stabilized, so these must refer to a package that does not stabilize -->
|
||||
<AspNetCoreBlobVersion>$(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion)</AspNetCoreBlobVersion>
|
||||
<CoreSetupBlobVersion>$(MicrosoftNETCoreAppInternalPackageVersion)</CoreSetupBlobVersion>
|
||||
|
||||
<!-- Change these individually to or $(CoreSetupBlobVersion) or $(AspNetCoreBlobVersion) if corresponding .Ref packages are unpinned. -->
|
||||
<NETCoreAppTargetingPackBlobVersion>3.0.0</NETCoreAppTargetingPackBlobVersion>
|
||||
<AspNetCoreTargetingPackBlobVersion>3.0.0</AspNetCoreTargetingPackBlobVersion>
|
||||
<WindowsDesktopTargetingPackBlobVersion>3.0.0</WindowsDesktopTargetingPackBlobVersion>
|
||||
<NETStandardTargetingPackBlobVersion>3.0.0</NETStandardTargetingPackBlobVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
|
||||
<Target Name="SetupBundledComponents" DependsOnTargets="GetCurrentRuntimeInformation;SetupFileExtensions;SetSdkVersionInfo;SetBuildDefaults">
|
||||
<PropertyGroup>
|
||||
<SdkOutputDirectory>$(RedistLayoutPath)sdk\$(SdkVersion)\</SdkOutputDirectory>
|
||||
|
|
@ -49,12 +54,12 @@
|
|||
|
||||
<DownloadedSharedHostInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedSharedHostInstallerFileName>
|
||||
<DownloadedHostFxrInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-hostfxr$(InstallerStartSuffix)-$(HostFxrVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedHostFxrInstallerFileName>
|
||||
<DownloadedSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedSharedFrameworkInstallerFileName>
|
||||
<DownloadedSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppRuntimePackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedSharedFrameworkInstallerFileName>
|
||||
<DownloadedRuntimeDepsInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-runtime-deps-$(SharedHostVersion)-$(RuntimeDepsInstallerFileRid)$(InstallerExtension)</DownloadedRuntimeDepsInstallerFileName>
|
||||
<DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != '' ">windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName>
|
||||
<DownloadedNetCoreAppTargetingPackInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-targeting-pack-$(NetCoreAppTargetingPackVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedNetCoreAppTargetingPackInstallerFileName>
|
||||
<DownloadedNetCoreAppHostPackInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-apphost-pack-$(NetCoreAppHostPackVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedNetCoreAppHostPackInstallerFileName>
|
||||
<DownloadedWindowsDesktopTargetingPackInstallerFileName Condition=" '$(InstallerExtension)' != '' ">windowsdesktop-targeting-pack-$(WindowsDesktopTargetingPackVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedWindowsDesktopTargetingPackInstallerFileName>
|
||||
<DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != '' ">windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName>
|
||||
<DownloadedNetCoreAppTargetingPackInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-targeting-pack-$(MicrosoftNETCoreAppRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedNetCoreAppTargetingPackInstallerFileName>
|
||||
<DownloadedNetCoreAppHostPackInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-apphost-pack-$(MicrosoftNETCoreAppHostPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedNetCoreAppHostPackInstallerFileName>
|
||||
<DownloadedWindowsDesktopTargetingPackInstallerFileName Condition=" '$(InstallerExtension)' != '' ">windowsdesktop-targeting-pack-$(MicrosoftWindowsDesktopAppRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedWindowsDesktopTargetingPackInstallerFileName>
|
||||
<DownloadedNetStandardTargetingPackInstallerFileName Condition=" '$(InstallerExtension)' != '' ">netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedNetStandardTargetingPackInstallerFileName>
|
||||
<NetStandardTargetingPackTargetFramework>netstandard$(NETStandardLibraryRefPackageVersion.Split('.')[0])$(NETStandardLibraryRefPackageVersion.Split('.')[1])</NetStandardTargetingPackTargetFramework>
|
||||
|
||||
|
|
@ -62,21 +67,21 @@
|
|||
<SharedFrameworkRid>$(CoreSetupRid)</SharedFrameworkRid>
|
||||
<SharedFrameworkRid Condition=" '$(ProductMonikerRid)' == 'linux-musl-x64' ">$(ProductMonikerRid)</SharedFrameworkRid>
|
||||
<SharedFrameworkRid Condition=" '$(UsePortableLinuxSharedFramework)' == 'true' ">linux-$(Architecture)</SharedFrameworkRid>
|
||||
<CombinedFrameworkHostCompressedFileName>dotnet-runtime-$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</CombinedFrameworkHostCompressedFileName>
|
||||
<CombinedFrameworkHostCompressedFileName>dotnet-runtime-$(MicrosoftNETCoreAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</CombinedFrameworkHostCompressedFileName>
|
||||
|
||||
<AspNetCoreSharedFxInstallerRid Condition="'$(AspNetCoreSharedFxInstallerRid)' == ''">$(SharedFrameworkRid)</AspNetCoreSharedFxInstallerRid>
|
||||
<AspNetCoreSharedFxInstallerRid Condition="'$(SharedFrameworkRid)' == 'rhel.6-x64'">linux-x64</AspNetCoreSharedFxInstallerRid>
|
||||
<AspNetCoreSharedFxArchiveRid>$(AspNetCoreSharedFxInstallerRid)</AspNetCoreSharedFxArchiveRid>
|
||||
<AspNetCoreSharedFxInstallerRid Condition="'$(InstallerExtension)' == '.deb' OR '$(InstallerExtension)' == '.rpm'">x64</AspNetCoreSharedFxInstallerRid>
|
||||
|
||||
<DownloadedAspNetCoreSharedFxInstallerFileName Condition=" '$(InstallerExtension)' != '' AND '$(HostOSName)' != 'osx' ">aspnetcore-runtime-$(AspNetCoreVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension)</DownloadedAspNetCoreSharedFxInstallerFileName>
|
||||
<DownloadedAspNetCoreSharedFxInstallerFileName Condition=" '$(InstallerExtension)' != '' AND '$(HostOSName)' != 'osx' ">aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension)</DownloadedAspNetCoreSharedFxInstallerFileName>
|
||||
<!-- 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)$(InstallerExtension)</DownloadedAspNetTargetingPackInstallerFileName>
|
||||
<DownloadedAspNetTargetingPackInstallerFileName Condition=" '$(InstallerExtension)' == '.msi' ">aspnetcore-targeting-pack-$(AspNetTargetingPackVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension)</DownloadedAspNetTargetingPackInstallerFileName>
|
||||
<AspNetTargetingPackArchiveFileName>aspnetcore-targeting-pack-$(AspNetCoreVersion)$(ArchiveExtension)</AspNetTargetingPackArchiveFileName>
|
||||
<AspNetCoreSharedFxArchiveFileName>aspnetcore-runtime-internal-$(AspNetCoreVersion)-$(AspNetCoreSharedFxArchiveRid)$(ArchiveExtension)</AspNetCoreSharedFxArchiveFileName>
|
||||
<WinFormsAndWpfSharedFxArchiveFileName>windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</WinFormsAndWpfSharedFxArchiveFileName>
|
||||
<DownloadedAspNetCoreSharedFxInstallerFileName Condition=" '$(InstallerExtension)' == '.msi' ">aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid).wixlib</DownloadedAspNetCoreSharedFxInstallerFileName>
|
||||
<DownloadedAspNetTargetingPackInstallerFileName Condition=" '$(InstallerExtension)' != '' ">aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(InstallerExtension)</DownloadedAspNetTargetingPackInstallerFileName>
|
||||
<DownloadedAspNetTargetingPackInstallerFileName Condition=" '$(InstallerExtension)' == '.msi' ">aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension)</DownloadedAspNetTargetingPackInstallerFileName>
|
||||
<AspNetTargetingPackArchiveFileName>aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(ArchiveExtension)</AspNetTargetingPackArchiveFileName>
|
||||
<AspNetCoreSharedFxArchiveFileName>aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxArchiveRid)$(ArchiveExtension)</AspNetCoreSharedFxArchiveFileName>
|
||||
<WinFormsAndWpfSharedFxArchiveFileName>windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</WinFormsAndWpfSharedFxArchiveFileName>
|
||||
|
||||
<!-- Used to detect if ASP.NET Core is built against the same version of Microsoft.NETCore.App. -->
|
||||
<AspNetCoreSharedFxBaseRuntimeVersionFileName>aspnetcore_base_runtime.version</AspNetCoreSharedFxBaseRuntimeVersionFileName>
|
||||
|
|
@ -86,7 +91,7 @@
|
|||
<CoreSetupRootUrl>$(CoreSetupBlobRootUrl)Runtime/</CoreSetupRootUrl>
|
||||
<AspNetCoreSharedFxRootUrl>$(CoreSetupBlobRootUrl)aspnetcore/Runtime/</AspNetCoreSharedFxRootUrl>
|
||||
<WinFormsAndWpfSharedFxRootUrl>$(CoreSetupRootUrl)</WinFormsAndWpfSharedFxRootUrl>
|
||||
<CoreSetupDownloadDirectory>$(IntermediateDirectory)/coreSetupDownload/$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</CoreSetupDownloadDirectory>
|
||||
<CoreSetupDownloadDirectory>$(IntermediateDirectory)/coreSetupDownload/$(MicrosoftNETCoreAppRuntimePackageVersion)</CoreSetupDownloadDirectory>
|
||||
<CombinedSharedHostAndFrameworkArchive>$(CoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive$(ArchiveExtension)</CombinedSharedHostAndFrameworkArchive>
|
||||
</PropertyGroup>
|
||||
|
||||
|
|
@ -97,7 +102,7 @@
|
|||
|
||||
<ItemGroup>
|
||||
<BundledLayoutComponent Include="CombinedSharedHostAndFrameworkArchive">
|
||||
<BaseUrl>$(CoreSetupRootUrl)$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</BaseUrl>
|
||||
<BaseUrl>$(CoreSetupRootUrl)$(MicrosoftNETCoreAppRuntimePackageVersion)</BaseUrl>
|
||||
<DownloadFileName>$(CombinedFrameworkHostCompressedFileName)</DownloadFileName>
|
||||
<AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
|
||||
<RelativeLayoutPath></RelativeLayoutPath>
|
||||
|
|
@ -105,7 +110,7 @@
|
|||
|
||||
<BundledLayoutPackage Include="MicrosoftNetCoreAppTargetingPackNupkg">
|
||||
<PackageName>Microsoft.NETCore.App.Ref</PackageName>
|
||||
<PackageVersion>$(NetCoreAppTargetingPackVersion)</PackageVersion>
|
||||
<PackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</PackageVersion>
|
||||
<TargetFramework>$(TargetFramework)</TargetFramework>
|
||||
<RelativeLayoutPath>packs/%(PackageName)/%(PackageVersion)</RelativeLayoutPath>
|
||||
</BundledLayoutPackage>
|
||||
|
|
@ -119,77 +124,77 @@
|
|||
|
||||
<BundledLayoutPackage Include="MicrosoftAspNetCoreAppTargetingPackNupkg">
|
||||
<PackageName>Microsoft.AspNetCore.App.Ref</PackageName>
|
||||
<PackageVersion>$(AspNetTargetingPackVersion)</PackageVersion>
|
||||
<PackageVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)</PackageVersion>
|
||||
<TargetFramework>$(TargetFramework)</TargetFramework>
|
||||
<RelativeLayoutPath>packs/%(PackageName)/%(PackageVersion)</RelativeLayoutPath>
|
||||
</BundledLayoutPackage>
|
||||
|
||||
<BundledLayoutPackage Include="MicrosoftNetCoreAppHostPackNupkg">
|
||||
<PackageName>Microsoft.NETCore.App.Host.$(SharedFrameworkRid)</PackageName>
|
||||
<PackageVersion>$(NetCoreAppHostPackVersion)</PackageVersion>
|
||||
<PackageVersion>$(MicrosoftNETCoreAppHostPackageVersion)</PackageVersion>
|
||||
<TargetFramework>$(TargetFramework)</TargetFramework>
|
||||
<RelativeLayoutPath>packs/%(PackageName)/%(PackageVersion)</RelativeLayoutPath>
|
||||
</BundledLayoutPackage>
|
||||
|
||||
<BundledLayoutPackage Include="MicrosoftNetCoreAppHostPackNupkg_Alternate" Condition="'$(AlternateAppHostRid)' != ''">
|
||||
<PackageName>Microsoft.NETCore.App.Host.$(AlternateAppHostRid)</PackageName>
|
||||
<PackageVersion>$(NetCoreAppHostPackVersion)</PackageVersion>
|
||||
<PackageVersion>$(MicrosoftNETCoreAppHostPackageVersion)</PackageVersion>
|
||||
<TargetFramework>$(TargetFramework)</TargetFramework>
|
||||
<RelativeLayoutPath>packs/%(PackageName)/%(PackageVersion)</RelativeLayoutPath>
|
||||
</BundledLayoutPackage>
|
||||
|
||||
<BundledInstallerComponent Include="DownloadedRuntimeDepsInstallerFile"
|
||||
Condition="('$(IsDebianBaseDistro)' == 'true' OR '$(IsRPMBasedDistro)' == 'true') And '$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
|
||||
<BaseUrl>$(CoreSetupRootUrl)$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</BaseUrl>
|
||||
<BaseUrl>$(CoreSetupRootUrl)$(CoreSetupBlobVersion)</BaseUrl>
|
||||
<DownloadFileName>$(DownloadedRuntimeDepsInstallerFileName)</DownloadFileName>
|
||||
<AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
|
||||
</BundledInstallerComponent>
|
||||
|
||||
<BundledInstallerComponent Include="DownloadedSharedFrameworkInstallerFile"
|
||||
Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
|
||||
<BaseUrl>$(CoreSetupRootUrl)$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</BaseUrl>
|
||||
<BaseUrl>$(CoreSetupRootUrl)$(CoreSetupBlobVersion)</BaseUrl>
|
||||
<DownloadFileName>$(DownloadedSharedFrameworkInstallerFileName)</DownloadFileName>
|
||||
<AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
|
||||
</BundledInstallerComponent>
|
||||
|
||||
<BundledInstallerComponent Include="DownloadedSharedHostInstallerFile"
|
||||
Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
|
||||
<BaseUrl>$(CoreSetupRootUrl)$(SharedHostVersion)</BaseUrl>
|
||||
<BaseUrl>$(CoreSetupRootUrl)$(CoreSetupBlobVersion)</BaseUrl>
|
||||
<DownloadFileName>$(DownloadedSharedHostInstallerFileName)</DownloadFileName>
|
||||
<AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
|
||||
</BundledInstallerComponent>
|
||||
|
||||
<BundledInstallerComponent Include="DownloadedHostFxrInstallerFile"
|
||||
Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
|
||||
<BaseUrl>$(CoreSetupRootUrl)$(HostFxrVersion)</BaseUrl>
|
||||
<BaseUrl>$(CoreSetupRootUrl)$(CoreSetupBlobVersion)</BaseUrl>
|
||||
<DownloadFileName>$(DownloadedHostFxrInstallerFileName)</DownloadFileName>
|
||||
<AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
|
||||
</BundledInstallerComponent>
|
||||
|
||||
<BundledInstallerComponent Include="DownloadedNetCoreAppTargetingPackInstallerFile"
|
||||
Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
|
||||
<BaseUrl>$(CoreSetupRootUrl)$(NetCoreAppTargetingPackVersion)</BaseUrl>
|
||||
<BaseUrl>$(CoreSetupRootUrl)$(NETCoreAppTargetingPackBlobVersion)</BaseUrl>
|
||||
<DownloadFileName>$(DownloadedNetCoreAppTargetingPackInstallerFileName)</DownloadFileName>
|
||||
<AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
|
||||
</BundledInstallerComponent>
|
||||
|
||||
<BundledInstallerComponent Include="DownloadedNetStandardTargetingPackInstallerFile"
|
||||
Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
|
||||
<BaseUrl>$(CoreSetupRootUrl)$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</BaseUrl>
|
||||
<BaseUrl>$(CoreSetupRootUrl)$(NETStandardTargetingPackBlobVersion)</BaseUrl>
|
||||
<DownloadFileName>$(DownloadedNetStandardTargetingPackInstallerFileName)</DownloadFileName>
|
||||
<AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
|
||||
</BundledInstallerComponent>
|
||||
|
||||
<BundledInstallerComponent Include="DownloadedNetCoreAppHostPackInstallerFile"
|
||||
Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
|
||||
<BaseUrl>$(CoreSetupRootUrl)$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</BaseUrl>
|
||||
<BaseUrl>$(CoreSetupRootUrl)$(CoreSetupBlobVersion)</BaseUrl>
|
||||
<DownloadFileName>$(DownloadedNetCoreAppHostPackInstallerFileName)</DownloadFileName>
|
||||
<AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
|
||||
</BundledInstallerComponent>
|
||||
|
||||
<BundledInstallerComponent Include="DownloadedWindowsDesktopTargetingPackInstallerFile"
|
||||
Condition="'$(InstallerExtension)' == '.msi' And '$(SkipBuildingInstallers)' != 'true' And !$(Architecture.StartsWith('arm'))">
|
||||
<BaseUrl>$(CoreSetupRootUrl)$(WindowsDesktopTargetingPackVersion)</BaseUrl>
|
||||
<BaseUrl>$(CoreSetupRootUrl)$(WindowsDesktopTargetingPackBlobVersion)</BaseUrl>
|
||||
<DownloadFileName>$(DownloadedWindowsDesktopTargetingPackInstallerFileName)</DownloadFileName>
|
||||
<AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
|
||||
</BundledInstallerComponent>
|
||||
|
|
@ -204,7 +209,7 @@
|
|||
|
||||
<ItemGroup Condition=" '$(IncludeAspNetCoreRuntime)' != 'false' ">
|
||||
<BundledLayoutComponent Include="DownloadedAspNetCoreSharedFxArchiveFile">
|
||||
<BaseUrl>$(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobDirectory)</BaseUrl>
|
||||
<BaseUrl>$(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobVersion)</BaseUrl>
|
||||
<DownloadFileName>$(AspNetCoreSharedFxArchiveFileName)</DownloadFileName>
|
||||
<AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
|
||||
<RelativeLayoutPath></RelativeLayoutPath>
|
||||
|
|
@ -214,7 +219,7 @@
|
|||
https://github.com/aspnet/AspNetCore/issues/8806 -->
|
||||
<BundledLayoutComponent Include="DownloadedAspNetTargetingPackArchiveFile"
|
||||
Condition="'$(InstallerExtension)' == '.pkg' And '$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
|
||||
<BaseUrl>$(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobDirectory)</BaseUrl>
|
||||
<BaseUrl>$(AspNetCoreSharedFxRootUrl)$(AspNetCoreTargetingPackBlobVersion)</BaseUrl>
|
||||
<DownloadFileName>$(AspNetTargetingPackArchiveFileName)</DownloadFileName>
|
||||
<AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
|
||||
<RelativeLayoutPath></RelativeLayoutPath>
|
||||
|
|
@ -222,21 +227,22 @@
|
|||
|
||||
<BundledInstallerComponent Include="DownloadedAspNetTargetingPackInstallerFile"
|
||||
Condition="'$(InstallerExtension)' != '.pkg' And '$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
|
||||
<BaseUrl>$(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobDirectory)</BaseUrl>
|
||||
<BaseUrl Condition="'$(AspNetTargetingPackIsPinned)' == 'true'">$(AspNetCoreSharedFxRootUrl)$(MicrosoftAspNetCoreAppRefPackageVersion)</BaseUrl>
|
||||
<BaseUrl Condition="'$(AspNetTargetingPackIsPinned)' != 'true'">$(AspNetCoreSharedFxRootUrl)$(MicrosoftAspNetCoreAppRefPackageVersion)</BaseUrl>
|
||||
<DownloadFileName>$(DownloadedAspNetTargetingPackInstallerFileName)</DownloadFileName>
|
||||
<AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
|
||||
</BundledInstallerComponent>
|
||||
|
||||
<BundledInstallerComponent Include="DownloadedAspNetCoreSharedFxInstallerFile"
|
||||
Condition="'$(SkipBuildingInstallers)' != 'true' AND '$(DownloadedAspNetCoreSharedFxInstallerFileName)' != '' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
|
||||
<BaseUrl>$(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobDirectory)</BaseUrl>
|
||||
<BaseUrl>$(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobVersion)</BaseUrl>
|
||||
<DownloadFileName>$(DownloadedAspNetCoreSharedFxInstallerFileName)</DownloadFileName>
|
||||
<AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
|
||||
</BundledInstallerComponent>
|
||||
|
||||
<BundledInstallerComponent Include="AspNetCoreSharedFxBaseRuntimeVersionFile"
|
||||
Condition="!$(Architecture.StartsWith('arm'))">
|
||||
<BaseUrl>$(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobDirectory)</BaseUrl>
|
||||
<BaseUrl>$(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobVersion)</BaseUrl>
|
||||
<DownloadFileName>$(AspNetCoreSharedFxBaseRuntimeVersionFileName)</DownloadFileName>
|
||||
<AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
|
||||
</BundledInstallerComponent>
|
||||
|
|
@ -251,20 +257,20 @@
|
|||
<ItemGroup Condition=" '$(IncludeWpfAndWinForms)' != 'false' ">
|
||||
<BundledLayoutPackage Include="MicrosoftWindowsDesktopAppTargetingPackNupkg">
|
||||
<PackageName>Microsoft.WindowsDesktop.App.Ref</PackageName>
|
||||
<PackageVersion>$(WindowsDesktopTargetingPackVersion)</PackageVersion>
|
||||
<PackageVersion>$(MicrosoftWindowsDesktopAppRefPackageVersion)</PackageVersion>
|
||||
<TargetFramework>$(TargetFramework)</TargetFramework>
|
||||
<RelativeLayoutPath>packs/%(PackageName)/%(PackageVersion)</RelativeLayoutPath>
|
||||
</BundledLayoutPackage>
|
||||
|
||||
<BundledLayoutComponent Include="WinFormsAndWpfSharedFxArchiveFile">
|
||||
<BaseUrl>$(WinFormsAndWpfSharedFxRootUrl)$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)</BaseUrl>
|
||||
<BaseUrl>$(WinFormsAndWpfSharedFxRootUrl)$(CoreSetupBlobVersion)</BaseUrl>
|
||||
<DownloadFileName>$(WinFormsAndWpfSharedFxArchiveFileName)</DownloadFileName>
|
||||
<AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
|
||||
</BundledLayoutComponent>
|
||||
|
||||
<BundledInstallerComponent Include="DownloadedWinFormsAndWpfSharedFrameworkInstallerFile"
|
||||
Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
|
||||
<BaseUrl>$(WinFormsAndWpfSharedFxRootUrl)$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)</BaseUrl>
|
||||
<BaseUrl>$(WinFormsAndWpfSharedFxRootUrl)$(CoreSetupBlobVersion)</BaseUrl>
|
||||
<DownloadFileName>$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName)</DownloadFileName>
|
||||
<AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
|
||||
</BundledInstallerComponent>
|
||||
|
|
@ -356,7 +362,7 @@
|
|||
<Target Name="RetargetTools">
|
||||
<PropertyGroup>
|
||||
<ReplacementPattern>"version": ".*"</ReplacementPattern>
|
||||
<ReplacementString>"version": "$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)"</ReplacementString>
|
||||
<ReplacementString>"version": "$(MicrosoftNETCoreAppRuntimePackageVersion)"</ReplacementString>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ToolRuntimeConfigPath Include="$(RedistLayoutPath)sdk/$(SdkVersion)/**/*.runtimeconfig.json" />
|
||||
|
|
@ -377,7 +383,7 @@
|
|||
<Target Name="LayoutAppHostTemplate" DependsOnTargets="RunResolvePackageDependencies">
|
||||
|
||||
<PropertyGroup>
|
||||
<NETCoreDotNetAppHostPackageName>Microsoft.NETCore.App.Host.$(SharedFrameworkRid)</NETCoreDotNetAppHostPackageName>
|
||||
<NETCoreAppHostPackageName>Microsoft.NETCore.App.Host.$(SharedFrameworkRid)</NETCoreAppHostPackageName>
|
||||
<AppHostRestorePath>$(IntermediateOutputPath)AppHostRestore\</AppHostRestorePath>
|
||||
<AppHostTemplatePath>$(SdkOutputDirectory)AppHostTemplate</AppHostTemplatePath>
|
||||
</PropertyGroup>
|
||||
|
|
@ -388,8 +394,8 @@
|
|||
<ItemGroup>
|
||||
<AppHostTemplateDownloadPackageProject Include="$(MSBuildThisFileDirectory)DownloadPackage.csproj">
|
||||
<Properties>
|
||||
PackageToRestore=$(NETCoreDotNetAppHostPackageName);
|
||||
PackageVersionToRestore=$(MicrosoftNETCoreDotNetAppHostPackageVersion);
|
||||
PackageToRestore=$(NETCoreAppHostPackageName);
|
||||
PackageVersionToRestore=$(MicrosoftNETCoreAppHostPackageVersion);
|
||||
TargetFramework=$(TargetFramework);
|
||||
RestorePackagesPath=$(AppHostRestorePath);
|
||||
RuntimeIdentifier=$(Rid)
|
||||
|
|
@ -414,7 +420,7 @@
|
|||
</ItemGroup>
|
||||
|
||||
<Error Condition="@(NativeRestoredAppHostNETCore->Distinct()->Count()) != 1"
|
||||
Text="Failed to determine the $(NETCoreDotNetAppHostPackageName) executable in @(AllFileOfRestoredAppHostPackage)" />
|
||||
Text="Failed to determine the $(NETCoreAppHostPackageName) executable in @(AllFileOfRestoredAppHostPackage)" />
|
||||
|
||||
<Copy
|
||||
SourceFiles="@(NativeRestoredAppHostNETCore)"
|
||||
|
|
|
|||
|
|
@ -249,12 +249,12 @@
|
|||
'$(MsiVersion)' ^
|
||||
'$(SDKBundleVersion)' ^
|
||||
'$(NugetVersion)' ^
|
||||
'$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)' ^
|
||||
'$(MicrosoftWindowsDesktopAppRuntimePackageVersion)' ^
|
||||
'$(CombinedFrameworkSDKHostInstallerUpgradeCode)' ^
|
||||
'$(SdkDependencyKeyName)' ^
|
||||
'$(Architecture)' ^
|
||||
'$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)' ^
|
||||
'$(AspNetCoreVersion)' ^
|
||||
'$(MicrosoftNETCoreAppRuntimePackageVersion)' ^
|
||||
'$(MicrosoftAspNetCoreAppRuntimePackageVersion)' ^
|
||||
'$(CliProductBandVersion)' ^
|
||||
-InformationAction Continue " />
|
||||
</Target>
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@
|
|||
<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.$(NetCoreAppTargetingPackVersion).component.osx.x64</NetCoreAppTargetingPackComponentId>
|
||||
<NetCoreAppHostPackComponentId>com.microsoft.dotnet.pack.apphost.$(NetCoreAppHostPackVersion).component.osx.x64</NetCoreAppHostPackComponentId>
|
||||
<NetCoreAppTargetingPackComponentId>com.microsoft.dotnet.pack.targeting.$(MicrosoftNETCoreAppRefPackageVersion).component.osx.x64</NetCoreAppTargetingPackComponentId>
|
||||
<NetCoreAppHostPackComponentId>com.microsoft.dotnet.pack.apphost.$(MicrosoftNETCoreAppHostPackageVersion).component.osx.x64</NetCoreAppHostPackComponentId>
|
||||
<NetStandardTargetingPackComponentId>com.microsoft.standard.pack.targeting.$(NETStandardLibraryRefPackageVersion).component.osx.x64</NetStandardTargetingPackComponentId>
|
||||
<SdkComponentId>com.microsoft.dotnet.dev.$(SdkVersion).component.osx.x64</SdkComponentId>
|
||||
<SdkProductArchiveId>com.microsoft.dotnet.dev.$(SdkVersion).osx.x64</SdkProductArchiveId>
|
||||
|
|
@ -94,10 +94,10 @@
|
|||
<ReplacementString>$(SdkVersion)</ReplacementString>
|
||||
</ResourcesReplacement>
|
||||
<ResourcesReplacement Include="{DOTNETRUNTIMEVERSION}">
|
||||
<ReplacementString>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</ReplacementString>
|
||||
<ReplacementString>$(MicrosoftNETCoreAppRuntimePackageVersion)</ReplacementString>
|
||||
</ResourcesReplacement>
|
||||
<ResourcesReplacement Include="{ASPNETCOREVERSION}">
|
||||
<ReplacementString>$(AspNetCoreVersion)</ReplacementString>
|
||||
<ReplacementString>$(MicrosoftAspNetCoreAppRuntimePackageVersion)</ReplacementString>
|
||||
</ResourcesReplacement>
|
||||
</ItemGroup>
|
||||
|
||||
|
|
|
|||
|
|
@ -78,13 +78,19 @@
|
|||
<!-- Replace config json variables -->
|
||||
<ItemGroup>
|
||||
<SDKTokenValue Include="%SHARED_FRAMEWORK_RPM_PACKAGE_VERSION%">
|
||||
<ReplacementString>$(MicrosoftNETCoreAppMajorMinorPatchVersion)</ReplacementString>
|
||||
<ReplacementString>$(MicrosoftNETCoreAppRuntimeMajorMinorPatchVersion)</ReplacementString>
|
||||
</SDKTokenValue>
|
||||
<SDKTokenValue Include="%NETCOREAPP_TARGETING_PACK_RPM_PACKAGE_VERSION%">
|
||||
<ReplacementString>$(MicrosoftNETCoreAppRefMajorMinorPatchVersion)</ReplacementString>
|
||||
</SDKTokenValue>
|
||||
<SDKTokenValue Include="%NETSTANDARD_TARGETING_PACK_RPM_PACKAGE_VERSION%">
|
||||
<ReplacementString>$(NetStandardTargetingPackMajorMinorPatchVersion)</ReplacementString>
|
||||
</SDKTokenValue>
|
||||
<SDKTokenValue Include="%ASPNETCORE_SHAREDFX_RPM_PACKAGE_VERSION%">
|
||||
<ReplacementString>$(AspNetCoreMajorMinorPatchVersion)</ReplacementString>
|
||||
<ReplacementString>$(AspNetCoreRuntimeMajorMinorPatchVersion)</ReplacementString>
|
||||
</SDKTokenValue>
|
||||
<SDKTokenValue Include="%ASPNET_TARGETING_PACK_RPM_PACKAGE_VERSION%">
|
||||
<ReplacementString>$(AspNetCoreRefMajorMinorPatchVersion)</ReplacementString>
|
||||
</SDKTokenValue>
|
||||
<SDKTokenValue Include="%SHARED_FRAMEWORK_RPM_PACKAGE_NAME%">
|
||||
<ReplacementString>$(SharedFxRpmPackageName)</ReplacementString>
|
||||
|
|
@ -199,20 +205,20 @@
|
|||
|
||||
<PropertyGroup>
|
||||
<SharedFxRpmPackageVersion>$(MicrosoftNETCoreAppMajorMinorVersion)</SharedFxRpmPackageVersion>
|
||||
<SharedFxRpmPackageFileVersion>$(MicrosoftNETCoreAppPackageVersion)</SharedFxRpmPackageFileVersion>
|
||||
<SharedFxRpmPackageFileVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</SharedFxRpmPackageFileVersion>
|
||||
<SharedFxRpmPackageName>dotnet-runtime-$(SharedFxRpmPackageVersion)</SharedFxRpmPackageName>
|
||||
<SharedFxRpmPackageName>$(SharedFxRpmPackageName.ToLower())</SharedFxRpmPackageName>
|
||||
<SharedFxRpmPackageFileName>dotnet-runtime-$(SharedFxRpmPackageFileVersion)</SharedFxRpmPackageFileName>
|
||||
<SharedFxRpmPackageFileName>$(SharedFxRpmPackageFileName.ToLower())</SharedFxRpmPackageFileName>
|
||||
<NetCoreAppTargetingPackRpmPackageName>dotnet-targeting-pack-$(SharedFxRpmPackageVersion)</NetCoreAppTargetingPackRpmPackageName>
|
||||
<NetCoreAppTargetingPackRpmPackageName>$(NetCoreAppTargetingPackRpmPackageName.ToLower())</NetCoreAppTargetingPackRpmPackageName>
|
||||
<NetCoreAppTargetingPackRpmPackageFileName>dotnet-targeting-pack-$(SharedFxRpmPackageFileVersion)</NetCoreAppTargetingPackRpmPackageFileName>
|
||||
<NetCoreAppTargetingPackRpmPackageFileName>dotnet-targeting-pack-$(MicrosoftNETCoreAppRefPackageVersion)</NetCoreAppTargetingPackRpmPackageFileName>
|
||||
<NetCoreAppTargetingPackRpmPackageFileName>$(NetCoreAppTargetingPackRpmPackageFileName.ToLower())</NetCoreAppTargetingPackRpmPackageFileName>
|
||||
<NetCoreAppHostPackRpmPackageName>dotnet-apphost-pack-$(SharedFxRpmPackageVersion)</NetCoreAppHostPackRpmPackageName>
|
||||
<NetCoreAppHostPackRpmPackageName>$(NetCoreAppHostPackRpmPackageName.ToLower())</NetCoreAppHostPackRpmPackageName>
|
||||
<NetCoreAppHostPackRpmPackageFileName>dotnet-apphost-pack-$(SharedFxRpmPackageFileVersion)</NetCoreAppHostPackRpmPackageFileName>
|
||||
<NetCoreAppHostPackRpmPackageFileName>$(NetCoreAppHostPackRpmPackageFileName.ToLower())</NetCoreAppHostPackRpmPackageFileName>
|
||||
<NetStandardTargetingPackRpmPackageName>netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion.Split('.')[0]).$(NETStandardLibraryRefPackageVersion.Split('.')[1])</NetStandardTargetingPackRpmPackageName>
|
||||
<NetStandardTargetingPackRpmPackageName>netstandard-targeting-pack-$(NetStandardTargetingPackMajorMinorVersion)</NetStandardTargetingPackRpmPackageName>
|
||||
<NetStandardTargetingPackRpmPackageName>$(NetStandardTargetingPackRpmPackageName.ToLower())</NetStandardTargetingPackRpmPackageName>
|
||||
<NetStandardTargetingPackRpmPackageFileName>netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion)</NetStandardTargetingPackRpmPackageFileName>
|
||||
<NetStandardTargetingPackRpmPackageFileName>$(NetStandardTargetingPackRpmPackageFileName.ToLower())</NetStandardTargetingPackRpmPackageFileName>
|
||||
|
|
@ -223,11 +229,11 @@
|
|||
<SharedHostRpmPackageName>dotnet-host</SharedHostRpmPackageName>
|
||||
<AspNetCoreSharedFxRpmPackageName>aspnetcore-runtime-$(AspNetCoreMajorMinorVersion)</AspNetCoreSharedFxRpmPackageName>
|
||||
<AspNetCoreSharedFxRpmPackageName>$(AspNetCoreSharedFxRpmPackageName.ToLower())</AspNetCoreSharedFxRpmPackageName>
|
||||
<AspNetCoreSharedFxRpmPackageFileName>aspnetcore-runtime-$(AspNetCoreVersion)</AspNetCoreSharedFxRpmPackageFileName>
|
||||
<AspNetCoreSharedFxRpmPackageFileName>aspnetcore-runtime-$(MicrosoftAspNetCoreRuntimePackageVersion)</AspNetCoreSharedFxRpmPackageFileName>
|
||||
<AspNetCoreSharedFxRpmPackageFileName>$(AspNetCoreSharedFxRpmPackageFileName.ToLower())</AspNetCoreSharedFxRpmPackageFileName>
|
||||
<AspNetTargetingPackRpmPackageName>aspnetcore-targeting-pack-$(AspNetCoreMajorMinorVersion)</AspNetTargetingPackRpmPackageName>
|
||||
<AspNetTargetingPackRpmPackageName>$(AspNetTargetingPackRpmPackageName.ToLower())</AspNetTargetingPackRpmPackageName>
|
||||
<AspNetTargetingPackRpmPackageFileName>aspnetcore-targeting-pack-$(AspNetCoreVersion)</AspNetTargetingPackRpmPackageFileName>
|
||||
<AspNetTargetingPackRpmPackageFileName>aspnetcore-targeting-pack-$(MicrosoftAspNetCoreRefPackageVersion)</AspNetTargetingPackRpmPackageFileName>
|
||||
<AspNetTargetingPackRpmPackageFileName>$(AspNetTargetingPackRpmPackageFileName.ToLower())</AspNetTargetingPackRpmPackageFileName>
|
||||
<AfterInstallHostScriptTemplateFile>$(ScriptsDir)/$(AfterInstallHostScriptName)</AfterInstallHostScriptTemplateFile>
|
||||
<AfterInstallHostScriptDestinationFile>$(RpmLayoutScripts)/$(AfterInstallHostScriptName)</AfterInstallHostScriptDestinationFile>
|
||||
|
|
|
|||
|
|
@ -1,43 +1,34 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project>
|
||||
<Target Name="CalculateLinuxNativeInstallerDependencyVersions">
|
||||
<PropertyGroup>
|
||||
<MicrosoftNETCoreAppPatchSeparatorIndex>$([MSBuild]::Add($(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion.IndexOf('.')), 1))</MicrosoftNETCoreAppPatchSeparatorIndex>
|
||||
<MicrosoftNETCoreAppPatchSeparatorIndex>$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion.IndexOf('.', $(MicrosoftNETCoreAppPatchSeparatorIndex)))</MicrosoftNETCoreAppPatchSeparatorIndex>
|
||||
<MicrosoftNETCoreAppMajorMinorVersion>$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion.Substring(0, $(MicrosoftNETCoreAppPatchSeparatorIndex)))</MicrosoftNETCoreAppMajorMinorVersion>
|
||||
<GetLinuxNativeInstallerDependencyVersions PackageVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)">
|
||||
<Output TaskParameter="VersionWithTilde" PropertyName="MicrosoftNETCoreAppRuntimePackageVersionWithTilde" />
|
||||
<Output TaskParameter="MajorMinorVersion" PropertyName="MicrosoftNETCoreAppMajorMinorVersion" />
|
||||
<Output TaskParameter="MajorMinorPatchVersion" PropertyName="MicrosoftNETCoreAppMajorMinorPatchVersion" />
|
||||
</GetLinuxNativeInstallerDependencyVersions>
|
||||
|
||||
<MicrosoftNETCoreAppVersionPreReleaseSeparator>$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion.IndexOf('-'))</MicrosoftNETCoreAppVersionPreReleaseSeparator>
|
||||
<MicrosoftNETCoreAppMajorMinorPatchVersion>$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppMajorMinorPatchVersion>
|
||||
<MicrosoftNETCoreAppMajorMinorPatchVersion Condition=" '$(MicrosoftNETCoreAppVersionPreReleaseSeparator)' != -1 ">$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion.Substring(0, $(MicrosoftNETCoreAppVersionPreReleaseSeparator)))</MicrosoftNETCoreAppMajorMinorPatchVersion>
|
||||
<MicrosoftNETCoreAppVersionPreReleaseSeparatorStartIndex>$([MSBuild]::Add($(MicrosoftNETCoreAppVersionPreReleaseSeparator), 1))</MicrosoftNETCoreAppVersionPreReleaseSeparatorStartIndex>
|
||||
<MicrosoftNETCoreVersionSuffix Condition=" '$(MicrosoftNETCoreAppVersionPreReleaseSeparator)' != -1 ">$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion.Substring($(MicrosoftNETCoreAppVersionPreReleaseSeparatorStartIndex)))</MicrosoftNETCoreVersionSuffix>
|
||||
<MicrosoftNETCoreAppPackageVersionWithTilde>$(MicrosoftNETCoreAppMajorMinorPatchVersion)</MicrosoftNETCoreAppPackageVersionWithTilde>
|
||||
<MicrosoftNETCoreAppPackageVersionWithTilde Condition=" '$(MicrosoftNETCoreAppVersionPreReleaseSeparator)' != -1 ">$(MicrosoftNETCoreAppMajorMinorPatchVersion)~$(MicrosoftNETCoreVersionSuffix)</MicrosoftNETCoreAppPackageVersionWithTilde>
|
||||
<GetLinuxNativeInstallerDependencyVersions PackageVersion="$(MicrosoftNETCoreAppRefPackageVersion)">
|
||||
<Output TaskParameter="VersionWithTilde" PropertyName="MicrosoftNETCoreAppRefPackageVersionWithTilde" />
|
||||
</GetLinuxNativeInstallerDependencyVersions>
|
||||
|
||||
<NetStandardTargetingPackVersionPreReleaseSeparator>$(NETStandardLibraryRefPackageVersion.IndexOf('-'))</NetStandardTargetingPackVersionPreReleaseSeparator>
|
||||
<NetStandardTargetingPackMajorMinorPatchVersion>$(NETStandardLibraryRefPackageVersion)</NetStandardTargetingPackMajorMinorPatchVersion>
|
||||
<NetStandardTargetingPackMajorMinorPatchVersion Condition=" '$(NetStandardTargetingPackVersionPreReleaseSeparator)' != -1 ">$(NETStandardLibraryRefPackageVersion.Substring(0, $(NetStandardTargetingPackVersionPreReleaseSeparator)))</NetStandardTargetingPackMajorMinorPatchVersion>
|
||||
<NetStandardTargetingPackVersionPreReleaseSeparatorStartIndex>$([MSBuild]::Add($(NetStandardTargetingPackVersionPreReleaseSeparator), 1))</NetStandardTargetingPackVersionPreReleaseSeparatorStartIndex>
|
||||
<NetStandardTargetingPackVersionSuffix Condition=" '$(NetStandardTargetingPackVersionPreReleaseSeparator)' != -1 ">$(NETStandardLibraryRefPackageVersion.Substring($(NetStandardTargetingPackVersionPreReleaseSeparatorStartIndex)))</NetStandardTargetingPackVersionSuffix>
|
||||
<NetStandardTargetingPackPackageVersionWithTilde>$(NetStandardTargetingPackMajorMinorPatchVersion)</NetStandardTargetingPackPackageVersionWithTilde>
|
||||
<NetStandardTargetingPackPackageVersionWithTilde Condition=" '$(NetStandardTargetingPackVersionPreReleaseSeparator)' != -1 ">$(NetStandardTargetingPackMajorMinorPatchVersion)~$(NetStandardTargetingPackVersionSuffix)</NetStandardTargetingPackPackageVersionWithTilde>
|
||||
<GetLinuxNativeInstallerDependencyVersions PackageVersion="$(MicrosoftAspNetCoreAppRuntimePackageVersion)">
|
||||
<Output TaskParameter="VersionWithTilde" PropertyName="AspNetCoreRuntimeVersionWithTilde" />
|
||||
<Output TaskParameter="MajorMinorVersion" PropertyName="AspNetCoreMajorMinorVersion" />
|
||||
<Output TaskParameter="MajorMinorVersion" PropertyName="AspNetCoreMajorMinorPatchVersion" />
|
||||
</GetLinuxNativeInstallerDependencyVersions>
|
||||
|
||||
<AspNetCoreVersionPatchSeparatorIndex>$([MSBuild]::Add($(AspNetCoreVersion.IndexOf('.')), 1))</AspNetCoreVersionPatchSeparatorIndex>
|
||||
<AspNetCoreVersionPatchSeparatorIndex>$(AspNetCoreVersion.IndexOf('.', $(AspNetCoreVersionPatchSeparatorIndex)))</AspNetCoreVersionPatchSeparatorIndex>
|
||||
<AspNetCoreMajorMinorVersion>$(AspNetCoreVersion.Substring(0, $(AspNetCoreVersionPatchSeparatorIndex)))</AspNetCoreMajorMinorVersion>
|
||||
<GetLinuxNativeInstallerDependencyVersions PackageVersion="$(MicrosoftAspNetCoreAppRefPackageVersion)">
|
||||
<Output TaskParameter="VersionWithTilde" PropertyName="AspNetCoreRefVersionWithTilde" />
|
||||
</GetLinuxNativeInstallerDependencyVersions>
|
||||
|
||||
<AspNetCoreVersionPreReleaseSeparator>$(AspNetCoreVersion.IndexOf('-'))</AspNetCoreVersionPreReleaseSeparator>
|
||||
<AspNetCoreMajorMinorPatchVersion>$(AspNetCoreVersion)</AspNetCoreMajorMinorPatchVersion>
|
||||
<AspNetCoreMajorMinorPatchVersion Condition=" '$(AspNetCoreVersionPreReleaseSeparator)' != -1 ">$(AspNetCoreVersion.Substring(0, $(AspNetCoreVersionPreReleaseSeparator)))</AspNetCoreMajorMinorPatchVersion>
|
||||
<AspNetCoreVersionPreReleaseSeparatorStartIndex>$([MSBuild]::Add($(AspNetCoreVersionPreReleaseSeparator), 1))</AspNetCoreVersionPreReleaseSeparatorStartIndex>
|
||||
<AspNetCoreVersionSuffix Condition=" '$(AspNetCoreVersionPreReleaseSeparator)' != -1 ">$(AspNetCoreVersion.Substring($(AspNetCoreVersionPreReleaseSeparatorStartIndex)))</AspNetCoreVersionSuffix>
|
||||
<AspNetCoreVersionWithTilde>$(AspNetCoreMajorMinorPatchVersion)</AspNetCoreVersionWithTilde>
|
||||
<AspNetCoreVersionWithTilde Condition=" '$(AspNetCoreVersionPreReleaseSeparator)' != -1 ">$(AspNetCoreMajorMinorPatchVersion)~$(AspNetCoreVersionSuffix)</AspNetCoreVersionWithTilde>
|
||||
<GetLinuxNativeInstallerDependencyVersions PackageVersion="$(HostFxrVersion)">
|
||||
<Output TaskParameter="MajorMinorVersion" PropertyName="HostFxrMajorMinorVersion" />
|
||||
</GetLinuxNativeInstallerDependencyVersions>
|
||||
|
||||
<HostFxrVersionPatchSeparatorIndex>$([MSBuild]::Add($(HostFxrVersion.IndexOf('.')), 1))</HostFxrVersionPatchSeparatorIndex>
|
||||
<HostFxrVersionPatchSeparatorIndex>$(HostFxrVersion.IndexOf('.', $(HostFxrVersionPatchSeparatorIndex)))</HostFxrVersionPatchSeparatorIndex>
|
||||
<HostFxrMajorMinorVersion>$(HostFxrVersion.Substring(0, $(HostFxrVersionPatchSeparatorIndex)))</HostFxrMajorMinorVersion>
|
||||
|
||||
</PropertyGroup>
|
||||
<GetLinuxNativeInstallerDependencyVersions PackageVersion="$(NETStandardLibraryRefPackageVersion)">
|
||||
<Output TaskParameter="VersionWithTilde" PropertyName="NetStandardTargetingPackPackageVersionWithTilde" />
|
||||
<Output TaskParameter="MajorMinorVersion" PropertyName="NetStandardTargetingPackMajorMinorVersion" />
|
||||
<Output TaskParameter="MajorMinorPatchVersion" PropertyName="NetStandardTargetingPackMajorMinorPatchVersion" />
|
||||
</GetLinuxNativeInstallerDependencyVersions>
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -30,10 +30,10 @@
|
|||
|
||||
"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%" },
|
||||
"%NETCOREAPP_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%NETCOREAPP_TARGETING_PACK_DEBIAN_PACKAGE_VERSION%" },
|
||||
"%NETCORE_APPHOST_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%" }
|
||||
"%ASPNET_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%ASPNET_TARGETING_PACK_DEBIAN_PACKAGE_VERSION%" }
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
},
|
||||
{
|
||||
"package_name": "%NETCOREAPP_TARGETING_PACK_RPM_PACKAGE_NAME%",
|
||||
"package_version": "%SHARED_FRAMEWORK_RPM_PACKAGE_VERSION%"
|
||||
"package_version": "%NETCOREAPP_TARGETING_PACK_RPM_PACKAGE_VERSION%"
|
||||
},
|
||||
{
|
||||
"package_name": "%NETCORE_APPHOST_PACK_RPM_PACKAGE_NAME%",
|
||||
|
|
@ -44,7 +44,7 @@
|
|||
},
|
||||
{
|
||||
"package_name": "%ASPNET_TARGETING_PACK_RPM_PACKAGE_NAME%",
|
||||
"package_version": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_VERSION%"
|
||||
"package_version": "%ASPNET_TARGETING_PACK_RPM_PACKAGE_VERSION%"
|
||||
}
|
||||
],
|
||||
"directories": [
|
||||
|
|
|
|||
Loading…
Reference in a new issue