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

Pass a few switches to the orchestrator (#18398)

Browse source
This commit is contained in:
Matt Mitchell 2024-01-26 00:19:35 -08:00 • committed by GitHub
parent d839e846f6
commit 0644f48e14
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/SourceBuild/content/Directory.Build.props
View file

@ -121,7 +121,7 @@
<!-- Builds from the VMR are by definition vertical builds. --> <!-- Builds from the VMR are by definition vertical builds. -->
<DotNetBuildVertical Condition="'$(DotNetBuildVertical)' == '' and '$(DotNetBuildFromSource)' != 'true'">true</DotNetBuildVertical> <DotNetBuildVertical Condition="'$(DotNetBuildVertical)' == '' and '$(DotNetBuildFromSource)' != 'true'">true</DotNetBuildVertical>
<!-- By default, the VMR builds with online sources. --> <!-- By default, the VMR builds with online sources. -->
<BuildWithOnlineSources Condition="'$(BuildWithOnlineSources)' == '' and '$(DotNetBuildVertical)' == 'true'">true</BuildWithOnlineSources> <DotNetBuildWithOnlineSources Condition="'$(DotNetBuildWithOnlineSources)' == '' and '$(DotNetBuildVertical)' == 'true'">true</DotNetBuildWithOnlineSources>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>

4
src/SourceBuild/content/build.sh
View file

@ -119,10 +119,10 @@ while [[ $# > 0 ]]; do
# Source-only settings # Source-only settings
-source-only|-so) -source-only|-so)
sourceOnly=true sourceOnly=true
properties="$properties /p:DotNetBuildFromSource=true" properties="$properties /p:DotNetBuildFromSource=true /p:DotNetBuildSourceOnly=true"
;; ;;
-online) -online)
properties="$properties /p:BuildWithOnlineSources=true" properties="$properties /p:DotNetBuildWithOnlineSources=true"
;; ;;
-poison) -poison)
properties="$properties /p:EnablePoison=true" properties="$properties /p:EnablePoison=true"

4
src/SourceBuild/content/repo-projects/Directory.Build.targets
View file

@ -82,7 +82,7 @@
<RemoveInternetSourcesFromNuGetConfig <RemoveInternetSourcesFromNuGetConfig
NuGetConfigFile="%(NuGetConfigFiles.Identity)" NuGetConfigFile="%(NuGetConfigFiles.Identity)"
BuildWithOnlineSources="$(BuildWithOnlineSources)" BuildWithOnlineSources="$(DotNetBuildWithOnlineSources)"
KeepFeedPrefixes="@(KeepFeedPrefixes)" KeepFeedPrefixes="@(KeepFeedPrefixes)"
Condition="'$(DotNetBuildFromSource)' == 'true'" /> Condition="'$(DotNetBuildFromSource)' == 'true'" />
@ -112,7 +112,7 @@
<UpdateNuGetConfigPackageSourcesMappings <UpdateNuGetConfigPackageSourcesMappings
NuGetConfigFile="%(NuGetConfigFiles.Identity)" NuGetConfigFile="%(NuGetConfigFiles.Identity)"
BuildWithOnlineSources="$(BuildWithOnlineSources)" BuildWithOnlineSources="$(DotNetBuildWithOnlineSources)"
SourceBuildSources="$(SourceBuildSources)" /> SourceBuildSources="$(SourceBuildSources)" />
<MakeDir Directories="$(BaseIntermediateOutputPath)" /> <MakeDir Directories="$(BaseIntermediateOutputPath)" />