mirror of
https://github.com/VSadov/Satori.git
synced 2025-06-09 09:34:49 +09:00
Allow incremental servicing of packages and more packaging infra cleanup (#46447)
* More packaging cleanup * Add incremental package servicing throughout the repo * Update dependencies to 6.0.0-beta.20630.3
This commit is contained in:
Viktor Hofer
parent
73b824d38e
commit
752c927cf2
GPG key ID:
4AEE18F83AFDEB23
30 changed files with 79 additions and 143 deletions
|
|
@ -207,9 +207,9 @@
|
|||
<!-- Packaging -->
|
||||
<PropertyGroup>
|
||||
<GitHubRepositoryName>runtime</GitHubRepositoryName>
|
||||
<RepositoryUrl>git://github.com/dotnet/runtime</RepositoryUrl>
|
||||
<ProjectUrl>https://github.com/dotnet/runtime</ProjectUrl>
|
||||
<LicenseUrl>https://github.com/dotnet/runtime/blob/master/LICENSE.TXT</LicenseUrl>
|
||||
<RepositoryUrl>git://github.com/dotnet/$(GitHubRepositoryName)</RepositoryUrl>
|
||||
<ProjectUrl>https://github.com/dotnet/$(GitHubRepositoryName)</ProjectUrl>
|
||||
<LicenseUrl>https://github.com/dotnet/$(GitHubRepositoryName)/blob/master/LICENSE.TXT</LicenseUrl>
|
||||
<RuntimeIdGraphDefinitionFile>$([MSBuild]::NormalizePath('$(LibrariesProjectRoot)', 'pkg', 'Microsoft.NETCore.Platforms', 'runtime.json'))</RuntimeIdGraphDefinitionFile>
|
||||
<LicenseFile>$(MSBuildThisFileDirectory)LICENSE.TXT</LicenseFile>
|
||||
<PackageLicenseExpression>MIT</PackageLicenseExpression>
|
||||
|
|
@ -220,15 +220,20 @@
|
|||
<!-- Keep it in sync with PRERELEASE in eng/native/configureplatform.cmake -->
|
||||
<IsPrerelease>true</IsPrerelease>
|
||||
<IsExperimentalAssembly>$(MSBuildProjectName.Contains('Experimental'))</IsExperimentalAssembly>
|
||||
<IsPrivateAssembly>$(MSBuildProjectName.Contains('Private'))</IsPrivateAssembly>
|
||||
<!-- Experimental packages should not be stable -->
|
||||
<SuppressFinalPackageVersion Condition="'$(SuppressFinalPackageVersion)' == '' and $(IsExperimentalAssembly)">true</SuppressFinalPackageVersion>
|
||||
<SuppressFinalPackageVersion Condition="'$(SuppressFinalPackageVersion)' == '' and ($(IsExperimentalAssembly) or $(IsPrivateAssembly))">true</SuppressFinalPackageVersion>
|
||||
<IsShippingAssembly Condition="$(IsExperimentalAssembly)">false</IsShippingAssembly>
|
||||
<!-- We don't want Private packages to be shipped to NuGet.org -->
|
||||
<IsShippingPackage Condition="($(MSBuildProjectName.Contains('Private')) or $(IsExperimentalAssembly)) and '$(MSBuildProjectExtension)' == '.pkgproj'">false</IsShippingPackage>
|
||||
<!-- Set IsPackable true for all pkgproj as Arcade unconditionally overrides the value. -->
|
||||
<IsPackable Condition="'$(MSBuildProjectExtension)' == '.pkgproj'">true</IsPackable>
|
||||
<!-- A package isn't generated (in traversal builds) if in servicing or in runtimelab. Intended to be overridden at project level. -->
|
||||
<GeneratePackage Condition="'$(GeneratePackage)' == ''">true</GeneratePackage>
|
||||
<GeneratePackage Condition="(('$(PreReleaseVersionLabel)' == 'servicing' or
|
||||
'$(RepositoryName)' == 'runtimelab') and
|
||||
'$(BuildAllProjects)' == 'true')">false</GeneratePackage>
|
||||
</PropertyGroup>
|
||||
|
||||
|
||||
<!-- Language configuration -->
|
||||
<PropertyGroup>
|
||||
<!-- default to allowing all language features -->
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<Project InitialTargets="ErrorForMissingPackageDescription">
|
||||
<Project InitialTargets="ErrorForMissingPackageDescription;_OverridePackDependsOn">
|
||||
<PropertyGroup>
|
||||
<!--
|
||||
For non-SDK projects that import this file and then import Microsoft.Common.targets,
|
||||
|
|
@ -53,4 +53,13 @@
|
|||
Condition="'$(IsPackable)' == 'true' and '$(PackageDescription)' == ''">
|
||||
<Error Text="Required property 'PackageDescription' is missing for $(MSBuildProjectName)." />
|
||||
</Target>
|
||||
|
||||
<!-- <GeneratePackage /> controls if a package should be created by clearing out <PackDependsOn />. -->
|
||||
<Target Name="_OverridePackDependsOn"
|
||||
Condition="'$(IsPackable)' == 'true' and
|
||||
'$(GeneratePackage)' != 'true'">
|
||||
<PropertyGroup>
|
||||
<PackDependsOn />
|
||||
</PropertyGroup>
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20621.12">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20630.3">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>3ba79fbd73d6765b67d0f75ac9dac148d6bea346</Sha>
|
||||
</Dependency>
|
||||
|
|
@ -38,7 +38,7 @@
|
|||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>3ba79fbd73d6765b67d0f75ac9dac148d6bea346</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.20621.12">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.20630.3">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>3ba79fbd73d6765b67d0f75ac9dac148d6bea346</Sha>
|
||||
</Dependency>
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@
|
|||
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.20621.12</MicrosoftDotNetXUnitExtensionsVersion>
|
||||
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.20621.12</MicrosoftDotNetXUnitConsoleRunnerVersion>
|
||||
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.20621.12</MicrosoftDotNetBuildTasksArchivesVersion>
|
||||
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.20621.12</MicrosoftDotNetBuildTasksPackagingVersion>
|
||||
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.20630.3</MicrosoftDotNetBuildTasksPackagingVersion>
|
||||
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.20621.12</MicrosoftDotNetBuildTasksInstallersVersion>
|
||||
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.20621.12</MicrosoftDotNetRemoteExecutorVersion>
|
||||
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.20621.12</MicrosoftDotNetVersionToolsTasksVersion>
|
||||
|
|
|
|||
|
|
@ -31,13 +31,6 @@
|
|||
|
||||
<PropertyGroup>
|
||||
<PkgProjPath>$(MSBuildProjectDirectory)\..\pkg\$(MSBuildProjectName).pkgproj</PkgProjPath>
|
||||
<!-- Controls if packages for libraries should be created in (traversal) builds. -->
|
||||
<PackAllLibraries Condition="'$(PackAllLibraries)' == '' and
|
||||
('$(PreReleaseVersionLabel)' != 'servicing' or
|
||||
'$(BuildAllProjects)' != 'true')">true</PackAllLibraries>
|
||||
<IsPackable Condition="('$(MSBuildProjectExtension)' == '.pkgproj' or
|
||||
('$(IsSourceProject)' == 'true' and Exists('$(PkgProjPath)'))) and
|
||||
'$(PackAllLibraries)' == 'true'">true</IsPackable>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Condition="Exists('$(PkgDir)baseline\baseline.props') and '$(MSBuildProjectExtension)' == '.pkgproj'" Project="$(PkgDir)baseline\baseline.props" />
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<Project InitialTargets="_OverridePackDependsOn">
|
||||
<Project InitialTargets="_OverridePackDependsOnForCsProjToPkgProj">
|
||||
<!-- There are some packages where we require only one ref for a specific framework to be present. In order to avoid problems with this package when targetting
|
||||
dektop with RAR we will make sure there are no exclude=compile references in the package.
|
||||
For more info, please check issues:
|
||||
|
|
@ -27,12 +27,13 @@
|
|||
'%(Dependency.Identity)' != '_._'" />
|
||||
</Target>
|
||||
|
||||
<Target Name="_OverridePackDependsOn"
|
||||
Condition="'$(IsSourceProject)' == 'true' and
|
||||
'$(IsPackable)' == 'true' and
|
||||
<!-- Point to the custom pack target which invokes the pkgproj from a source csproj. -->
|
||||
<Target Name="_OverridePackDependsOnForCsProjToPkgProj"
|
||||
Condition="'$(GeneratePackage)' == 'true' and
|
||||
'$(IsSourceProject)' == 'true' and
|
||||
Exists('$(PkgProjPath)')">
|
||||
<PropertyGroup>
|
||||
<!-- Point to the custom pack target which invokes the pkgproj. -->
|
||||
<IsPackable>true</IsPackable>
|
||||
<PackDependsOn>_BuildPkgProj</PackDependsOn>
|
||||
</PropertyGroup>
|
||||
</Target>
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.20621.12",
|
||||
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20621.12",
|
||||
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20630.3",
|
||||
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "6.0.0-beta.20621.12",
|
||||
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20621.12",
|
||||
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.20621.12",
|
||||
|
|
|
|||
|
|
@ -1,17 +1,32 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project>
|
||||
|
||||
<!-- Packaging projects (.pkgproj) are non-SDK-style, so they need to directly import Directory.Build.props -->
|
||||
<Import Project="../Directory.Build.props" />
|
||||
|
||||
<Import Project="..\Directory.Build.props" />
|
||||
<Import Project="$(NuGetPackageRoot)\microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\build\Microsoft.DotNet.Build.Tasks.Packaging.props" />
|
||||
|
||||
<Import Project="packaging.props" />
|
||||
|
||||
<PropertyGroup>
|
||||
<!-- defined in Packaging.targets, but we need this before targets are imported -->
|
||||
<!-- Defined in Packaging.targets, but we need this before targets are imported -->
|
||||
<PackagePlatform Condition="'$(PackagePlatform)' == ''">$(Platform)</PackagePlatform>
|
||||
<PackagePlatform Condition="'$(PackagePlatform)' == 'amd64'">x64</PackagePlatform>
|
||||
<MinOSForArch>win7</MinOSForArch>
|
||||
<MinOSForArch Condition="'$(PackagePlatform)' == 'arm'">win8</MinOSForArch>
|
||||
<MinOSForArch Condition="'$(PackagePlatform)' == 'arm64'">win10</MinOSForArch>
|
||||
<PackagePlatform>AnyCPU</PackagePlatform>
|
||||
|
||||
<PackageIndexFile>$(MSBuildThisFileDirectory)packageIndex.json</PackageIndexFile>
|
||||
|
||||
<!-- coreclr doesn't currently use the index so don't force it to be in sync -->
|
||||
<SkipIndexCheck>true</SkipIndexCheck>
|
||||
|
||||
<!-- Central place to set the versions of all nuget packages produced in the repo -->
|
||||
<PackageVersion Condition="'$(PackageVersion)' == ''">6.0.0</PackageVersion>
|
||||
<StableVersion Condition="'$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == ''">$(PackageVersion)</StableVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageIndex Condition="'$(MSBuildProjectExtension)' == '.pkgproj'" Include="$(PackageIndexFile)" />
|
||||
</ItemGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<!-- build the transport package which includes product and symbols in addition to standard packages
|
||||
This is a legacy setting as we tend to use symbol packages for symbol indexing and we don't use
|
||||
transport packages to flow dependencies anymore -->
|
||||
|
|
|
|||
|
|
@ -1,8 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
|
||||
<Import Project="../Directory.Build.targets" />
|
||||
|
||||
<Project>
|
||||
<Import Project="..\Directory.Build.targets" />
|
||||
<Import Project="$(NuGetPackageRoot)\microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\build\Microsoft.DotNet.Build.Tasks.Packaging.targets" />
|
||||
|
||||
<!--
|
||||
|
|
|
|||
|
|
@ -1,17 +1,15 @@
|
|||
<Project>
|
||||
<Import Sdk="Microsoft.Build.Traversal" Project="Sdk.props" />
|
||||
|
||||
<Project Sdk="Microsoft.Build.Traversal">
|
||||
<PropertyGroup>
|
||||
<BuildIdentityPackage>false</BuildIdentityPackage>
|
||||
<SupportedRids>linux-x64;linux-musl-x64;linux-arm64;linux-musl-arm64;linux-arm;linux-musl-arm</SupportedRids>
|
||||
</PropertyGroup>
|
||||
|
||||
<Target Name="VerifyCrossDacProperties" BeforeTargets="Build">
|
||||
<Target Name="VerifyCrossDacProperties" BeforeTargets="Build;Pack">
|
||||
<Error Condition="'$(CrossDacArtifactsDir)' == '' or !Exists('$(CrossDacArtifactsDir)')"
|
||||
Text="Packaging the Cross OS DAC requires property CrossDacArtifactsDir to to a path containing all cross OS DAC assets needed." />
|
||||
</Target>
|
||||
|
||||
<Target Name="FilterSupportedCrossOsDacPackages" BeforeTargets="Build">
|
||||
<Target Name="FilterSupportedCrossOsDacPackages" BeforeTargets="Build;Pack">
|
||||
<ItemGroup>
|
||||
<_projectsToBuild Include="@(Project)" Condition="$(SupportedRids.Contains('%(Project.PackageTargetRuntime)'))">
|
||||
<AdditionalProperties Condition="'%(Project.PackageTargetRuntime)' == 'linux-x64'">%(AdditionalProperties);CrossDacBinRoot=$(CrossDacArtifactsDir)/Linux.x64.$(Configuration)/x64</AdditionalProperties>
|
||||
|
|
@ -29,8 +27,4 @@
|
|||
</Target>
|
||||
|
||||
<Import Project="$([MSBuild]::GetPathOfFileAbove(versioning.targets))" />
|
||||
<Import Sdk="Microsoft.Build.Traversal" Project="Sdk.targets" />
|
||||
|
||||
<!-- Ordering matters! Overwriting the Pack target which should just invoke Build. -->
|
||||
<Target Name="Pack" DependsOnTargets="Build" />
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -12,10 +12,6 @@ Copyright (c) .NET Foundation. All rights reserved.
|
|||
-->
|
||||
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
|
||||
<PropertyGroup>
|
||||
<MSBuildAllProjects>$(MSBuildThisFileFullPath);$(MSBuildAllProjects)</MSBuildAllProjects>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ Copyright (c) .NET Foundation. All rights reserved.
|
|||
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
|
||||
<PropertyGroup>
|
||||
<MSBuildAllProjects>$(MSBuildThisFileFullPath);$(MSBuildAllProjects)</MSBuildAllProjects>
|
||||
<LanguageTargets Condition="'$(MSBuildProjectExtension)' == '.ilproj'">$(MSBuildThisFileDirectory)..\targets\Microsoft.NET.Sdk.IL.Common.targets</LanguageTargets>
|
||||
</PropertyGroup>
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ Copyright (c) .NET Foundation. All rights reserved.
|
|||
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
|
||||
<PropertyGroup>
|
||||
<MSBuildAllProjects>$(MSBuildThisFileFullPath);$(MSBuildAllProjects)</MSBuildAllProjects>
|
||||
<DefaultLanguageSourceExtension>.il</DefaultLanguageSourceExtension>
|
||||
<Language>IL</Language>
|
||||
<TargetRuntime>Managed</TargetRuntime>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project Sdk="Microsoft.Build.Traversal">
|
||||
<ItemGroup>
|
||||
<!-- identity project, runtime specific projects are included by props above -->
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project Sdk="Microsoft.Build.Traversal">
|
||||
<ItemGroup>
|
||||
<!-- identity project, runtime specific projects are included by props above -->
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project Sdk="Microsoft.Build.Traversal">
|
||||
<ItemGroup>
|
||||
<!-- identity project, runtime specific projects are included by props above -->
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project>
|
||||
<PropertyGroup Condition="'$(BuildIdentityPackage)' == ''">
|
||||
<BuildIdentityPackage>true</BuildIdentityPackage>
|
||||
|
|
@ -12,7 +11,7 @@
|
|||
<BuildIdentityPackage Condition="'$(BuildingAnOfficialBuildLeg)' == 'true' AND ('$(OS)' != 'Windows_NT' OR '$(TargetArchitecture)' != 'x64')">false</BuildIdentityPackage>
|
||||
</PropertyGroup>
|
||||
|
||||
<Target Name="FilterProjects" BeforeTargets="Build">
|
||||
<Target Name="FilterProjects" BeforeTargets="Build;Pack">
|
||||
<Error Condition="'$(PackageRID)' == ''" Text="'PackageRID' property must be specified."/>
|
||||
|
||||
<!-- Only build packages for current RID or non-RID-specific -->
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
<Project>
|
||||
<Import Sdk="Microsoft.Build.Traversal" Project="Sdk.props" />
|
||||
<Project Sdk="Microsoft.Build.Traversal" DefaultTargets="Pack">
|
||||
<PropertyGroup>
|
||||
<TraversalGlobalProperties>BuildAllProjects=true</TraversalGlobalProperties>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetsWindows)'=='true' OR '$(DotNetBuildFromSource)'=='true'">
|
||||
<ItemGroup Condition="'$(TargetOS)' == 'windows' or '$(DotNetBuildFromSource)' == 'true'">
|
||||
<ProjectReference Include="Microsoft.NET.Sdk.IL\Microsoft.NET.Sdk.IL.pkgproj" />
|
||||
<ProjectReference Include="Microsoft.ILVerification\Microsoft.ILVerification.pkgproj" />
|
||||
<ProjectReference Include="dotnet-ilverify\dotnet-ilverify.pkgproj" />
|
||||
|
|
@ -13,10 +15,5 @@
|
|||
<ProjectReference Include="Microsoft.NETCore.ILDAsm\Microsoft.NETCore.ILDAsm.proj" />
|
||||
</ItemGroup>
|
||||
|
||||
|
||||
<Import Project="versioning.targets" />
|
||||
<Import Sdk="Microsoft.Build.Traversal" Project="Sdk.targets" />
|
||||
|
||||
<!-- Ordering matters! Overwriting the Pack target which should just invoke Build. -->
|
||||
<Target Name="Pack" DependsOnTargets="Build" />
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
<Project>
|
||||
<PropertyGroup>
|
||||
<!-- Defined in Packaging.targets, but we need this before targets are imported -->
|
||||
<PackagePlatform Condition="'$(PackagePlatform)' == ''">$(Platform)</PackagePlatform>
|
||||
<PackagePlatform Condition="'$(PackagePlatform)' == 'amd64'">x64</PackagePlatform>
|
||||
<MinOSForArch>win7</MinOSForArch>
|
||||
<MinOSForArch Condition="'$(PackagePlatform)' == 'arm'">win8</MinOSForArch>
|
||||
<MinOSForArch Condition="'$(PackagePlatform)' == 'arm64'">win10</MinOSForArch>
|
||||
|
||||
<PackageIndexFile>$(MSBuildThisFileDirectory)packageIndex.json</PackageIndexFile>
|
||||
|
||||
<!-- coreclr doesn't currently use the index so don't force it to be in sync -->
|
||||
<SkipIndexCheck>true</SkipIndexCheck>
|
||||
|
||||
<!-- Central place to set the versions of all nuget packages produced in the repo -->
|
||||
<PackageVersion Condition="'$(PackageVersion)' == ''">6.0.0</PackageVersion>
|
||||
<!-- Set the boolean below to true to generate packages with stabilized versions -->
|
||||
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
|
||||
<StableVersion Condition="'$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == ''">$(PackageVersion)</StableVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageIndex Condition="'$(MSBuildProjectExtension)' == '.pkgproj'" Include="$(PackageIndexFile)" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
We depend on this private Arcade target instead of the SDK-defined GetAssemblyVersion since the packaging
|
||||
build does not use the .NET SDK -->
|
||||
<Target Name="UpdateAdditionalProperties"
|
||||
BeforeTargets="Build"
|
||||
BeforeTargets="Build;Pack"
|
||||
DependsOnTargets="_InitializeAssemblyVersion">
|
||||
<ItemGroup>
|
||||
<!-- Pass the FileVersion calculated by _InitializeAssemblyVersion to referenced projects -->
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
|
||||
|
||||
<Target Name="Build">
|
||||
<!-- To Serialize we use msbuild's batching functionality '%' to force it to batch all similar projects with the same identity
|
||||
however since the project names are unique it will essentially force each to run in its own batch -->
|
||||
<MSBuild Targets="Build" Projects="@(Project)" Condition="'$(SerializeProjects)'=='true'" Properties="Dummy=%(Identity)"/>
|
||||
<MSBuild Targets="Build" Projects="@(Project)" Condition="'$(SerializeProjects)'!='true'" BuildInParallel="true" />
|
||||
</Target>
|
||||
|
||||
<Target Name="Clean">
|
||||
<!-- To Serialize we use msbuild's batching functionality '%' to force it to batch all similar projects with the same identity
|
||||
however since the project names are unique it will essentially force each to run in its own batch -->
|
||||
<MSBuild Targets="Clean" Projects="@(Project)" Condition="'$(SerializeProjects)'=='true'" Properties="Dummy=%(Identity)"/>
|
||||
<MSBuild Targets="Clean" Projects="@(Project)" Condition="'$(SerializeProjects)'!='true'" BuildInParallel="true" />
|
||||
</Target>
|
||||
|
||||
<Target Name="Rebuild" DependsOnTargets="Clean;Build" />
|
||||
</Project>
|
||||
|
|
@ -1,5 +1,7 @@
|
|||
<Project>
|
||||
<Import Sdk="Microsoft.Build.Traversal" Project="Sdk.props" />
|
||||
<Project Sdk="Microsoft.Build.Traversal" DefaultTargets="Pack">
|
||||
<PropertyGroup>
|
||||
<TraversalGlobalProperties>BuildAllProjects=true</TraversalGlobalProperties>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="Microsoft.NETCore.DotNetAppHost\Microsoft.NETCore.DotNetAppHost.pkgproj" />
|
||||
|
|
@ -8,9 +10,4 @@
|
|||
<ProjectReference Include="Microsoft.NETCore.DotNetHostResolver\Microsoft.NETCore.DotNetHostResolver.pkgproj" />
|
||||
<ProjectReference Include="@(ProjectReference)" AdditionalProperties="PackageTargetRuntime=$(OutputRid)" />
|
||||
</ItemGroup>
|
||||
|
||||
<Import Sdk="Microsoft.Build.Traversal" Project="Sdk.targets" />
|
||||
|
||||
<!-- Ordering matters! Overwriting the Pack target which should just invoke Build. -->
|
||||
<Target Name="Pack" DependsOnTargets="Build" />
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -39,9 +39,4 @@
|
|||
<Project Include="@(_project->'$(MSBuildProjectName).pkgproj')" />
|
||||
</ItemGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<!-- SuppressFinalPackageVersion on private packages by default -->
|
||||
<SuppressFinalPackageVersion Condition="'$(SuppressFinalPackageVersion)' == '' and $(MSBuildProjectName.Contains('Private'))">true</SuppressFinalPackageVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<Project DefaultTargets="Build">
|
||||
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
|
||||
|
||||
<ItemGroup Condition="'$(PackAllLibraries)' == 'true' And ('$(BuildingAnOfficialBuildLeg)' != 'true' Or '$(BuildAllConfigurations)' == 'true')">
|
||||
<ItemGroup Condition="'$(BuildingAnOfficialBuildLeg)' != 'true' Or '$(BuildAllConfigurations)' == 'true'">
|
||||
<Project Include="Microsoft.NETCore.Platforms.pkgproj" />
|
||||
</ItemGroup>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<Project DefaultTargets="Build">
|
||||
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
|
||||
|
||||
<ItemGroup Condition="'$(PackAllLibraries)' == 'true' And ('$(BuildingAnOfficialBuildLeg)' != 'true' Or '$(BuildAllConfigurations)' == 'true')">
|
||||
<ItemGroup Condition="'$(BuildingAnOfficialBuildLeg)' != 'true' Or '$(BuildAllConfigurations)' == 'true'">
|
||||
<Project Include="Microsoft.NETCore.Targets.pkgproj"/>
|
||||
</ItemGroup>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<Project>
|
||||
<ItemGroup Condition="'$(PackAllLibraries)' == 'true'">
|
||||
<ItemGroup Condition="'$(GeneratePackage)' == 'true'">
|
||||
<BuildRID Include="linux-arm">
|
||||
<Platform>arm</Platform>
|
||||
</BuildRID>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<Project DefaultTargets="Build">
|
||||
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
|
||||
|
||||
<ItemGroup Condition="'$(PackAllLibraries)' == 'true' And '$(BuildAllConfigurations)' == 'true'">
|
||||
<ItemGroup Condition="'$(BuildAllConfigurations)' == 'true'">
|
||||
<!-- identity project built in AllConfigurations leg, runtime specific projects are included through netcoreapp.rids.props -->
|
||||
<Project Include="$(MSBuildProjectName).pkgproj" />
|
||||
</ItemGroup>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
<Project>
|
||||
|
||||
<!-- Packaging projects (.pkgproj) are non-SDK-style, so they need to directly import Directory.Build.props -->
|
||||
<Import Project="..\..\Directory.Build.props" />
|
||||
<Import Project="$(NuGetPackageRoot)\microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\build\Microsoft.DotNet.Build.Tasks.Packaging.props" />
|
||||
|
|
@ -13,13 +12,10 @@
|
|||
|
||||
<!-- Central place to set the versions of all nuget packages produced in the repo -->
|
||||
<PackageVersion Condition="'$(PackageVersion)' == ''">6.0.0</PackageVersion>
|
||||
<!-- Set the boolean below to true to generate packages with stabilized versions -->
|
||||
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
|
||||
<StableVersion Condition="'$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == ''">$(PackageVersion)</StableVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageIndex Condition="'$(MSBuildProjectExtension)' == '.pkgproj'" Include="$(PackageIndexFile)" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
|
||||
<Import Project="../../Directory.Build.targets" />
|
||||
|
||||
<Project>
|
||||
<Import Project="..\..\Directory.Build.targets" />
|
||||
<Import Project="$(NuGetPackageRoot)\microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\build\Microsoft.DotNet.Build.Tasks.Packaging.targets" />
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
<Project>
|
||||
<Import Sdk="Microsoft.Build.Traversal" Project="Sdk.props" />
|
||||
<Project Sdk="Microsoft.Build.Traversal" DefaultTargets="Pack">
|
||||
<PropertyGroup>
|
||||
<TraversalGlobalProperties>BuildAllProjects=true</TraversalGlobalProperties>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetOS)' == 'Android'">
|
||||
<ProjectReference Include="Microsoft.NET.Runtime.Android.Sample.Mono\Microsoft.NET.Runtime.Android.Sample.Mono.pkgproj" />
|
||||
|
|
@ -13,10 +15,4 @@
|
|||
<ItemGroup Condition="'$(TargetOS)' == 'iOS'">
|
||||
<ProjectReference Include="Microsoft.NET.Runtime.iOS.Sample.Mono\Microsoft.NET.Runtime.iOS.Sample.Mono.pkgproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<Import Sdk="Microsoft.Build.Traversal" Project="Sdk.targets" />
|
||||
|
||||
<!-- Ordering matters! Overwriting the Pack target which should just invoke Build. -->
|
||||
<Target Name="Pack" DependsOnTargets="Build">
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue