Merge main to feature/triggers (#775)

* Update dependencies from https://github.com/dotnet/runtime build 20210823.19 (#761) [main] Update dependencies from dotnet/runtime * Update dependencies from https://github.com/dotnet/symstore build 20210823.1 (#762) [main] Update dependencies from dotnet/symstore * Update dependencies from https://github.com/dotnet/runtime build 20210824.25 (#765) [main] Update dependencies from dotnet/runtime * Update dependencies from https://github.com/dotnet/aspnetcore build 20210825.1 (#766) [main] Update dependencies from dotnet/aspnetcore * Update dependencies from https://github.com/dotnet/arcade build 20210824.3 (#764) [main] Update dependencies from dotnet/arcade * Update preview 7 canidate build version from 5.0.0-preview.7.21420.5 to 5.0.0-preview.7.21425.3 (#767) * Update dependencies from https://github.com/dotnet/diagnostics build 20210825.4 (#771) [main] Update dependencies from dotnet/diagnostics * Update dependencies from https://github.com/dotnet/runtime build 20210825.6 (#773) [main] Update dependencies from dotnet/runtime * Update dependencies from https://github.com/dotnet/arcade build 20210825.3 (#772) [main] Update dependencies from dotnet/arcade * Update dependencies from https://github.com/dotnet/aspnetcore build 20210826.1 (#774) [main] Update dependencies from dotnet/aspnetcore Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Patrick Fenelon <[email protected]>
dotnet · Aug 26, 2021 · e743a8e · e743a8e
2 parents ebe5765 + 96bbc9f
commit e743a8e
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 29 deletions.
diff --git a/.../releaseNotes.v5.0.0-preview.7.21420.5.md → .../releaseNotes.v5.0.0-preview.7.21425.3.md b/.../releaseNotes.v5.0.0-preview.7.21420.5.md → .../releaseNotes.v5.0.0-preview.7.21425.3.md
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -4,35 +4,35 @@
       <Uri>https://github.com/dotnet/command-line-api</Uri>
       <Sha>166610c56ff732093f0145a2911d4f6c40b786da</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Diagnostics.Monitoring" Version="5.0.0-preview.21420.1">
+    <Dependency Name="Microsoft.Diagnostics.Monitoring" Version="5.0.0-preview.21425.4">
       <Uri>https://github.com/dotnet/diagnostics</Uri>
-      <Sha>d90e32c58b23103f361833645cd922eb112aee30</Sha>
+      <Sha>2b6fc4861ae37bfa2dcc7e2d1ca8278178b46490</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Diagnostics.Monitoring.EventPipe" Version="5.0.0-preview.21420.1">
+    <Dependency Name="Microsoft.Diagnostics.Monitoring.EventPipe" Version="5.0.0-preview.21425.4">
       <Uri>https://github.com/dotnet/diagnostics</Uri>
-      <Sha>d90e32c58b23103f361833645cd922eb112aee30</Sha>
+      <Sha>2b6fc4861ae37bfa2dcc7e2d1ca8278178b46490</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21420.4">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21425.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>fe787bd48ed72e51a98eb5e4e5e5af74edb531e5</Sha>
+      <Sha>809cbb58dea1d1e477ab0e12855d1758d50844a8</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21420.4">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21425.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>fe787bd48ed72e51a98eb5e4e5e5af74edb531e5</Sha>
+      <Sha>809cbb58dea1d1e477ab0e12855d1758d50844a8</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.FileFormats" Version="1.0.240901">
+    <Dependency Name="Microsoft.FileFormats" Version="1.0.242301">
       <Uri>https://github.com/dotnet/symstore</Uri>
-      <Sha>d8e2990b89c53632653d7d67f3481cc72773f25c</Sha>
+      <Sha>5bf5ec03cd9eae25259904537c9959b59d1f21e1</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.0-rc.2.21421.2">
+    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.0-rc.2.21426.1">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>ddf61babd32546d06c7b1f0eb9a4ac37af275189</Sha>
+      <Sha>0b383edbcfebc483911cf020fa20a76ace0dafbc</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-rc.2.21420.29">
+    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-rc.2.21425.6">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>91406a13fb953d6ba8a6e274e8a6f6d240ac9436</Sha>
+      <Sha>ba336a27669420d291df7f69aa2a11eba73147b7</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -27,16 +27,16 @@
   -->
   <PropertyGroup Label="Automated">
     <!-- dotnet/arcade references -->
-    <MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21420.4</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21425.3</MicrosoftDotNetXUnitExtensionsVersion>
     <!-- dotnet/aspnetcore references -->
-    <VSRedistCommonAspNetCoreSharedFrameworkx6460Version>6.0.0-rc.2.21421.2</VSRedistCommonAspNetCoreSharedFrameworkx6460Version>
+    <VSRedistCommonAspNetCoreSharedFrameworkx6460Version>6.0.0-rc.2.21426.1</VSRedistCommonAspNetCoreSharedFrameworkx6460Version>
     <!-- dotnet/diagnostics references -->
-    <MicrosoftDiagnosticsMonitoringVersion>5.0.0-preview.21420.1</MicrosoftDiagnosticsMonitoringVersion>
-    <MicrosoftDiagnosticsMonitoringEventPipeVersion>5.0.0-preview.21420.1</MicrosoftDiagnosticsMonitoringEventPipeVersion>
+    <MicrosoftDiagnosticsMonitoringVersion>5.0.0-preview.21425.4</MicrosoftDiagnosticsMonitoringVersion>
+    <MicrosoftDiagnosticsMonitoringEventPipeVersion>5.0.0-preview.21425.4</MicrosoftDiagnosticsMonitoringEventPipeVersion>
     <!-- dotnet/runtime references -->
-    <VSRedistCommonNetCoreSharedFrameworkx6460Version>6.0.0-rc.2.21420.29</VSRedistCommonNetCoreSharedFrameworkx6460Version>
+    <VSRedistCommonNetCoreSharedFrameworkx6460Version>6.0.0-rc.2.21425.6</VSRedistCommonNetCoreSharedFrameworkx6460Version>
     <!-- dotnet/symstore references -->
-    <MicrosoftFileFormatsVersion>1.0.240901</MicrosoftFileFormatsVersion>
+    <MicrosoftFileFormatsVersion>1.0.242301</MicrosoftFileFormatsVersion>
   </PropertyGroup>
   <PropertyGroup Label="Runtime Versions">
     <MicrosoftNETCoreApp31Version>3.1.15</MicrosoftNETCoreApp31Version>

diff --git a/eng/common/build.sh b/eng/common/build.sh
@@ -187,7 +187,10 @@ function InitializeCustomToolset {
 }
 
 function Build {
-  TryLogClientIpAddress
+
+  if [[ "$ci" == true ]]; then
+    TryLogClientIpAddress
+  fi
   InitializeToolset
   InitializeCustomToolset
 

diff --git a/eng/common/post-build/sourcelink-validation.ps1 b/eng/common/post-build/sourcelink-validation.ps1
@@ -107,8 +107,12 @@ $ValidatePackage = {
                         try {
                           $Uri = $Link -as [System.URI]
 
-                          # Only GitHub links are valid
-                          if ($Uri.AbsoluteURI -ne $null -and ($Uri.Host -match 'github' -or $Uri.Host -match 'githubusercontent')) {
+                          if ($Link -match "submodules") {
+                            # Skip submodule links until sourcelink properly handles submodules
+                            $Status = 200
+                          }
+                          elseif ($Uri.AbsoluteURI -ne $null -and ($Uri.Host -match 'github' -or $Uri.Host -match 'githubusercontent')) {
+                            # Only GitHub links are valid
                             $Status = (Invoke-WebRequest -Uri $Link -UseBasicParsing -Method HEAD -TimeoutSec 5).StatusCode
                           }
                           else {

diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1
@@ -83,7 +83,9 @@ try {
   }
 
   if ($restore) {
-    Try-LogClientIpAddress
+    if ($ci) {
+      Try-LogClientIpAddress
+    }
     Build 'Restore'
   }
 

diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
@@ -154,9 +154,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
     return $global:_DotNetInstallDir
   }
 
-  # In case of network error, try to log the current IP for reference
-  Try-LogClientIpAddress
-
   # Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism
   $env:DOTNET_MULTILEVEL_LOOKUP=0
 
@@ -166,6 +163,9 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
   # Disable telemetry on CI.
   if ($ci) {
     $env:DOTNET_CLI_TELEMETRY_OPTOUT=1
+
+    # In case of network error, try to log the current IP for reference
+    Try-LogClientIpAddress
   }
 
   # Source Build uses DotNetCoreSdkDir variable

diff --git 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
 }
 

diff --git a/global.json b/global.json
@@ -16,6 +16,6 @@
   },
   "msbuild-sdks": {
     "Microsoft.Build.NoTargets": "2.0.1",
-    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21420.4"
+    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21425.3"
   }
 }