[main] Update dependencies from dotnet/sdk (#12716)
[main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 7.0.0-alpha.1.21566.3 to 7.0.0-alpha.1.21580.7 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21566.3 to 7.0.0-alpha.1.21580.7 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21566.3 to 7.0.0-alpha.1.21580.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 7.0.0-alpha.1.21567.1 to 7.0.0-alpha.1.21580.11 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21567.1 to 7.0.0-alpha.1.21580.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21567.1 to 7.0.0-alpha.1.21580.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-alpha.1.21567.1 to 7.0.0-alpha.1.21580.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-alpha.1.21567.1 to 7.0.0-alpha.1.21580.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 7.0.0-alpha.1.21567.1 to 7.0.0-alpha.1.21580.11 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21568.1 to 7.0.0-alpha.1.21601.8 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21568.1 to 7.0.0-alpha.1.21601.8 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21568.1 to 7.0.0-alpha.1.21601.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21568.1 to 7.0.0-alpha.1.21601.8 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-alpha.1.21568.1 to 7.0.0-alpha.1.21601.8 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-alpha.1.21568.1 to 7.0.0-alpha.1.21601.8 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 7.0.100-alpha.1.21568.4 to 7.0.100-alpha.1.21601.1 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 7.0.100-alpha.1.21568.4 to 7.0.100-alpha.1.21601.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21566.3 to 7.0.0-alpha.1.21580.7 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.0-alpha.1.21566.2 to 7.0.0-alpha.1.21580.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21566.3 to 7.0.0-alpha.1.21580.7 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-alpha.1.21566.6 to 7.0.0-alpha.1.21580.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211118-03 to 17.1.0-preview-20211202-01 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 7.0.100-1.21567.1 to 7.0.100-1.21601.2 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.0.1-1.21568.1 to 4.0.1-1.21573.5 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.1.0-preview-21567-01 to 17.1.0-preview-21579-12 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21567.1 to 7.0.0-alpha.1.21580.11 (parent: Microsoft.NET.Sdk) - Try using new dotnetbuilds asset root URI - !fixup! typo - Resolve msbuild source-build patch conflict - Merge branch 'darc-main-5f79afa4-8b96-43d6-a79b-6954e7183172' of https://github.com/dotnet/installer into darc-main-5f79afa4-8b96-43d6-a79b-6954e7183172 - Merge branch 'main' of https://github.com/dotnet/installer into darc-main-5f79afa4-8b96-43d6-a79b-6954e7183172 - Resolve source-build conflicts w/format patches
This commit is contained in:
dotnet-maestro[bot]
GitHub
parent
6d169a3c83
commit
819d5f47a4
5 changed files with 86 additions and 259 deletions
|
|
@ -1,46 +1,46 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Dependencies>
|
||||
<ProductDependencies>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.0-alpha.1.21566.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.0-alpha.1.21580.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>7214df3a9275a3a5e30c3045a69d5c26e709a55d</Sha>
|
||||
<Sha>411473ddf9b7d031eae26395a816b0059faa2c50</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.0-alpha.1.21566.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.0-alpha.1.21580.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>7214df3a9275a3a5e30c3045a69d5c26e709a55d</Sha>
|
||||
<Sha>411473ddf9b7d031eae26395a816b0059faa2c50</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.0-alpha.1.21566.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.0-alpha.1.21580.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>7214df3a9275a3a5e30c3045a69d5c26e709a55d</Sha>
|
||||
<Sha>411473ddf9b7d031eae26395a816b0059faa2c50</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.0-alpha.1.21566.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.0-alpha.1.21580.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>7214df3a9275a3a5e30c3045a69d5c26e709a55d</Sha>
|
||||
<Sha>411473ddf9b7d031eae26395a816b0059faa2c50</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-alpha.1.21567.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-alpha.1.21580.11" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>10e107debae28de4bd1e710cfe448be3c293e841</Sha>
|
||||
<Sha>09cd9c2cfd21f7e830269ee7cd64ea11cbe47a1d</Sha>
|
||||
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-alpha.1.21567.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-alpha.1.21580.11" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>10e107debae28de4bd1e710cfe448be3c293e841</Sha>
|
||||
<Sha>09cd9c2cfd21f7e830269ee7cd64ea11cbe47a1d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.0-alpha.1.21567.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.0-alpha.1.21580.11" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>10e107debae28de4bd1e710cfe448be3c293e841</Sha>
|
||||
<Sha>09cd9c2cfd21f7e830269ee7cd64ea11cbe47a1d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-alpha.1.21567.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-alpha.1.21580.11" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>10e107debae28de4bd1e710cfe448be3c293e841</Sha>
|
||||
<Sha>09cd9c2cfd21f7e830269ee7cd64ea11cbe47a1d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.0-alpha.1.21567.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.0-alpha.1.21580.11" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>10e107debae28de4bd1e710cfe448be3c293e841</Sha>
|
||||
<Sha>09cd9c2cfd21f7e830269ee7cd64ea11cbe47a1d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.0-alpha.1.21567.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.0-alpha.1.21580.11" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>10e107debae28de4bd1e710cfe448be3c293e841</Sha>
|
||||
<Sha>09cd9c2cfd21f7e830269ee7cd64ea11cbe47a1d</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,34 +48,34 @@
|
|||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-alpha.1.21567.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-alpha.1.21580.11" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>10e107debae28de4bd1e710cfe448be3c293e841</Sha>
|
||||
<Sha>09cd9c2cfd21f7e830269ee7cd64ea11cbe47a1d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.0-alpha.1.21568.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.0-alpha.1.21601.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>ad46e0355613b8cfca9d401a44d9eba7004a175b</Sha>
|
||||
<Sha>a32dde1438404a98ec437e249f43666cd4001170</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.0-alpha.1.21568.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.0-alpha.1.21601.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>ad46e0355613b8cfca9d401a44d9eba7004a175b</Sha>
|
||||
<Sha>a32dde1438404a98ec437e249f43666cd4001170</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.0-alpha.1.21568.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.0-alpha.1.21601.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>ad46e0355613b8cfca9d401a44d9eba7004a175b</Sha>
|
||||
<Sha>a32dde1438404a98ec437e249f43666cd4001170</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.0-alpha.1.21568.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.0-alpha.1.21601.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>ad46e0355613b8cfca9d401a44d9eba7004a175b</Sha>
|
||||
<Sha>a32dde1438404a98ec437e249f43666cd4001170</Sha>
|
||||
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-dev-certs" Version="7.0.0-alpha.1.21568.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-dev-certs" Version="7.0.0-alpha.1.21601.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>ad46e0355613b8cfca9d401a44d9eba7004a175b</Sha>
|
||||
<Sha>a32dde1438404a98ec437e249f43666cd4001170</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-user-secrets" Version="7.0.0-alpha.1.21568.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-user-secrets" Version="7.0.0-alpha.1.21601.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>ad46e0355613b8cfca9d401a44d9eba7004a175b</Sha>
|
||||
<Sha>a32dde1438404a98ec437e249f43666cd4001170</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.21606.1">
|
||||
<Uri>https://github.com/dotnet/test-templates</Uri>
|
||||
|
|
@ -90,32 +90,32 @@
|
|||
<Sha>a27234829e6f68613c9f558bc548539a9cc397bb</Sha>
|
||||
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.100-alpha.1.21568.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.100-alpha.1.21601.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/templating</Uri>
|
||||
<Sha>41c976b056ee37235f37df41d971e025d6519ec9</Sha>
|
||||
<Sha>9b8b780bf233907ae5d38aaf8c8b769782322735</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.100-alpha.1.21568.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.100-alpha.1.21601.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/templating</Uri>
|
||||
<Sha>41c976b056ee37235f37df41d971e025d6519ec9</Sha>
|
||||
<Sha>9b8b780bf233907ae5d38aaf8c8b769782322735</Sha>
|
||||
<SourceBuild RepoName="templating" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.100-alpha.1.21568.15">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.100-alpha.1.21602.1">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>cf5593dba1b37e3eb41f44a7cc66ecd841c7f16c</Sha>
|
||||
<Sha>6b3bcfffc3a6280eec5cc2f84b59891515b3d20c</Sha>
|
||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.100-alpha.1.21568.15">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.100-alpha.1.21602.1">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>cf5593dba1b37e3eb41f44a7cc66ecd841c7f16c</Sha>
|
||||
<Sha>6b3bcfffc3a6280eec5cc2f84b59891515b3d20c</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="7.0.0-alpha.1.21566.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.0-alpha.1.21580.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/winforms</Uri>
|
||||
<Sha>5a5a7c7874d9a707328d4e69a6fffca1998bc1e3</Sha>
|
||||
<Sha>36b637614457bf865679cf2f8730fe0676cc91c2</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.0-alpha.1.21566.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.0-alpha.1.21580.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/wpf</Uri>
|
||||
<Sha>19b4ef3e3621c1d8252e000d920920fdf64cf858</Sha>
|
||||
<Sha>095e51221dd8c9d603cff3eebd23252179350ae7</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.0-beta.21522.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
|
|
@ -126,25 +126,25 @@
|
|||
<Sha>6d626ff0752a77d339f609b4d361787dc9ca93a5</Sha>
|
||||
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.1.0-preview-20211118-03" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.1.0-preview-20211202-01" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/microsoft/vstest</Uri>
|
||||
<Sha>efb84220a100157d0a9b97ded93af240d1da8936</Sha>
|
||||
<Sha>3599fd55bbabfe757db4121b3cd04b8512bd86b7</Sha>
|
||||
<SourceBuildTarball RepoName="vstest" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.21567.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.21601.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/linker</Uri>
|
||||
<Sha>57574f1178ea4489ca207ae8d87197a20b8ae78e</Sha>
|
||||
<Sha>2914e5a11fa685c2ce90e1ba972c9ac5deea079c</Sha>
|
||||
<SourceBuild RepoName="linker" ManagedOnly="true" />
|
||||
<RepoName>linker</RepoName>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.1-1.21568.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.1-1.21573.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/roslyn</Uri>
|
||||
<Sha>6ab6601178d9fba8c680b56934cd1742e0816bff</Sha>
|
||||
<Sha>1fa6e45dd631b37e7b28a78907240aed8a300d50</Sha>
|
||||
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Build" Version="17.1.0-preview-21567-01" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.Build" Version="17.1.0-preview-21579-12" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/msbuild</Uri>
|
||||
<Sha>7434b575d12157ef98aeaad3b86c8f235f551c41</Sha>
|
||||
<Sha>befb72b8adf0a934c94f5cc6be85cf4039f78aea</Sha>
|
||||
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="NuGet.Build.Tasks" Version="6.0.0-rc.278" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
|
|
|
|||
|
|
@ -18,21 +18,27 @@
|
|||
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
|
||||
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
|
||||
</PropertyGroup>
|
||||
<!-- Restore feeds -->
|
||||
<PropertyGroup Label="Restore feeds">
|
||||
<!-- In an orchestrated build, this may be overridden to other Azure feeds. -->
|
||||
<DotNetAssetRootUrl Condition="'$(DotNetAssetRootUrl)'==''">https://dotnetbuilds.blob.core.windows.net/public/</DotNetAssetRootUrl>
|
||||
<DotNetPrivateAssetRootUrl Condition="'$(DotNetPrivateAssetRootUrl)'==''">https://dotnetclimsrc.blob.core.windows.net/dotnet/</DotNetPrivateAssetRootUrl>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.21603.6</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>7.0.0-alpha.1.21566.2</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>7.0.0-alpha.1.21580.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/wpf -->
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>7.0.0-alpha.1.21566.6</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>7.0.0-alpha.1.21580.3</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/templating -->
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.100-alpha.1.21568.4</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.100-alpha.1.21601.1</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/test-templates -->
|
||||
|
|
@ -45,44 +51,44 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
|
||||
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.0-alpha.1.21568.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefPackageVersion>7.0.0-alpha.1.21568.1</MicrosoftAspNetCoreAppRefPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.0-alpha.1.21568.1</MicrosoftAspNetCoreAppRefInternalPackageVersion>
|
||||
<VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.0-alpha.1.21568.1</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
|
||||
<dotnetdevcertsPackageVersion>7.0.0-alpha.1.21568.1</dotnetdevcertsPackageVersion>
|
||||
<dotnetusersecretsPackageVersion>7.0.0-alpha.1.21568.1</dotnetusersecretsPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.0-alpha.1.21601.8</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefPackageVersion>7.0.0-alpha.1.21601.8</MicrosoftAspNetCoreAppRefPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.0-alpha.1.21601.8</MicrosoftAspNetCoreAppRefInternalPackageVersion>
|
||||
<VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.0-alpha.1.21601.8</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
|
||||
<dotnetdevcertsPackageVersion>7.0.0-alpha.1.21601.8</dotnetdevcertsPackageVersion>
|
||||
<dotnetusersecretsPackageVersion>7.0.0-alpha.1.21601.8</dotnetusersecretsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftNETSdkPackageVersion>7.0.100-alpha.1.21568.15</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.100-alpha.1.21568.15</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>7.0.100-alpha.1.21602.1</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.100-alpha.1.21602.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/corefx -->
|
||||
<MicrosoftNETCorePlatformsPackageVersion>7.0.0-alpha.1.21567.1</MicrosoftNETCorePlatformsPackageVersion>
|
||||
<MicrosoftNETCorePlatformsPackageVersion>7.0.0-alpha.1.21580.11</MicrosoftNETCorePlatformsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/core-setup -->
|
||||
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-alpha.1.21567.1</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
|
||||
<VSRedistCommonNetCoreTargetingPackx6470PackageVersion>7.0.0-alpha.1.21567.1</VSRedistCommonNetCoreTargetingPackx6470PackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.0-alpha.1.21567.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>7.0.0-alpha.1.21567.1</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-alpha.1.21567.1</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.0-alpha.1.21567.1</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-alpha.1.21580.11</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
|
||||
<VSRedistCommonNetCoreTargetingPackx6470PackageVersion>7.0.0-alpha.1.21580.11</VSRedistCommonNetCoreTargetingPackx6470PackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.0-alpha.1.21580.11</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>7.0.0-alpha.1.21580.11</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-alpha.1.21580.11</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.0-alpha.1.21580.11</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
|
||||
<VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.0-alpha.1.21566.3</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>
|
||||
<VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.0-alpha.1.21566.3</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>7.0.0-alpha.1.21566.3</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>7.0.0-alpha.1.21566.3</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
<VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.0-alpha.1.21580.7</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>
|
||||
<VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.0-alpha.1.21580.7</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>7.0.0-alpha.1.21580.7</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>7.0.0-alpha.1.21580.7</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->
|
||||
|
|
@ -153,7 +159,7 @@
|
|||
<PropertyGroup>
|
||||
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
|
||||
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
|
||||
<MicrosoftNETTestSdkVersion>17.1.0-preview-20211118-03</MicrosoftNETTestSdkVersion>
|
||||
<MicrosoftNETTestSdkVersion>17.1.0-preview-20211202-01</MicrosoftNETTestSdkVersion>
|
||||
</PropertyGroup>
|
||||
<!-- dependencies for source-build tarball -->
|
||||
<PropertyGroup>
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ index 6b628c2..9b579ea 100644
|
|||
<PropertyGroup>
|
||||
- <MicrosoftExtensionsVersion>5.0.0</MicrosoftExtensionsVersion>
|
||||
<!-- In order tests against the same version of NuGet as the SDK. We have to set this to match. -->
|
||||
<NuGetVersion>6.0.0-preview.4.221</NuGetVersion>
|
||||
<NuGetVersion>6.0.0-rc.278</NuGetVersion>
|
||||
</PropertyGroup>
|
||||
@@ -25,9 +24,9 @@
|
||||
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(MicrosoftNETCoreCompilersPackageVersion)" />
|
||||
|
|
@ -51,7 +51,7 @@ index b1990aa..f6ddbbd 100644
|
|||
<MicrosoftCodeAnalysisAnalyzersVersion>3.3.2</MicrosoftCodeAnalysisAnalyzersVersion>
|
||||
+ <MicrosoftExtensionsDependencyInjectionVersion>5.0.0</MicrosoftExtensionsDependencyInjectionVersion>
|
||||
<!-- Dependencies from https://github.com/dotnet/roslyn -->
|
||||
<MicrosoftNETCoreCompilersPackageVersion>4.0.0-6.21515.3</MicrosoftNETCoreCompilersPackageVersion>
|
||||
<MicrosoftNETCoreCompilersPackageVersion>4.0.0-6.21526.21</MicrosoftNETCoreCompilersPackageVersion>
|
||||
<!-- Dependencies from https://github.com/dotnet/command-line-api -->
|
||||
diff --git a/src/Logging/SimpleConsoleLogger.cs b/src/Logging/SimpleConsoleLogger.cs
|
||||
index c361f84..fd8015c 100644
|
||||
|
|
|
|||
|
|
@ -1,164 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Simons <msimons@microsoft.com>
|
||||
Date: Fri, 19 Nov 2021 13:50:52 -0600
|
||||
Subject: [PATCH] Update system-command-line version
|
||||
|
||||
Backported with https://github.com/dotnet/format/pull/1436
|
||||
---
|
||||
eng/Version.Details.xml | 8 ++++----
|
||||
eng/Versions.props | 4 ++--
|
||||
src/Commands/FormatAnalyzersCommand.cs | 4 ++--
|
||||
src/Commands/FormatCommandCommon.cs | 12 ++++++------
|
||||
src/Commands/FormatStyleCommand.cs | 4 ++--
|
||||
src/Commands/RootFormatCommand.cs | 4 ++--
|
||||
6 files changed, 18 insertions(+), 18 deletions(-)
|
||||
|
||||
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
|
||||
index 48b181b..68c0b43 100644
|
||||
--- a/eng/Version.Details.xml
|
||||
+++ b/eng/Version.Details.xml
|
||||
@@ -5,13 +5,13 @@
|
||||
<Uri>https://github.com/dotnet/roslyn</Uri>
|
||||
<Sha>95b7a0198f8c805b367f17e4639020ec21c16705</Sha>
|
||||
</Dependency>
|
||||
- <Dependency Name="System.CommandLine" Version="2.0.0-beta1.21473.1">
|
||||
+ <Dependency Name="System.CommandLine" Version="2.0.0-beta1.21525.1">
|
||||
<Uri>https://github.com/dotnet/command-line-api</Uri>
|
||||
- <Sha>82273cb56c83b589e8e5b63da0ac9745ffc6e105</Sha>
|
||||
+ <Sha>09a24a79ef01a0c70655919ee3c59bb54a8574df</Sha>
|
||||
</Dependency>
|
||||
- <Dependency Name="System.CommandLine.Rendering" Version="0.3.0-alpha.21473.1">
|
||||
+ <Dependency Name="System.CommandLine.Rendering" Version="0.3.0-alpha.21525.1">
|
||||
<Uri>https://github.com/dotnet/command-line-api</Uri>
|
||||
- <Sha>82273cb56c83b589e8e5b63da0ac9745ffc6e105</Sha>
|
||||
+ <Sha>09a24a79ef01a0c70655919ee3c59bb54a8574df</Sha>
|
||||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
diff --git a/eng/Versions.props b/eng/Versions.props
|
||||
index 2758207..6a02917 100644
|
||||
--- a/eng/Versions.props
|
||||
+++ b/eng/Versions.props
|
||||
@@ -18,8 +18,8 @@
|
||||
<!-- Dependencies from https://github.com/dotnet/roslyn -->
|
||||
<MicrosoftNETCoreCompilersPackageVersion>4.0.0-6.21515.3</MicrosoftNETCoreCompilersPackageVersion>
|
||||
<!-- Dependencies from https://github.com/dotnet/command-line-api -->
|
||||
- <SystemCommandLineVersion>2.0.0-beta1.21473.1</SystemCommandLineVersion>
|
||||
- <SystemCommandLineRenderingVersion>0.3.0-alpha.21473.1</SystemCommandLineRenderingVersion>
|
||||
+ <SystemCommandLineVersion>2.0.0-beta1.21525.1</SystemCommandLineVersion>
|
||||
+ <SystemCommandLineRenderingVersion>0.3.0-alpha.21525.1</SystemCommandLineRenderingVersion>
|
||||
</PropertyGroup>
|
||||
<!--
|
||||
Other Dependency versions
|
||||
diff --git a/src/Commands/FormatAnalyzersCommand.cs b/src/Commands/FormatAnalyzersCommand.cs
|
||||
index 322397e..0be3daf 100644
|
||||
--- a/src/Commands/FormatAnalyzersCommand.cs
|
||||
+++ b/src/Commands/FormatAnalyzersCommand.cs
|
||||
@@ -37,13 +37,13 @@ namespace Microsoft.CodeAnalysis.Tools.Commands
|
||||
formatOptions = parseResult.ParseWorkspaceOptions(formatOptions);
|
||||
|
||||
if (parseResult.HasOption(SeverityOption) &&
|
||||
- parseResult.ValueForOption(SeverityOption) is string { Length: > 0 } analyzerSeverity)
|
||||
+ parseResult.GetValueForOption(SeverityOption) is string { Length: > 0 } analyzerSeverity)
|
||||
{
|
||||
formatOptions = formatOptions with { AnalyzerSeverity = GetSeverity(analyzerSeverity) };
|
||||
}
|
||||
|
||||
if (parseResult.HasOption(DiagnosticsOption) &&
|
||||
- parseResult.ValueForOption(DiagnosticsOption) is string[] { Length: > 0 } diagnostics)
|
||||
+ parseResult.GetValueForOption(DiagnosticsOption) is string[] { Length: > 0 } diagnostics)
|
||||
{
|
||||
formatOptions = formatOptions with { Diagnostics = diagnostics.ToImmutableHashSet() };
|
||||
}
|
||||
diff --git a/src/Commands/FormatCommandCommon.cs b/src/Commands/FormatCommandCommon.cs
|
||||
index fb69853..565c2d1 100644
|
||||
--- a/src/Commands/FormatCommandCommon.cs
|
||||
+++ b/src/Commands/FormatCommandCommon.cs
|
||||
@@ -137,7 +137,7 @@ namespace Microsoft.CodeAnalysis.Tools
|
||||
public static FormatOptions ParseVerbosityOption(this ParseResult parseResult, FormatOptions formatOptions)
|
||||
{
|
||||
if (parseResult.HasOption(VerbosityOption) &&
|
||||
- parseResult.ValueForOption(VerbosityOption) is string { Length: > 0 } verbosity)
|
||||
+ parseResult.GetValueForOption(VerbosityOption) is string { Length: > 0 } verbosity)
|
||||
{
|
||||
formatOptions = formatOptions with { LogLevel = GetLogLevel(verbosity) };
|
||||
}
|
||||
@@ -169,8 +169,8 @@ namespace Microsoft.CodeAnalysis.Tools
|
||||
|
||||
if (parseResult.HasOption(IncludeOption) || parseResult.HasOption(ExcludeOption))
|
||||
{
|
||||
- var fileToInclude = parseResult.ValueForOption(IncludeOption) ?? Array.Empty<string>();
|
||||
- var fileToExclude = parseResult.ValueForOption(ExcludeOption) ?? Array.Empty<string>();
|
||||
+ var fileToInclude = parseResult.GetValueForOption(IncludeOption) ?? Array.Empty<string>();
|
||||
+ var fileToExclude = parseResult.GetValueForOption(ExcludeOption) ?? Array.Empty<string>();
|
||||
HandleStandardInput(logger, ref fileToInclude, ref fileToExclude);
|
||||
formatOptions = formatOptions with { FileMatcher = SourceFileMatcher.CreateMatcher(fileToInclude, fileToExclude) };
|
||||
}
|
||||
@@ -179,7 +179,7 @@ namespace Microsoft.CodeAnalysis.Tools
|
||||
{
|
||||
formatOptions = formatOptions with { ReportPath = string.Empty };
|
||||
|
||||
- if (parseResult.ValueForOption(ReportOption) is string { Length: > 0 } reportPath)
|
||||
+ if (parseResult.GetValueForOption(ReportOption) is string { Length: > 0 } reportPath)
|
||||
{
|
||||
formatOptions = formatOptions with { ReportPath = reportPath };
|
||||
}
|
||||
@@ -189,7 +189,7 @@ namespace Microsoft.CodeAnalysis.Tools
|
||||
{
|
||||
formatOptions = formatOptions with { BinaryLogPath = "format.binlog" };
|
||||
|
||||
- if (parseResult.ValueForOption(BinarylogOption) is string { Length: > 0 } binaryLogPath)
|
||||
+ if (parseResult.GetValueForOption(BinarylogOption) is string { Length: > 0 } binaryLogPath)
|
||||
{
|
||||
formatOptions = Path.GetExtension(binaryLogPath)?.Equals(".binlog") == false
|
||||
? (formatOptions with { BinaryLogPath = Path.ChangeExtension(binaryLogPath, ".binlog") })
|
||||
@@ -285,7 +285,7 @@ namespace Microsoft.CodeAnalysis.Tools
|
||||
{
|
||||
var currentDirectory = Environment.CurrentDirectory;
|
||||
|
||||
- if (parseResult.ValueForArgument<string>(SlnOrProjectArgument) is string { Length: > 0 } slnOrProject)
|
||||
+ if (parseResult.GetValueForArgument<string>(SlnOrProjectArgument) is string { Length: > 0 } slnOrProject)
|
||||
{
|
||||
if (parseResult.HasOption(FolderOption))
|
||||
{
|
||||
diff --git a/src/Commands/FormatStyleCommand.cs b/src/Commands/FormatStyleCommand.cs
|
||||
index b44398c..7839855 100644
|
||||
--- a/src/Commands/FormatStyleCommand.cs
|
||||
+++ b/src/Commands/FormatStyleCommand.cs
|
||||
@@ -37,13 +37,13 @@ namespace Microsoft.CodeAnalysis.Tools.Commands
|
||||
formatOptions = parseResult.ParseWorkspaceOptions(formatOptions);
|
||||
|
||||
if (parseResult.HasOption(SeverityOption) &&
|
||||
- parseResult.ValueForOption(SeverityOption) is string { Length: > 0 } styleSeverity)
|
||||
+ parseResult.GetValueForOption(SeverityOption) is string { Length: > 0 } styleSeverity)
|
||||
{
|
||||
formatOptions = formatOptions with { CodeStyleSeverity = GetSeverity(styleSeverity) };
|
||||
}
|
||||
|
||||
if (parseResult.HasOption(DiagnosticsOption) &&
|
||||
- parseResult.ValueForOption(DiagnosticsOption) is string[] { Length: > 0 } diagnostics)
|
||||
+ parseResult.GetValueForOption(DiagnosticsOption) is string[] { Length: > 0 } diagnostics)
|
||||
{
|
||||
formatOptions = formatOptions with { Diagnostics = diagnostics.ToImmutableHashSet() };
|
||||
}
|
||||
diff --git a/src/Commands/RootFormatCommand.cs b/src/Commands/RootFormatCommand.cs
|
||||
index 741effb..40f8cc8 100644
|
||||
--- a/src/Commands/RootFormatCommand.cs
|
||||
+++ b/src/Commands/RootFormatCommand.cs
|
||||
@@ -40,14 +40,14 @@ namespace Microsoft.CodeAnalysis.Tools.Commands
|
||||
formatOptions = parseResult.ParseWorkspaceOptions(formatOptions);
|
||||
|
||||
if (parseResult.HasOption(SeverityOption) &&
|
||||
- parseResult.ValueForOption(SeverityOption) is string { Length: > 0 } defaultSeverity)
|
||||
+ parseResult.GetValueForOption(SeverityOption) is string { Length: > 0 } defaultSeverity)
|
||||
{
|
||||
formatOptions = formatOptions with { AnalyzerSeverity = GetSeverity(defaultSeverity) };
|
||||
formatOptions = formatOptions with { CodeStyleSeverity = GetSeverity(defaultSeverity) };
|
||||
}
|
||||
|
||||
if (parseResult.HasOption(DiagnosticsOption) &&
|
||||
- parseResult.ValueForOption(DiagnosticsOption) is string[] { Length: > 0 } diagnostics)
|
||||
+ parseResult.GetValueForOption(DiagnosticsOption) is string[] { Length: > 0 } diagnostics)
|
||||
{
|
||||
formatOptions = formatOptions with { Diagnostics = diagnostics.ToImmutableHashSet() };
|
||||
}
|
||||
|
|
@ -7,27 +7,12 @@ Removes prebuilts.
|
|||
|
||||
Background Issue: https://github.com/dotnet/source-build/issues/2542
|
||||
---
|
||||
eng/Packages.props | 3 ---
|
||||
src/Build/Microsoft.Build.csproj | 4 +++-
|
||||
src/Directory.BeforeCommon.targets | 2 +-
|
||||
src/Samples/Directory.Build.props | 1 +
|
||||
src/Tasks/Microsoft.Build.Tasks.csproj | 4 +++-
|
||||
src/Utilities/Microsoft.Build.Utilities.csproj | 2 +-
|
||||
6 files changed, 9 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/eng/Packages.props b/eng/Packages.props
|
||||
index 494c9c0..7689042 100644
|
||||
--- a/eng/Packages.props
|
||||
+++ b/eng/Packages.props
|
||||
@@ -46,9 +46,6 @@
|
||||
|
||||
<ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
|
||||
<GlobalPackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="$(MicrosoftCodeAnalysisBannedApiAnalyzersVersion)" />
|
||||
- </ItemGroup>
|
||||
-
|
||||
- <ItemGroup>
|
||||
<GlobalPackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.15" PrivateAssets="All" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />
|
||||
</ItemGroup>
|
||||
5 files changed, 9 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/Build/Microsoft.Build.csproj b/src/Build/Microsoft.Build.csproj
|
||||
index d08e337c5..3b173aee5 100644
|
||||
|
|
|
|||
Loading…
Reference in a new issue