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

Change name of DotNetBuildWithOnlineSources to DotNetBuildWithOnlineF… (#18426)

Browse source
This commit is contained in:
Matt Mitchell 2024-01-26 13:38:54 -08:00 • committed by GitHub
parent 051de02367
commit af3c100f01
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -119,7 +119,7 @@
<!-- It's not unusual to build with a preview SDK --> <!-- It's not unusual to build with a preview SDK -->
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage> <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
<!-- By default, the VMR builds with online sources when not building source-only. --> <!-- By default, the VMR builds with online sources when not building source-only. -->
<DotNetBuildWithOnlineSources Condition="'$(DotNetBuildWithOnlineSources)' == '' and '$(DotNetBuildSourceOnly)' != 'true'">true</DotNetBuildWithOnlineSources> <DotNetBuildWithOnlineFeeds Condition="'$(DotNetBuildWithOnlineFeeds)' == '' and '$(DotNetBuildSourceOnly)' != 'true'">true</DotNetBuildWithOnlineFeeds>
<!-- By default, skip building tests when building the VMR. --> <!-- By default, skip building tests when building the VMR. -->
<DotNetBuildSkipTests Condition="'$(DotNetBuildSkipTests)' == ''">true</DotNetBuildSkipTests> <DotNetBuildSkipTests Condition="'$(DotNetBuildSkipTests)' == ''">true</DotNetBuildSkipTests>
</PropertyGroup> </PropertyGroup>

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

@ -122,7 +122,7 @@ while [[ $# > 0 ]]; do
properties="$properties /p:DotNetBuildSourceOnly=true" properties="$properties /p:DotNetBuildSourceOnly=true"
;; ;;
-online) -online)
properties="$properties /p:DotNetBuildWithOnlineSources=true" properties="$properties /p:DotNetBuildWithOnlineFeeds=true"
;; ;;
-poison) -poison)
properties="$properties /p:EnablePoison=true" properties="$properties /p:EnablePoison=true"

4
src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/RemoveInternetSourcesFromNuGetConfig.cs
View file

@ -26,7 +26,7 @@ namespace Microsoft.DotNet.Build.Tasks
/// <summary> /// <summary>
/// Whether to work in offline mode (remove all internet sources) or online mode (remove only authenticated sources) /// Whether to work in offline mode (remove all internet sources) or online mode (remove only authenticated sources)
/// </summary> /// </summary>
public bool BuildWithOnlineSources { get; set; } public bool BuildWithOnlineFeeds { get; set; }
/// <summary> /// <summary>
/// A list of prefix strings that make the task keep a package source unconditionally. For /// A list of prefix strings that make the task keep a package source unconditionally. For
@ -56,7 +56,7 @@ namespace Microsoft.DotNet.Build.Tasks
} }
string feedUrl = e.Attribute("value").Value; string feedUrl = e.Attribute("value").Value;
if (BuildWithOnlineSources) if (BuildWithOnlineFeeds)
{ {
return !( feedUrl.StartsWith("https://pkgs.dev.azure.com/dnceng/_packaging", StringComparison.OrdinalIgnoreCase) || return !( feedUrl.StartsWith("https://pkgs.dev.azure.com/dnceng/_packaging", StringComparison.OrdinalIgnoreCase) ||
feedUrl.StartsWith("https://pkgs.dev.azure.com/dnceng/internal/_packaging", StringComparison.OrdinalIgnoreCase) ); feedUrl.StartsWith("https://pkgs.dev.azure.com/dnceng/internal/_packaging", StringComparison.OrdinalIgnoreCase) );

4
src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UpdateNuGetConfigPackageSourcesMappings.cs
View file

@ -27,7 +27,7 @@ namespace Microsoft.DotNet.Build.Tasks
/// <summary> /// <summary>
/// Whether to work in offline mode (remove all internet sources) or online mode (remove only authenticated sources) /// Whether to work in offline mode (remove all internet sources) or online mode (remove only authenticated sources)
/// </summary> /// </summary>
public bool BuildWithOnlineSources { get; set; } public bool BuildWithOnlineFeeds { get; set; }
/// <summary> /// <summary>
/// A list of all source-build specific NuGet sources. /// A list of all source-build specific NuGet sources.
@ -54,7 +54,7 @@ namespace Microsoft.DotNet.Build.Tasks
.Distinct() .Distinct()
.ToArray(); .ToArray();
if (!BuildWithOnlineSources) if (!BuildWithOnlineFeeds)
{ {
// When building offline remove all packageSourceMappings. // When building offline remove all packageSourceMappings.
pkgSrcMappingElement?.ReplaceNodes(new XElement("clear")); pkgSrcMappingElement?.ReplaceNodes(new XElement("clear"));

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

@ -98,7 +98,7 @@
<RemoveInternetSourcesFromNuGetConfig <RemoveInternetSourcesFromNuGetConfig
NuGetConfigFile="%(NuGetConfigFiles.Identity)" NuGetConfigFile="%(NuGetConfigFiles.Identity)"
BuildWithOnlineSources="$(DotNetBuildWithOnlineSources)" BuildWithOnlineFeeds="$(DotNetBuildWithOnlineFeeds)"
KeepFeedPrefixes="@(KeepFeedPrefixes)" KeepFeedPrefixes="@(KeepFeedPrefixes)"
Condition="'$(DotNetBuildSourceOnly)' == 'true'" /> Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
@ -134,7 +134,7 @@
<UpdateNuGetConfigPackageSourcesMappings <UpdateNuGetConfigPackageSourcesMappings
NuGetConfigFile="%(NuGetConfigFiles.Identity)" NuGetConfigFile="%(NuGetConfigFiles.Identity)"
BuildWithOnlineSources="$(DotNetBuildWithOnlineSources)" BuildWithOnlineFeeds="$(DotNetBuildWithOnlineFeeds)"
SourceBuildSources="$(SourceBuildSources)" /> SourceBuildSources="$(SourceBuildSources)" />
<MakeDir Directories="$(BaseIntermediateOutputPath)" /> <MakeDir Directories="$(BaseIntermediateOutputPath)" />