Skip to content

Commit 37cae14

Browse files
authored
Installer/finalizer in c# (#44611)
2 parents 7842ae3 + ddfd561 commit 37cae14

17 files changed

+352
-788
lines changed

Directory.Build.props

+1-7
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,6 @@
99
<Architecture Condition="'$(Architecture)' == '' AND '$(BuildArchitecture)' == 'ppc64le'">$(BuildArchitecture)</Architecture>
1010
<Architecture Condition="'$(Architecture)' == '' AND '$(BuildArchitecture)' == 'loongarch64'">$(BuildArchitecture)</Architecture>
1111
<Architecture Condition="'$(Architecture)' == ''">x64</Architecture>
12-
13-
<!--
14-
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.
15-
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.
16-
Note: The redist-installer project does use Architecture. The Arcade SDK does not use either BuildArchitecture or Architecture.
17-
-->
18-
<Platform Condition="'$(SetPlatformFromArchitecture)' == 'true' And ('$(Platform)' == '' Or '$(Platform)' == 'AnyCPU')">$(Architecture)</Platform>
1912
<Nullable>enable</Nullable>
2013
</PropertyGroup>
2114

@@ -35,6 +28,7 @@
3528
</PropertyGroup>
3629

3730
<PropertyGroup>
31+
<SdkSrcRoot>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'src'))</SdkSrcRoot>
3832
<PackageProjectUrl>https://github.com/dotnet/sdk</PackageProjectUrl>
3933
<PackageLicenseExpression>MIT</PackageLicenseExpression>
4034
<LangVersion>Latest</LangVersion>

build.cmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ if %errorlevel%==0 (
88
set SkipBuildingInstallers=/p:SkipBuildingInstallers=true
99
set DISABLE_CROSSGEN=true
1010
)
11-
powershell -NoLogo -NoProfile -ExecutionPolicy ByPass -command "& """%~dp0eng\common\build.ps1""" -restore -build -nativeToolsOnMachine -msbuildEngine dotnet %SkipBuildingInstallers% %*"
11+
powershell -NoLogo -NoProfile -ExecutionPolicy ByPass -command "& """%~dp0eng\common\build.ps1""" -restore -build -msbuildEngine dotnet %SkipBuildingInstallers% %*"
1212
exit /b %ErrorLevel%

global.json

+1-5
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,9 @@
1313
"version": "16.8"
1414
}
1515
},
16-
"native-tools": {
17-
"cmake": "latest"
18-
},
1916
"msbuild-sdks": {
2017
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25163.2",
2118
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25163.2",
22-
"Microsoft.Build.NoTargets": "3.7.0",
23-
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
19+
"Microsoft.Build.NoTargets": "3.7.0"
2420
}
2521
}

sdk.sln

+1-1
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-format", "src\BuiltI
482482
EndProject
483483
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-format.UnitTests", "test\dotnet-format.Tests\tests\dotnet-format.UnitTests.csproj", "{D7495CE7-64E5-4715-9304-799A41EC1D71}"
484484
EndProject
485-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "finalizer-build", "src\Layout\finalizer\finalizer-build.csproj", "{32DA04FF-A951-43EA-B2FA-86A825009A97}"
485+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "finalizer-build", "src\Layout\finalizer\finalizer.csproj", "{32DA04FF-A951-43EA-B2FA-86A825009A97}"
486486
EndProject
487487
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "redist-installer", "src\Layout\redist-installer\redist-installer.proj", "{FAADC193-BA41-449D-97CE-0EF82836046A}"
488488
EndProject

src/Layout/finalizer/CMakeLists.txt

-65
This file was deleted.

src/Layout/finalizer/Directory.Build.props

-9
This file was deleted.

0 commit comments

Comments
 (0)