[main] Update dependencies from dotnet/sdk (#16864)

[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 8.0.0-preview.7.23329.3 to 8.0.0-preview.7.23355.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-preview.7.23329.3 to 8.0.0-preview.7.23355.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-preview.7.23329.3 to 8.0.0-preview.7.23355.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-preview.7.23329.8 to 8.0.0-preview.7.23355.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 8.0.0-preview.7.23329.8 to 8.0.0-preview.7.23355.7 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-preview.7.23329.8 to 8.0.0-preview.7.23355.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-preview.7.23329.8 to 8.0.0-preview.7.23355.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-preview.7.23329.8 to 8.0.0-preview.7.23355.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 8.0.0-preview.7.23329.8 to 8.0.0-preview.7.23355.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 8.0.0-preview.7.23329.9 to 8.0.0-preview.7.23355.19 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-preview.7.23329.9 to 8.0.0-preview.7.23355.19 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-preview.7.23329.9 to 8.0.0-preview.7.23355.19 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-preview.7.23329.9 to 8.0.0-preview.7.23355.19 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 8.0.0-preview.7.23329.9 to 8.0.0-preview.7.23355.19 (parent: Microsoft.NET.Sdk)
  - dotnet-user-jwts: from 8.0.0-preview.7.23329.9 to 8.0.0-preview.7.23355.19 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 8.0.0-preview.7.23329.9 to 8.0.0-preview.7.23355.19 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-preview.7.23329.3 to 8.0.0-preview.7.23355.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 8.0.0-preview.7.23328.3 to 8.0.0-preview.7.23354.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-preview.7.23329.3 to 8.0.0-preview.7.23355.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 8.0.0-preview.7.23329.1 to 8.0.0-preview.7.23354.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.FSharp.Compiler: from 12.8.0-beta.23327.15 to 12.8.0-beta.23354.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.100-beta.23327.15 to 8.0.100-beta.23354.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.ILLink.Tasks: from 8.0.0-preview.7.23329.8 to 8.0.0-preview.7.23355.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.7.0-3.23329.1 to 4.8.0-1.23355.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.8.0-preview-23328-02 to 17.8.0-preview-23353-01 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-preview.7.23329.8 to 8.0.0-preview.7.23355.7 (parent: Microsoft.NET.Sdk)
  - System.CommandLine: from 2.0.0-beta4.22564.1 to 2.0.0-beta4.23307.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.command-line-api: from 0.1.356401 to 0.1.430701 (parent: Microsoft.NET.Sdk)

 - Merge branch 'main' of https://github.com/dotnet/installer into darc-main-c9de4a14-3172-41f6-9336-1865d7edc45d

 - Remove backported msbuild source-build patch

 - Remove backported command-line-api source-build patches

 - Merge branch 'main' into darc-main-c9de4a14-3172-41f6-9336-1865d7edc45d
This commit is contained in:
dotnet-maestro[bot] 2023-07-06 09:53:22 +00:00 committed by GitHub
parent d778746311
commit 5e4a6560aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 86 additions and 239 deletions

View file

@ -1,46 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.0-preview.7.23329.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.0-preview.7.23355.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>458f9396f7e6305feab20f5d04b068267f982841</Sha>
<Sha>a29858d328ce94c56778494d331b8f27a7290cef</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.0-preview.7.23329.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.0-preview.7.23355.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>458f9396f7e6305feab20f5d04b068267f982841</Sha>
<Sha>a29858d328ce94c56778494d331b8f27a7290cef</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.0-preview.7.23329.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.0-preview.7.23355.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>458f9396f7e6305feab20f5d04b068267f982841</Sha>
<Sha>a29858d328ce94c56778494d331b8f27a7290cef</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-preview.7.23329.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-preview.7.23355.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>458f9396f7e6305feab20f5d04b068267f982841</Sha>
<Sha>a29858d328ce94c56778494d331b8f27a7290cef</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.7.23329.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.7.23355.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>3e87528325b09f884b0a09a8c4ef79393abfd0db</Sha>
<Sha>f1d2be8f443a599a142506d622a35e1c2e683961</Sha>
<SourceBuild RepoName="runtime" ManagedOnly="false" />
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.7.23329.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.7.23355.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>3e87528325b09f884b0a09a8c4ef79393abfd0db</Sha>
<Sha>f1d2be8f443a599a142506d622a35e1c2e683961</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-preview.7.23329.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-preview.7.23355.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>3e87528325b09f884b0a09a8c4ef79393abfd0db</Sha>
<Sha>f1d2be8f443a599a142506d622a35e1c2e683961</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-preview.7.23329.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-preview.7.23355.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>3e87528325b09f884b0a09a8c4ef79393abfd0db</Sha>
<Sha>f1d2be8f443a599a142506d622a35e1c2e683961</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-preview.7.23329.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-preview.7.23355.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>3e87528325b09f884b0a09a8c4ef79393abfd0db</Sha>
<Sha>f1d2be8f443a599a142506d622a35e1c2e683961</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-preview.7.23329.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-preview.7.23355.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>3e87528325b09f884b0a09a8c4ef79393abfd0db</Sha>
<Sha>f1d2be8f443a599a142506d622a35e1c2e683961</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,38 +48,38 @@
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-preview.7.23329.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-preview.7.23355.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>3e87528325b09f884b0a09a8c4ef79393abfd0db</Sha>
<Sha>f1d2be8f443a599a142506d622a35e1c2e683961</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-preview.7.23329.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-preview.7.23355.19" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>d07f4d43aa93d91dd2db65daaffbf37ce0012841</Sha>
<Sha>82e1738c4525bb74d11dbbe856a771b52b951ef6</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.0-preview.7.23329.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.0-preview.7.23355.19" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>d07f4d43aa93d91dd2db65daaffbf37ce0012841</Sha>
<Sha>82e1738c4525bb74d11dbbe856a771b52b951ef6</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.0-preview.7.23329.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.0-preview.7.23355.19" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>d07f4d43aa93d91dd2db65daaffbf37ce0012841</Sha>
<Sha>82e1738c4525bb74d11dbbe856a771b52b951ef6</Sha>
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.7.23329.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.7.23355.19" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>d07f4d43aa93d91dd2db65daaffbf37ce0012841</Sha>
<Sha>82e1738c4525bb74d11dbbe856a771b52b951ef6</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="8.0.0-preview.7.23329.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-dev-certs" Version="8.0.0-preview.7.23355.19" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>d07f4d43aa93d91dd2db65daaffbf37ce0012841</Sha>
<Sha>82e1738c4525bb74d11dbbe856a771b52b951ef6</Sha>
</Dependency>
<Dependency Name="dotnet-user-jwts" Version="8.0.0-preview.7.23329.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-jwts" Version="8.0.0-preview.7.23355.19" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>d07f4d43aa93d91dd2db65daaffbf37ce0012841</Sha>
<Sha>82e1738c4525bb74d11dbbe856a771b52b951ef6</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="8.0.0-preview.7.23329.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-secrets" Version="8.0.0-preview.7.23355.19" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>d07f4d43aa93d91dd2db65daaffbf37ce0012841</Sha>
<Sha>82e1738c4525bb74d11dbbe856a771b52b951ef6</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>
@ -102,39 +102,39 @@
<Uri>https://github.com/dotnet/test-templates</Uri>
<Sha>86fd4cd1c57057f920678e29d6ecbba491abd142</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.100-preview.7.23330.1">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.100-preview.7.23356.4">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>c24068d23c636b121e1680f88bd773fc72109891</Sha>
<Sha>51762f9cd60ecc346dc6a13dcbb5f88fec1750d8</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.100-preview.7.23330.1">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.100-preview.7.23356.4">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>c24068d23c636b121e1680f88bd773fc72109891</Sha>
<Sha>51762f9cd60ecc346dc6a13dcbb5f88fec1750d8</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.100-preview.7.23330.1">
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.100-preview.7.23356.4">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>c24068d23c636b121e1680f88bd773fc72109891</Sha>
<Sha>51762f9cd60ecc346dc6a13dcbb5f88fec1750d8</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.100-preview.7.23330.1">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.100-preview.7.23356.4">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>c24068d23c636b121e1680f88bd773fc72109891</Sha>
<Sha>51762f9cd60ecc346dc6a13dcbb5f88fec1750d8</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.7.23328.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.0-preview.7.23354.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>23e83c29f422e4ab823ac535f4a4f63745de3d05</Sha>
<Sha>918e34631094c184e6b29d659842b540f092ed98</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="8.0.0-preview.7.23329.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="8.0.0-preview.7.23354.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>d8e3ae2342d9f51e4d904b78ca3ef7fe6d494dac</Sha>
<Sha>fa5c1d4a57fbc973453a4e24932277615199788e</Sha>
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.0-beta.23327.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.0-beta.23354.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>9bf50f790ca3135b4428d464cc735ff4e8ff1bd5</Sha>
<Sha>4885abbdf7595c1b8475ea868964d4ce43284b9e</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="8.0.100-beta.23327.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="8.0.100-beta.23354.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>9bf50f790ca3135b4428d464cc735ff4e8ff1bd5</Sha>
<Sha>4885abbdf7595c1b8475ea868964d4ce43284b9e</Sha>
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.7.0-preview-23317-01" CoherentParentDependency="Microsoft.NET.Sdk">
@ -142,18 +142,18 @@
<Sha>919ec8358820228cc5fa77ef000051c1d6875399</Sha>
<SourceBuild RepoName="vstest" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.7.23329.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.7.23355.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>3e87528325b09f884b0a09a8c4ef79393abfd0db</Sha>
<Sha>f1d2be8f443a599a142506d622a35e1c2e683961</Sha>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.7.0-3.23329.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.8.0-1.23355.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>b2bd4936daed91d4efd10c71177f7766823e615c</Sha>
<Sha>c022624fcdbfe5a5130e8dc5eec24a2a22f395b1</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.8.0-preview-23328-02" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.Build" Version="17.8.0-preview-23353-01" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>0cad196bd27a639e701af16d435e0be64bb852f6</Sha>
<Sha>946c584115367635c37ac7ecaadb2f36542f88b0</Sha>
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.7.0-rc.111" CoherentParentDependency="Microsoft.NET.Sdk">
@ -191,13 +191,13 @@
<Sha>2c8079e2e8e78c0cd11ac75a32014756136ecdb9</Sha>
<SourceBuild RepoName="symreader" ManagedOnly="true" />
</Dependency>
<Dependency Name="System.CommandLine" Version="2.0.0-beta4.22564.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="System.CommandLine" Version="2.0.0-beta4.23307.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/command-line-api</Uri>
<Sha>8374d5fca634a93458c84414b1604c12f765d1ab</Sha>
<Sha>02fe27cd6a9b001c8feb7938e6ef4b3799745759</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.command-line-api" Version="0.1.356401" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.SourceBuild.Intermediate.command-line-api" Version="0.1.430701" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/command-line-api</Uri>
<Sha>8374d5fca634a93458c84414b1604c12f765d1ab</Sha>
<Sha>02fe27cd6a9b001c8feb7938e6ef4b3799745759</Sha>
<SourceBuild RepoName="command-line-api" ManagedOnly="true" />
</Dependency>
</ProductDependencies>

View file

@ -44,11 +44,11 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>8.0.0-preview.7.23328.3</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>8.0.0-preview.7.23354.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/wpf -->
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>8.0.0-preview.7.23329.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>8.0.0-preview.7.23354.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/test-templates -->
@ -68,50 +68,50 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>8.0.0-preview.7.23329.9</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>8.0.0-preview.7.23329.9</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>8.0.0-preview.7.23329.9</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.7.23329.9</VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>
<dotnetdevcertsPackageVersion>8.0.0-preview.7.23329.9</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>8.0.0-preview.7.23329.9</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>8.0.0-preview.7.23329.9</dotnetusersecretsPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>8.0.0-preview.7.23355.19</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>8.0.0-preview.7.23355.19</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>8.0.0-preview.7.23355.19</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.7.23355.19</VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>
<dotnetdevcertsPackageVersion>8.0.0-preview.7.23355.19</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>8.0.0-preview.7.23355.19</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>8.0.0-preview.7.23355.19</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.100-preview.7.23330.1</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>8.0.100-preview.7.23330.1</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.100-preview.7.23330.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.100-preview.7.23356.4</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>8.0.100-preview.7.23356.4</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.100-preview.7.23356.4</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/roslyn -->
<MicrosoftNetCompilersToolsetPackageVersion>4.7.0-3.23329.1</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>4.8.0-1.23355.3</MicrosoftNetCompilersToolsetPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/corefx -->
<MicrosoftNETCorePlatformsPackageVersion>8.0.0-preview.7.23329.8</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>8.0.0-preview.7.23355.7</MicrosoftNETCorePlatformsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/core-setup -->
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.7.23329.8</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<VSRedistCommonNetCoreTargetingPackx6480PackageVersion>8.0.0-preview.7.23329.8</VSRedistCommonNetCoreTargetingPackx6480PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-preview.7.23329.8</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>8.0.0-preview.7.23329.8</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.7.23329.8</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-preview.7.23329.8</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.7.23355.7</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<VSRedistCommonNetCoreTargetingPackx6480PackageVersion>8.0.0-preview.7.23355.7</VSRedistCommonNetCoreTargetingPackx6480PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-preview.7.23355.7</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>8.0.0-preview.7.23355.7</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.7.23355.7</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-preview.7.23355.7</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
<VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>8.0.0-preview.7.23329.3</VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>
<VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>8.0.0-preview.7.23329.3</VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>8.0.0-preview.7.23329.3</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>8.0.0-preview.7.23329.3</MicrosoftWindowsDesktopAppRefPackageVersion>
<VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>8.0.0-preview.7.23355.1</VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>
<VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>8.0.0-preview.7.23355.1</VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>8.0.0-preview.7.23355.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>8.0.0-preview.7.23355.1</MicrosoftWindowsDesktopAppRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->

View file

@ -1,23 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Wed, 18 Jan 2023 22:23:40 +0000
Subject: [PATCH] Build System.CommandLine.NamingConventionBinder during
source-build
Backport: https://github.com/dotnet/command-line-api/pull/2026
---
sourcebuild.slnf | 1 +
1 file changed, 1 insertion(+)
diff --git a/sourcebuild.slnf b/sourcebuild.slnf
index dd18805b..dc155a4d 100644
--- a/sourcebuild.slnf
+++ b/sourcebuild.slnf
@@ -4,6 +4,7 @@
"projects": [
"src\\System.CommandLine\\System.CommandLine.csproj",
"src\\System.CommandLine.DragonFruit\\System.CommandLine.DragonFruit.csproj",
+ "src\\System.CommandLine.NamingConventionBinder\\System.CommandLine.NamingConventionBinder.csproj",
"src\\System.CommandLine.Rendering\\System.CommandLine.Rendering.csproj"
]
}

View file

@ -1,68 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Thu, 6 Apr 2023 09:16:13 -0500
Subject: [PATCH] Use net8.0 TFM when building with source-build
Backport: https://github.com/dotnet/command-line-api/pull/2150
---
Directory.Build.props | 6 +++---
.../System.CommandLine.Benchmarks.csproj | 4 ++--
src/System.CommandLine/System.CommandLine.csproj | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Directory.Build.props b/Directory.Build.props
index 4c1f04a2..0444426a 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -11,11 +11,11 @@
<LangVersion>10.0</LangVersion>
</PropertyGroup>
- <PropertyGroup Condition="'$(DisableArcade)' == '1'">
- <TargetFrameworkForNETSDK>net7.0</TargetFrameworkForNETSDK>
+ <PropertyGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
+ <TargetFrameworkForNETSDK>$(NetCurrent)</TargetFrameworkForNETSDK>
</PropertyGroup>
- <PropertyGroup Condition="'$(DisableArcade)' != '1'">
+ <PropertyGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
<TargetFrameworkForNETSDK>net7.0</TargetFrameworkForNETSDK>
</PropertyGroup>
diff --git a/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj b/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj
index b63e109c..3ef1afa1 100644
--- a/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj
+++ b/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj
@@ -9,8 +9,8 @@
<UseSharedCompilation>false</UseSharedCompilation>
<!-- Supported target frameworks -->
- <TargetFrameworks Condition="'$(TargetFrameworks)' == '' AND '$(OS)' == 'Windows_NT'">net7.0</TargetFrameworks>
- <TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net7.0</TargetFrameworks>
+ <TargetFrameworks Condition="'$(TargetFrameworks)' == '' AND '$(OS)' == 'Windows_NT'">$(TargetFrameworkForNETSDK)</TargetFrameworks>
+ <TargetFrameworks Condition="'$(TargetFrameworks)' == ''">$(TargetFrameworkForNETSDK)</TargetFrameworks>
<!-- This repo does not produce any libraries, therefore generating docs is disabled -->
<GenerateDocumentationFile>False</GenerateDocumentationFile>
diff --git a/src/System.CommandLine/System.CommandLine.csproj b/src/System.CommandLine/System.CommandLine.csproj
index 05d28476..37115d70 100644
--- a/src/System.CommandLine/System.CommandLine.csproj
+++ b/src/System.CommandLine/System.CommandLine.csproj
@@ -3,7 +3,7 @@
<PropertyGroup>
<IsPackable>true</IsPackable>
<PackageId>System.CommandLine</PackageId>
- <TargetFrameworks>net7.0;netstandard2.0</TargetFrameworks>
+ <TargetFrameworks>$(TargetFrameworkForNETSDK);netstandard2.0</TargetFrameworks>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<LangVersion>10</LangVersion>
@@ -18,7 +18,7 @@
<EnableSingleFileAnalyzer>true</EnableSingleFileAnalyzer>
</PropertyGroup>
- <PropertyGroup Condition="'$(TargetFramework)' == 'net7.0'">
+ <PropertyGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkForNETSDK)'">
<IsTrimmable>true</IsTrimmable>
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
</PropertyGroup>

View file

@ -1,23 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Mon, 17 Apr 2023 12:26:51 -0500
Subject: [PATCH] Explicitly cast default for Task.Delay method
Backport: Not needed since this code is removed in latest version of command-line-api
---
src/System.CommandLine/Builder/CommandLineBuilderExtensions.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/System.CommandLine/Builder/CommandLineBuilderExtensions.cs b/src/System.CommandLine/Builder/CommandLineBuilderExtensions.cs
index 0fb30887..cd59971d 100644
--- a/src/System.CommandLine/Builder/CommandLineBuilderExtensions.cs
+++ b/src/System.CommandLine/Builder/CommandLineBuilderExtensions.cs
@@ -107,7 +107,7 @@ namespace System.CommandLine
if (timeout! > TimeSpan.Zero)
{
Task
- .Delay(timeout.Value, default)
+ .Delay(timeout.Value, (CancellationToken)default)
.ContinueWith(t =>
{
// Prevent our ProcessExit from intervene and block the exit

View file

@ -1,39 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Thu, 22 Jun 2023 09:28:28 -0500
Subject: [PATCH] Add patch for MSBuild to fix Mono scenario
Backport: https://github.com/dotnet/msbuild/pull/8940
---
eng/Version.Details.xml | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 724c5623a..f4d1fb921 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -6,12 +6,24 @@
<Sha>525b6c35cc5c5c9b80b47044be2e4e77858d505a</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
+ <Dependency Name="System.Collections.Immutable" Version="7.0.0">
+ <Uri>https://github.com/dotnet/runtime</Uri>
+ <Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
+ </Dependency>
<!-- Necessary for source-build. This allows the packages to be retrieved from previously-source-built artifacts
and flow in as dependencies of the packages produced by msbuild. -->
<Dependency Name="System.Configuration.ConfigurationManager" Version="7.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
</Dependency>
+ <Dependency Name="System.Reflection.Metadata" Version="7.0.0">
+ <Uri>https://github.com/dotnet/runtime</Uri>
+ <Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
+ </Dependency>
+ <Dependency Name="System.Reflection.MetadataLoadContext" Version="7.0.0">
+ <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>