5a0e95897e
* dotnet/release/15.5: (26 commits) Fixing the reference to Microsoft.Build.Runtime from Cli.Utils.Tests. It was using the wrong package version property. One more old style version package name needed to change in redist. Fixing the versions of MSBuild and passing the right property to find roslyn files. Use "15.5.179" for the other Microsoft.Build.* packages Moving the 'MicrosoftBuildPackageVersion' forward. Fixing "RuntimeFrameworkVersion" Updating version naming convention. Fixed a typo... Nuget.config update to align with CLI:master - add comments in DependencyVersions.prop Even more package dependency re-names... Third pass clean-up of package names. Second pass clean-up of package names; resequencing download. Updating dependency version properties in alignment with sample orchestrated build file at: https://dotnetfeed.blob.core.windows.net/orchestrated/20171129-03/orchestration-metadata/PackageVersions.props The access key is already resolved: 'CoreSetupBlobAccessTokenParam' Fixed another typo... Fixed typo... The first pass will need the extra args [same as run-build.ps1]. Dependency Uptake: download and import a package version props file. Accounting for MSRC builds with pre-set 'CoreSetupBlobRootUrl' and 'CoreSetupBlobAccessToke' properties. Changes per code review... ... TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.csproj TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.csproj TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj TestAssets/TestProjects/XunitMulti/VSTestXunitDesktopAndNetCore.csproj build/BundledTemplates.props build/DependencyVersions.props build/NugetConfigFile.targets build/Test.targets build_projects/dotnet-cli-build/dotnet-cli-build.csproj dir.props run-build.sh src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj src/dotnet/dotnet.csproj src/redist/redist.csproj src/tool_fsharp/tool_fsc.csproj test/ArgumentForwardingTests/ArgumentForwardingTests.csproj test/EndToEnd/EndToEnd.csproj test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj test/binding-redirects.Tests/binding-redirects.Tests.csproj test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj test/dotnet-back-compat.Tests/dotnet-back-compat.Tests.csproj test/dotnet-help.Tests/dotnet-help.Tests.csproj test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj test/dotnet-new.Tests/dotnet-new.Tests.csproj test/dotnet-remove-package.Tests/dotnet-remove-package.Tests.csproj test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj test/dotnet-restore.Tests/dotnet-restore.Tests.csproj test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj test/dotnet.Tests/dotnet.Tests.csproj
145 lines
8.5 KiB
XML
145 lines
8.5 KiB
XML
<Project>
|
|
<Target Name="GenerateMSBuildExtensions"
|
|
DependsOnTargets="GenerateBundledVersionsProps;RestoreMSBuildExtensionsPackages">
|
|
|
|
<ItemGroup>
|
|
|
|
<!-- The MSBuildExtensionsContent item is for the files that will be laid out in the CLI install -->
|
|
<MSBuildExtensionsContent Include="$(GeneratedMSBuildExtensionsDirectory)/**/*" />
|
|
|
|
<!-- We want to include the tasks and targets from the Microsoft.NET.Build.Extensions package, but we don't want to include the DLLs
|
|
from that package under the net461, net462, etc folders. That is because they come from the NETStandard.Library.NETFramework
|
|
package, and we want to insert them directly into the CLI from CoreFx instead of having to do a two-hop insertion (CoreFX -> SDK -> CLI)
|
|
if we need to update them.
|
|
|
|
https://github.com/dotnet/sdk/issues/1324 has been filed to exclude these from the Microsoft.NET.Build.Extensions package when
|
|
we generate it.
|
|
-->
|
|
<MSBuildExtensionsContent Include="$(MSBuildExtensionsNuPkgPath)\msbuildExtensions\**\*.*"
|
|
Exclude="$(MSBuildExtensionsNuPkgPath)\msbuildExtensions\Microsoft\Microsoft.NET.Build.Extensions\net*\**" />
|
|
|
|
<!-- Don't include .NET Framework MS.NET.Build.Extensions tasks in CLI layout -->
|
|
<MSBuildExtensionsContent Remove="$(MSBuildExtensionsNuPkgPath)\msbuildExtensions\Microsoft\Microsoft.NET.Build.Extensions\tools\net46\**" />
|
|
|
|
<MSBuildExtensionsContent Include="$(MSBuildExtensionsNuPkgPath)\msbuildExtensions-ver\**\*.*"
|
|
DeploymentSubpath="$(MSBuildExtensionsVersionSubfolder)/" />
|
|
|
|
<MSBuildExtensionsContent Include="$(NETStandardLibraryNETFrameworkNuPkgPath)\build\**\*.*"
|
|
Exclude="$(NETStandardLibraryNETFrameworkNuPkgPath)\build\**\*.props;$(NETStandardLibraryNETFrameworkNuPkgPath)\build\**\*.targets"
|
|
DeploymentSubpath="Microsoft/Microsoft.NET.Build.Extensions/" />
|
|
|
|
|
|
<!-- The VSMSBuildExtensionsContent item is for the files that will be included in the VS.Redist.Common.Net.Core.SDK.MSBuildExtensions
|
|
package and inserted into Visual Studio -->
|
|
<VSMSBuildExtensionsContent Include="$(MSBuildExtensionsNuPkgPath)\msbuildExtensions\**\*.*"
|
|
Exclude="$(MSBuildExtensionsNuPkgPath)\msbuildExtensions\Microsoft\Microsoft.NET.Build.Extensions\net*\**"
|
|
DeploymentSubpath="msbuildExtensions/"/>
|
|
|
|
<!-- Don't include .NET Core MS.NET.Build.Extensions tasks in Full Framework MSBuild layout -->
|
|
<VSMSBuildExtensionsContent Remove="$(MSBuildExtensionsNuPkgPath)\msbuildExtensions\Microsoft\Microsoft.NET.Build.Extensions\tools\netcoreapp*\**" />
|
|
|
|
<VSMSBuildExtensionsContent Include="$(MSBuildExtensionsNuPkgPath)\msbuildExtensions-ver\**\*.*"
|
|
DeploymentSubpath="msbuildExtensions-ver/"/>
|
|
<VSMSBuildExtensionsContent Include="$(NETStandardLibraryNETFrameworkNuPkgPath)\build\**\*.*"
|
|
Exclude="$(NETStandardLibraryNETFrameworkNuPkgPath)\build\**\*.props;$(NETStandardLibraryNETFrameworkNuPkgPath)\build\**\*.targets"
|
|
DeploymentSubpath="msbuildExtensions/Microsoft/Microsoft.NET.Build.Extensions/" />
|
|
|
|
<VSMSBuildExtensionsContent Update="@(VSMSBuildExtensionsContent)">
|
|
<DestinationPath >$(MSBuildExtensionsLayoutDirectory)/%(VSMSBuildExtensionsContent.DeploymentSubpath)%(RecursiveDir)%(Filename)%(Extension)</DestinationPath>
|
|
</VSMSBuildExtensionsContent>
|
|
</ItemGroup>
|
|
|
|
<Copy SourceFiles="@(VSMSBuildExtensionsContent)" DestinationFiles="%(VSMSBuildExtensionsContent.DestinationPath)" />
|
|
</Target>
|
|
|
|
<Target Name="PrepareMSBuildExtensionsProps">
|
|
<PropertyGroup>
|
|
<MSBuildExtensionsPackageName>Microsoft.NET.Build.Extensions</MSBuildExtensionsPackageName>
|
|
<MSBuildExtensionsVersionSubfolder>15.0</MSBuildExtensionsVersionSubfolder>
|
|
<MSBuildExtensionsNuPkgPath>$(NuGetPackagesDir)/$(MSBuildExtensionsPackageName.ToLower())/$(MicrosoftNETBuildExtensionsPackageVersion.ToLower())</MSBuildExtensionsNuPkgPath>
|
|
|
|
<NETStandardLibraryNETFrameworkPackageName>NETStandard.Library.NETFramework</NETStandardLibraryNETFrameworkPackageName>
|
|
<NETStandardLibraryNETFrameworkNuPkgPath>$(NuGetPackagesDir)/$(NETStandardLibraryNETFrameworkPackageName.ToLower())/$(CLI_NETStandardLibraryNETFrameworkVersion.ToLower())</NETStandardLibraryNETFrameworkNuPkgPath>
|
|
</PropertyGroup>
|
|
</Target>
|
|
|
|
<Target Name="RestoreMSBuildExtensionsPackages"
|
|
DependsOnTargets="PrepareMSBuildExtensionsProps">
|
|
<ItemGroup>
|
|
<ExtensionPackageToRestore Include="$(MSBuildExtensionsPackageName)" Version="$(MicrosoftNETBuildExtensionsPackageVersion)"/>
|
|
<ExtensionPackageToRestore Include="$(NETStandardLibraryNETFrameworkPackageName)" Version="$(CLI_NETStandardLibraryNETFrameworkVersion)"/>
|
|
|
|
<ExtensionRestore Include="$(RepoRoot)/build/RestoreDependency.proj">
|
|
<Properties>
|
|
CLIBuildDll=$(CLIBuildDll);
|
|
NuGetPackagesDir=$(NuGetPackagesDir);
|
|
DependencyPackageName=%(ExtensionPackageToRestore.Identity);
|
|
DependencyPackageVersion=%(ExtensionPackageToRestore.Version);
|
|
PreviousStageDirectory=$(PreviousStageDirectory)
|
|
</Properties>
|
|
</ExtensionRestore>
|
|
</ItemGroup>
|
|
|
|
<MSBuild
|
|
BuildInParallel="False"
|
|
Projects="@(ExtensionRestore)">
|
|
</MSBuild>
|
|
</Target>
|
|
|
|
<Target Name="GenerateBundledVersionsProps">
|
|
<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>
|
|
<_NETStandardLibraryVersions Include="@(PackageDefinitions->'%(Version)')"
|
|
Condition="%(PackageDefinitions.Name) == 'NetStandard.Library'" />
|
|
</ItemGroup>
|
|
|
|
<Error Condition="@(_NETStandardLibraryVersions->Distinct()->Count()) != 1"
|
|
Text="Failed to determine the NETStandard.Library version pulled in Microsoft.NETCore.App" />
|
|
|
|
<PropertyGroup>
|
|
<_NETCoreAppPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</_NETCoreAppPackageVersion>
|
|
<_NETStandardPackageVersion>@(_NETStandardLibraryVersions->Distinct())</_NETStandardPackageVersion>
|
|
|
|
<!-- Use only major and minor in target framework version -->
|
|
<_NETCoreAppTargetFrameworkVersion>$(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1])</_NETCoreAppTargetFrameworkVersion>
|
|
<_NETStandardTargetFrameworkVersion>$(_NETStandardPackageVersion.Split('.')[0]).$(_NETStandardPackageVersion.Split('.')[1])</_NETStandardTargetFrameworkVersion>
|
|
|
|
<BundledVersionsPropsContent>
|
|
<![CDATA[
|
|
<!--
|
|
***********************************************************************************************
|
|
$(BundledVersionsPropsFileName)
|
|
|
|
WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
|
|
created a backup copy. Incorrect changes to this file will make it
|
|
impossible to load or build your projects from the command-line or the IDE.
|
|
|
|
Copyright (c) .NET Foundation. All rights reserved.
|
|
***********************************************************************************************
|
|
-->
|
|
<Project>
|
|
<PropertyGroup>
|
|
<BundledNETCoreAppTargetFrameworkVersion>$(_NETCoreAppTargetFrameworkVersion)</BundledNETCoreAppTargetFrameworkVersion>
|
|
<BundledNETCoreAppPackageVersion>$(_NETCoreAppPackageVersion)</BundledNETCoreAppPackageVersion>
|
|
<BundledNETStandardTargetFrameworkVersion>$(_NETStandardTargetFrameworkVersion)</BundledNETStandardTargetFrameworkVersion>
|
|
<BundledNETStandardPackageVersion>$(_NETStandardPackageVersion)</BundledNETStandardPackageVersion>
|
|
</PropertyGroup>
|
|
</Project>
|
|
]]>
|
|
</BundledVersionsPropsContent>
|
|
</PropertyGroup>
|
|
|
|
<MakeDir Directories="$(GeneratedMSBuildExtensionsDirectory)" />
|
|
<WriteLinesToFile File="$(GeneratedMSBuildExtensionsDirectory)/$(BundledVersionsPropsFileName)"
|
|
Lines="$(BundledVersionsPropsContent)"
|
|
Overwrite="true" />
|
|
</Target>
|
|
</Project>
|