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

Instead of making it complicated, I simply made these 2 packaging projects only ever build with the default configuration (Debug) since it is irrelevant for packaging. Updated the paths used when creating the MSIs, which uses the output of these to create NuGet packages.

Browse source
This commit is contained in:
Michael Yanni 2023-12-13 17:34:32 -08:00
parent ed59078629
commit bec677e68a
2 changed files with 4 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Microsoft.DotNet.Cli.sln
View file

@ -21,14 +21,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SdkTests", "test\SdkTests\S
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}"
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
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -63,29 +55,17 @@ Global
{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.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
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{098D9321-1201-4974-A75E-F58EBCD98ACF} = {0F9ADC9A-20D9-498C-9016-C21DBAD8615E}
{098D9321-1201-4974-A75E-F58EBCD98ACF} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
{1BFF54F9-4E35-49DB-893C-AF2047722FC6} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
{53AF2D01-B69F-4CD0-86A7-8FD95967D23C} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
{78E15EC1-7732-41E3-8591-934E9F583254} = {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}
{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
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {B526D2CE-EE2D-4AD4-93EF-1867D90FF1F5}

4
src/redist/targets/GenerateMSIs.targets
View file

@ -30,7 +30,8 @@
<VSToolsNuspecFile>$(SdkPkgSourcesRootDirectory)/VS.Tools.Net.Core.SDK.nuspec</VSToolsNuspecFile>
<VSToolsNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Tools.Net.Core.SDK.$(Architecture).$(FullNugetVersion).nupkg</VSToolsNupkgFile>
<SdkResolverLayoutPath>$(ArtifactsDir)bin/SdkResolver/$(Configuration)</SdkResolverLayoutPath>
<!-- Hard-coded to Debug since this project is not in the SLN, so it won't pick up $(Configuration) on build. The configuration is irrelevant since this project only creates a package. -->
<SdkResolverLayoutPath>$(ArtifactsDir)bin/SdkResolver/Debug</SdkResolverLayoutPath>
<VSToolsResolverNuspecFile>$(SdkPkgSourcesRootDirectory)/VS.Tools.Net.Core.SDK.Resolver.nuspec</VSToolsResolverNuspecFile>
<VSToolsResolverNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Tools.Net.Core.SDK.Resolver.nupkg</VSToolsResolverNupkgFile>
@ -38,6 +39,7 @@
<SdkMSBuildExtensionsNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.$(FullNugetVersion).nupkg</SdkMSBuildExtensionsNupkgFile>
<SdkMSBuildExtensionsSwrFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.swr</SdkMSBuildExtensionsSwrFile>
<!-- Hard-coded to Debug since this project is not in the SLN, so it won't pick up $(Configuration) on build. The configuration is irrelevant since this project only creates a package. -->
<VSTemplateLocatorLayoutPath>$(ArtifactsDir)bin/VSTemplateLocator/Debug</VSTemplateLocatorLayoutPath>
<VSTemplateLocatorNuspecFile>$(SdkPkgSourcesRootDirectory)/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec</VSTemplateLocatorNuspecFile>
<VSTemplateLocatorNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.$(FullNugetVersion).nupkg</VSTemplateLocatorNupkgFile>