mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use Microsoft.Build.NoTargets for the SdkResolver.csproj and VSTemplateLocator.csproj projects. Added the projects back to the SLN so they build using the proper configuration (debug/release).

Browse source
This commit is contained in:
Michael Yanni 2023-12-13 16:40:29 -08:00
parent d9cc884725
commit ed59078629
4 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Microsoft.DotNet.Cli.sln
View file

@ -21,6 +21,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SdkTests", "test\SdkTests\S
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "core-sdk-tasks.Tests", "test\core-sdk-tasks.Tests\core-sdk-tasks.Tests.csproj", "{658EF9BE-452C-4D31-AA24-B9E2235799A8}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "core-sdk-tasks.Tests", "test\core-sdk-tasks.Tests\core-sdk-tasks.Tests.csproj", "{658EF9BE-452C-4D31-AA24-B9E2235799A8}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "redist", "redist", "{0F9ADC9A-20D9-498C-9016-C21DBAD8615E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "projects", "projects", "{3A366863-9C7B-4789-8F72-57F62DE9C71F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SdkResolver", "src\redist\projects\SdkResolver.csproj", "{2CDD151F-BFD1-4440-B9CB-772A3DE4987E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VSTemplateLocator", "src\redist\projects\VSTemplateLocator.csproj", "{6180AD29-2F76-4E52-B8D7-211D01F9F2CB}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@ -55,17 +63,29 @@ Global
{658EF9BE-452C-4D31-AA24-B9E2235799A8}.Debug|Any CPU.Build.0 = Debug|Any CPU {658EF9BE-452C-4D31-AA24-B9E2235799A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{658EF9BE-452C-4D31-AA24-B9E2235799A8}.Release|Any CPU.ActiveCfg = Release|Any CPU {658EF9BE-452C-4D31-AA24-B9E2235799A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{658EF9BE-452C-4D31-AA24-B9E2235799A8}.Release|Any CPU.Build.0 = Release|Any CPU {658EF9BE-452C-4D31-AA24-B9E2235799A8}.Release|Any CPU.Build.0 = Release|Any CPU
{2CDD151F-BFD1-4440-B9CB-772A3DE4987E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2CDD151F-BFD1-4440-B9CB-772A3DE4987E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2CDD151F-BFD1-4440-B9CB-772A3DE4987E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2CDD151F-BFD1-4440-B9CB-772A3DE4987E}.Release|Any CPU.Build.0 = Release|Any CPU
{6180AD29-2F76-4E52-B8D7-211D01F9F2CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6180AD29-2F76-4E52-B8D7-211D01F9F2CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6180AD29-2F76-4E52-B8D7-211D01F9F2CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6180AD29-2F76-4E52-B8D7-211D01F9F2CB}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
EndGlobalSection EndGlobalSection
GlobalSection(NestedProjects) = preSolution GlobalSection(NestedProjects) = preSolution
{098D9321-1201-4974-A75E-F58EBCD98ACF} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {098D9321-1201-4974-A75E-F58EBCD98ACF} = {0F9ADC9A-20D9-498C-9016-C21DBAD8615E}
{1BFF54F9-4E35-49DB-893C-AF2047722FC6} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} {1BFF54F9-4E35-49DB-893C-AF2047722FC6} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
{53AF2D01-B69F-4CD0-86A7-8FD95967D23C} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {53AF2D01-B69F-4CD0-86A7-8FD95967D23C} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
{78E15EC1-7732-41E3-8591-934E9F583254} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} {78E15EC1-7732-41E3-8591-934E9F583254} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
{CB1EE94E-CB83-4071-9DD0-9929AE2B7282} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} {CB1EE94E-CB83-4071-9DD0-9929AE2B7282} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
{658EF9BE-452C-4D31-AA24-B9E2235799A8} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} {658EF9BE-452C-4D31-AA24-B9E2235799A8} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
{0F9ADC9A-20D9-498C-9016-C21DBAD8615E} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
{3A366863-9C7B-4789-8F72-57F62DE9C71F} = {0F9ADC9A-20D9-498C-9016-C21DBAD8615E}
{2CDD151F-BFD1-4440-B9CB-772A3DE4987E} = {3A366863-9C7B-4789-8F72-57F62DE9C71F}
{6180AD29-2F76-4E52-B8D7-211D01F9F2CB} = {3A366863-9C7B-4789-8F72-57F62DE9C71F}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {B526D2CE-EE2D-4AD4-93EF-1867D90FF1F5} SolutionGuid = {B526D2CE-EE2D-4AD4-93EF-1867D90FF1F5}

5
src/redist/projects/SdkResolver.csproj
View file

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.Build.NoTargets">
<PropertyGroup> <PropertyGroup>
<TargetFramework>$(CoreSdkTargetFramework)</TargetFramework> <TargetFramework>$(CoreSdkTargetFramework)</TargetFramework>
@ -6,7 +6,6 @@
<GenerateDependencyFile>false</GenerateDependencyFile> <GenerateDependencyFile>false</GenerateDependencyFile>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles> <GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
<AssemblyName>UNUSED</AssemblyName>
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild> <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
</PropertyGroup> </PropertyGroup>
@ -17,7 +16,7 @@
<PackageReference Include="runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" ExcludeAssets="all" GeneratePathProperty="true" /> <PackageReference Include="runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" ExcludeAssets="all" GeneratePathProperty="true" />
</ItemGroup> </ItemGroup>
<Target Name="GenerateLayout" Condition=" '$(OS)' == 'Windows_NT' " BeforeTargets="AfterBuild"> <Target Name="GenerateLayout" Condition="'$(OS)' == 'Windows_NT'" BeforeTargets="AfterBuild">
<Message Importance="High" Text="$(MSBuildProjectName) -&gt; $(OutputPath)" /> <Message Importance="High" Text="$(MSBuildProjectName) -&gt; $(OutputPath)" />
<RemoveDir Directories="$(OutputPath)" /> <RemoveDir Directories="$(OutputPath)" />

5
src/redist/projects/VSTemplateLocator.csproj
View file

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.Build.NoTargets">
<PropertyGroup> <PropertyGroup>
<TargetFramework>$(CoreSdkTargetFramework)</TargetFramework> <TargetFramework>$(CoreSdkTargetFramework)</TargetFramework>
@ -6,7 +6,6 @@
<GenerateDependencyFile>false</GenerateDependencyFile> <GenerateDependencyFile>false</GenerateDependencyFile>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles> <GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
<AssemblyName>UNUSED</AssemblyName>
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild> <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
</PropertyGroup> </PropertyGroup>
@ -18,7 +17,7 @@
<PackageReference Include="Microsoft.Deployment.DotNet.Releases" Version="$(MicrosoftDeploymentDotNetReleasesVersion)" ExcludeAssets="all" GeneratePathProperty="true" /> <PackageReference Include="Microsoft.Deployment.DotNet.Releases" Version="$(MicrosoftDeploymentDotNetReleasesVersion)" ExcludeAssets="all" GeneratePathProperty="true" />
</ItemGroup> </ItemGroup>
<Target Name="GenerateLayout" Condition=" '$(OS)' == 'Windows_NT' " BeforeTargets="AfterBuild"> <Target Name="GenerateLayout" Condition="'$(OS)' == 'Windows_NT'" BeforeTargets="AfterBuild">
<Message Importance="High" Text="$(MSBuildProjectName) -&gt; $(OutputPath)" /> <Message Importance="High" Text="$(MSBuildProjectName) -&gt; $(OutputPath)" />
<RemoveDir Directories="$(OutputPath)" /> <RemoveDir Directories="$(OutputPath)" />

4
src/redist/redist.csproj
View file

@ -20,10 +20,6 @@
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Installers" Version="$(MicrosoftDotNetBuildTasksInstallersPackageVersion)" /> <PackageReference Include="Microsoft.DotNet.Build.Tasks.Installers" Version="$(MicrosoftDotNetBuildTasksInstallersPackageVersion)" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="targets\DownloadPackage.csproj" />
</ItemGroup>
<Import Project="targets\BuildCoreSdkTasks.targets" /> <Import Project="targets\BuildCoreSdkTasks.targets" />
<Import Project="targets\GetRuntimeInformation.targets" /> <Import Project="targets\GetRuntimeInformation.targets" />
<Import Project="targets\SetBuildDefaults.targets" /> <Import Project="targets\SetBuildDefaults.targets" />