Skip to content

Move src/Installer components under src/Layout for better sharing and consolidation #47597

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.

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
merged 2 commits into from
Mar 14, 2025
Merged
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 documentation/general/workloads/workload-finalizer.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

When the .NET SDK is uninstalled, any workloads that were installed with that SDK should also be uninstalled. In order to do this when uninstalling an SDK which was installed via the standalone EXE installer bundle, there is a piece of native code called the finalizer. The finalizer removes any reference counts on workload packs and manifests from the SDK that is being uninstalled, and uninstalls any MSIs which then have no reference counts.

The finalizer code is here: https://github.com/dotnet/installer/tree/main/src/finalizer
The finalizer code is [here](/src/Layout/finalizer/README.md)
2 changes: 1 addition & 1 deletion eng/Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
it depends on assets from other verticals that are built in the first build pass. -->
<ItemGroup Condition="'$(DotNetBuildPass)' == '2' and
'$(OS)' == 'Windows_NT'">
<ProjectToBuild Include="$(RepoRoot)src\Installer\redist-installer\redist-installer.proj" DotNetBuildPass="2" />
<ProjectToBuild Include="$(RepoRoot)src\Layout\redist-installer\redist-installer.proj" DotNetBuildPass="2" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion eng/Publishing.props
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<Target Name="GetNonStableProductVersion">
<!-- Retrieve the non-stable product version. -->
<MSBuild Projects="$(RepoRoot)src/Installer/redist-installer/redist-installer.proj"
<MSBuild Projects="$(RepoRoot)src\Layout\redist-installer\redist-installer.proj"
Targets="ReturnProductVersion">
<Output TaskParameter="TargetOutputs" PropertyName="NonStableProductVersion" />
</MSBuild>
Expand Down
6 changes: 3 additions & 3 deletions sdk.sln
Original file line number Diff line number Diff line change
Expand Up @@ -485,11 +485,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-format.UnitTests", "
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Installer", "Installer", "{3FA6F1CB-295B-4414-B18F-93845917A8CD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "finalizer-build", "src\Installer\finalizer\finalizer-build.csproj", "{32DA04FF-A951-43EA-B2FA-86A825009A97}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "finalizer-build", "src\Layout\finalizer\finalizer-build.csproj", "{32DA04FF-A951-43EA-B2FA-86A825009A97}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "redist-installer", "src\Installer\redist-installer\redist-installer.proj", "{FAADC193-BA41-449D-97CE-0EF82836046A}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "redist-installer", "src\Layout\redist-installer\redist-installer.proj", "{FAADC193-BA41-449D-97CE-0EF82836046A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-sdk", "src\Installer\pkg\dotnet-sdk.proj", "{8D6A9984-118D-4415-A8FA-AB1F26CF5C44}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-sdk", "src\Layout\pkg\dotnet-sdk.proj", "{8D6A9984-118D-4415-A8FA-AB1F26CF5C44}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VS.Redist.Common.Net.Core.SDK.VSTemplateLocator", "src\Layout\VS.Redist.Common.Net.Core.SDK.VSTemplateLocator\VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.proj", "{0CBA5FB8-71A3-457A-89F3-E52B9602164A}"
EndProject
Expand Down
4 changes: 2 additions & 2 deletions source-build.slnf
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"src\\Compatibility\\Microsoft.DotNet.ApiSymbolExtensions\\Microsoft.DotNet.ApiSymbolExtensions.csproj",
"src\\Containers\\Microsoft.NET.Build.Containers\\Microsoft.NET.Build.Containers.csproj",
"src\\Containers\\packaging\\package.csproj",
"src\\Installer\\redist-installer\\redist-installer.proj",
"src\\Installer\\pkg\\dotnet-sdk.proj",
"src\\Layout\\redist-installer\\redist-installer.proj",
"src\\Layout\\pkg\\dotnet-sdk.proj",
"src\\Layout\\redist\\redist.csproj",
"src\\Layout\\redist\\tools\\tool_fsc.csproj",
"src\\Layout\\redist\\tools\\tool_msbuild.csproj",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<ItemGroup>
<ProjectReference Include="$(RepoRoot)src\Microsoft.Net.Sdk.AnalyzerRedirecting\Microsoft.Net.Sdk.AnalyzerRedirecting.csproj" />
<ProjectReference Include="$(RepoRoot)src\Installer\redist-installer\redist-installer.proj" />
<ProjectReference Include="..\redist-installer\redist-installer.proj" />
</ItemGroup>

<!-- Shared infra to build and use the sdk-tasks -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="$(RepoRoot)src\Installer\redist-installer\redist-installer.proj" />
<ProjectReference Include="..\redist-installer\redist-installer.proj" />
</ItemGroup>

<Target Name="GenerateLayout" Condition="'$(IsPackable)' == 'true'" DependsOnTargets="ResolveProjectReferences">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="$(RepoRoot)src\Installer\redist-installer\redist-installer.proj" />
<ProjectReference Include="..\redist-installer\redist-installer.proj" />
</ItemGroup>

<Target Name="GenerateLayout" Condition="'$(IsPackable)' == 'true'" DependsOnTargets="ResolveProjectReferences">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
<SetPlatformFromArchitecture>true</SetPlatformFromArchitecture>
</PropertyGroup>

<Import Project="..\..\..\Directory.Build.props" />
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />

</Project>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
</PropertyGroup>

<ItemGroup Condition="'$(GenerateSdkBundleOnly)' != 'true'">
<ProjectReference Include="$(RepoRoot)src\Layout\redist\redist.csproj" />
<ProjectReference Include="..\redist\redist.csproj" />
<ProjectReference Include="$(RepoRoot)template_feed\*\*.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(OS)' == 'Windows_NT'">
<ProjectReference Include="$(RepoRoot)src\Installer\finalizer\finalizer-build.csproj" />
<ProjectReference Include="..\finalizer\finalizer-build.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down