Skip to content

Removed dependency to Microsoft.Dotnet.Cli.Utils #5482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vlada-shubina merged 7 commits into from
Nov 3, 2022
Merged

Removed dependency to Microsoft.Dotnet.Cli.Utils #5482

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fc7eded
removed dependency on Cli.Utils
vlada-shubina Oct 19, 2022
07e4e8f
enabled API analyzer
vlada-shubina Oct 20, 2022
e2a3f90
renames to match solution structure
vlada-shubina Oct 20, 2022
5a94502
excluded tools from source-build
vlada-shubina Oct 20, 2022
6c12b38
included command utils as internal shared code
vlada-shubina Oct 27, 2022
ff2f459
removed unsafe code
vlada-shubina Nov 2, 2022
d96c23b
do not enable telemetry by default in wrappers for dotnet commands
vlada-shubina Nov 3, 2022
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
Prev Previous commit
Next Next commit
included command utils as internal shared code
  • Loading branch information
@vlada-shubina
vlada-shubina committed Nov 2, 2022
commit 6c12b38f3e9bc4c1d4d1d035bd2bd3ac7acb8924
34 changes: 20 additions & 14 deletions Microsoft.TemplateEngine.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,24 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "eng", "eng", "{D190251C-564
eng\Versions.props = eng\Versions.props
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.CommandUtils", "tools\Microsoft.TemplateEngine.CommandUtils\Microsoft.TemplateEngine.CommandUtils.csproj", "{67986D9B-72ED-4B97-B72E-D65EBA75193A}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{43053BC4-32B4-4404-B62D-410F367CE0CE}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.TemplateEngine.CommandUtils", "Microsoft.TemplateEngine.CommandUtils", "{EE8CD472-D8C4-4CD0-BC84-6C305F5971AE}"
ProjectSection(SolutionItems) = preProject
tools\Shared\Microsoft.TemplateEngine.CommandUtils\ArgumentEscaper.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\ArgumentEscaper.cs
tools\Shared\Microsoft.TemplateEngine.CommandUtils\BasicCommand.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\BasicCommand.cs
tools\Shared\Microsoft.TemplateEngine.CommandUtils\Command.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\Command.cs
tools\Shared\Microsoft.TemplateEngine.CommandUtils\CommandResult.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\CommandResult.cs
tools\Shared\Microsoft.TemplateEngine.CommandUtils\CommandResultAssertions.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\CommandResultAssertions.cs
tools\Shared\Microsoft.TemplateEngine.CommandUtils\CommandResultExtensions.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\CommandResultExtensions.cs
tools\Shared\Microsoft.TemplateEngine.CommandUtils\DotnetCommand.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\DotnetCommand.cs
tools\Shared\Microsoft.TemplateEngine.CommandUtils\DotnetNewCommand.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\DotnetNewCommand.cs
tools\Shared\Microsoft.TemplateEngine.CommandUtils\NativeMethods.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\NativeMethods.cs
tools\Shared\Microsoft.TemplateEngine.CommandUtils\ProcessReaper.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\ProcessReaper.cs
tools\Shared\Microsoft.TemplateEngine.CommandUtils\SdkCommandSpec.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\SdkCommandSpec.cs
tools\Shared\Microsoft.TemplateEngine.CommandUtils\StreamForwarder.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\StreamForwarder.cs
tools\Shared\Microsoft.TemplateEngine.CommandUtils\TestCommand.cs = tools\Shared\Microsoft.TemplateEngine.CommandUtils\TestCommand.cs
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -453,18 +470,6 @@ Global
{E8B9226E-879F-495A-BDAD-2607844D048C}.Release|x64.Build.0 = Release|Any CPU
{E8B9226E-879F-495A-BDAD-2607844D048C}.Release|x86.ActiveCfg = Release|Any CPU
{E8B9226E-879F-495A-BDAD-2607844D048C}.Release|x86.Build.0 = Release|Any CPU
{67986D9B-72ED-4B97-B72E-D65EBA75193A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{67986D9B-72ED-4B97-B72E-D65EBA75193A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{67986D9B-72ED-4B97-B72E-D65EBA75193A}.Debug|x64.ActiveCfg = Debug|Any CPU
{67986D9B-72ED-4B97-B72E-D65EBA75193A}.Debug|x64.Build.0 = Debug|Any CPU
{67986D9B-72ED-4B97-B72E-D65EBA75193A}.Debug|x86.ActiveCfg = Debug|Any CPU
{67986D9B-72ED-4B97-B72E-D65EBA75193A}.Debug|x86.Build.0 = Debug|Any CPU
{67986D9B-72ED-4B97-B72E-D65EBA75193A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{67986D9B-72ED-4B97-B72E-D65EBA75193A}.Release|Any CPU.Build.0 = Release|Any CPU
{67986D9B-72ED-4B97-B72E-D65EBA75193A}.Release|x64.ActiveCfg = Release|Any CPU
{67986D9B-72ED-4B97-B72E-D65EBA75193A}.Release|x64.Build.0 = Release|Any CPU
{67986D9B-72ED-4B97-B72E-D65EBA75193A}.Release|x86.ActiveCfg = Release|Any CPU
{67986D9B-72ED-4B97-B72E-D65EBA75193A}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -501,7 +506,8 @@ Global
{D478568D-CA20-4331-9019-F585B564425E} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60}
{E8B9226E-879F-495A-BDAD-2607844D048C} = {8B498D0C-F488-4B38-8A7D-B20BF9DB6F60}
{D190251C-5649-4DD6-A158-16D119116352} = {C5186341-2064-49AA-B398-CDF4302D2823}
{67986D9B-72ED-4B97-B72E-D65EBA75193A} = {B794BF86-4185-4DCE-AC86-C27D5D966B9B}
{43053BC4-32B4-4404-B62D-410F367CE0CE} = {B794BF86-4185-4DCE-AC86-C27D5D966B9B}
{EE8CD472-D8C4-4CD0-BC84-6C305F5971AE} = {43053BC4-32B4-4404-B62D-410F367CE0CE}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6EA1A508-6033-4538-BF98-7F71B4E297AD}
Expand Down
1 change: 0 additions & 1 deletion test/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/ExportCommandFailureTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

using System.Globalization;
using Microsoft.TemplateEngine.CommandUtils;
using Microsoft.TemplateEngine.CommandUtils.Assertions;
using Xunit.Abstractions;

namespace Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests
Expand Down
1 change: 0 additions & 1 deletion test/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/VerifyCommandTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using FluentAssertions;
using Microsoft.TemplateEngine.Authoring.TemplateVerifier;
using Microsoft.TemplateEngine.CommandUtils;
using Microsoft.TemplateEngine.CommandUtils.Assertions;
using Microsoft.TemplateEngine.TestHelper;
using Microsoft.TemplateEngine.Tests;
using Xunit.Abstractions;
Expand Down
1 change: 0 additions & 1 deletion test/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests/LocalizeTemplateTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

using FluentAssertions;
using Microsoft.TemplateEngine.CommandUtils;
using Microsoft.TemplateEngine.CommandUtils.Assertions;
using Microsoft.TemplateEngine.TestHelper;
using Microsoft.TemplateEngine.Tests;
using Xunit;
Expand Down
6 changes: 5 additions & 1 deletion ...g.Tasks.IntegrationTests/Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<TargetFramework>$(NETCoreTargetFramework)</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<None Include="Resources\**\*">
Expand All @@ -14,7 +15,6 @@
<ItemGroup>
<ProjectReference Include="$(ToolsDir)Microsoft.TemplateEngine.Authoring.Tasks\Microsoft.TemplateEngine.Authoring.Tasks.csproj" />
<ProjectReference Include="$(TestDir)Microsoft.TemplateEngine.TestHelper\Microsoft.TemplateEngine.TestHelper.csproj" />
<ProjectReference Include="$(ToolsDir)Microsoft.TemplateEngine.CommandUtils\Microsoft.TemplateEngine.CommandUtils.csproj" />
</ItemGroup>

<Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(BuildingInsideVisualStudio)' == 'true'">
Expand All @@ -24,4 +24,8 @@
<ItemGroup>
<Compile Include="..\Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>

<ItemGroup>
<Compile Include="..\..\tools\Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>
</Project>
1 change: 0 additions & 1 deletion test/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests/TemplateDiscoveryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.

using Microsoft.TemplateEngine.CommandUtils;
using Microsoft.TemplateEngine.CommandUtils.Assertions;
using Microsoft.TemplateEngine.TestHelper;
using Microsoft.TemplateEngine.Tests;
using Newtonsoft.Json.Linq;
Expand Down
6 changes: 5 additions & 1 deletion ...ine.Authoring.TemplateVerifier/Microsoft.TemplateEngine.Authoring.TemplateVerifier.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<EnablePublicApiAnalyzer>true</EnablePublicApiAnalyzer>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

<ItemGroup>
Expand All @@ -22,7 +23,10 @@

<ItemGroup>
<ProjectReference Include="$(SrcDir)Microsoft.TemplateEngine.Utils\Microsoft.TemplateEngine.Utils.csproj" />
<ProjectReference Include="$(ToolsDir)Microsoft.TemplateEngine.CommandUtils\Microsoft.TemplateEngine.CommandUtils.csproj" />
</ItemGroup>

<ItemGroup>
<Compile Include="..\Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>

<ItemGroup>
Expand Down
20 changes: 0 additions & 20 deletions tools/Microsoft.TemplateEngine.CommandUtils/Microsoft.TemplateEngine.CommandUtils.csproj
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion tools/Microsoft.TemplateEngine.CommandUtils/PublicAPI.Shipped.txt
View file
Open in desktop

This file was deleted.

70 changes: 0 additions & 70 deletions tools/Microsoft.TemplateEngine.CommandUtils/PublicAPI.Unshipped.txt
View file
Open in desktop

This file was deleted.

6 changes: 5 additions & 1 deletion ...rosoft.TemplateSearch.TemplateDiscovery/Microsoft.TemplateSearch.TemplateDiscovery.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="$(SrcDir)Microsoft.TemplateEngine.Orchestrator.RunnableProjects\Microsoft.TemplateEngine.Orchestrator.RunnableProjects.csproj" />
<ProjectReference Include="$(TestDir)Microsoft.TemplateEngine.TestHelper\Microsoft.TemplateEngine.TestHelper.csproj" />
<ProjectReference Include="$(SrcDir)Microsoft.TemplateSearch.Common\Microsoft.TemplateSearch.Common.csproj" />
<ProjectReference Include="$(ToolsDir)Microsoft.TemplateEngine.CommandUtils\Microsoft.TemplateEngine.CommandUtils.csproj" />
<PackageReference Include="Newtonsoft.Json" />
<PackageReference Include="NuGet.Configuration" />
<PackageReference Include="NuGet.Protocol" />
Expand All @@ -25,4 +25,8 @@
<None Update="**\*.list" CopyToOutputDirectory="Always" />
</ItemGroup>

<ItemGroup>
<Compile Include="..\Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>

</Project>
Loading