diff --git a/eng/Versions.props b/eng/Versions.props index 457eda8e5..e7bb4ffc6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -160,8 +160,8 @@ removed. See https://github.com/dotnet/source-build/issues/2295 --> 15.7.179 15.7.179 - 0.1.0-6.0.100-bootstrap.16 - 0.1.0-6.0.100-19 + 0.1.0-6.0.100-bootstrap.17 + 0.1.0-6.0.100-20 diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index 6f3293ea6..a8ebad0d7 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -27,10 +27,9 @@ jobs: Fedora33-Online: _runOnline: true _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 - # TODO: Renable once installer prebuilts are eliminated. - # Fedora33-Offline: - # _runOnline: false - # _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 + Fedora33-Offline: + _runOnline: false + _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 timeoutInMinutes: 180 variables: _TarballDir: $(Build.StagingDirectory)/tarball diff --git a/src/SourceBuild/tarball/content/eng/Versions.props b/src/SourceBuild/tarball/content/eng/Versions.props index 34a90269c..5ecff2337 100644 --- a/src/SourceBuild/tarball/content/eng/Versions.props +++ b/src/SourceBuild/tarball/content/eng/Versions.props @@ -21,8 +21,8 @@ - 0.1.0-6.0.100-bootstrap.16 + 0.1.0-6.0.100-bootstrap.17 0.1.0-6.0.100- - 19 + 20 diff --git a/src/SourceBuild/tarball/content/patches/sourcelink/0002-https-github.com-dotnet-arcade-issues-7778-Ignore-cu.patch b/src/SourceBuild/tarball/content/patches/sourcelink/0002-https-github.com-dotnet-arcade-issues-7778-Ignore-cu.patch new file mode 100644 index 000000000..8dffe11a5 --- /dev/null +++ b/src/SourceBuild/tarball/content/patches/sourcelink/0002-https-github.com-dotnet-arcade-issues-7778-Ignore-cu.patch @@ -0,0 +1,26 @@ +From 4c6179851c1e4ff7f6835707d11f0d9a411aefbc Mon Sep 17 00:00:00 2001 +From: Matt Galbraith +Date: Mon, 23 Aug 2021 08:52:35 -0700 +Subject: [PATCH] https://github.com/dotnet/arcade/issues/7778 - Ignore curl + failures for no-network build scenario + +--- + eng/common/tools.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/eng/common/tools.sh b/eng/common/tools.sh +index 3c5f3a12..41e32310 100755 +--- a/eng/common/tools.sh ++++ b/eng/common/tools.sh +@@ -402,7 +402,7 @@ function StopProcesses { + function TryLogClientIpAddress () { + echo 'Attempting to log this client''s IP for Azure Package feed telemetry purposes' + if command -v curl > /dev/null; then +- curl -s 'http://co1.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: ' ++ curl -s 'http://co1.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: ' || true + fi + } + +-- +2.30.2 +