Merge branch 'main' of https://github.com/dotnet/installer into TestProjectValidation
This commit is contained in:
Jackson Schuster
commit
9414ff87db
11 changed files with 164 additions and 231 deletions
|
|
@ -5,41 +5,41 @@
|
|||
Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos.
|
||||
The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal.
|
||||
-->
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="9.0.0-preview.4.24181.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="9.0.0-preview.4.24201.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>672c180b467833f824fd19cab7ac76a73138ab6c</Sha>
|
||||
<Sha>6890b3896882b0b31278b0d28dd4ca8e03e52390</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0" Version="9.0.0-preview.4.24181.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0" Version="9.0.0-preview.4.24201.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>672c180b467833f824fd19cab7ac76a73138ab6c</Sha>
|
||||
<Sha>6890b3896882b0b31278b0d28dd4ca8e03e52390</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0" Version="9.0.0-preview.4.24181.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0" Version="9.0.0-preview.4.24201.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>672c180b467833f824fd19cab7ac76a73138ab6c</Sha>
|
||||
<Sha>6890b3896882b0b31278b0d28dd4ca8e03e52390</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.0-preview.4.24181.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.0-preview.4.24201.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>672c180b467833f824fd19cab7ac76a73138ab6c</Sha>
|
||||
<Sha>6890b3896882b0b31278b0d28dd4ca8e03e52390</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.9.0" Version="9.0.0-preview.4.24181.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.9.0" Version="9.0.0-preview.4.24201.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>1949bd2e017a0dc1e48b7cfed263051a6ed147a5</Sha>
|
||||
<Sha>ab2bd48741b54baa9ac416a3da56efe915826085</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.4.24181.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.4.24201.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>1949bd2e017a0dc1e48b7cfed263051a6ed147a5</Sha>
|
||||
<Sha>ab2bd48741b54baa9ac416a3da56efe915826085</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.9.0" Version="9.0.0-preview.4.24181.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.9.0" Version="9.0.0-preview.4.24201.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>1949bd2e017a0dc1e48b7cfed263051a6ed147a5</Sha>
|
||||
<Sha>ab2bd48741b54baa9ac416a3da56efe915826085</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-preview.4.24181.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-preview.4.24201.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>1949bd2e017a0dc1e48b7cfed263051a6ed147a5</Sha>
|
||||
<Sha>ab2bd48741b54baa9ac416a3da56efe915826085</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="9.0.0-preview.4.24181.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="9.0.0-preview.4.24201.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>1949bd2e017a0dc1e48b7cfed263051a6ed147a5</Sha>
|
||||
<Sha>ab2bd48741b54baa9ac416a3da56efe915826085</Sha>
|
||||
</Dependency>
|
||||
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
|
||||
<!-- No new netstandard.library planned for 3.1 timeframe at this time. -->
|
||||
|
|
@ -47,70 +47,70 @@
|
|||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.Platforms" Version="9.0.0-preview.4.24181.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.Platforms" Version="9.0.0-preview.4.24201.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>1949bd2e017a0dc1e48b7cfed263051a6ed147a5</Sha>
|
||||
<Sha>ab2bd48741b54baa9ac416a3da56efe915826085</Sha>
|
||||
</Dependency>
|
||||
<!-- Intermediate is necessary for source build. -->
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.runtime.linux-x64" Version="9.0.0-preview.4.24181.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.runtime.linux-x64" Version="9.0.0-preview.4.24201.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>1949bd2e017a0dc1e48b7cfed263051a6ed147a5</Sha>
|
||||
<Sha>ab2bd48741b54baa9ac416a3da56efe915826085</Sha>
|
||||
<SourceBuild RepoName="runtime" ManagedOnly="false" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-preview.4.24179.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-preview.4.24201.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>6dfaf9e2cff6cfa3aab0b7842fe02fe9f71e0f60</Sha>
|
||||
<Sha>dc1acba9cd1374a8a8560bee655682e1a72de3eb</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="9.0.0-preview.4.24179.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="9.0.0-preview.4.24201.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>6dfaf9e2cff6cfa3aab0b7842fe02fe9f71e0f60</Sha>
|
||||
<Sha>dc1acba9cd1374a8a8560bee655682e1a72de3eb</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0-preview.4.24179.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0-preview.4.24201.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>6dfaf9e2cff6cfa3aab0b7842fe02fe9f71e0f60</Sha>
|
||||
<Sha>dc1acba9cd1374a8a8560bee655682e1a72de3eb</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0" Version="9.0.0-preview.4.24179.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0" Version="9.0.0-preview.4.24201.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>6dfaf9e2cff6cfa3aab0b7842fe02fe9f71e0f60</Sha>
|
||||
<Sha>dc1acba9cd1374a8a8560bee655682e1a72de3eb</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-dev-certs" Version="9.0.0-preview.4.24179.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-dev-certs" Version="9.0.0-preview.4.24201.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>6dfaf9e2cff6cfa3aab0b7842fe02fe9f71e0f60</Sha>
|
||||
<Sha>dc1acba9cd1374a8a8560bee655682e1a72de3eb</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-user-jwts" Version="9.0.0-preview.4.24179.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-user-jwts" Version="9.0.0-preview.4.24201.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>6dfaf9e2cff6cfa3aab0b7842fe02fe9f71e0f60</Sha>
|
||||
<Sha>dc1acba9cd1374a8a8560bee655682e1a72de3eb</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-user-secrets" Version="9.0.0-preview.4.24179.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-user-secrets" Version="9.0.0-preview.4.24201.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>6dfaf9e2cff6cfa3aab0b7842fe02fe9f71e0f60</Sha>
|
||||
<Sha>dc1acba9cd1374a8a8560bee655682e1a72de3eb</Sha>
|
||||
</Dependency>
|
||||
<!-- Intermediate is necessary for source build. -->
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.aspnetcore" Version="9.0.0-preview.4.24179.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.aspnetcore" Version="9.0.0-preview.4.24201.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>6dfaf9e2cff6cfa3aab0b7842fe02fe9f71e0f60</Sha>
|
||||
<Sha>dc1acba9cd1374a8a8560bee655682e1a72de3eb</Sha>
|
||||
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="9.0.100-preview.4.24181.5">
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="9.0.100-preview.4.24202.4">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>acd489ee0dae8d34e75986978cfd3f2bce1b2288</Sha>
|
||||
<Sha>4d607580e645c9c7749f394ad7172f91a6fa17d1</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="9.0.100-preview.4.24181.5">
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="9.0.100-preview.4.24202.4">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>acd489ee0dae8d34e75986978cfd3f2bce1b2288</Sha>
|
||||
<Sha>4d607580e645c9c7749f394ad7172f91a6fa17d1</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-preview.4.24181.5">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-preview.4.24202.4">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>acd489ee0dae8d34e75986978cfd3f2bce1b2288</Sha>
|
||||
<Sha>4d607580e645c9c7749f394ad7172f91a6fa17d1</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="9.0.100-preview.4.24181.5">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="9.0.100-preview.4.24202.4">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>acd489ee0dae8d34e75986978cfd3f2bce1b2288</Sha>
|
||||
<Sha>4d607580e645c9c7749f394ad7172f91a6fa17d1</Sha>
|
||||
</Dependency>
|
||||
<!-- Intermediate is necessary for source build. -->
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.sdk" Version="9.0.100-preview.4.24181.5">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.sdk" Version="9.0.100-preview.4.24202.4">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>acd489ee0dae8d34e75986978cfd3f2bce1b2288</Sha>
|
||||
<Sha>4d607580e645c9c7749f394ad7172f91a6fa17d1</Sha>
|
||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
|
||||
|
|
@ -129,37 +129,37 @@
|
|||
<Uri>https://github.com/dotnet/test-templates</Uri>
|
||||
<Sha>becc4bd157cd6608b51a5ffe414a5d2de6330272</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.8.0" Version="1.1.0-rc.24175.1">
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.8.0" Version="1.1.0-rc.24202.1">
|
||||
<Uri>https://github.com/dotnet/test-templates</Uri>
|
||||
<Sha>3bda3d335edaf10ef6c5bc93c06c8c57db5ee9c4</Sha>
|
||||
<Sha>49c9ad01f057b3c6352bbec12b117acc2224493c</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.9.0" Version="1.1.0-rc.24175.1">
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.9.0" Version="1.1.0-rc.24202.1">
|
||||
<Uri>https://github.com/dotnet/test-templates</Uri>
|
||||
<Sha>3bda3d335edaf10ef6c5bc93c06c8c57db5ee9c4</Sha>
|
||||
<Sha>49c9ad01f057b3c6352bbec12b117acc2224493c</Sha>
|
||||
</Dependency>
|
||||
<!-- Intermediate is necessary for source build. -->
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.test-templates" Version="1.1.0-rc.24175.1">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.test-templates" Version="1.1.0-rc.24202.1">
|
||||
<Uri>https://github.com/dotnet/test-templates</Uri>
|
||||
<Sha>3bda3d335edaf10ef6c5bc93c06c8c57db5ee9c4</Sha>
|
||||
<Sha>49c9ad01f057b3c6352bbec12b117acc2224493c</Sha>
|
||||
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
|
||||
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="9.0.0-preview.4.24180.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="9.0.0-preview.4.24181.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/winforms</Uri>
|
||||
<Sha>5cc859511608804df7a4fd16cb7b7503fd8d76d8</Sha>
|
||||
<Sha>50add59bd0407dc3e1b5003ec56f592f06c32bda</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="9.0.0-preview.4.24180.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="9.0.0-preview.4.24181.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/wpf</Uri>
|
||||
<Sha>7b356d191513c508297f3c83640dcda10d3b1c7c</Sha>
|
||||
<Sha>e1642d0c0b59336a035e944391110c6fff19a4c1</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.300-beta.24179.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.300-beta.24201.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
<Sha>b3701b7936766cf73224c7a55ba04a046b3d1a28</Sha>
|
||||
<Sha>78caa77ac30021b33f2126dc1b57b2f255551def</Sha>
|
||||
</Dependency>
|
||||
<!-- Intermediate is necessary for source build. -->
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="8.0.300-beta.24179.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="8.0.300-beta.24201.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
<Sha>b3701b7936766cf73224c7a55ba04a046b3d1a28</Sha>
|
||||
<Sha>78caa77ac30021b33f2126dc1b57b2f255551def</Sha>
|
||||
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.10.0-release-24177-07" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
|
|
@ -172,9 +172,9 @@
|
|||
<Sha>1cd0d8998250d36c95ed65a76304ef5d1b33e98f</Sha>
|
||||
<SourceBuild RepoName="vstest" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-preview.4.24181.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-preview.4.24201.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>1949bd2e017a0dc1e48b7cfed263051a6ed147a5</Sha>
|
||||
<Sha>ab2bd48741b54baa9ac416a3da56efe915826085</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.11.0-1.24180.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/roslyn</Uri>
|
||||
|
|
@ -226,34 +226,34 @@
|
|||
<SourceBuild RepoName="deployment-tools" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<!-- Intermediate is necessary for source build. -->
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="9.0.0-alpha.1.24175.4">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="9.0.0-alpha.1.24201.3">
|
||||
<Uri>https://github.com/dotnet/source-build-externals</Uri>
|
||||
<Sha>52d6569d44f86b5d442017f4a9eb3cda4c766afb</Sha>
|
||||
<Sha>bcd44732882bc2b81b30146c778eb6ccb7fea793</Sha>
|
||||
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="System.CommandLine" Version="2.0.0-beta4.24126.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="System.CommandLine" Version="2.0.0-beta4.24201.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/command-line-api</Uri>
|
||||
<Sha>5ea97af07263ea3ef68a18557c8aa3f7e3200bda</Sha>
|
||||
<Sha>c96672b8b84c307feb035fed6cbe9db85d5b87d3</Sha>
|
||||
</Dependency>
|
||||
<!-- Intermediate is necessary for source build. -->
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.command-line-api" Version="0.1.512601" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.command-line-api" Version="0.1.520101" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/command-line-api</Uri>
|
||||
<Sha>5ea97af07263ea3ef68a18557c8aa3f7e3200bda</Sha>
|
||||
<Sha>c96672b8b84c307feb035fed6cbe9db85d5b87d3</Sha>
|
||||
<SourceBuild RepoName="command-line-api" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24179.6">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24201.3">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>986a55a9c7f1ef547bc705d6adada5e0c2217819</Sha>
|
||||
<Sha>0ffb8e9f4a064d8c77f07420dc399baec9daef89</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24179.6">
|
||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24201.3">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>986a55a9c7f1ef547bc705d6adada5e0c2217819</Sha>
|
||||
<Sha>0ffb8e9f4a064d8c77f07420dc399baec9daef89</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24179.6">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24201.3">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>986a55a9c7f1ef547bc705d6adada5e0c2217819</Sha>
|
||||
<Sha>0ffb8e9f4a064d8c77f07420dc399baec9daef89</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24168.3">
|
||||
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
||||
|
|
@ -263,14 +263,14 @@
|
|||
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
||||
<Sha>0e9abfee048404d9b994fc64235b42216ce68dad</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24179.6">
|
||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24201.3">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>986a55a9c7f1ef547bc705d6adada5e0c2217819</Sha>
|
||||
<Sha>0ffb8e9f4a064d8c77f07420dc399baec9daef89</Sha>
|
||||
</Dependency>
|
||||
<!-- Intermediate is necessary for source build. -->
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24179.6">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24201.3">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>986a55a9c7f1ef547bc705d6adada5e0c2217819</Sha>
|
||||
<Sha>0ffb8e9f4a064d8c77f07420dc399baec9daef89</Sha>
|
||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-alpha.1.23612.13">
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24179.6</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24201.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/arcade-services -->
|
||||
|
|
@ -47,19 +47,19 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.0-preview.4.24180.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.0-preview.4.24181.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/wpf -->
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-preview.4.24180.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-preview.4.24181.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/test-templates -->
|
||||
<!-- Supported versions -->
|
||||
<MicrosoftDotNetTestProjectTemplates60PackageVersion>1.1.0-rc.24069.1</MicrosoftDotNetTestProjectTemplates60PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates70PackageVersion>1.1.0-rc.24069.1</MicrosoftDotNetTestProjectTemplates70PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates80PackageVersion>1.1.0-rc.24175.1</MicrosoftDotNetTestProjectTemplates80PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates90PackageVersion>1.1.0-rc.24175.1</MicrosoftDotNetTestProjectTemplates90PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates80PackageVersion>1.1.0-rc.24202.1</MicrosoftDotNetTestProjectTemplates80PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates90PackageVersion>1.1.0-rc.24202.1</MicrosoftDotNetTestProjectTemplates90PackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- NUnit3.DotNetNew.Template versions do not 'flow in' -->
|
||||
|
|
@ -67,22 +67,22 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
|
||||
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-preview.4.24179.2</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-preview.4.24179.2</MicrosoftAspNetCoreAppRefPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-preview.4.24179.2</MicrosoftAspNetCoreAppRefInternalPackageVersion>
|
||||
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.4.24179.2</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
|
||||
<dotnetdevcertsPackageVersion>9.0.0-preview.4.24179.2</dotnetdevcertsPackageVersion>
|
||||
<dotnetuserjwtsPackageVersion>9.0.0-preview.4.24179.2</dotnetuserjwtsPackageVersion>
|
||||
<dotnetusersecretsPackageVersion>9.0.0-preview.4.24179.2</dotnetusersecretsPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-preview.4.24201.14</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-preview.4.24201.14</MicrosoftAspNetCoreAppRefPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-preview.4.24201.14</MicrosoftAspNetCoreAppRefInternalPackageVersion>
|
||||
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.4.24201.14</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
|
||||
<dotnetdevcertsPackageVersion>9.0.0-preview.4.24201.14</dotnetdevcertsPackageVersion>
|
||||
<dotnetuserjwtsPackageVersion>9.0.0-preview.4.24201.14</dotnetuserjwtsPackageVersion>
|
||||
<dotnetusersecretsPackageVersion>9.0.0-preview.4.24201.14</dotnetusersecretsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>9.0.100-preview.4.24181.5</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>9.0.100-preview.4.24181.5</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>9.0.100-preview.4.24181.5</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>9.0.100-preview.4.24202.4</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>9.0.100-preview.4.24202.4</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>9.0.100-preview.4.24202.4</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
|
|
@ -93,23 +93,23 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/corefx -->
|
||||
<MicrosoftNETCorePlatformsPackageVersion>9.0.0-preview.4.24181.1</MicrosoftNETCorePlatformsPackageVersion>
|
||||
<MicrosoftNETCorePlatformsPackageVersion>9.0.0-preview.4.24201.8</MicrosoftNETCorePlatformsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/core-setup -->
|
||||
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.4.24181.1</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
|
||||
<VSRedistCommonNetCoreTargetingPackx6490PackageVersion>9.0.0-preview.4.24181.1</VSRedistCommonNetCoreTargetingPackx6490PackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-preview.4.24181.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>9.0.0-preview.4.24181.1</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.4.24181.1</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.4.24201.8</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
|
||||
<VSRedistCommonNetCoreTargetingPackx6490PackageVersion>9.0.0-preview.4.24201.8</VSRedistCommonNetCoreTargetingPackx6490PackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-preview.4.24201.8</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>9.0.0-preview.4.24201.8</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.4.24201.8</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
|
||||
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-preview.4.24181.1</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
|
||||
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-preview.4.24181.1</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-preview.4.24181.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-preview.4.24181.1</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-preview.4.24201.1</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
|
||||
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-preview.4.24201.1</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-preview.4.24201.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-preview.4.24201.1</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ jobs:
|
|||
# Currently, CodeQL slows the build down too much
|
||||
# https://github.com/dotnet/source-build/issues/4276
|
||||
${{ if and(parameters.isBuiltFromVmr, startswith(parameters.buildName, 'Windows'), eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}:
|
||||
timeoutInMinutes: 360
|
||||
timeoutInMinutes: 720
|
||||
${{ else }}:
|
||||
timeoutInMinutes: 150
|
||||
|
||||
|
|
@ -203,7 +203,7 @@ jobs:
|
|||
- task: CopyFiles@2
|
||||
displayName: Copy Previous Build
|
||||
inputs:
|
||||
SourceFolder: $(Pipeline.Workspace)/${{ parameters.reuseBuildArtifactsFrom }}_${{ parameters.architecture }}_Artifacts
|
||||
SourceFolder: $(Pipeline.Workspace)/${{ parameters.reuseBuildArtifactsFrom }}_${{ parameters.architecture }}_Artifacts/assets/Release
|
||||
Contents: '*.tar.gz'
|
||||
TargetFolder: $(sourcesPath)/prereqs/packages/archive/
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
"cmake": "latest"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24179.6",
|
||||
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24179.6"
|
||||
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24201.3",
|
||||
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24201.3"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -63,6 +63,7 @@ src/nuget-client/test/TestUtilities/Test.Utility/compiler/resources/*.zip
|
|||
|
||||
# razor
|
||||
src/razor/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/TestFiles/BlazorProject.zip
|
||||
src/razor/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/Resources/project.razor.bin
|
||||
|
||||
# roslyn
|
||||
src/roslyn/src/Compilers/Test/Resources/Core/**/*.metadata
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.Globalization;
|
||||
using System.IO;
|
||||
using System.IO.Compression;
|
||||
|
|
@ -53,6 +54,8 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks
|
|||
|
||||
public string PreviouslySourceBuiltSourceName { get; set; }
|
||||
|
||||
public string PrebuiltSourceName { get; set; }
|
||||
|
||||
public string[] CustomSources { get; set; }
|
||||
|
||||
// allSourcesPackages and oldSourceMappingPatterns contain 'package source', 'list of packages' mappings
|
||||
|
|
@ -242,31 +245,33 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks
|
|||
}
|
||||
else if (packageSource.Equals(PreviouslySourceBuiltSourceName))
|
||||
{
|
||||
foreach (string version in previouslySourceBuiltPackages[packagePattern])
|
||||
{
|
||||
if (!currentPackages[packagePattern].Contains(version))
|
||||
{
|
||||
pkgSrc.Add(new XElement("package", new XAttribute("pattern", packagePattern)));
|
||||
break;
|
||||
}
|
||||
}
|
||||
AddPackageSourceMappingIfPackageVersionNotInCurrentPackages(pkgSrc, packagePattern, previouslySourceBuiltPackages);
|
||||
}
|
||||
else // prebuilt source
|
||||
else if (packageSource.Equals(PrebuiltSourceName))
|
||||
{
|
||||
foreach (string version in prebuiltPackages[packagePattern])
|
||||
{
|
||||
if (!currentPackages[packagePattern].Contains(version))
|
||||
{
|
||||
pkgSrc.Add(new XElement("package", new XAttribute("pattern", packagePattern)));
|
||||
break;
|
||||
}
|
||||
}
|
||||
AddPackageSourceMappingIfPackageVersionNotInCurrentPackages(pkgSrc, packagePattern, prebuiltPackages);
|
||||
}
|
||||
else // unknown/unexpected source
|
||||
{
|
||||
throw new UnreachableException($"Unexpected package source name: {packageSource}");
|
||||
}
|
||||
}
|
||||
|
||||
return pkgSrc;
|
||||
}
|
||||
|
||||
private void AddPackageSourceMappingIfPackageVersionNotInCurrentPackages(XElement pkgSrc, string packagePattern, Dictionary<string, List<string>> packages)
|
||||
{
|
||||
foreach (string version in packages[packagePattern])
|
||||
{
|
||||
if (!currentPackages[packagePattern].Contains(version))
|
||||
{
|
||||
pkgSrc.Add(new XElement("package", new XAttribute("pattern", packagePattern)));
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void DiscoverPackagesFromAllSourceBuildSources(XElement pkgSourcesElement)
|
||||
{
|
||||
foreach (string packageSource in SourceBuildSources)
|
||||
|
|
@ -303,10 +308,14 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks
|
|||
{
|
||||
AddToDictionary(previouslySourceBuiltPackages, id, version);
|
||||
}
|
||||
else // prebuilt source
|
||||
else if (packageSource.Equals(PrebuiltSourceName))
|
||||
{
|
||||
AddToDictionary(prebuiltPackages, id, version);
|
||||
}
|
||||
else // unknown/unexpected source
|
||||
{
|
||||
throw new UnreachableException($"Unexpected package source name: {packageSource}");
|
||||
}
|
||||
|
||||
AddToDictionary(allSourcesPackages, packageSource, id);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<!-- Force use of dotnet msbuild (ignoring global.json contents) unless BuildWithDesktopMSBuild is explicitly set in the repo project. -->
|
||||
<BuildArgs Condition="'$(BuildOS)' == 'windows' and '$(BuildWithDesktopMSBuild)' != 'true'">$(BuildArgs) $(FlagParameterPrefix)msbuildEngine dotnet</BuildArgs>
|
||||
<!-- Force use of dotnet msbuild (ignoring global.json contents) unless ForceDotNetMSBuildEngine is explicitly set in the repo project. -->
|
||||
<BuildArgs Condition="'$(BuildOS)' == 'windows' and '$(ForceDotNetMSBuildEngine)' != 'false'">$(BuildArgs) $(FlagParameterPrefix)msbuildEngine dotnet</BuildArgs>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
|
|
@ -24,8 +24,6 @@
|
|||
<PackageReportDataFile>$(PackageReportDir)prebuilt-usage.xml</PackageReportDataFile>
|
||||
<ProjectAssetsJsonArchiveFile>$(PackageReportDir)all-project-assets-json-files.zip</ProjectAssetsJsonArchiveFile>
|
||||
<ProdConManifestFile>$(PackageReportDir)prodcon-build.xml</ProdConManifestFile>
|
||||
<RepoManifestFile>$([MSBuild]::NormalizePath('$(ProjectDirectory)', 'artifacts', 'RepoManifest.xml'))</RepoManifestFile>
|
||||
<RepoAssetsSymbolsArchive>$(ArtifactsAssetsSymbolsDir)Symbols.$(RepositoryName)$(ArchiveExtension)</RepoAssetsSymbolsArchive>
|
||||
|
||||
<IntermediateSymbolsRepoDir>$(IntermediateSymbolsRootDir)$(RepositoryName)</IntermediateSymbolsRepoDir>
|
||||
</PropertyGroup>
|
||||
|
|
@ -55,7 +53,6 @@
|
|||
<!-- Exclude repositories that currently don't build when not building source-only. -->
|
||||
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
|
||||
<TransitiveRepositoryReference Remove="nuget-client" />
|
||||
<TransitiveRepositoryReference Remove="fsharp" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
|
|
@ -194,6 +191,7 @@
|
|||
SbrpCacheSourceName="$(SbrpCacheNuGetSourceName)"
|
||||
ReferencePackagesSourceName="$(ReferencePackagesNuGetSourceName)"
|
||||
PreviouslySourceBuiltSourceName="$(PreviouslySourceBuiltNuGetSourceName)"
|
||||
PrebuiltSourceName="$(PrebuiltNuGetSourceName)"
|
||||
SourceBuiltSourceNamePrefix="$(SourceBuiltSourceNamePrefix)"
|
||||
CustomSources="$(NetSdkSupportingFeedName)" />
|
||||
|
||||
|
|
@ -410,87 +408,23 @@
|
|||
<Message Importance="High" Text="See '$(RepoConsoleLogFile)' for more information." Condition="Exists('$(RepoConsoleLogFile)') and '$(MinimalConsoleLogOutput)' == 'true'" />
|
||||
</Target>
|
||||
|
||||
<!--
|
||||
Remove this target after arcade changes for publishing have flown to installer repo.
|
||||
https://github.com/dotnet/source-build/issues/4207
|
||||
-->
|
||||
<Target Name="CopyRepoArtifacts"
|
||||
<!-- Log the new repo artifacts -->
|
||||
<Target Name="LogRepoArtifacts"
|
||||
DependsOnTargets="RepoBuild"
|
||||
Condition="'$(IsUtilityProject)' != 'true' and Exists('$(RepoManifestFile)')"
|
||||
Inputs="$(RepoManifestFile)"
|
||||
Outputs="$(BaseIntermediateOutputPath)CopyRepoArtifacts.complete">
|
||||
<Error Text="Repo manifest file doesn't exist." Condition="!Exists('$(RepoManifestFile)')" />
|
||||
Condition="'$(IsUtilityProject)' != 'true'">
|
||||
<ItemGroup>
|
||||
<RepoAssetManifest Include="$(RepoAssetManifestsDir)*.xml" />
|
||||
</ItemGroup>
|
||||
|
||||
<XmlPeek XmlInputPath="$(RepoManifestFile)"
|
||||
Query="Build/Artifact/@Path">
|
||||
<Error Text="Repo manifest files don't exist." Condition="'@(RepoAssetManifest)' == ''" />
|
||||
|
||||
<XmlPeek XmlInputPath="%(RepoAssetManifest.Identity)"
|
||||
Query="/Build/*[self::Package | self::Blob]/@Id">
|
||||
<Output TaskParameter="Result" ItemName="RepoManifestArtifact" />
|
||||
</XmlPeek>
|
||||
|
||||
<!-- Error if a repository doesn't produce any shipping or non-shipping artifacts. -->
|
||||
<ItemGroup Condition="'@(RepoManifestArtifact)' == ''">
|
||||
<_ArtifactsNotCreatedReason Include="^ There may have been a silent failure in the repo build." />
|
||||
<_ArtifactsNotCreatedReason Include="^ To confirm, check the build log file for undetected errors that may have prevented package creation: $(RepoConsoleLogFile)" Condition="'$(MinimalConsoleLogOutput)' == 'true'" />
|
||||
<_ArtifactsNotCreatedReason Include="^ The packages may have been written to an unexpected directory. For example, some repos used bin/ and changed to artifacts/ to match Arcade. Check RepoManifestFile in $(MSBuildProjectFullPath) (currently '$(RepoManifestFile)')" />
|
||||
</ItemGroup>
|
||||
|
||||
<Error Text="$(RepositoryName) produced no new source-built package identities. Known possible causes:%0A@(_ArtifactsNotCreatedReason, '%0A')"
|
||||
Condition="'@(RepoManifestArtifact)' == ''" />
|
||||
|
||||
<!-- The repo symbol archive shouldn't be copied. -->
|
||||
<ItemGroup>
|
||||
<RepoSymbolsArchive Include="@(RepoManifestArtifact)"
|
||||
Condition="$([System.String]::Copy('%(Identity)').EndsWith('Symbols.$(RepositoryName)$(ArchiveExtension)'))" />
|
||||
<RepoManifestArtifact Remove="@(RepoSymbolsArchive)" />
|
||||
</ItemGroup>
|
||||
|
||||
<!-- Log the new repo artifacts -->
|
||||
<Message Importance="High" Text="New artifact(s) after building $(RepositoryName):" />
|
||||
<Message Importance="High" Text=" -> %(RepoManifestArtifact.Filename)%(RepoManifestArtifact.Extension)" />
|
||||
|
||||
<ItemGroup>
|
||||
<RepoManifestPackage Include="@(RepoManifestArtifact->WithMetadataValue('Extension', '.nupkg'))" />
|
||||
<RepoManifestAsset Include="@(RepoManifestArtifact)" Exclude="@(RepoManifestPackage)" />
|
||||
</ItemGroup>
|
||||
|
||||
<!-- Prepare the repo manifest packages and group them by shipping and non-shipping. -->
|
||||
<ItemGroup>
|
||||
<RepoManifestNonShippingPackage Include="@(RepoManifestPackage)"
|
||||
Condition="$([System.String]::Copy('%(Identity)').Contains('$([System.IO.Path]::DirectorySeparatorChar)NonShipping$([System.IO.Path]::DirectorySeparatorChar)'))">
|
||||
<DestinationFolder Condition="'$(ReferenceOnlyRepoArtifacts)' != 'true'">$(RepoArtifactsNonShippingPackagesDir)</DestinationFolder>
|
||||
<DestinationFolder Condition="'$(ReferenceOnlyRepoArtifacts)' == 'true'">$(ReferencePackagesDir)</DestinationFolder>
|
||||
</RepoManifestNonShippingPackage>
|
||||
|
||||
<RepoManifestShippingPackage Include="@(RepoManifestPackage)"
|
||||
Exclude="@(RepoManifestNonShippingPackage)">
|
||||
<DestinationFolder Condition="'$(ReferenceOnlyRepoArtifacts)' != 'true'">$(RepoArtifactsShippingPackagesDir)</DestinationFolder>
|
||||
<DestinationFolder Condition="'$(ReferenceOnlyRepoArtifacts)' == 'true'">$(ReferencePackagesDir)</DestinationFolder>
|
||||
</RepoManifestShippingPackage>
|
||||
|
||||
<RepoManifestAsset>
|
||||
<DestinationFolder Condition="'$(ReferenceOnlyRepoArtifacts)' != 'true'">$(ArtifactsAssetsDir)</DestinationFolder>
|
||||
<DestinationFolder Condition="'$(ReferenceOnlyRepoArtifacts)' == 'true'">$(ReferenceAssetsDir)</DestinationFolder>
|
||||
</RepoManifestAsset>
|
||||
</ItemGroup>
|
||||
|
||||
<!-- Copy shipping packages -->
|
||||
<Copy SourceFiles="@(RepoManifestShippingPackage)"
|
||||
DestinationFolder="%(RepoManifestShippingPackage.DestinationFolder)"
|
||||
Condition="'@(RepoManifestShippingPackage)' != ''" />
|
||||
|
||||
<!-- Copy non-shipping packages -->
|
||||
<Copy SourceFiles="@(RepoManifestNonShippingPackage)"
|
||||
DestinationFolder="%(RepoManifestNonShippingPackage.DestinationFolder)"
|
||||
Condition="'@(RepoManifestNonShippingPackage)' != ''" />
|
||||
|
||||
<!-- Copy assets -->
|
||||
<Copy SourceFiles="@(RepoManifestAsset)"
|
||||
DestinationFolder="%(RepoManifestAsset.DestinationFolder)"
|
||||
Condition="'@(RepoManifestAsset)' != ''" />
|
||||
|
||||
<MakeDir Directories="$(BaseIntermediateOutputPath)" />
|
||||
<Touch Files="$(BaseIntermediateOutputPath)CopyRepoArtifacts.complete" AlwaysCreate="true">
|
||||
<Output TaskParameter="TouchedFiles" ItemName="FileWrites" />
|
||||
</Touch>
|
||||
<Message Importance="High" Text=" -> %(RepoManifestArtifact.Identity)" />
|
||||
</Target>
|
||||
|
||||
<!-- Copy restored packages from inner build to ensure they're included in the
|
||||
|
|
@ -566,7 +500,7 @@
|
|||
</Target>
|
||||
|
||||
<Target Name="ExtractToolPackage"
|
||||
DependsOnTargets="CopyRepoArtifacts"
|
||||
DependsOnTargets="RepoBuild"
|
||||
Condition="'@(BuiltSdkPackageOverride)' != ''"
|
||||
Inputs="$(MSBuildProjectFullPath)"
|
||||
Outputs="$(BaseIntermediateOutputPath)ExtractToolPackage.complete">
|
||||
|
|
@ -606,16 +540,18 @@
|
|||
|
||||
<Target Name="DiscoverSymbolsArchiveFile"
|
||||
Condition="'$(DotNetBuildSourceOnly)' == 'true' and
|
||||
'$(IsUtilityProject)' != 'true' and
|
||||
Exists('$(RepoAssetsSymbolsArchive)')">
|
||||
'$(IsUtilityProject)' != 'true'">
|
||||
<PropertyGroup>
|
||||
<RepoAssetsSymbolsArchive>$(ArtifactsAssetsSymbolsDir)Symbols.$(RepositoryName)$(ArchiveExtension)</RepoAssetsSymbolsArchive>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<RepoSymbolsArchive Include="$(RepoAssetsSymbolsArchive)" />
|
||||
<RepoSymbolsArchive Include="$(RepoAssetsSymbolsArchive)" Condition="Exists('$(RepoAssetsSymbolsArchive)')" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<Target Name="ExtractSymbolsArchiveFile"
|
||||
DependsOnTargets="CopyRepoArtifacts;DiscoverSymbolsArchiveFile"
|
||||
DependsOnTargets="RepoBuild;DiscoverSymbolsArchiveFile"
|
||||
Condition="'$(DotNetBuildSourceOnly)' == 'true' and
|
||||
'$(IsUtilityProject)' != 'true' and
|
||||
'@(RepoSymbolsArchive)' != ''"
|
||||
|
|
@ -634,7 +570,7 @@
|
|||
DependsOnTargets="
|
||||
BuildRepoReferences;
|
||||
RepoBuild;
|
||||
CopyRepoArtifacts;
|
||||
LogRepoArtifacts;
|
||||
CopyInnerBuildRestoredPackages;
|
||||
ExtractToolPackage;
|
||||
DiscoverSymbolsArchiveFile;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
<BuildActions Condition="'$(BuildOS)' != 'windows'">$(BuildActions) $(FlagParameterPrefix)no-build-java</BuildActions>
|
||||
|
||||
<BuildArgs>$(BuildArgs) $(FlagParameterPrefix)arch $(TargetArchitecture)</BuildArgs>
|
||||
<BuildWithDesktopMSBuild>true</BuildWithDesktopMSBuild>
|
||||
<ForceDotNetMSBuildEngine>false</ForceDotNetMSBuildEngine>
|
||||
|
||||
<LogVerbosityOptOut>true</LogVerbosityOptOut>
|
||||
</PropertyGroup>
|
||||
|
|
|
|||
|
|
@ -10,12 +10,14 @@
|
|||
<BuildActions>$(FlagParameterPrefix)pack $(FlagParameterPrefix)publish</BuildActions>
|
||||
|
||||
<BuildArgs>$(BuildArgs) /p:TreatWarningsAsErrors=false</BuildArgs>
|
||||
<BuildArgs>$(BuildArgs) /p:GenerateResourceUsePreserializedResources=true</BuildArgs>
|
||||
|
||||
<!--
|
||||
dotnet/fsharp has a custom eng/build.sh script that handles its own sourcebuild arg
|
||||
differently from the ArcadeBuildFromSource MSBuild arg. Including both args is fine, but the
|
||||
custom sourcebuild arg is the one that's required. This avoids running bootstrapping twice.
|
||||
-->
|
||||
<BuildArgs>$(BuildArgs) $(FlagParameterPrefix)sourcebuild $(FlagParameterPrefix)tfm $(NetCurrent) /p:SourceBuildBootstrapTfm=$(NetCurrent)</BuildArgs>
|
||||
<BuildArgs Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(BuildArgs) $(FlagParameterPrefix)sourcebuild $(FlagParameterPrefix)tfm $(NetCurrent) /p:SourceBuildBootstrapTfm=$(NetCurrent)</BuildArgs>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -31,19 +31,4 @@
|
|||
SourcePath="$(LocalNuGetPackageCacheDirectory)" />
|
||||
</Target>
|
||||
|
||||
<!--
|
||||
Remove this target after VMR picks up new arcade publishing changes: https://github.com/dotnet/arcade/pull/14559
|
||||
Tracking issue: https://github.com/dotnet/source-build/issues/4210
|
||||
|
||||
We only run this target if we're publishing using repo manifest.
|
||||
-->
|
||||
<Target Name="ClearPreviousSBRP"
|
||||
Condition="Exists('$(RepoManifestFile)')"
|
||||
BeforeTargets="CopyRepoArtifacts"
|
||||
DependsOnTargets="RepoBuild">
|
||||
<!-- Building SBRP: At this point the References directory contains the previously-source-built SBRPs,
|
||||
clear it before copying the current SBRPs. This ensures n-1 SBRPs aren't required to build the product repos. -->
|
||||
<RemoveDir Directories="$(ReferencePackagesDir)" />
|
||||
</Target>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
<PropertyGroup>
|
||||
<LogVerbosityOptOut>true</LogVerbosityOptOut>
|
||||
<BuildWithDesktopMSBuild>true</BuildWithDesktopMSBuild>
|
||||
<ForceDotNetMSBuildEngine>false</ForceDotNetMSBuildEngine>
|
||||
|
||||
<BuildArgs>$(BuildArgs) $(FlagParameterPrefix)v $(LogVerbosity)</BuildArgs>
|
||||
<BuildArgs>$(BuildArgs) $(FlagParameterPrefix)warnAsError $(ArcadeFalseBoolBuildArg)</BuildArgs>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue