Skip to content

Commit 299a697

Browse files
committed
Change Microsoft.DotNet.Cli.csproj back to dotnet.csproj. Change paths to match.
1 parent cfd325d commit 299a697

File tree

22 files changed

+26
-26
lines changed

22 files changed

+26
-26
lines changed

TemplateEngine.slnf

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"src\\Cli\\Microsoft.DotNet.Configurer\\Microsoft.DotNet.Configurer.csproj",
99
"src\\Cli\\Microsoft.DotNet.InternalAbstractions\\Microsoft.DotNet.InternalAbstractions.csproj",
1010
"src\\Cli\\Microsoft.TemplateEngine.Cli\\Microsoft.TemplateEngine.Cli.csproj",
11-
"src\\Cli\\Microsoft.DotNet.Cli\\Microsoft.DotNet.Cli.csproj",
11+
"src\\Cli\\dotnet\\dotnet.csproj",
1212
"src\\Microsoft.DotNet.TemplateLocator\\Microsoft.DotNet.TemplateLocator.csproj",
1313
"src\\Microsoft.Win32.Msi\\Microsoft.Win32.Msi.csproj",
1414
"src\\Resolvers\\Microsoft.DotNet.NativeWrapper\\Microsoft.DotNet.NativeWrapper.csproj",

sdk.sln

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.InternalAb
7777
EndProject
7878
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Configurer", "src\Cli\Microsoft.DotNet.Configurer\Microsoft.DotNet.Configurer.csproj", "{B22C90C9-BA46-4F07-9613-253DD01E3EFF}"
7979
EndProject
80-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Cli", "src\Cli\Microsoft.DotNet.Cli\Microsoft.DotNet.Cli.csproj", "{D62591F3-ED86-4014-B765-7CDA47F55EE2}"
80+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet", "src\Cli\dotnet\dotnet.csproj", "{D62591F3-ED86-4014-B765-7CDA47F55EE2}"
8181
EndProject
8282
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Layout", "Layout", "{71C279BD-E850-4A8D-9775-11CA26B8E5BA}"
8383
EndProject

source-build.slnf

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"src\\Cli\\Microsoft.DotNet.Configurer\\Microsoft.DotNet.Configurer.csproj",
1313
"src\\Cli\\Microsoft.DotNet.InternalAbstractions\\Microsoft.DotNet.InternalAbstractions.csproj",
1414
"src\\Cli\\Microsoft.TemplateEngine.Cli\\Microsoft.TemplateEngine.Cli.csproj",
15-
"src\\Cli\\Microsoft.DotNet.Cli\\Microsoft.DotNet.Cli.csproj",
15+
"src\\Cli\\dotnet\\dotnet.csproj",
1616
"src\\Compatibility\\ApiCompat\\Microsoft.DotNet.ApiCompat.Shared\\Microsoft.DotNet.ApiCompat.Shared.shproj",
1717
"src\\Compatibility\\ApiCompat\\Microsoft.DotNet.ApiCompat.Task\\Microsoft.DotNet.ApiCompat.Task.csproj",
1818
"src\\Compatibility\\ApiCompat\\Microsoft.DotNet.ApiCompatibility\\Microsoft.DotNet.ApiCompatibility.csproj",

src/BuiltInTools/dotnet-watch/dotnet-watch.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
</ItemGroup>
4343

4444
<ItemGroup>
45-
<ProjectReference Include="$(RepoRoot)\src\Cli\Microsoft.DotNet.Cli\Microsoft.DotNet.Cli.csproj" />
45+
<ProjectReference Include="$(RepoRoot)\src\Cli\dotnet\dotnet.csproj" />
4646
<ProjectReference Include="..\BrowserRefresh\Microsoft.AspNetCore.Watch.BrowserRefresh.csproj" PrivateAssets="All" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" UndefineProperties="TargetFramework;TargetFrameworks" OutputItemType="Content" TargetPath="middleware\Microsoft.AspNetCore.Watch.BrowserRefresh.dll" CopyToOutputDirectory="PreserveNewest" />
4747
<ProjectReference Include="..\DotNetDeltaApplier\Microsoft.Extensions.DotNetDeltaApplier.csproj" PrivateAssets="All" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" UndefineProperties="TargetFramework;TargetFrameworks" OutputItemType="Content" TargetPath="hotreload\Microsoft.Extensions.DotNetDeltaApplier.dll" CopyToOutputDirectory="PreserveNewest" />
4848
<ProjectReference Include="..\DotNetWatchTasks\DotNetWatchTasks.csproj" PrivateAssets="All" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" UndefineProperties="TargetFramework;TargetFrameworks" OutputItemType="Content" CopyToOutputDirectory="PreserveNewest" />

src/Layout/redist/redist.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<ProjectReference Include="..\..\Containers\packaging\package.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" Private="false" />
6363
<ProjectReference Include="tools\tool_msbuild.csproj" />
6464
<ProjectReference Include="tools\tool_nuget.csproj" />
65-
<ProjectReference Include="..\..\Cli\Microsoft.DotNet.Cli\Microsoft.DotNet.Cli.csproj" />
65+
<ProjectReference Include="..\..\Cli\dotnet\dotnet.csproj" />
6666
<ProjectReference Include="..\..\Tasks\Microsoft.NET.Build.Tasks\Microsoft.NET.Build.Tasks.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
6767
<ProjectReference Include="..\..\Tasks\Microsoft.NET.Build.Extensions.Tasks\Microsoft.NET.Build.Extensions.Tasks.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
6868
<ProjectReference Include="..\..\Resolvers\Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver\Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.csproj" />

src/Microsoft.DotNet.TemplateLocator/Microsoft.DotNet.TemplateLocator.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<Compile Include="$(RepoRoot)src\Common\EnvironmentVariableNames.cs" LinkBase="Common" />
3838
<Compile Include="$(RepoRoot)src\Common\WorkloadFileBasedInstall.cs" LinkBase="Common" />
3939
<Compile Include="$(RepoRoot)src\Common\WorkloadSetVersion.cs" LinkBase="Common" />
40-
<Compile Include="$(RepoRoot)src\Cli\Microsoft.DotNet.Cli\Commands\Workload\InstallStateContents.cs" LinkBase="Cli" />
40+
<Compile Include="$(RepoRoot)src\Cli\dotnet\Commands\Workload\InstallStateContents.cs" LinkBase="Cli" />
4141
</ItemGroup>
4242

4343
<ItemGroup>

src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@
4848

4949
<!-- To reduce dll load (cause RPS perf regression). Directly compile files from Microsoft.DotNet.NativeWrapper, Microsoft.DotNet.SdkResolver, and the workload resolver -->
5050
<ItemGroup>
51-
<Compile Include="$(RepoRoot)src\Cli\Microsoft.DotNet.Cli\Commands\Workload\InstallStateContents.cs" LinkBase="Cli" />
51+
<Compile Include="$(RepoRoot)src\Cli\dotnet\Commands\Workload\InstallStateContents.cs" LinkBase="Cli" />
5252
<Compile Include="..\Microsoft.DotNet.NativeWrapper\**\*.cs" LinkBase="Microsoft.DotNet.NativeWrapper" />
5353
<Compile Include="..\Microsoft.DotNet.SdkResolver\**\*.cs" LinkBase="Microsoft.DotNet.SdkResolver" />
5454
<Compile Include="..\Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver\CachingWorkloadResolver.cs" LinkBase="Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver" />
5555
<Compile Include="..\Microsoft.NET.Sdk.WorkloadManifestReader\**\*.cs" LinkBase="Microsoft.NET.Sdk.WorkloadManifestReader" />
56-
<Compile Include="..\..\Cli\Microsoft.DotNet.Cli\Commands\Workload\Install\WorkloadInstallRecords\**\*.cs"
57-
Exclude="..\..\Cli\Microsoft.DotNet.Cli\Commands\Workload\Install\WorkloadInstallRecords\RegistryWorkloadInstallationRecordRepository.cs"
56+
<Compile Include="..\..\Cli\dotnet\Commands\Workload\Install\WorkloadInstallRecords\**\*.cs"
57+
Exclude="..\..\Cli\dotnet\Commands\Workload\Install\WorkloadInstallRecords\RegistryWorkloadInstallationRecordRepository.cs"
5858
LinkBase="WorkloadInstallRecords" />
5959

6060
<Compile Include="$(RepoRoot)src\Common\EnvironmentVariableNames.cs" LinkBase="Common" />

src/Resolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
<ItemGroup>
2121
<ProjectReference Include="..\Microsoft.NET.Sdk.WorkloadManifestReader\Microsoft.NET.Sdk.WorkloadManifestReader.csproj" />
2222
<ProjectReference Include="..\Microsoft.DotNet.NativeWrapper\Microsoft.DotNet.NativeWrapper.csproj" />
23-
<Compile Include="..\..\Cli\Microsoft.DotNet.Cli\Commands\Workload\Install\WorkloadInstallRecords\**\*.cs"
24-
Exclude="..\..\Cli\Microsoft.DotNet.Cli\Commands\Workload\Install\WorkloadInstallRecords\RegistryWorkloadInstallationRecordRepository.cs"
23+
<Compile Include="..\..\Cli\dotnet\Commands\Workload\Install\WorkloadInstallRecords\**\*.cs"
24+
Exclude="..\..\Cli\dotnet\Commands\Workload\Install\WorkloadInstallRecords\RegistryWorkloadInstallationRecordRepository.cs"
2525
LinkBase="WorkloadInstallRecords" />
2626
<Compile Include="$(RepoRoot)src\Common\CliFolderPathCalculatorCore.cs" LinkBase="Common" />
2727
<Compile Include="$(RepoRoot)src\Common\WorkloadFileBasedInstall.cs" LinkBase="Common" />

src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/Microsoft.NET.Sdk.WorkloadManifestReader.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<Compile Include="$(RepoRoot)src\Common\EnvironmentVariableNames.cs" LinkBase="Common" />
1313
<Compile Include="$(RepoRoot)src\Common\WorkloadFileBasedInstall.cs" LinkBase="Common" />
1414
<Compile Include="$(RepoRoot)src\Common\WorkloadSetVersion.cs" LinkBase="Common" />
15-
<Compile Include="$(RepoRoot)src\Cli\Microsoft.DotNet.Cli\Commands\Workload\InstallStateContents.cs" LinkBase="Cli" />
15+
<Compile Include="$(RepoRoot)src\Cli\dotnet\Commands\Workload\InstallStateContents.cs" LinkBase="Cli" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@
101101
<Compile Include="$(RepoRoot)src\Common\CliFolderPathCalculatorCore.cs" LinkBase="Common" />
102102
<Compile Include="$(RepoRoot)src\Common\WorkloadFileBasedInstall.cs" LinkBase="Common" />
103103
<Compile Include="$(RepoRoot)src\Common\WorkloadSetVersion.cs" LinkBase="Common" />
104-
<Compile Include="$(RepoRoot)src\Cli\Microsoft.DotNet.Cli\Commands\Workload\InstallStateContents.cs" LinkBase="Cli" />
105-
<Compile Include="$(RepoRoot)src\Cli\Microsoft.DotNet.Cli\Commands\Test\IPC\**\*.cs" />
104+
<Compile Include="$(RepoRoot)src\Cli\dotnet\Commands\Workload\InstallStateContents.cs" LinkBase="Cli" />
105+
<Compile Include="$(RepoRoot)src\Cli\dotnet\Commands\Test\IPC\**\*.cs" />
106106
</ItemGroup>
107107

108108
<ItemGroup>

src/Tasks/Microsoft.NET.slnf

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"src\\Cli\\Microsoft.DotNet.Cli.Utils\\Microsoft.DotNet.Cli.Utils.csproj",
77
"src\\Cli\\Microsoft.DotNet.Configurer\\Microsoft.DotNet.Configurer.csproj",
88
"src\\Cli\\Microsoft.DotNet.InternalAbstractions\\Microsoft.DotNet.InternalAbstractions.csproj",
9-
"src\\Cli\\Microsoft.DotNet.Cli\\Microsoft.DotNet.Cli.csproj",
9+
"src\\Cli\\dotnet\\dotnet.csproj",
1010
"src\\Compatibility\\ApiCompat\\Microsoft.DotNet.ApiCompat.Shared\\Microsoft.DotNet.ApiCompat.Shared.shproj",
1111
"src\\Compatibility\\ApiCompat\\Microsoft.DotNet.ApiCompat.Task\\Microsoft.DotNet.ApiCompat.Task.csproj",
1212
"src\\Compatibility\\ApiCompat\\Microsoft.DotNet.ApiCompat.Tool\\Microsoft.DotNet.ApiCompat.Tool.csproj",

test/ArgumentForwarding.Tests/ArgumentForwarding.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<ProjectReference Include="..\..\src\Cli\Microsoft.DotNet.Cli\Microsoft.DotNet.Cli.csproj" />
11+
<ProjectReference Include="..\..\src\Cli\dotnet\dotnet.csproj" />
1212
<ProjectReference Include="..\Microsoft.NET.TestFramework\Microsoft.NET.TestFramework.csproj" />
1313

1414
<ProjectReference Include="..\ArgumentsReflector\ArgumentsReflector.csproj" />

test/Microsoft.DotNet.PackageInstall.Tests/Microsoft.DotNet.PackageInstall.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup>
17-
<ProjectReference Include="..\..\src\Cli\Microsoft.DotNet.Cli\Microsoft.DotNet.Cli.csproj" />
17+
<ProjectReference Include="..\..\src\Cli\dotnet\dotnet.csproj" />
1818
<ProjectReference Include="..\..\src\Cli\Microsoft.DotNet.Configurer\Microsoft.DotNet.Configurer.csproj" />
1919
<ProjectReference Include="..\..\src\Cli\Microsoft.DotNet.InternalAbstractions\Microsoft.DotNet.InternalAbstractions.csproj" />
2020
<ProjectReference Include="..\Microsoft.NET.TestFramework\Microsoft.NET.TestFramework.csproj" />

test/Microsoft.DotNet.Tools.Tests.ComponentMocks/Microsoft.DotNet.Tools.Tests.ComponentMocks.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<ProjectReference Include="..\..\src\Cli\Microsoft.DotNet.Cli\Microsoft.DotNet.Cli.csproj" />
13+
<ProjectReference Include="..\..\src\Cli\dotnet\dotnet.csproj" />
1414
<ProjectReference Include="..\..\src\Cli\Microsoft.DotNet.Cli.Utils\Microsoft.DotNet.Cli.Utils.csproj" />
1515
<ProjectReference Include="..\Microsoft.NET.TestFramework\Microsoft.NET.TestFramework.csproj" />
1616
</ItemGroup>

test/Microsoft.NET.Pack.Tests/Microsoft.NET.Pack.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
<!-- Use string resources from tasks in order to validate test output. -->
3636
<EmbeddedResource Include="..\..\src\Tasks\Common\Resources\Strings.resx" LinkBase="Resources" GenerateSource="True" Namespace="Microsoft.NET.Build.Tasks" />
37-
<EmbeddedResource Include="..\..\src\Cli\Microsoft.DotNet.Cli\CommonLocalizableStrings.resx" LinkBase="Resources" GenerateSource="True" Namespace="Microsoft.DotNet.Tools" />
37+
<EmbeddedResource Include="..\..\src\Cli\dotnet\CommonLocalizableStrings.resx" LinkBase="Resources" GenerateSource="True" Namespace="Microsoft.DotNet.Tools" />
3838
</ItemGroup>
3939

4040
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />

test/Microsoft.NET.Publish.Tests/Microsoft.NET.Publish.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</ItemGroup>
3333

3434
<ItemGroup>
35-
<EmbeddedResource Include="..\..\src\Cli\Microsoft.DotNet.Cli\CommonLocalizableStrings.resx" LinkBase="Resources" GenerateSource="True" Namespace="Microsoft.DotNet.Tools" />
35+
<EmbeddedResource Include="..\..\src\Cli\dotnet\CommonLocalizableStrings.resx" LinkBase="Resources" GenerateSource="True" Namespace="Microsoft.DotNet.Tools" />
3636
<EmbeddedResource Include="..\..\src\Tasks\Common\Resources\Strings.resx" LinkBase="Resources" GenerateSource="True" Namespace="Microsoft.NET.Build.Tasks" />
3737
<None Include="..\..\src\Tasks\Common\Resources\xlf\**\*" LinkBase="Resources\xlf" />
3838
<PackageReference Include="Microsoft.DotNet.XliffTasks" Version="$(MicrosoftDotNetXliffTasksVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />

test/SDDLTests/SDDLTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<ProjectReference Include="..\..\src\Cli\Microsoft.DotNet.Cli\Microsoft.DotNet.Cli.csproj" />
15+
<ProjectReference Include="..\..\src\Cli\dotnet\dotnet.csproj" />
1616
<ProjectReference Include="..\..\src\Cli\Microsoft.DotNet.Cli.Utils\Microsoft.DotNet.Cli.Utils.csproj" />
1717
</ItemGroup>
1818

test/dotnet-MsiInstallation.Tests/dotnet-MsiInstallation.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
<ItemGroup>
3737
<ProjectReference Include="..\Microsoft.NET.TestFramework\Microsoft.NET.TestFramework.csproj" />
38-
<ProjectReference Include="..\..\src\Cli\Microsoft.DotNet.Cli\Microsoft.DotNet.Cli.csproj" />
38+
<ProjectReference Include="..\..\src\Cli\dotnet\dotnet.csproj" />
3939
</ItemGroup>
4040

4141
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />

test/dotnet-new.Tests/dotnet-new.IntegrationTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<ProjectReference Include="..\..\src\Cli\Microsoft.DotNet.Cli\Microsoft.DotNet.Cli.csproj" />
14+
<ProjectReference Include="..\..\src\Cli\dotnet\dotnet.csproj" />
1515
<ProjectReference Include="..\Microsoft.NET.TestFramework\Microsoft.NET.TestFramework.csproj" />
1616
<PackageReference Include="Moq" />
1717
<PackageReference Include="Verify.Xunit" />

test/dotnet-sln.Tests/dotnet-sln.Tests.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
<ItemGroup>
2121
<!-- Use string resources from product in order to validate test output. -->
22-
<EmbeddedResource Include="..\..\src\Cli\Microsoft.DotNet.Cli\CommonLocalizableStrings.resx" LinkBase="Resources" GenerateSource="True" Namespace="Microsoft.DotNet.Tools" />
23-
<EmbeddedResource Include="..\..\src\Cli\Microsoft.DotNet.Cli\Commands\Solution\LocalizableStrings.resx" LinkBase="Resources" GenerateSource="True" Namespace="Microsoft.DotNet.Tools.Sln" />
22+
<EmbeddedResource Include="..\..\src\Cli\dotnet\CommonLocalizableStrings.resx" LinkBase="Resources" GenerateSource="True" Namespace="Microsoft.DotNet.Tools" />
23+
<EmbeddedResource Include="..\..\src\Cli\dotnet\Commands\Solution\LocalizableStrings.resx" LinkBase="Resources" GenerateSource="True" Namespace="Microsoft.DotNet.Tools.Sln" />
2424
</ItemGroup>
2525

2626
<ItemGroup>

test/dotnet.Tests/dotnet.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
<ItemGroup>
115115
<ProjectReference Include="..\Microsoft.NET.TestFramework\Microsoft.NET.TestFramework.csproj" />
116116
<ProjectReference Include="..\Microsoft.DotNet.Tools.Tests.ComponentMocks\Microsoft.DotNet.Tools.Tests.ComponentMocks.csproj" />
117-
<ProjectReference Include="..\..\src\Cli\Microsoft.DotNet.Cli\Microsoft.DotNet.Cli.csproj" />
117+
<ProjectReference Include="..\..\src\Cli\dotnet\dotnet.csproj" />
118118
<ProjectReference Include="..\..\src\Cli\Microsoft.DotNet.Cli.Utils\Microsoft.DotNet.Cli.Utils.csproj" />
119119
<ProjectReference Include="..\Msbuild.Tests.Utilities\Msbuild.Tests.Utilities.csproj" />
120120
</ItemGroup>

0 commit comments

Comments
 (0)