Skip to content

Commit

Permalink
Enable Signing in Repos that Override Build Actions (#44855)
Browse files Browse the repository at this point in the history
  • Loading branch information
ellahathaway authored Dec 16, 2024
1 parent f4ee559 commit b5e0903
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/SourceBuild/content/repo-projects/aspnetcore.proj
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<BuildScript>$(ProjectDirectory)eng\build$(ShellExtension)</BuildScript>

<BuildActions Condition="'$(DotNetBuildSourceOnly)' != 'true'">$(FlagParameterPrefix)restore $(FlagParameterPrefix)all $(FlagParameterPrefix)pack $(FlagParameterPrefix)publish</BuildActions>
<BuildActions Condition="'$(Sign)' == 'true'">$(BuildActions) $(FlagParameterPrefix)sign</BuildActions>
<!-- On windows, native tooling (JDK) is pre-installed on the machine. -->
<BuildActions Condition="'$(BuildOS)' == 'windows'">$(BuildActions) -NativeToolsOnMachine</BuildActions>
<!-- On non-windows, we don't have the JDK available and don't need to build those projects anyway because they are not consumed downstream. -->
Expand Down
4 changes: 4 additions & 0 deletions src/SourceBuild/content/repo-projects/fsharp.proj
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@

<!-- Restore and Build actions are already passed in by the root script. -->
<BuildActions>$(FlagParameterPrefix)pack $(FlagParameterPrefix)publish</BuildActions>
<BuildActions Condition="'$(Sign)' == 'true'">$(BuildActions) $(FlagParameterPrefix)sign</BuildActions>

<!-- noVisualStudio build action must be passed if building with Core MSBuild on Windows. -->
<BuildActions Condition="'$(BuildOS)' == 'windows' and '$(ForceDotNetMSBuildEngine)' != 'false'">$(BuildActions) $(FlagParameterPrefix)noVisualStudio</BuildActions>

<BuildArgs>$(BuildArgs) /p:TreatWarningsAsErrors=false</BuildArgs>
<BuildArgs>$(BuildArgs) /p:GenerateResourceUsePreserializedResources=true</BuildArgs>
Expand Down
1 change: 1 addition & 0 deletions src/SourceBuild/content/repo-projects/roslyn.proj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<BuildActions Condition="'$(BuildOS)' == 'windows'">$(FlagParameterPrefix)restore</BuildActions>
<BuildActions Condition="'$(BuildOS)' == 'windows'">$(BuildActions) $(FlagParameterPrefix)pack</BuildActions>
<BuildActions Condition="'$(BuildOS)' == 'windows'">$(BuildActions) $(FlagParameterPrefix)publish</BuildActions>
<BuildActions Condition="'$(BuildOS)' == 'windows' and '$(Sign)' == 'true'">$(BuildActions) $(FlagParameterPrefix)sign</BuildActions>

<!-- Use the repo root build script -->
<BuildScript>$(ProjectDirectory)build$(ShellExtension)</BuildScript>
Expand Down

0 comments on commit b5e0903

Please sign in to comment.