Skip to content
New issue

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

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

Already on GitHub? # to your account

Installer/finalizer in c# #44611

Open
wants to merge 29 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
ed5dd1f
Installer/finalizer in c#
kasperk81 Nov 3, 2024
5a62454
direct p/invoke
kasperk81 Nov 7, 2024
a16e9f9
Update finalizer.csproj
kasperk81 Dec 7, 2024
831935d
Update Program.cs
kasperk81 Dec 7, 2024
5c4c010
Merge branch 'main' into finalizer-csharp
kasperk81 Dec 7, 2024
69a9f94
Update src/Installer/finalizer/finalizer.csproj
kasperk81 Dec 9, 2024
a883ccf
Merge branch 'main' into finalizer-csharp
kasperk81 Dec 9, 2024
436c5a2
undo
kasperk81 Dec 9, 2024
101b471
Update src/Installer/finalizer/Program.cs
kasperk81 Dec 9, 2024
789c697
Ensure parity with native finalizer behavior
joeloff Dec 13, 2024
c31f71a
Clean up workload provider keys
joeloff Dec 13, 2024
3da5173
Remove native tools from build.cmd
joeloff Dec 13, 2024
6a7d073
Fix SDK detection
joeloff Dec 13, 2024
ae32cfd
publish on windows only
kasperk81 Dec 15, 2024
ae5b2e6
Merge branch 'main' into finalizer-csharp
kasperk81 Dec 15, 2024
7896158
Update src/Installer/finalizer/finalizer.csproj
kasperk81 Dec 17, 2024
466fe89
add size optimization flags
kasperk81 Dec 17, 2024
541542c
Remove nativeToolsOnMachine flag from sdk.proj (VMR)
ViktorHofer Dec 17, 2024
c3aa430
Merge branch 'main' into finalizer-csharp
kasperk81 Jan 14, 2025
f052972
revert a commit to see if it fix VMR
kasperk81 Jan 14, 2025
eafb883
revert the revert
kasperk81 Jan 15, 2025
c0355d9
Merge branch 'main' into finalizer-csharp
kasperk81 Jan 18, 2025
b665a85
Merge remote-tracking branch 'upstream/main' into finalizer-csharp
kasperk81 Feb 18, 2025
60b342e
merge
kasperk81 Feb 18, 2025
9a8f5c8
Update src/Installer/finalizer/finalizer.csproj
kasperk81 Feb 18, 2025
e91cdec
Merge branch 'main' into finalizer-csharp
kasperk81 Feb 18, 2025
49176dd
Merge branch 'main' into finalizer-csharp
kasperk81 Mar 1, 2025
7b6a731
Update finalizer.csproj
kasperk81 Mar 1, 2025
cfe2801
Merge branch 'main' into finalizer-csharp
kasperk81 Mar 2, 2025
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
8 changes: 1 addition & 7 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,6 @@
<Architecture Condition="'$(Architecture)' == '' AND '$(BuildArchitecture)' == 'ppc64le'">$(BuildArchitecture)</Architecture>
<Architecture Condition="'$(Architecture)' == '' AND '$(BuildArchitecture)' == 'loongarch64'">$(BuildArchitecture)</Architecture>
<Architecture Condition="'$(Architecture)' == ''">x64</Architecture>

<!--
The finalizer.nativeproject needs to have Platform set to build for the correct architecture, but this value being set below isn't used by the project because of the build hierarchy when using the CMake SDK.
Instead, the Platform being set here is prior to calling the Arcade SDK, which sets PlatformName in RepoDefaults.props and modifies the OutputPath in ProjectLayout.props to include a PlatformName folder in the path.
Note: The redist-installer project does use Architecture. The Arcade SDK does not use either BuildArchitecture or Architecture.
-->
<Platform Condition="'$(SetPlatformFromArchitecture)' == 'true' And ('$(Platform)' == '' Or '$(Platform)' == 'AnyCPU')">$(Architecture)</Platform>
<Nullable>enable</Nullable>
</PropertyGroup>

Expand Down Expand Up @@ -59,6 +52,7 @@
</PropertyGroup>

<PropertyGroup>
<SdkSrcRoot>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'src'))</SdkSrcRoot>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<LangVersion>Latest</LangVersion>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
Expand Down
2 changes: 1 addition & 1 deletion build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ if %errorlevel%==0 (
set PackInstaller=/p:PackInstaller=false
set DISABLE_CROSSGEN=true
)
powershell -NoLogo -NoProfile -ExecutionPolicy ByPass -command "& """%~dp0eng\common\build.ps1""" -restore -build -nativeToolsOnMachine -msbuildEngine dotnet %PackInstaller% %*"
powershell -NoLogo -NoProfile -ExecutionPolicy ByPass -command "& """%~dp0eng\common\build.ps1""" -restore -build -msbuildEngine dotnet %PackInstaller% %*"
exit /b %ErrorLevel%
6 changes: 1 addition & 5 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,9 @@
"version": "16.8"
}
},
"native-tools": {
"cmake": "latest"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25113.2",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25113.2",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
"Microsoft.Build.NoTargets": "3.7.0"
}
}
2 changes: 1 addition & 1 deletion sdk.sln
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ 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", "src\Installer\finalizer\finalizer.csproj", "{32DA04FF-A951-43EA-B2FA-86A825009A97}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "redist-installer", "src\Installer\redist-installer\redist-installer.csproj", "{FAADC193-BA41-449D-97CE-0EF82836046A}"
EndProject
Expand Down
65 changes: 0 additions & 65 deletions src/Installer/finalizer/CMakeLists.txt

This file was deleted.

6 changes: 1 addition & 5 deletions src/Installer/finalizer/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
<Project>

<PropertyGroup>
<SetPlatformFromArchitecture>true</SetPlatformFromArchitecture>
</PropertyGroup>

<Import Project="..\..\..\Directory.Build.props" />

</Project>
</Project>
Loading
Loading