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
62 lines
2.9 KiB
XML
62 lines
2.9 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<Project ToolsVersion="14.0" DefaultTargets="BuildTheWholeCli" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
<Import Project="Directory.Build.props" />
|
|
|
|
<ItemGroup>
|
|
<DotnetCliBuildFrameworkInputs Include="build_projects/**/*.cs" Exclude="build_projects/**/obj/**/*.cs" />
|
|
<DotnetCliBuildFrameworkInputs Include="build_projects/**/*.csproj" />
|
|
</ItemGroup>
|
|
|
|
<!-- Workaround to "Native image cannot be loaded multiple times" issue
|
|
A target in the top level file needs to run and invoke a task
|
|
https://github.com/Microsoft/msbuild/issues/750 -->
|
|
<Target Name="MSBuildWorkaroundTarget">
|
|
<Message Text="Dont remove this target" />
|
|
</Target>
|
|
|
|
<Target Name="BuildDotnetCliBuildFramework"
|
|
Inputs="@(DotnetCliBuildFrameworkInputs)"
|
|
Outputs="$(CLIBuildDll)"
|
|
DependsOnTargets="MSBuildWorkaroundTarget;
|
|
RestoreDotnetCliBuildFramework">
|
|
|
|
<Exec Command="$(PreviousStageDotnet) publish --no-restore -o $(DotnetCliBuildDirectory)/bin --framework $(CliTargetFramework) /p:GeneratePropsFile=$(GeneratePropsFile)"
|
|
WorkingDirectory="$(DotnetCliBuildDirectory)"/>
|
|
</Target>
|
|
|
|
<ItemGroup>
|
|
<RestoreDotnetCliBuildFrameworkOutputs Include="$(DotnetCliBuildDirectory)/obj/project.assets.json" />
|
|
<RestoreDotnetCliBuildFrameworkOutputs Include="$(DotnetCliBuildDirectory)/obj/dotnet-cli-build.csproj.nuget.g.props" />
|
|
<RestoreDotnetCliBuildFrameworkOutputs Include="$(DotnetCliBuildDirectory)/obj/dotnet-cli-build.csproj.nuget.g.targets" />
|
|
</ItemGroup>
|
|
|
|
<Target Name="RestoreDotnetCliBuildFramework"
|
|
Inputs="$(DotnetCliBuildDirectory)/dotnet-cli-build.csproj"
|
|
Outputs="@(RestoreDotnetCliBuildFrameworkOutputs)"
|
|
DependsOnTargets="WriteNugetConfigFile">
|
|
|
|
<PropertyGroup>
|
|
<ExtraRestoreArgs>$(ExtraRestoreArgs) /p:GeneratePropsFile=$(GeneratePropsFile)</ExtraRestoreArgs>
|
|
<ExtraRestoreArgs Condition="'$(OS)' != 'Windows_NT'">$(ExtraRestoreArgs) --disable-parallel</ExtraRestoreArgs>
|
|
</PropertyGroup>
|
|
|
|
<Exec Command="$(PreviousStageDotnet) restore $(ExtraRestoreArgs)"
|
|
WorkingDirectory="$(DotnetCliBuildDirectory)"/>
|
|
</Target>
|
|
|
|
<Target Name="BuildTheWholeCli" DependsOnTargets="$(CLITargets)" />
|
|
|
|
<Import Project="build/NugetConfigFile.targets" />
|
|
<Import Project="build/GitCommitInfo.targets" />
|
|
<Import Project="build/HostInfo.targets" />
|
|
<Import Project="build/BuildInfo.targets" />
|
|
<Import Project="build/DownloadPackageVersions.targets" />
|
|
<Import Project="build/Prepare.targets" />
|
|
<Import Project="build/Compile.targets" />
|
|
<Import Project="build/BuildAndPublishAllLinuxDistrosNativeInstallers.targets" />
|
|
<Import Project="build/Package.targets" />
|
|
<Import Project="build/Test.targets" />
|
|
<Import Project="build/Publish.targets" />
|
|
|
|
<Import Project="build/InitRepo.targets" />
|
|
</Project>
|