Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="$(MicrosoftEntityFrameworkCorePackageVersion)" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(MicrosoftEntityFrameworkCoreSqlServerPackageVersion)" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="$(MicrosoftEntityFrameworkCoreDesignPackageVersion)" />
<PackageVersion Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion)" />
<PackageVersion Include="McMaster.Extensions.CommandLineUtils" Version="$(McMasterExtensionsCommandLineUtilsPackageVersion)" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionsConfigurationVersion)" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="$(MicrosoftExtensionsConfigurationBinderVersion)" />
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@
<MicrosoftCodeAnalysisRazorPackageVersion>6.0.24</MicrosoftCodeAnalysisRazorPackageVersion>
<!-- Microsoft.CodeAnalysis.CSharp.Workspaces -->
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>$(MicrosoftCodeAnalysisVersion)</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<!-- Microsoft.Extensions.CommandLineUtils.Sources -->
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>6.0.0-preview.3.21166.3</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
<!-- McMaster.Extensions.CommandLineUtils -->
<McMasterExtensionsCommandLineUtilsPackageVersion>4.1.1</McMasterExtensionsCommandLineUtilsPackageVersion>
<NewtonsoftJsonPackageVersion>13.0.3</NewtonsoftJsonPackageVersion>
<NuGetPackagingVersion>6.12.1</NuGetPackagingVersion>
<HumanizerPackageVersion>2.14.1</HumanizerPackageVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/Scaffolding/VS.Web.CG.Core/ActionInvoker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System;
using System.Reflection;
using System.Threading.Tasks;
using Microsoft.Extensions.CommandLineUtils;
using McMaster.Extensions.CommandLineUtils;
using Microsoft.VisualStudio.Web.CodeGeneration.Core;

namespace Microsoft.VisualStudio.Web.CodeGeneration
Expand Down
2 changes: 1 addition & 1 deletion src/Scaffolding/VS.Web.CG.Core/ParameterDescriptor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System;
using System.Diagnostics;
using System.Reflection;
using Microsoft.Extensions.CommandLineUtils;
using McMaster.Extensions.CommandLineUtils;
using Microsoft.VisualStudio.Web.CodeGeneration.CommandLine;

namespace Microsoft.VisualStudio.Web.CodeGeneration
Expand Down Expand Up @@ -78,7 +78,7 @@
}
}

private string GetOptionTemplate(OptionAttribute optionAttribute)

Check failure on line 81 in src/Scaffolding/VS.Web.CG.Core/ParameterDescriptor.cs

View check run for this annotation

Azure Pipelines / scaffolding-ci (Build Linux debug_configuration)

src/Scaffolding/VS.Web.CG.Core/ParameterDescriptor.cs#L81

src/Scaffolding/VS.Web.CG.Core/ParameterDescriptor.cs(81,42): error CS0104: (NETCORE_ENGINEERING_TELEMETRY=Build) 'OptionAttribute' is an ambiguous reference between 'Microsoft.VisualStudio.Web.CodeGeneration.CommandLine.OptionAttribute' and 'McMaster.Extensions.CommandLineUtils.OptionAttribute'

Check failure on line 81 in src/Scaffolding/VS.Web.CG.Core/ParameterDescriptor.cs

View check run for this annotation

Azure Pipelines / scaffolding-ci (Build Linux release_configuration)

src/Scaffolding/VS.Web.CG.Core/ParameterDescriptor.cs#L81

src/Scaffolding/VS.Web.CG.Core/ParameterDescriptor.cs(81,42): error CS0104: (NETCORE_ENGINEERING_TELEMETRY=Build) 'OptionAttribute' is an ambiguous reference between 'Microsoft.VisualStudio.Web.CodeGeneration.CommandLine.OptionAttribute' and 'McMaster.Extensions.CommandLineUtils.OptionAttribute'

Check failure on line 81 in src/Scaffolding/VS.Web.CG.Core/ParameterDescriptor.cs

View check run for this annotation

Azure Pipelines / scaffolding-ci (Build OSX debug_configuration)

src/Scaffolding/VS.Web.CG.Core/ParameterDescriptor.cs#L81

src/Scaffolding/VS.Web.CG.Core/ParameterDescriptor.cs(81,42): error CS0104: (NETCORE_ENGINEERING_TELEMETRY=Build) 'OptionAttribute' is an ambiguous reference between 'Microsoft.VisualStudio.Web.CodeGeneration.CommandLine.OptionAttribute' and 'McMaster.Extensions.CommandLineUtils.OptionAttribute'

Check failure on line 81 in src/Scaffolding/VS.Web.CG.Core/ParameterDescriptor.cs

View check run for this annotation

Azure Pipelines / scaffolding-ci (Build OSX release_configuration)

src/Scaffolding/VS.Web.CG.Core/ParameterDescriptor.cs#L81

src/Scaffolding/VS.Web.CG.Core/ParameterDescriptor.cs(81,42): error CS0104: (NETCORE_ENGINEERING_TELEMETRY=Build) 'OptionAttribute' is an ambiguous reference between 'Microsoft.VisualStudio.Web.CodeGeneration.CommandLine.OptionAttribute' and 'McMaster.Extensions.CommandLineUtils.OptionAttribute'
{
if (optionAttribute == null)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Scaffolding/VS.Web.CG.Core/VS.Web.CG.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" PrivateAssets="All" />
<PackageReference Include="McMaster.Extensions.CommandLineUtils" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
<PackageReference Include="Newtonsoft.Json" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Scaffolding/VS.Web.CG.Design/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using System.Linq;
using Microsoft.DotNet.Scaffolding.Shared;
using Microsoft.DotNet.Scaffolding.Shared.ProjectModel;
using Microsoft.Extensions.CommandLineUtils;
using McMaster.Extensions.CommandLineUtils;

namespace Microsoft.VisualStudio.Web.CodeGeneration.Design
{
Expand Down
2 changes: 1 addition & 1 deletion src/Scaffolding/VS.Web.CG.Design/Shared.props
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" PrivateAssets="All" />
<PackageReference Include="McMaster.Extensions.CommandLineUtils" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Scaffolding/VS.Web.CG/VS.Web.CG.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" PrivateAssets="All" />
<PackageReference Include="McMaster.Extensions.CommandLineUtils" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
using System.Linq;
using System.Text;
using Microsoft.DotNet.Scaffolding.Shared.ProjectModel;
using Microsoft.Extensions.CommandLineUtils;
using McMaster.Extensions.CommandLineUtils;
using Newtonsoft.Json;

namespace Microsoft.VisualStudio.Web.CodeGeneration.Tools
Expand Down Expand Up @@ -43,7 +43,7 @@
public CommandArgument GeneratorArgument { get; }


public override string GetHelpText(string commandName = null)

Check failure on line 46 in src/Scaffolding/dotnet-aspnet-codegenerator/ScaffoldingApp.cs

View check run for this annotation

Azure Pipelines / scaffolding-ci (Build Linux debug_configuration)

src/Scaffolding/dotnet-aspnet-codegenerator/ScaffoldingApp.cs#L46

src/Scaffolding/dotnet-aspnet-codegenerator/ScaffoldingApp.cs(46,32): error CS0115: (NETCORE_ENGINEERING_TELEMETRY=Build) 'ScaffoldingApp.GetHelpText(string)': no suitable method found to override

Check failure on line 46 in src/Scaffolding/dotnet-aspnet-codegenerator/ScaffoldingApp.cs

View check run for this annotation

Azure Pipelines / scaffolding-ci (Build Linux release_configuration)

src/Scaffolding/dotnet-aspnet-codegenerator/ScaffoldingApp.cs#L46

src/Scaffolding/dotnet-aspnet-codegenerator/ScaffoldingApp.cs(46,32): error CS0115: (NETCORE_ENGINEERING_TELEMETRY=Build) 'ScaffoldingApp.GetHelpText(string)': no suitable method found to override

Check failure on line 46 in src/Scaffolding/dotnet-aspnet-codegenerator/ScaffoldingApp.cs

View check run for this annotation

Azure Pipelines / scaffolding-ci (Build OSX debug_configuration)

src/Scaffolding/dotnet-aspnet-codegenerator/ScaffoldingApp.cs#L46

src/Scaffolding/dotnet-aspnet-codegenerator/ScaffoldingApp.cs(46,32): error CS0115: (NETCORE_ENGINEERING_TELEMETRY=Build) 'ScaffoldingApp.GetHelpText(string)': no suitable method found to override

Check failure on line 46 in src/Scaffolding/dotnet-aspnet-codegenerator/ScaffoldingApp.cs

View check run for this annotation

Azure Pipelines / scaffolding-ci (Build OSX release_configuration)

src/Scaffolding/dotnet-aspnet-codegenerator/ScaffoldingApp.cs#L46

src/Scaffolding/dotnet-aspnet-codegenerator/ScaffoldingApp.cs(46,32): error CS0115: (NETCORE_ENGINEERING_TELEMETRY=Build) 'ScaffoldingApp.GetHelpText(string)': no suitable method found to override
{
string helpText = base.GetHelpText(commandName);
StringBuilder sb = new StringBuilder(helpText);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" PrivateAssets="All" />
<PackageReference Include="McMaster.Extensions.CommandLineUtils" />
<PackageReference Include="Newtonsoft.Json" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

using System.Linq;
using Microsoft.Extensions.CommandLineUtils;
using McMaster.Extensions.CommandLineUtils;
using Microsoft.VisualStudio.Web.CodeGeneration.CommandLine;
using Xunit;

Expand Down
Loading