Merge branch 'main' into switch-ubuntu-sb-ci
This commit is contained in:
commit
0460d09e60
16 changed files with 575 additions and 316 deletions
|
@ -1,46 +1,46 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Dependencies>
|
||||
<ProductDependencies>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.0-preview.6.23316.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.0-preview.6.23320.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>46ed719582e52595dfc890ef242cb8ed64cff2f2</Sha>
|
||||
<Sha>a220420021ba8a8047ff26b3e86c9fccf6725a5c</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.0-preview.6.23316.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.0-preview.6.23320.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>46ed719582e52595dfc890ef242cb8ed64cff2f2</Sha>
|
||||
<Sha>a220420021ba8a8047ff26b3e86c9fccf6725a5c</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.0-preview.6.23316.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.0-preview.6.23320.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>46ed719582e52595dfc890ef242cb8ed64cff2f2</Sha>
|
||||
<Sha>a220420021ba8a8047ff26b3e86c9fccf6725a5c</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-preview.6.23316.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-preview.6.23320.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>46ed719582e52595dfc890ef242cb8ed64cff2f2</Sha>
|
||||
<Sha>a220420021ba8a8047ff26b3e86c9fccf6725a5c</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.6.23316.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.6.23321.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>76da696f3ffdd81506b09dfc440ee6f4e1001868</Sha>
|
||||
<Sha>f644e5be3268064485fb74c3c9cb5735e446df4a</Sha>
|
||||
<SourceBuild RepoName="runtime" ManagedOnly="false" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.6.23316.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.6.23321.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>76da696f3ffdd81506b09dfc440ee6f4e1001868</Sha>
|
||||
<Sha>f644e5be3268064485fb74c3c9cb5735e446df4a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-preview.6.23316.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-preview.6.23321.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>76da696f3ffdd81506b09dfc440ee6f4e1001868</Sha>
|
||||
<Sha>f644e5be3268064485fb74c3c9cb5735e446df4a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-preview.6.23316.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-preview.6.23321.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>76da696f3ffdd81506b09dfc440ee6f4e1001868</Sha>
|
||||
<Sha>f644e5be3268064485fb74c3c9cb5735e446df4a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-preview.6.23316.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-preview.6.23321.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>76da696f3ffdd81506b09dfc440ee6f4e1001868</Sha>
|
||||
<Sha>f644e5be3268064485fb74c3c9cb5735e446df4a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-preview.6.23316.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-preview.6.23321.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>76da696f3ffdd81506b09dfc440ee6f4e1001868</Sha>
|
||||
<Sha>f644e5be3268064485fb74c3c9cb5735e446df4a</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. -->
|
||||
|
@ -48,117 +48,117 @@
|
|||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-preview.6.23316.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-preview.6.23321.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>76da696f3ffdd81506b09dfc440ee6f4e1001868</Sha>
|
||||
<Sha>f644e5be3268064485fb74c3c9cb5735e446df4a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-preview.6.23316.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-preview.6.23320.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>974d15e3b021101ad702d898f15e63a17b9a7160</Sha>
|
||||
<Sha>53845260d1ffa1a90fe4c499142bc6709dddeacf</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.0-preview.6.23316.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.0-preview.6.23320.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>974d15e3b021101ad702d898f15e63a17b9a7160</Sha>
|
||||
<Sha>53845260d1ffa1a90fe4c499142bc6709dddeacf</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.0-preview.6.23316.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.0-preview.6.23320.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>974d15e3b021101ad702d898f15e63a17b9a7160</Sha>
|
||||
<Sha>53845260d1ffa1a90fe4c499142bc6709dddeacf</Sha>
|
||||
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.6.23316.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.6.23320.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>974d15e3b021101ad702d898f15e63a17b9a7160</Sha>
|
||||
<Sha>53845260d1ffa1a90fe4c499142bc6709dddeacf</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-dev-certs" Version="8.0.0-preview.6.23316.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-dev-certs" Version="8.0.0-preview.6.23320.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>974d15e3b021101ad702d898f15e63a17b9a7160</Sha>
|
||||
<Sha>53845260d1ffa1a90fe4c499142bc6709dddeacf</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-user-jwts" Version="8.0.0-preview.6.23316.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-user-jwts" Version="8.0.0-preview.6.23320.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>974d15e3b021101ad702d898f15e63a17b9a7160</Sha>
|
||||
<Sha>53845260d1ffa1a90fe4c499142bc6709dddeacf</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-user-secrets" Version="8.0.0-preview.6.23316.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-user-secrets" Version="8.0.0-preview.6.23320.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>974d15e3b021101ad702d898f15e63a17b9a7160</Sha>
|
||||
<Sha>53845260d1ffa1a90fe4c499142bc6709dddeacf</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
|
||||
<Uri>https://github.com/dotnet/test-templates</Uri>
|
||||
<Sha>0385265f4d0b6413d64aea0223172366a9b9858c</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.5.0" Version="1.1.0-rc.23319.1">
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.5.0" Version="1.1.0-rc.23320.1">
|
||||
<Uri>https://github.com/dotnet/test-templates</Uri>
|
||||
<Sha>5a409b3d4230e127fe0a0cff816ec82000cc03cf</Sha>
|
||||
<Sha>e713da5f1f9a4b5918810af40d1a2867d46c8b85</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.6.0" Version="1.1.0-rc.23319.1">
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.6.0" Version="1.1.0-rc.23320.1">
|
||||
<Uri>https://github.com/dotnet/test-templates</Uri>
|
||||
<Sha>5a409b3d4230e127fe0a0cff816ec82000cc03cf</Sha>
|
||||
<Sha>e713da5f1f9a4b5918810af40d1a2867d46c8b85</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.7.0" Version="1.1.0-rc.23319.1">
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.7.0" Version="1.1.0-rc.23320.1">
|
||||
<Uri>https://github.com/dotnet/test-templates</Uri>
|
||||
<Sha>5a409b3d4230e127fe0a0cff816ec82000cc03cf</Sha>
|
||||
<Sha>e713da5f1f9a4b5918810af40d1a2867d46c8b85</Sha>
|
||||
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.8.0" Version="1.1.0-rc.23319.1">
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.8.0" Version="1.1.0-rc.23320.1">
|
||||
<Uri>https://github.com/dotnet/test-templates</Uri>
|
||||
<Sha>5a409b3d4230e127fe0a0cff816ec82000cc03cf</Sha>
|
||||
<Sha>e713da5f1f9a4b5918810af40d1a2867d46c8b85</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.100-preview.6.23316.43">
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.100-preview.6.23321.12">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>284a328a657695f610f223e363a143f6afd75014</Sha>
|
||||
<Sha>93e55d1c564231556a4ea0b713a248c9e4359b9e</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.100-preview.6.23316.43">
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.100-preview.6.23321.12">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>284a328a657695f610f223e363a143f6afd75014</Sha>
|
||||
<Sha>93e55d1c564231556a4ea0b713a248c9e4359b9e</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.100-preview.6.23316.43">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.100-preview.6.23321.12">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>284a328a657695f610f223e363a143f6afd75014</Sha>
|
||||
<Sha>93e55d1c564231556a4ea0b713a248c9e4359b9e</Sha>
|
||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.100-preview.6.23316.43">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.100-preview.6.23321.12">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>284a328a657695f610f223e363a143f6afd75014</Sha>
|
||||
<Sha>93e55d1c564231556a4ea0b713a248c9e4359b9e</Sha>
|
||||
</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="8.0.0-preview.6.23315.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.0-preview.6.23319.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/winforms</Uri>
|
||||
<Sha>62c8151e7f585ee06d72a8cbc6b77dd34f489382</Sha>
|
||||
<Sha>c21d0511b6c385922521e62bed9cf8884a30ec53</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="8.0.0-preview.6.23315.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="8.0.0-preview.6.23320.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/wpf</Uri>
|
||||
<Sha>56cb91bcd08bcd4dd758bd0d984bd7d884ee9653</Sha>
|
||||
<Sha>fd8fc8064a119961824319b637a8048ffbb36936</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.0-beta.23315.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.0-beta.23319.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
<Sha>2976333d29f3f6940ee9d5ea55866264f003409f</Sha>
|
||||
<Sha>6ddcebb8453396904103e911c2886be5fc327987</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="8.0.100-beta.23315.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="8.0.100-beta.23319.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
<Sha>2976333d29f3f6940ee9d5ea55866264f003409f</Sha>
|
||||
<Sha>6ddcebb8453396904103e911c2886be5fc327987</Sha>
|
||||
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.7.0-preview-23315-03" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.7.0-preview-23317-01" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/microsoft/vstest</Uri>
|
||||
<Sha>74cbc39c9cf836dea821686d65013e399075948e</Sha>
|
||||
<Sha>919ec8358820228cc5fa77ef000051c1d6875399</Sha>
|
||||
<SourceBuild RepoName="vstest" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.6.23316.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.6.23321.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>76da696f3ffdd81506b09dfc440ee6f4e1001868</Sha>
|
||||
<Sha>f644e5be3268064485fb74c3c9cb5735e446df4a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.7.0-3.23315.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.7.0-3.23320.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/roslyn</Uri>
|
||||
<Sha>fcfb85983ac231b870ed737d4be669b50d627b64</Sha>
|
||||
<Sha>50aa37f11d39a55f70254eca281749dc40cb52ee</Sha>
|
||||
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Build" Version="17.7.0-preview-23316-03" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.Build" Version="17.7.0-preview-23321-03" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/msbuild</Uri>
|
||||
<Sha>0fdab8fb802dbd4d75065a282a9cf8bd4f665af2</Sha>
|
||||
<Sha>b58ecd263b4ae464412fde58aff2d7498370ce4f</Sha>
|
||||
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="NuGet.Build.Tasks" Version="6.7.0-preview.3.83" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="NuGet.Build.Tasks" Version="6.7.0-preview.3.93" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/nuget/nuget.client</Uri>
|
||||
<Sha>c7cd11ae0afd9c69638587dd5e86826983b3fa21</Sha>
|
||||
<Sha>488693efb590056b7f9e07d3a376d17c60d7f9e6</Sha>
|
||||
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
|
||||
|
@ -181,9 +181,9 @@
|
|||
<Sha>9e870996b8bf0b91a791edd1039bfd23bdd01af8</Sha>
|
||||
<SourceBuild RepoName="deployment-tools" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23315.1">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23319.1">
|
||||
<Uri>https://github.com/dotnet/source-build-externals</Uri>
|
||||
<Sha>06913fc4c3fcb0065ee390d135fb766870d2c38a</Sha>
|
||||
<Sha>0d04efdab9f26bad07edc881dc7fa088337b8562</Sha>
|
||||
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.symreader" Version="2.1.0-beta.23253.1">
|
||||
|
@ -202,18 +202,18 @@
|
|||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23316.6">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23320.3">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>e2334b2be36919347923d0ec872a46acddb1e385</Sha>
|
||||
<Sha>06d73ccc1f421af06c2794741a9913f474f66b3d</Sha>
|
||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23316.6">
|
||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23320.3">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>e2334b2be36919347923d0ec872a46acddb1e385</Sha>
|
||||
<Sha>06d73ccc1f421af06c2794741a9913f474f66b3d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23316.6">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23320.3">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>e2334b2be36919347923d0ec872a46acddb1e385</Sha>
|
||||
<Sha>06d73ccc1f421af06c2794741a9913f474f66b3d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23307.2">
|
||||
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
<VersionFeature>00</VersionFeature>
|
||||
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
|
||||
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
|
||||
<PreReleaseVersionIteration>6</PreReleaseVersionIteration>
|
||||
<PreReleaseVersionIteration>7</PreReleaseVersionIteration>
|
||||
<MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
|
||||
<CliProductBandVersion>$(MajorMinorVersion).$(VersionSDKMinor)</CliProductBandVersion>
|
||||
<!-- Enable to remove prerelease label. -->
|
||||
|
@ -22,8 +22,8 @@
|
|||
<VersionFeature21>30</VersionFeature21>
|
||||
<VersionFeature31>32</VersionFeature31>
|
||||
<VersionFeature50>17</VersionFeature50>
|
||||
<VersionFeature60>16</VersionFeature60>
|
||||
<VersionFeature70>5</VersionFeature70>
|
||||
<VersionFeature60>18</VersionFeature60>
|
||||
<VersionFeature70>7</VersionFeature70>
|
||||
<!-- Should be kept in sync with VersionFeature70. It should match the version of Microsoft.NET.ILLink.Tasks
|
||||
referenced by the same 7.0 SDK that references the 7.0.VersionFeature70 runtime pack. -->
|
||||
<_NET70ILLinkPackVersion>7.0.100-1.23211.1</_NET70ILLinkPackVersion>
|
||||
|
@ -36,7 +36,7 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23316.6</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23320.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/arcade-services -->
|
||||
|
@ -44,11 +44,11 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>8.0.0-preview.6.23315.4</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>8.0.0-preview.6.23319.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/wpf -->
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>8.0.0-preview.6.23315.5</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>8.0.0-preview.6.23320.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/test-templates -->
|
||||
|
@ -57,10 +57,10 @@
|
|||
<MicrosoftDotNetTestProjectTemplates30PackageVersion>1.0.2-beta4.22406.1</MicrosoftDotNetTestProjectTemplates30PackageVersion>
|
||||
<!-- Supported versions -->
|
||||
<MicrosoftDotNetTestProjectTemplates31PackageVersion>1.1.0-rc.22558.1</MicrosoftDotNetTestProjectTemplates31PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates50PackageVersion>1.1.0-rc.23319.1</MicrosoftDotNetTestProjectTemplates50PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates60PackageVersion>1.1.0-rc.23319.1</MicrosoftDotNetTestProjectTemplates60PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates70PackageVersion>1.1.0-rc.23319.1</MicrosoftDotNetTestProjectTemplates70PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates80PackageVersion>1.1.0-rc.23319.1</MicrosoftDotNetTestProjectTemplates80PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates50PackageVersion>1.1.0-rc.23320.1</MicrosoftDotNetTestProjectTemplates50PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates60PackageVersion>1.1.0-rc.23320.1</MicrosoftDotNetTestProjectTemplates60PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates70PackageVersion>1.1.0-rc.23320.1</MicrosoftDotNetTestProjectTemplates70PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates80PackageVersion>1.1.0-rc.23320.1</MicrosoftDotNetTestProjectTemplates80PackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- NUnit3.DotNetNew.Template versions do not 'flow in' -->
|
||||
|
@ -68,50 +68,50 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
|
||||
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>8.0.0-preview.6.23316.5</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefPackageVersion>8.0.0-preview.6.23316.5</MicrosoftAspNetCoreAppRefPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefInternalPackageVersion>8.0.0-preview.6.23316.5</MicrosoftAspNetCoreAppRefInternalPackageVersion>
|
||||
<VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.6.23316.5</VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>
|
||||
<dotnetdevcertsPackageVersion>8.0.0-preview.6.23316.5</dotnetdevcertsPackageVersion>
|
||||
<dotnetuserjwtsPackageVersion>8.0.0-preview.6.23316.5</dotnetuserjwtsPackageVersion>
|
||||
<dotnetusersecretsPackageVersion>8.0.0-preview.6.23316.5</dotnetusersecretsPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>8.0.0-preview.6.23320.14</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefPackageVersion>8.0.0-preview.6.23320.14</MicrosoftAspNetCoreAppRefPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefInternalPackageVersion>8.0.0-preview.6.23320.14</MicrosoftAspNetCoreAppRefInternalPackageVersion>
|
||||
<VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.6.23320.14</VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>
|
||||
<dotnetdevcertsPackageVersion>8.0.0-preview.6.23320.14</dotnetdevcertsPackageVersion>
|
||||
<dotnetuserjwtsPackageVersion>8.0.0-preview.6.23320.14</dotnetuserjwtsPackageVersion>
|
||||
<dotnetusersecretsPackageVersion>8.0.0-preview.6.23320.14</dotnetusersecretsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.100-preview.6.23316.43</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>8.0.100-preview.6.23316.43</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.100-preview.6.23316.43</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.100-preview.6.23321.12</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>8.0.100-preview.6.23321.12</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.100-preview.6.23321.12</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/roslyn -->
|
||||
<MicrosoftNetCompilersToolsetPackageVersion>4.7.0-3.23315.4</MicrosoftNetCompilersToolsetPackageVersion>
|
||||
<MicrosoftNetCompilersToolsetPackageVersion>4.7.0-3.23320.5</MicrosoftNetCompilersToolsetPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/corefx -->
|
||||
<MicrosoftNETCorePlatformsPackageVersion>8.0.0-preview.6.23316.3</MicrosoftNETCorePlatformsPackageVersion>
|
||||
<MicrosoftNETCorePlatformsPackageVersion>8.0.0-preview.6.23321.2</MicrosoftNETCorePlatformsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/core-setup -->
|
||||
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.6.23316.3</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
|
||||
<VSRedistCommonNetCoreTargetingPackx6480PackageVersion>8.0.0-preview.6.23316.3</VSRedistCommonNetCoreTargetingPackx6480PackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-preview.6.23316.3</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>8.0.0-preview.6.23316.3</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.6.23316.3</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-preview.6.23316.3</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.6.23321.2</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
|
||||
<VSRedistCommonNetCoreTargetingPackx6480PackageVersion>8.0.0-preview.6.23321.2</VSRedistCommonNetCoreTargetingPackx6480PackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-preview.6.23321.2</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>8.0.0-preview.6.23321.2</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.6.23321.2</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-preview.6.23321.2</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
|
||||
<VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>8.0.0-preview.6.23316.4</VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>
|
||||
<VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>8.0.0-preview.6.23316.4</VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>8.0.0-preview.6.23316.4</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>8.0.0-preview.6.23316.4</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
<VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>8.0.0-preview.6.23320.4</VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>
|
||||
<VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>8.0.0-preview.6.23320.4</VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>8.0.0-preview.6.23320.4</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>8.0.0-preview.6.23320.4</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->
|
||||
|
@ -123,7 +123,7 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/NuGet/NuGet.Client -->
|
||||
<NuGetBuildTasksPackageVersion>6.7.0-preview.3.83</NuGetBuildTasksPackageVersion>
|
||||
<NuGetBuildTasksPackageVersion>6.7.0-preview.3.93</NuGetBuildTasksPackageVersion>
|
||||
</PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/deployment-tools -->
|
||||
<PropertyGroup>
|
||||
|
@ -141,11 +141,14 @@
|
|||
Therefore we stay at last month's version.
|
||||
We also need to special case the 1st patch release, because the incoming SDK version will never be 2 versions behind us in that case.
|
||||
Instead the indicator is that the incoming SDK version is not RTM or greater yet.
|
||||
Preview releases already use -1 versionining so don't subtract one for that version
|
||||
-->
|
||||
<SubtractOneFromTemplateVersions Condition="$([MSBuild]::Subtract($(VersionFeature), $(MicrosoftNETSdkPatchVersion))) >= 2">true</SubtractOneFromTemplateVersions>
|
||||
<SubtractOneFromTemplateVersions Condition="$(VersionFeature) >= 1 AND ! $(MicrosoftNETSdkPackageVersion.Contains('rtm')) AND ! $(MicrosoftNETSdkPackageVersion.Contains('servicing'))">true</SubtractOneFromTemplateVersions>
|
||||
<AspNetCoreTemplateFeature60>$([MSBuild]::Subtract($(VersionFeature60), 1))</AspNetCoreTemplateFeature60>
|
||||
<AspNetCoreTemplateFeature70>$([MSBuild]::Subtract($(VersionFeature70), 1))</AspNetCoreTemplateFeature70>
|
||||
<AspNetCoreTemplateFeature60 Condition="$(MicrosoftNETSdkPackageVersion.Contains('preview'))">$(VersionFeature60)</AspNetCoreTemplateFeature60>
|
||||
<AspNetCoreTemplateFeature70 Condition="$(MicrosoftNETSdkPackageVersion.Contains('preview'))">$(VersionFeature70)</AspNetCoreTemplateFeature70>
|
||||
<AspNetCoreTemplateFeature60 Condition="'$(SubtractOneFromTemplateVersions)' == 'true'">$([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1))</AspNetCoreTemplateFeature60>
|
||||
<AspNetCoreTemplateFeature70 Condition="'$(SubtractOneFromTemplateVersions)' == 'true'">$([MSBuild]::Subtract($(AspNetCoreTemplateFeature70), 1))</AspNetCoreTemplateFeature70>
|
||||
</PropertyGroup>
|
||||
|
@ -225,7 +228,7 @@
|
|||
<PropertyGroup>
|
||||
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
|
||||
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
|
||||
<MicrosoftNETTestSdkVersion>17.7.0-preview-23315-03</MicrosoftNETTestSdkVersion>
|
||||
<MicrosoftNETTestSdkVersion>17.7.0-preview-23317-01</MicrosoftNETTestSdkVersion>
|
||||
<MicrosoftExtensionsLoggingConsoleVersion>8.0.0-alpha.1.22557.12</MicrosoftExtensionsLoggingConsoleVersion>
|
||||
</PropertyGroup>
|
||||
<!-- Workload manifest package versions -->
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
"cmake": "3.21.0"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23316.6",
|
||||
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23316.6"
|
||||
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23320.3",
|
||||
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23320.3"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -15,11 +15,22 @@
|
|||
Building .NET from source depends on several archives, depending on the branch's current
|
||||
source-buildability status.
|
||||
|
||||
PrivateSourceBuiltArtifactsUrl is a tar.gz of .NET build outputs from a previous
|
||||
build needed to build the current version of .NET. This is always defined, because .NET needs
|
||||
to be bootstrappable at any point in time.
|
||||
|
||||
PrivateSourceBuiltPrebuiltsUrl is a tar.gz of assets downloaded from the internet
|
||||
that are needed to build the current version of .NET. Early in the lifecycle of a .NET major
|
||||
or minor release, prebuilts may be needed. When the release is mature, prebuilts are not
|
||||
necessary, and this property is removed from the file.
|
||||
|
||||
PrivateSourceBuiltSdkUrl_<abc> is a tar.gz of the source build .NET SDK from the previous release
|
||||
for a particular OS. It is used by CI to validate that the current release can be built with it.
|
||||
|
||||
These URLs can't be composed from their base URL and version as we read them from the
|
||||
prep.sh and pipeline scripts, outside of MSBuild.
|
||||
-->
|
||||
<PrivateSourceBuiltArtifactsUrl>https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-preview.5.23303.1.centos.8-x64.tar.gz</PrivateSourceBuiltArtifactsUrl>
|
||||
<PrivateSourceBuiltPrebuiltsUrl>https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-8.0.100-33.centos.8-x64.tar.gz</PrivateSourceBuiltPrebuiltsUrl>
|
||||
<PrivateSourceBuiltSdkUrl_CentOS8Stream>https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-preview.5.23303.1-centos.8-x64.tar.gz</PrivateSourceBuiltSdkUrl_CentOS8Stream>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
|
@ -36,7 +36,7 @@ internal class DotNetHelper
|
|||
}
|
||||
|
||||
Directory.CreateDirectory(Config.DotNetDirectory);
|
||||
Utilities.ExtractTarball(Config.SdkTarballPath, Config.DotNetDirectory);
|
||||
Utilities.ExtractTarball(Config.SdkTarballPath, Config.DotNetDirectory, outputHelper);
|
||||
}
|
||||
IsMonoRuntime = DetermineIsMonoRuntime(Config.DotNetDirectory);
|
||||
|
||||
|
|
|
@ -6,6 +6,7 @@ using System;
|
|||
using System.Diagnostics;
|
||||
using System.IO;
|
||||
using System.Net.Http;
|
||||
using System.Security.AccessControl;
|
||||
using System.Threading.Tasks;
|
||||
using Xunit;
|
||||
using Xunit.Abstractions;
|
||||
|
@ -65,7 +66,10 @@ public class OmniSharpTests : SmokeTests
|
|||
await client.DownloadFileAsync(omniSharpTarballUrl, omniSharpTarballFile, OutputHelper);
|
||||
|
||||
Directory.CreateDirectory(OmniSharpDirectory);
|
||||
Utilities.ExtractTarball(omniSharpTarballFile, OmniSharpDirectory);
|
||||
Utilities.ExtractTarball(omniSharpTarballFile, OmniSharpDirectory, OutputHelper);
|
||||
|
||||
// Ensure the run script is executable (see https://github.com/OmniSharp/omnisharp-roslyn/issues/2547)
|
||||
File.SetUnixFileMode($"{OmniSharpDirectory}/run", UnixFileMode.UserRead | UnixFileMode.UserExecute);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -16,11 +16,11 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests;
|
|||
|
||||
public static class Utilities
|
||||
{
|
||||
public static void ExtractTarball(string tarballPath, string outputDir)
|
||||
public static void ExtractTarball(string tarballPath, string outputDir, ITestOutputHelper outputHelper)
|
||||
{
|
||||
using FileStream fileStream = File.OpenRead(tarballPath);
|
||||
using GZipStream decompressorStream = new(fileStream, CompressionMode.Decompress);
|
||||
TarFile.ExtractToDirectory(decompressorStream, outputDir, true);
|
||||
// TarFile doesn't properly handle hard links (https://github.com/dotnet/runtime/pull/85378#discussion_r1221817490),
|
||||
// use 'tar' instead.
|
||||
ExecuteHelper.ExecuteProcessValidateExitCode("tar", $"xzf {tarballPath} -C {outputDir}", outputHelper);
|
||||
}
|
||||
|
||||
public static void ExtractTarball(string tarballPath, string outputDir, string targetFilePath)
|
||||
|
|
|
@ -33,16 +33,11 @@ msft,./sdk/x.y.z/Sdks/Microsoft.SourceLink.GitLab/tools/net472/*
|
|||
|
||||
# vstest localization is disabled in Linux builds - https://github.com/dotnet/source-build/issues/3517
|
||||
msft,./sdk/x.y.z/*?/Microsoft.CodeCoverage.IO.resources.dll
|
||||
msft,./sdk/x.y.z/*?/Microsoft.TestPlatform.*?.resources.dll
|
||||
msft,./sdk/x.y.z/*?/Microsoft.VisualStudio.TestPlatform.*?.resources.dll
|
||||
msft,./sdk/x.y.z/*?/Test.Utility.resources.dll
|
||||
msft,./sdk/x.y.z/*?/vstest.console.resources.dll
|
||||
msft,./sdk/x.y.z/Extensions/*?/Microsoft.TestPlatform.*?.resources.dll
|
||||
msft,./sdk/x.y.z/Extensions/*?/Microsoft.VisualStudio.TestPlatform.*?.resources.dll
|
||||
|
||||
# nuget localization is not available for Linux builds - https://github.com/NuGet/Home/issues/12440
|
||||
msft,./sdk/x.y.z/*?/NuGet.*?.resources.dll
|
||||
msft,./sdk/x.y.z/*?/Microsoft.Build.NuGetSdkResolver.resources.dll
|
||||
msft,./sdk/x.y.z/*?/Test.Utility.resources.dll
|
||||
|
||||
# ILMerge is not supported in Linux builds - excluding the whole NuGet.Build.Tasks.Pack directory, to avoid a noisy diff
|
||||
msft,./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/*?
|
||||
|
@ -82,3 +77,15 @@ msft,./sdk/x.y.z/DotnetTools/dotnet-format/System.Drawing.Common.dll
|
|||
msft,./sdk/x.y.z/DotnetTools/dotnet-format/System.Security.Cryptography.ProtectedData.dll
|
||||
msft,./sdk/x.y.z/DotnetTools/dotnet-format/System.Security.Permissions.dll
|
||||
msft,./sdk/x.y.z/DotnetTools/dotnet-format/System.Windows.Extensions.dll
|
||||
|
||||
# netfx runtimes for fsharp - https://github.com/dotnet/source-build/issues/3290
|
||||
msft,./sdk/x.y.z/FSharp/Microsoft.VisualStudio.Setup.Configuration.Interop.dll
|
||||
msft,./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll
|
||||
msft,./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Drawing.Common.dll
|
||||
msft,./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll
|
||||
msft,./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Windows.Extensions.dll
|
||||
|
||||
# windows components - https://github.com/dotnet/source-build/issues/3526
|
||||
msft,./sdk/x.y.z/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll
|
||||
msft,./sdk/x.y.z/runtimes/win/lib/netx.y/System.Drawing.Common.dll
|
||||
msft,./sdk/x.y.z/runtimes/win/lib/netx.y/System.Windows.Extensions.dll
|
||||
|
|
|
@ -428,108 +428,10 @@ index ------------
|
|||
-./sdk/x.y.z/Containers/tasks/netx.y/runtimes/win/lib/netx.y/System.Drawing.Common.dll
|
||||
./sdk/x.y.z/Containers/tasks/netx.y/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll
|
||||
-./sdk/x.y.z/Containers/tasks/netx.y/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll
|
||||
./sdk/x.y.z/Containers/tasks/netx.y/runtimes/win/lib/netx.y/System.Windows.Extensions.dll
|
||||
-./sdk/x.y.z/Containers/tasks/netx.y/runtimes/win/lib/netx.y/System.Windows.Extensions.dll
|
||||
./sdk/x.y.z/Containers/tasks/netx.y/System.CommandLine.dll
|
||||
./sdk/x.y.z/Containers/tasks/netx.y/System.Configuration.ConfigurationManager.dll
|
||||
@@ ------------ @@
|
||||
./sdk/x.y.z/cs/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll
|
||||
./sdk/x.y.z/cs/Microsoft.TemplateEngine.Utils.resources.dll
|
||||
./sdk/x.y.z/cs/Microsoft.TemplateSearch.Common.resources.dll
|
||||
+./sdk/x.y.z/cs/Microsoft.TestPlatform.Build.resources.dll
|
||||
./sdk/x.y.z/cs/MSBuild.resources.dll
|
||||
./sdk/x.y.z/cs/System.CommandLine.resources.dll
|
||||
./sdk/x.y.z/Current/
|
||||
@@ ------------ @@
|
||||
./sdk/x.y.z/de/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll
|
||||
./sdk/x.y.z/de/Microsoft.TemplateEngine.Utils.resources.dll
|
||||
./sdk/x.y.z/de/Microsoft.TemplateSearch.Common.resources.dll
|
||||
+./sdk/x.y.z/de/Microsoft.TestPlatform.Build.resources.dll
|
||||
./sdk/x.y.z/de/MSBuild.resources.dll
|
||||
./sdk/x.y.z/de/System.CommandLine.resources.dll
|
||||
./sdk/x.y.z/dotnet.deps.json
|
||||
@@ ------------ @@
|
||||
./sdk/x.y.z/es/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll
|
||||
./sdk/x.y.z/es/Microsoft.TemplateEngine.Utils.resources.dll
|
||||
./sdk/x.y.z/es/Microsoft.TemplateSearch.Common.resources.dll
|
||||
+./sdk/x.y.z/es/Microsoft.TestPlatform.Build.resources.dll
|
||||
./sdk/x.y.z/es/MSBuild.resources.dll
|
||||
./sdk/x.y.z/es/System.CommandLine.resources.dll
|
||||
./sdk/x.y.z/Extensions/
|
||||
-./sdk/x.y.z/Extensions/cs/
|
||||
-./sdk/x.y.z/Extensions/de/
|
||||
-./sdk/x.y.z/Extensions/es/
|
||||
-./sdk/x.y.z/Extensions/fr/
|
||||
-./sdk/x.y.z/Extensions/it/
|
||||
-./sdk/x.y.z/Extensions/ja/
|
||||
-./sdk/x.y.z/Extensions/ko/
|
||||
./sdk/x.y.z/Extensions/Microsoft.Diagnostics.NETCore.Client.dll
|
||||
./sdk/x.y.z/Extensions/Microsoft.TestPlatform.Extensions.BlameDataCollector.dll
|
||||
./sdk/x.y.z/Extensions/Microsoft.TestPlatform.Extensions.EventLogCollector.dll
|
||||
./sdk/x.y.z/Extensions/Microsoft.TestPlatform.TestHostRuntimeProvider.dll
|
||||
./sdk/x.y.z/Extensions/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll
|
||||
./sdk/x.y.z/Extensions/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll
|
||||
-./sdk/x.y.z/Extensions/pl/
|
||||
-./sdk/x.y.z/Extensions/pt-BR/
|
||||
-./sdk/x.y.z/Extensions/ru/
|
||||
-./sdk/x.y.z/Extensions/tr/
|
||||
-./sdk/x.y.z/Extensions/zh-Hans/
|
||||
-./sdk/x.y.z/Extensions/zh-Hant/
|
||||
./sdk/x.y.z/fr/
|
||||
./sdk/x.y.z/fr/dotnet.resources.dll
|
||||
./sdk/x.y.z/fr/Microsoft.Build.resources.dll
|
||||
@@ ------------ @@
|
||||
./sdk/x.y.z/fr/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll
|
||||
./sdk/x.y.z/fr/Microsoft.TemplateEngine.Utils.resources.dll
|
||||
./sdk/x.y.z/fr/Microsoft.TemplateSearch.Common.resources.dll
|
||||
+./sdk/x.y.z/fr/Microsoft.TestPlatform.Build.resources.dll
|
||||
./sdk/x.y.z/fr/MSBuild.resources.dll
|
||||
./sdk/x.y.z/fr/System.CommandLine.resources.dll
|
||||
./sdk/x.y.z/FSharp/
|
||||
@@ ------------ @@
|
||||
./sdk/x.y.z/FSharp/Microsoft.FSharp.Targets
|
||||
./sdk/x.y.z/FSharp/Microsoft.NET.StringTools.dll
|
||||
./sdk/x.y.z/FSharp/Microsoft.Portable.FSharp.Targets
|
||||
-./sdk/x.y.z/FSharp/Microsoft.VisualStudio.Setup.Configuration.Interop.dll
|
||||
./sdk/x.y.z/FSharp/Microsoft.Win32.SystemEvents.dll
|
||||
./sdk/x.y.z/FSharp/pl/
|
||||
./sdk/x.y.z/FSharp/pl/FSharp.Build.resources.dll
|
||||
@@ ------------ @@
|
||||
./sdk/x.y.z/FSharp/runtimes/win/
|
||||
./sdk/x.y.z/FSharp/runtimes/win/lib/
|
||||
./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/
|
||||
-./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll
|
||||
./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll
|
||||
./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll
|
||||
-./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Drawing.Common.dll
|
||||
./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll
|
||||
-./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll
|
||||
./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Windows.Extensions.dll
|
||||
./sdk/x.y.z/FSharp/System.CodeDom.dll
|
||||
./sdk/x.y.z/FSharp/System.Configuration.ConfigurationManager.dll
|
||||
@@ ------------ @@
|
||||
./sdk/x.y.z/it/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll
|
||||
./sdk/x.y.z/it/Microsoft.TemplateEngine.Utils.resources.dll
|
||||
./sdk/x.y.z/it/Microsoft.TemplateSearch.Common.resources.dll
|
||||
+./sdk/x.y.z/it/Microsoft.TestPlatform.Build.resources.dll
|
||||
./sdk/x.y.z/it/MSBuild.resources.dll
|
||||
./sdk/x.y.z/it/System.CommandLine.resources.dll
|
||||
./sdk/x.y.z/ja/
|
||||
@@ ------------ @@
|
||||
./sdk/x.y.z/ja/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll
|
||||
./sdk/x.y.z/ja/Microsoft.TemplateEngine.Utils.resources.dll
|
||||
./sdk/x.y.z/ja/Microsoft.TemplateSearch.Common.resources.dll
|
||||
+./sdk/x.y.z/ja/Microsoft.TestPlatform.Build.resources.dll
|
||||
./sdk/x.y.z/ja/MSBuild.resources.dll
|
||||
./sdk/x.y.z/ja/System.CommandLine.resources.dll
|
||||
./sdk/x.y.z/KnownWorkloadManifests.txt
|
||||
@@ ------------ @@
|
||||
./sdk/x.y.z/ko/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll
|
||||
./sdk/x.y.z/ko/Microsoft.TemplateEngine.Utils.resources.dll
|
||||
./sdk/x.y.z/ko/Microsoft.TemplateSearch.Common.resources.dll
|
||||
+./sdk/x.y.z/ko/Microsoft.TestPlatform.Build.resources.dll
|
||||
./sdk/x.y.z/ko/MSBuild.resources.dll
|
||||
./sdk/x.y.z/ko/System.CommandLine.resources.dll
|
||||
./sdk/x.y.z/Microsoft.ApplicationInsights.dll
|
||||
./sdk/x.y.z/Containers/tasks/netx.y/System.Diagnostics.EventLog.dll
|
||||
@@ ------------ @@
|
||||
./sdk/x.y.z/Microsoft.Build.NuGetSdkResolver.dll
|
||||
./sdk/x.y.z/Microsoft.Build.Tasks.Core.dll
|
||||
|
@ -546,22 +448,6 @@ index ------------
|
|||
./sdk/x.y.z/Microsoft.VisualStudio.TestPlatform.Client.dll
|
||||
./sdk/x.y.z/Microsoft.VisualStudio.TestPlatform.Common.dll
|
||||
./sdk/x.y.z/Microsoft.VisualStudio.TestPlatform.ObjectModel.dll
|
||||
@@ ------------ @@
|
||||
./sdk/x.y.z/pl/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll
|
||||
./sdk/x.y.z/pl/Microsoft.TemplateEngine.Utils.resources.dll
|
||||
./sdk/x.y.z/pl/Microsoft.TemplateSearch.Common.resources.dll
|
||||
+./sdk/x.y.z/pl/Microsoft.TestPlatform.Build.resources.dll
|
||||
./sdk/x.y.z/pl/MSBuild.resources.dll
|
||||
./sdk/x.y.z/pl/System.CommandLine.resources.dll
|
||||
./sdk/x.y.z/pt-BR/
|
||||
@@ ------------ @@
|
||||
./sdk/x.y.z/pt-BR/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll
|
||||
./sdk/x.y.z/pt-BR/Microsoft.TemplateEngine.Utils.resources.dll
|
||||
./sdk/x.y.z/pt-BR/Microsoft.TemplateSearch.Common.resources.dll
|
||||
+./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.Build.resources.dll
|
||||
./sdk/x.y.z/pt-BR/MSBuild.resources.dll
|
||||
./sdk/x.y.z/pt-BR/System.CommandLine.resources.dll
|
||||
./sdk/x.y.z/ref/
|
||||
@@ ------------ @@
|
||||
./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.CSharp.resources.dll
|
||||
./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.resources.dll
|
||||
|
@ -571,25 +457,14 @@ index ------------
|
|||
./sdk/x.y.z/Roslyn/bincore/tr/
|
||||
./sdk/x.y.z/Roslyn/bincore/tr/Microsoft.CodeAnalysis.CSharp.resources.dll
|
||||
./sdk/x.y.z/Roslyn/bincore/tr/Microsoft.CodeAnalysis.resources.dll
|
||||
@@ ------------ @@
|
||||
./sdk/x.y.z/ru/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll
|
||||
./sdk/x.y.z/ru/Microsoft.TemplateEngine.Utils.resources.dll
|
||||
./sdk/x.y.z/ru/Microsoft.TemplateSearch.Common.resources.dll
|
||||
+./sdk/x.y.z/ru/Microsoft.TestPlatform.Build.resources.dll
|
||||
./sdk/x.y.z/ru/MSBuild.resources.dll
|
||||
./sdk/x.y.z/ru/System.CommandLine.resources.dll
|
||||
./sdk/x.y.z/RuntimeIdentifierGraph.json
|
||||
@@ ------------ @@
|
||||
./sdk/x.y.z/runtimes/win/
|
||||
./sdk/x.y.z/runtimes/win/lib/
|
||||
./sdk/x.y.z/runtimes/win/lib/netx.y/
|
||||
-./sdk/x.y.z/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll
|
||||
-./sdk/x.y.z/runtimes/win/lib/netx.y/
|
||||
./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll
|
||||
./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll
|
||||
-./sdk/x.y.z/runtimes/win/lib/netx.y/System.Drawing.Common.dll
|
||||
./sdk/x.y.z/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll
|
||||
./sdk/x.y.z/runtimes/win/lib/netx.y/System.ServiceProcess.ServiceController.dll
|
||||
./sdk/x.y.z/runtimes/win/lib/netx.y/System.Windows.Extensions.dll
|
||||
@@ ------------ @@
|
||||
./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WebAssembly/tools/
|
||||
./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WebAssembly/tools/netx.y/
|
||||
|
@ -605,28 +480,4 @@ index ------------
|
|||
-./sdk/x.y.z/TestHostNetFramework/
|
||||
./sdk/x.y.z/tr/
|
||||
./sdk/x.y.z/tr/dotnet.resources.dll
|
||||
./sdk/x.y.z/tr/Microsoft.Build.resources.dll
|
||||
@@ ------------ @@
|
||||
./sdk/x.y.z/tr/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll
|
||||
./sdk/x.y.z/tr/Microsoft.TemplateEngine.Utils.resources.dll
|
||||
./sdk/x.y.z/tr/Microsoft.TemplateSearch.Common.resources.dll
|
||||
+./sdk/x.y.z/tr/Microsoft.TestPlatform.Build.resources.dll
|
||||
./sdk/x.y.z/tr/MSBuild.resources.dll
|
||||
./sdk/x.y.z/tr/System.CommandLine.resources.dll
|
||||
./sdk/x.y.z/trustedroots/
|
||||
@@ ------------ @@
|
||||
./sdk/x.y.z/zh-Hans/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll
|
||||
./sdk/x.y.z/zh-Hans/Microsoft.TemplateEngine.Utils.resources.dll
|
||||
./sdk/x.y.z/zh-Hans/Microsoft.TemplateSearch.Common.resources.dll
|
||||
+./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.Build.resources.dll
|
||||
./sdk/x.y.z/zh-Hans/MSBuild.resources.dll
|
||||
./sdk/x.y.z/zh-Hans/System.CommandLine.resources.dll
|
||||
./sdk/x.y.z/zh-Hant/
|
||||
@@ ------------ @@
|
||||
./sdk/x.y.z/zh-Hant/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll
|
||||
./sdk/x.y.z/zh-Hant/Microsoft.TemplateEngine.Utils.resources.dll
|
||||
./sdk/x.y.z/zh-Hant/Microsoft.TemplateSearch.Common.resources.dll
|
||||
+./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.Build.resources.dll
|
||||
./sdk/x.y.z/zh-Hant/MSBuild.resources.dll
|
||||
./sdk/x.y.z/zh-Hant/System.CommandLine.resources.dll
|
||||
./shared/
|
||||
./sdk/x.y.z/tr/Microsoft.Build.resources.dll
|
|
@ -1,28 +0,0 @@
|
|||
From f54948aa6cd6c5be2f35a9fb6766c66176303abe Mon Sep 17 00:00:00 2001
|
||||
From: Oleksandr Didyk <odidyk@microsoft.com>
|
||||
Date: Thu, 15 Jun 2023 13:57:35 +0000
|
||||
Subject: [PATCH] add Security.Cryptography to Version.Details
|
||||
|
||||
Backport: https://github.com/dotnet/msbuild/pull/8888
|
||||
---
|
||||
eng/Version.Details.xml | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
|
||||
index d3a75d781..97cc2bf3a 100644
|
||||
--- a/eng/Version.Details.xml
|
||||
+++ b/eng/Version.Details.xml
|
||||
@@ -12,6 +12,10 @@
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
|
||||
</Dependency>
|
||||
+ <Dependency Name="System.Security.Cryptography.Pkcs" Version="7.0.0">
|
||||
+ <Uri>https://github.com/dotnet/runtime</Uri>
|
||||
+ <Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
|
||||
+ </Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.23301.1">
|
||||
--
|
||||
2.25.1
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Rainer Sigwald <raines@microsoft.com>
|
||||
Date: Wed, 21 Jun 2023 12:31:49 +0000
|
||||
Subject: [PATCH] MSBuild: SourceBuild TF is NetCurrent
|
||||
|
||||
Backport: https://github.com/dotnet/sdk/pull/33188
|
||||
---
|
||||
.../Microsoft.DotNet.Cli.Utils.csproj | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
|
||||
index 345b986a81..da79ba61e7 100644
|
||||
--- a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
|
||||
+++ b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
|
||||
@@ -23,10 +23,10 @@
|
||||
<Target Name="VerifyMSBuildDependency" BeforeTargets="ResolveAssemblyReferences" Condition="'$([MSBuild]::GetTargetFrameworkIdentifier($(TargetFramework)))' == '.NETCoreApp'">
|
||||
<!-- We explicitly reference an older version of MSBuild here to support VS
|
||||
for Mac and other VS scenarios. During source-build, we only have access to
|
||||
- the latest version, which targets net7.0. -->
|
||||
+ the latest version, which targets NetCurrent. -->
|
||||
<PropertyGroup>
|
||||
<MSBuildPathInPackage>$(PkgMicrosoft_Build_Runtime)\contentFiles\any\net7.0\MSBuild.dll</MSBuildPathInPackage>
|
||||
- <MSBuildPathInPackage Condition="'$(DotNetBuildFromSource)' == 'true'">$(PkgMicrosoft_Build_Runtime)\contentFiles\any\net7.0\MSBuild.dll</MSBuildPathInPackage>
|
||||
+ <MSBuildPathInPackage Condition="'$(DotNetBuildFromSource)' == 'true'">$(PkgMicrosoft_Build_Runtime)\contentFiles\any\$(NetCurrent)\MSBuild.dll</MSBuildPathInPackage>
|
||||
</PropertyGroup>
|
||||
<Error Condition="!Exists('$(MSBuildPathInPackage)')" Text="Something moved around in Microsoft.Build.Runtime, adjust code here accordingly." />
|
||||
<ItemGroup>
|
|
@ -0,0 +1,217 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Nikola Milosavljevic <nikolam@microsoft.com>
|
||||
Date: Mon, 19 Jun 2023 22:28:26 +0000
|
||||
Subject: [PATCH] Consume localized resources in source-build
|
||||
|
||||
Backport: https://github.com/microsoft/vstest/pull/4564
|
||||
---
|
||||
...rosoft.TestPlatform.CLI.sourcebuild.nuspec | 197 ++++++++++++++++++
|
||||
1 file changed, 197 insertions(+)
|
||||
|
||||
diff --git a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.sourcebuild.nuspec b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.sourcebuild.nuspec
|
||||
index 39dd437c..4de0d6f8 100644
|
||||
--- a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.sourcebuild.nuspec
|
||||
+++ b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.sourcebuild.nuspec
|
||||
@@ -61,5 +61,202 @@
|
||||
<file src="$SourceBuildTfm$\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions" />
|
||||
<file src="$SourceBuildTfm$\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions" />
|
||||
|
||||
+ <!-- Resources -->
|
||||
+ <file src="$SourceBuildTfm$\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\cs" />
|
||||
+ <file src="$SourceBuildTfm$\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\de" />
|
||||
+ <file src="$SourceBuildTfm$\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\es" />
|
||||
+ <file src="$SourceBuildTfm$\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\fr" />
|
||||
+ <file src="$SourceBuildTfm$\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\it" />
|
||||
+ <file src="$SourceBuildTfm$\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\ja" />
|
||||
+ <file src="$SourceBuildTfm$\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\ko" />
|
||||
+ <file src="$SourceBuildTfm$\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\pl" />
|
||||
+ <file src="$SourceBuildTfm$\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\pt-BR" />
|
||||
+ <file src="$SourceBuildTfm$\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\ru" />
|
||||
+ <file src="$SourceBuildTfm$\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\tr" />
|
||||
+ <file src="$SourceBuildTfm$\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\zh-Hans" />
|
||||
+ <file src="$SourceBuildTfm$\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\zh-Hant" />
|
||||
+
|
||||
+ <file src="$SourceBuildTfm$\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\cs" />
|
||||
+ <file src="$SourceBuildTfm$\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\de" />
|
||||
+ <file src="$SourceBuildTfm$\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\es" />
|
||||
+ <file src="$SourceBuildTfm$\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\fr" />
|
||||
+ <file src="$SourceBuildTfm$\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\it" />
|
||||
+ <file src="$SourceBuildTfm$\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\ja" />
|
||||
+ <file src="$SourceBuildTfm$\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\ko" />
|
||||
+ <file src="$SourceBuildTfm$\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\pl" />
|
||||
+ <file src="$SourceBuildTfm$\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\pt-BR" />
|
||||
+ <file src="$SourceBuildTfm$\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\ru" />
|
||||
+ <file src="$SourceBuildTfm$\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\tr" />
|
||||
+ <file src="$SourceBuildTfm$\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\zh-Hans" />
|
||||
+ <file src="$SourceBuildTfm$\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\zh-Hant" />
|
||||
+
|
||||
+ <file src="$SourceBuildTfm$\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="contentFiles\any\$SourceBuildTfm$\cs" />
|
||||
+ <file src="$SourceBuildTfm$\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="contentFiles\any\$SourceBuildTfm$\de" />
|
||||
+ <file src="$SourceBuildTfm$\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="contentFiles\any\$SourceBuildTfm$\es" />
|
||||
+ <file src="$SourceBuildTfm$\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="contentFiles\any\$SourceBuildTfm$\fr" />
|
||||
+ <file src="$SourceBuildTfm$\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="contentFiles\any\$SourceBuildTfm$\it" />
|
||||
+ <file src="$SourceBuildTfm$\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="contentFiles\any\$SourceBuildTfm$\ja" />
|
||||
+ <file src="$SourceBuildTfm$\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="contentFiles\any\$SourceBuildTfm$\ko" />
|
||||
+ <file src="$SourceBuildTfm$\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="contentFiles\any\$SourceBuildTfm$\pl" />
|
||||
+ <file src="$SourceBuildTfm$\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="contentFiles\any\$SourceBuildTfm$\pt-BR" />
|
||||
+ <file src="$SourceBuildTfm$\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="contentFiles\any\$SourceBuildTfm$\ru" />
|
||||
+ <file src="$SourceBuildTfm$\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="contentFiles\any\$SourceBuildTfm$\tr" />
|
||||
+ <file src="$SourceBuildTfm$\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="contentFiles\any\$SourceBuildTfm$\zh-Hans" />
|
||||
+ <file src="$SourceBuildTfm$\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="contentFiles\any\$SourceBuildTfm$\zh-Hant" />
|
||||
+
|
||||
+ <file src="$SourceBuildTfm$\cs\Microsoft.TestPlatform.Utilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\cs" />
|
||||
+ <file src="$SourceBuildTfm$\de\Microsoft.TestPlatform.Utilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\de" />
|
||||
+ <file src="$SourceBuildTfm$\es\Microsoft.TestPlatform.Utilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\es" />
|
||||
+ <file src="$SourceBuildTfm$\fr\Microsoft.TestPlatform.Utilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\fr" />
|
||||
+ <file src="$SourceBuildTfm$\it\Microsoft.TestPlatform.Utilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\it" />
|
||||
+ <file src="$SourceBuildTfm$\ja\Microsoft.TestPlatform.Utilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\ja" />
|
||||
+ <file src="$SourceBuildTfm$\ko\Microsoft.TestPlatform.Utilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\ko" />
|
||||
+ <file src="$SourceBuildTfm$\pl\Microsoft.TestPlatform.Utilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\pl" />
|
||||
+ <file src="$SourceBuildTfm$\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\pt-BR" />
|
||||
+ <file src="$SourceBuildTfm$\ru\Microsoft.TestPlatform.Utilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\ru" />
|
||||
+ <file src="$SourceBuildTfm$\tr\Microsoft.TestPlatform.Utilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\tr" />
|
||||
+ <file src="$SourceBuildTfm$\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\zh-Hans" />
|
||||
+ <file src="$SourceBuildTfm$\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll" target="contentFiles\any\$SourceBuildTfm$\zh-Hant" />
|
||||
+
|
||||
+ <file src="$SourceBuildTfm$\cs\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\$SourceBuildTfm$\cs" />
|
||||
+ <file src="$SourceBuildTfm$\de\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\$SourceBuildTfm$\de" />
|
||||
+ <file src="$SourceBuildTfm$\es\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\$SourceBuildTfm$\es" />
|
||||
+ <file src="$SourceBuildTfm$\fr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\$SourceBuildTfm$\fr" />
|
||||
+ <file src="$SourceBuildTfm$\it\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\$SourceBuildTfm$\it" />
|
||||
+ <file src="$SourceBuildTfm$\ja\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\$SourceBuildTfm$\ja" />
|
||||
+ <file src="$SourceBuildTfm$\ko\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\$SourceBuildTfm$\ko" />
|
||||
+ <file src="$SourceBuildTfm$\pl\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\$SourceBuildTfm$\pl" />
|
||||
+ <file src="$SourceBuildTfm$\pt-BR\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\$SourceBuildTfm$\pt-BR" />
|
||||
+ <file src="$SourceBuildTfm$\ru\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\$SourceBuildTfm$\ru" />
|
||||
+ <file src="$SourceBuildTfm$\tr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\$SourceBuildTfm$\tr" />
|
||||
+ <file src="$SourceBuildTfm$\zh-Hans\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\$SourceBuildTfm$\zh-Hans" />
|
||||
+ <file src="$SourceBuildTfm$\zh-Hant\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\$SourceBuildTfm$\zh-Hant" />
|
||||
+
|
||||
+ <file src="$SourceBuildTfm$\cs\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\$SourceBuildTfm$\cs" />
|
||||
+ <file src="$SourceBuildTfm$\de\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\$SourceBuildTfm$\de" />
|
||||
+ <file src="$SourceBuildTfm$\es\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\$SourceBuildTfm$\es" />
|
||||
+ <file src="$SourceBuildTfm$\fr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\$SourceBuildTfm$\fr" />
|
||||
+ <file src="$SourceBuildTfm$\it\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\$SourceBuildTfm$\it" />
|
||||
+ <file src="$SourceBuildTfm$\ja\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\$SourceBuildTfm$\ja" />
|
||||
+ <file src="$SourceBuildTfm$\ko\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\$SourceBuildTfm$\ko" />
|
||||
+ <file src="$SourceBuildTfm$\pl\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\$SourceBuildTfm$\pl" />
|
||||
+ <file src="$SourceBuildTfm$\pt-BR\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\$SourceBuildTfm$\pt-BR" />
|
||||
+ <file src="$SourceBuildTfm$\ru\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\$SourceBuildTfm$\ru" />
|
||||
+ <file src="$SourceBuildTfm$\tr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\$SourceBuildTfm$\tr" />
|
||||
+ <file src="$SourceBuildTfm$\zh-Hans\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\$SourceBuildTfm$\zh-Hans" />
|
||||
+ <file src="$SourceBuildTfm$\zh-Hant\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\$SourceBuildTfm$\zh-Hant" />
|
||||
+
|
||||
+ <file src="$SourceBuildTfm$\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="contentFiles\any\$SourceBuildTfm$\cs" />
|
||||
+ <file src="$SourceBuildTfm$\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="contentFiles\any\$SourceBuildTfm$\de" />
|
||||
+ <file src="$SourceBuildTfm$\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="contentFiles\any\$SourceBuildTfm$\es" />
|
||||
+ <file src="$SourceBuildTfm$\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="contentFiles\any\$SourceBuildTfm$\fr" />
|
||||
+ <file src="$SourceBuildTfm$\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="contentFiles\any\$SourceBuildTfm$\it" />
|
||||
+ <file src="$SourceBuildTfm$\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="contentFiles\any\$SourceBuildTfm$\ja" />
|
||||
+ <file src="$SourceBuildTfm$\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="contentFiles\any\$SourceBuildTfm$\ko" />
|
||||
+ <file src="$SourceBuildTfm$\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="contentFiles\any\$SourceBuildTfm$\pl" />
|
||||
+ <file src="$SourceBuildTfm$\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="contentFiles\any\$SourceBuildTfm$\pt-BR" />
|
||||
+ <file src="$SourceBuildTfm$\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="contentFiles\any\$SourceBuildTfm$\ru" />
|
||||
+ <file src="$SourceBuildTfm$\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="contentFiles\any\$SourceBuildTfm$\tr" />
|
||||
+ <file src="$SourceBuildTfm$\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="contentFiles\any\$SourceBuildTfm$\zh-Hans" />
|
||||
+ <file src="$SourceBuildTfm$\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="contentFiles\any\$SourceBuildTfm$\zh-Hant" />
|
||||
+
|
||||
+ <file src="$SourceBuildTfm$\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="contentFiles\any\$SourceBuildTfm$\cs" />
|
||||
+ <file src="$SourceBuildTfm$\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="contentFiles\any\$SourceBuildTfm$\de" />
|
||||
+ <file src="$SourceBuildTfm$\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="contentFiles\any\$SourceBuildTfm$\es" />
|
||||
+ <file src="$SourceBuildTfm$\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="contentFiles\any\$SourceBuildTfm$\fr" />
|
||||
+ <file src="$SourceBuildTfm$\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="contentFiles\any\$SourceBuildTfm$\it" />
|
||||
+ <file src="$SourceBuildTfm$\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="contentFiles\any\$SourceBuildTfm$\ja" />
|
||||
+ <file src="$SourceBuildTfm$\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="contentFiles\any\$SourceBuildTfm$\ko" />
|
||||
+ <file src="$SourceBuildTfm$\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="contentFiles\any\$SourceBuildTfm$\pl" />
|
||||
+ <file src="$SourceBuildTfm$\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="contentFiles\any\$SourceBuildTfm$\pt-BR" />
|
||||
+ <file src="$SourceBuildTfm$\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="contentFiles\any\$SourceBuildTfm$\ru" />
|
||||
+ <file src="$SourceBuildTfm$\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="contentFiles\any\$SourceBuildTfm$\tr" />
|
||||
+ <file src="$SourceBuildTfm$\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="contentFiles\any\$SourceBuildTfm$\zh-Hans" />
|
||||
+ <file src="$SourceBuildTfm$\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="contentFiles\any\$SourceBuildTfm$\zh-Hant" />
|
||||
+
|
||||
+ <file src="$SourceBuildTfm$\cs\vstest.console.resources.dll" target="contentFiles\any\$SourceBuildTfm$\cs" />
|
||||
+ <file src="$SourceBuildTfm$\de\vstest.console.resources.dll" target="contentFiles\any\$SourceBuildTfm$\de" />
|
||||
+ <file src="$SourceBuildTfm$\es\vstest.console.resources.dll" target="contentFiles\any\$SourceBuildTfm$\es" />
|
||||
+ <file src="$SourceBuildTfm$\fr\vstest.console.resources.dll" target="contentFiles\any\$SourceBuildTfm$\fr" />
|
||||
+ <file src="$SourceBuildTfm$\it\vstest.console.resources.dll" target="contentFiles\any\$SourceBuildTfm$\it" />
|
||||
+ <file src="$SourceBuildTfm$\ja\vstest.console.resources.dll" target="contentFiles\any\$SourceBuildTfm$\ja" />
|
||||
+ <file src="$SourceBuildTfm$\ko\vstest.console.resources.dll" target="contentFiles\any\$SourceBuildTfm$\ko" />
|
||||
+ <file src="$SourceBuildTfm$\pl\vstest.console.resources.dll" target="contentFiles\any\$SourceBuildTfm$\pl" />
|
||||
+ <file src="$SourceBuildTfm$\pt-BR\vstest.console.resources.dll" target="contentFiles\any\$SourceBuildTfm$\pt-BR" />
|
||||
+ <file src="$SourceBuildTfm$\ru\vstest.console.resources.dll" target="contentFiles\any\$SourceBuildTfm$\ru" />
|
||||
+ <file src="$SourceBuildTfm$\tr\vstest.console.resources.dll" target="contentFiles\any\$SourceBuildTfm$\tr" />
|
||||
+ <file src="$SourceBuildTfm$\zh-Hans\vstest.console.resources.dll" target="contentFiles\any\$SourceBuildTfm$\zh-Hans" />
|
||||
+ <file src="$SourceBuildTfm$\zh-Hant\vstest.console.resources.dll" target="contentFiles\any\$SourceBuildTfm$\zh-Hant" />
|
||||
+
|
||||
+ <file src="$SourceBuildTfm$\cs\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\cs" />
|
||||
+ <file src="$SourceBuildTfm$\de\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\de" />
|
||||
+ <file src="$SourceBuildTfm$\es\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\es" />
|
||||
+ <file src="$SourceBuildTfm$\fr\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\fr" />
|
||||
+ <file src="$SourceBuildTfm$\it\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\it" />
|
||||
+ <file src="$SourceBuildTfm$\ja\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\ja" />
|
||||
+ <file src="$SourceBuildTfm$\ko\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\ko" />
|
||||
+ <file src="$SourceBuildTfm$\pl\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\pl" />
|
||||
+ <file src="$SourceBuildTfm$\pt-BR\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\pt-BR" />
|
||||
+ <file src="$SourceBuildTfm$\ru\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\ru" />
|
||||
+ <file src="$SourceBuildTfm$\tr\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\tr" />
|
||||
+ <file src="$SourceBuildTfm$\zh-Hans\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\zh-Hans" />
|
||||
+ <file src="$SourceBuildTfm$\zh-Hant\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\zh-Hant" />
|
||||
+
|
||||
+ <file src="$SourceBuildTfm$\cs\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\cs" />
|
||||
+ <file src="$SourceBuildTfm$\de\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\de" />
|
||||
+ <file src="$SourceBuildTfm$\es\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\es" />
|
||||
+ <file src="$SourceBuildTfm$\fr\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\fr" />
|
||||
+ <file src="$SourceBuildTfm$\it\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\it" />
|
||||
+ <file src="$SourceBuildTfm$\ja\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\ja" />
|
||||
+ <file src="$SourceBuildTfm$\ko\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\ko" />
|
||||
+ <file src="$SourceBuildTfm$\pl\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\pl" />
|
||||
+ <file src="$SourceBuildTfm$\pt-BR\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\pt-BR" />
|
||||
+ <file src="$SourceBuildTfm$\ru\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\ru" />
|
||||
+ <file src="$SourceBuildTfm$\tr\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\tr" />
|
||||
+ <file src="$SourceBuildTfm$\zh-Hans\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\zh-Hans" />
|
||||
+ <file src="$SourceBuildTfm$\zh-Hant\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\zh-Hant" />
|
||||
+
|
||||
+ <file src="$SourceBuildTfm$\cs\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\cs" />
|
||||
+ <file src="$SourceBuildTfm$\de\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\de" />
|
||||
+ <file src="$SourceBuildTfm$\es\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\es" />
|
||||
+ <file src="$SourceBuildTfm$\fr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\fr" />
|
||||
+ <file src="$SourceBuildTfm$\it\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\it" />
|
||||
+ <file src="$SourceBuildTfm$\ja\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\ja" />
|
||||
+ <file src="$SourceBuildTfm$\ko\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\ko" />
|
||||
+ <file src="$SourceBuildTfm$\pl\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\pl" />
|
||||
+ <file src="$SourceBuildTfm$\pt-BR\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\pt-BR" />
|
||||
+ <file src="$SourceBuildTfm$\ru\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\ru" />
|
||||
+ <file src="$SourceBuildTfm$\tr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\tr" />
|
||||
+ <file src="$SourceBuildTfm$\zh-Hans\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\zh-Hans" />
|
||||
+ <file src="$SourceBuildTfm$\zh-Hant\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\zh-Hant" />
|
||||
+
|
||||
+ <file src="$SourceBuildTfm$\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\cs" />
|
||||
+ <file src="$SourceBuildTfm$\de\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\de" />
|
||||
+ <file src="$SourceBuildTfm$\es\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\es" />
|
||||
+ <file src="$SourceBuildTfm$\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\fr" />
|
||||
+ <file src="$SourceBuildTfm$\it\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\it" />
|
||||
+ <file src="$SourceBuildTfm$\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\ja" />
|
||||
+ <file src="$SourceBuildTfm$\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\ko" />
|
||||
+ <file src="$SourceBuildTfm$\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\pl" />
|
||||
+ <file src="$SourceBuildTfm$\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\pt-BR" />
|
||||
+ <file src="$SourceBuildTfm$\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\ru" />
|
||||
+ <file src="$SourceBuildTfm$\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\tr" />
|
||||
+ <file src="$SourceBuildTfm$\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\zh-Hans" />
|
||||
+ <file src="$SourceBuildTfm$\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\zh-Hant" />
|
||||
+
|
||||
+ <file src="$SourceBuildTfm$\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\cs" />
|
||||
+ <file src="$SourceBuildTfm$\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\de" />
|
||||
+ <file src="$SourceBuildTfm$\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\es" />
|
||||
+ <file src="$SourceBuildTfm$\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\fr" />
|
||||
+ <file src="$SourceBuildTfm$\it\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\it" />
|
||||
+ <file src="$SourceBuildTfm$\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\ja" />
|
||||
+ <file src="$SourceBuildTfm$\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\ko" />
|
||||
+ <file src="$SourceBuildTfm$\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\pl" />
|
||||
+ <file src="$SourceBuildTfm$\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\pt-BR" />
|
||||
+ <file src="$SourceBuildTfm$\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\ru" />
|
||||
+ <file src="$SourceBuildTfm$\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\tr" />
|
||||
+ <file src="$SourceBuildTfm$\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\zh-Hans" />
|
||||
+ <file src="$SourceBuildTfm$\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\$SourceBuildTfm$\Extensions\zh-Hant" />
|
||||
+
|
||||
</files>
|
||||
</package>
|
171
src/core-sdk-tasks/ReplaceDuplicateFilesWithHardLinks.cs
Normal file
171
src/core-sdk-tasks/ReplaceDuplicateFilesWithHardLinks.cs
Normal file
|
@ -0,0 +1,171 @@
|
|||
// Licensed to the .NET Foundation under one or more agreements.
|
||||
// The .NET Foundation licenses this file to you under the MIT license.
|
||||
// See the LICENSE file in the project root for more information.
|
||||
|
||||
#if !NETFRAMEWORK
|
||||
#nullable enable
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
using System.IO;
|
||||
using System.IO.Enumeration;
|
||||
using System.IO.MemoryMappedFiles;
|
||||
using System.Linq;
|
||||
using System.Runtime.InteropServices;
|
||||
#endif
|
||||
using Microsoft.Build.Framework;
|
||||
using Microsoft.Build.Utilities;
|
||||
|
||||
namespace Microsoft.DotNet.Build.Tasks
|
||||
{
|
||||
/// <summary>
|
||||
/// Replaces files that have the same content with hard links.
|
||||
/// </summary>
|
||||
public sealed class ReplaceDuplicateFilesWithHardLinks : Task
|
||||
{
|
||||
/// <summary>
|
||||
/// The path to the directory.
|
||||
/// </summary>
|
||||
[Required]
|
||||
public string Directory { get; set; } = "";
|
||||
|
||||
#if NETFRAMEWORK
|
||||
public override bool Execute()
|
||||
{
|
||||
Log.LogError($"{nameof(ReplaceDuplicateFilesWithHardLinks)} is not supported on .NET Framework.");
|
||||
return false;
|
||||
}
|
||||
#else
|
||||
public override bool Execute()
|
||||
{
|
||||
if (OperatingSystem.IsWindows())
|
||||
{
|
||||
Log.LogError($"{nameof(ReplaceDuplicateFilesWithHardLinks)} is not supported on Windows.");
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!System.IO.Directory.Exists(Directory))
|
||||
{
|
||||
Log.LogError($"'{Directory}' does not exist.");
|
||||
return false;
|
||||
}
|
||||
|
||||
// Find all non-empty, non-symbolic link files.
|
||||
IEnumerable<FileInfo> fse = new FileSystemEnumerable<FileInfo>(
|
||||
Directory,
|
||||
(ref FileSystemEntry entry) => (FileInfo)entry.ToFileSystemInfo(),
|
||||
new EnumerationOptions()
|
||||
{
|
||||
AttributesToSkip = FileAttributes.ReparsePoint,
|
||||
RecurseSubdirectories = true
|
||||
})
|
||||
{
|
||||
ShouldIncludePredicate = (ref FileSystemEntry entry) => !entry.IsDirectory
|
||||
&& entry.Length > 0
|
||||
};
|
||||
|
||||
// Group them by file size.
|
||||
IEnumerable<string?[]> filesGroupedBySize = fse.GroupBy(file => file.Length,
|
||||
file => file.FullName,
|
||||
(size, files) => files.ToArray());
|
||||
|
||||
// Replace files with same content with hard link.
|
||||
foreach (var files in filesGroupedBySize)
|
||||
{
|
||||
for (int i = 0; i < files.Length; i++)
|
||||
{
|
||||
string? path1 = files[i];
|
||||
if (path1 is null)
|
||||
{
|
||||
continue; // already linked.
|
||||
}
|
||||
for (int j = i + 1; j < files.Length; j++)
|
||||
{
|
||||
string? path2 = files[j];
|
||||
if (path2 is null)
|
||||
{
|
||||
continue; // already linked.
|
||||
}
|
||||
|
||||
// note: There's no public API we can use to see if paths are already linked.
|
||||
// We treat those paths as unlinked files, and link them again.
|
||||
if (FilesHaveSameContent(path1, path2))
|
||||
{
|
||||
ReplaceByLink(path1, path2);
|
||||
|
||||
files[j] = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private unsafe bool FilesHaveSameContent(string path1, string path2)
|
||||
{
|
||||
using var mappedFile1 = MemoryMappedFile.CreateFromFile(path1, FileMode.Open);
|
||||
using var accessor1 = mappedFile1.CreateViewAccessor();
|
||||
byte* ptr1 = null;
|
||||
|
||||
using var mappedFile2 = MemoryMappedFile.CreateFromFile(path2, FileMode.Open);
|
||||
using var accessor2 = mappedFile2.CreateViewAccessor();
|
||||
byte* ptr2 = null;
|
||||
|
||||
try
|
||||
{
|
||||
accessor1.SafeMemoryMappedViewHandle.AcquirePointer(ref ptr1);
|
||||
Span<byte> span1 = new Span<byte>(ptr1, checked((int)accessor1.SafeMemoryMappedViewHandle.ByteLength));
|
||||
|
||||
accessor2.SafeMemoryMappedViewHandle.AcquirePointer(ref ptr2);
|
||||
Span<byte> span2 = new Span<byte>(ptr2, checked((int)accessor2.SafeMemoryMappedViewHandle.ByteLength));
|
||||
|
||||
return span1.SequenceEqual(span2);
|
||||
}
|
||||
finally
|
||||
{
|
||||
if (ptr1 != null)
|
||||
{
|
||||
accessor1.SafeMemoryMappedViewHandle.ReleasePointer();
|
||||
ptr1 = null;
|
||||
}
|
||||
if (ptr2 != null)
|
||||
{
|
||||
accessor2.SafeMemoryMappedViewHandle.ReleasePointer();
|
||||
ptr2 = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void ReplaceByLink(string path1, string path2)
|
||||
{
|
||||
// To link, the target mustn't exist. Make a backup, so we can restore it when linking fails.
|
||||
string path2Backup = $"{path2}.pre_link_backup";
|
||||
File.Move(path2, path2Backup);
|
||||
|
||||
int rv = SystemNative_Link(path1, path2);
|
||||
if (rv != 0)
|
||||
{
|
||||
var ex = new Win32Exception(); // Captures the LastError.
|
||||
|
||||
Log.LogError($"Unable to link '{path2}' to '{path1}.': {ex}");
|
||||
|
||||
File.Move(path2Backup, path2);
|
||||
|
||||
throw ex;
|
||||
}
|
||||
else
|
||||
{
|
||||
File.Delete(path2Backup);
|
||||
|
||||
Log.LogMessage(MessageImportance.Normal, $"Linked '{path1}' and '{path2}'.");
|
||||
}
|
||||
}
|
||||
|
||||
// This native method is used by the runtime to create hard links. It is not exposed through a public .NET API.
|
||||
[DllImport("libSystem.Native", SetLastError = true)]
|
||||
static extern int SystemNative_Link(string source, string link);
|
||||
#endif
|
||||
}
|
||||
}
|
|
@ -6,6 +6,7 @@
|
|||
<RootNamespace>Microsoft.DotNet.Cli.Build</RootNamespace>
|
||||
<DefineConstants Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefineConstants);SOURCE_BUILD</DefineConstants>
|
||||
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
@ -40,5 +40,6 @@
|
|||
<UsingTask TaskName="CollatePackageDownloads" AssemblyFile="$(CoreSdkTaskDll)"/>
|
||||
<UsingTask TaskName="GenerateSdkRuntimeIdentifierChain" AssemblyFile="$(CoreSdkTaskDll)"/>
|
||||
<UsingTask TaskName="GetDependencyInfo" AssemblyFile="$(CoreSdkTaskDll)"/>
|
||||
<UsingTask TaskName="ReplaceDuplicateFilesWithHardLinks" AssemblyFile="$(CoreSdkTaskDll)"/>
|
||||
|
||||
</Project>
|
||||
|
|
|
@ -567,14 +567,8 @@
|
|||
<!-- Replace duplicate files with hard links so that when the same files from a runtime pack
|
||||
and the corresponding shared frameworks are included in a distro package their data is shared instead of duplicated. -->
|
||||
<Target Name="ReplaceDuplicateFilesWithHardLinks" DependsOnTargets="LayoutBundledComponents"
|
||||
Condition="'$(BundleRuntimePacks)' == 'true'">
|
||||
<Exec Command="rdfind --help" StandardOutputImportance="low" StandardErrorImportance="low" IgnoreExitCode="True">
|
||||
<Output TaskParameter="ExitCode" PropertyName="RdFindInfoExitCode" />
|
||||
</Exec>
|
||||
|
||||
<Message Text="rdfind is not available to make hard links." Condition="'$(RdFindInfoExitCode)' != '0'" Importance="high" />
|
||||
|
||||
<Exec Command="rdfind -makehardlinks true -makeresultsfile false '$(RedistLayoutPath)'" Condition="'$(RdFindInfoExitCode)' == '0'" />
|
||||
Condition="'$(BundleRuntimePacks)' == 'true' and !$([MSBuild]::IsOSPlatform('WINDOWS'))">
|
||||
<ReplaceDuplicateFilesWithHardLinks Directory="$(RedistLayoutPath)" />
|
||||
</Target>
|
||||
|
||||
<Target Name="GenerateLayout"
|
||||
|
|
Loading…
Reference in a new issue