Skip to content

Commit 7609c46

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.SignTool , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21420.4 -> To Version 6.0.0-beta.21427.6 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent d1160d0 commit 7609c46

9 files changed

+33
-24
lines changed

‎eng/Version.Details.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,26 @@
77
</Dependency>
88
</ProductDependencies>
99
<ToolsetDependencies>
10-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21420.4">
10+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21427.6">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>fe787bd48ed72e51a98eb5e4e5e5af74edb531e5</Sha>
12+
<Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha>
1313
<SourceBuild RepoName="arcade" ManagedOnly="true" />
1414
</Dependency>
15-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21420.4">
15+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21427.6">
1616
<Uri>https://github.com/dotnet/arcade</Uri>
17-
<Sha>fe787bd48ed72e51a98eb5e4e5e5af74edb531e5</Sha>
17+
<Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.21420.4">
19+
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.21427.6">
2020
<Uri>https://github.com/dotnet/arcade</Uri>
21-
<Sha>fe787bd48ed72e51a98eb5e4e5e5af74edb531e5</Sha>
21+
<Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha>
2222
</Dependency>
23-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21420.4">
23+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21427.6">
2424
<Uri>https://github.com/dotnet/arcade</Uri>
25-
<Sha>fe787bd48ed72e51a98eb5e4e5e5af74edb531e5</Sha>
25+
<Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha>
2626
</Dependency>
27-
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="6.0.0-beta.21420.4">
27+
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="6.0.0-beta.21427.6">
2828
<Uri>https://github.com/dotnet/arcade</Uri>
29-
<Sha>fe787bd48ed72e51a98eb5e4e5e5af74edb531e5</Sha>
29+
<Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha>
3030
</Dependency>
3131
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.20074.1">
3232
<Uri>https://github.com/dotnet/arcade-services</Uri>

‎eng/Versions.props

+3-3
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@
6060
<XUnitVersion>2.4.1</XUnitVersion>
6161
<XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion>
6262
<XUnitVSRunnerVersion>2.4.1</XUnitVSRunnerVersion>
63-
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21420.4</MicrosoftDotNetBuildTasksFeedVersion>
64-
<MicrosoftDotNetSignToolVersion>6.0.0-beta.21420.4</MicrosoftDotNetSignToolVersion>
63+
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21427.6</MicrosoftDotNetBuildTasksFeedVersion>
64+
<MicrosoftDotNetSignToolVersion>6.0.0-beta.21427.6</MicrosoftDotNetSignToolVersion>
6565
<MicrosoftAzureDocumentDBVersion>1.22.0</MicrosoftAzureDocumentDBVersion>
6666
<MicrosoftAzureCosmosDBTableVersion>1.1.2</MicrosoftAzureCosmosDBTableVersion>
6767
<MicrosoftAspNetCoreAllVersion>2.0.0</MicrosoftAspNetCoreAllVersion>
@@ -73,7 +73,7 @@
7373
<MicrosoftDiaSymReaderNativeVersion>1.7.0</MicrosoftDiaSymReaderNativeVersion>
7474
<MicrosoftDotNetMaestroClientVersion>1.1.0-beta.20074.1</MicrosoftDotNetMaestroClientVersion>
7575
<MicrosoftSourceLinkVersion>1.0.0-beta2-19554-01</MicrosoftSourceLinkVersion>
76-
<MicrosoftDotNetSwaggerGeneratorMSBuildVersion>6.0.0-beta.21420.4</MicrosoftDotNetSwaggerGeneratorMSBuildVersion>
76+
<MicrosoftDotNetSwaggerGeneratorMSBuildVersion>6.0.0-beta.21427.6</MicrosoftDotNetSwaggerGeneratorMSBuildVersion>
7777
<XliffTasksVersion>1.0.0-beta.21272.1</XliffTasksVersion>
7878
<!-- Roslyn -->
7979
<!-- WARNING: Depending on Roslyn in code that also supports unmanaged scenarios (e.g. C++,

‎eng/common/build.sh

+4-1
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,10 @@ function InitializeCustomToolset {
187187
}
188188

189189
function Build {
190-
TryLogClientIpAddress
190+
191+
if [[ "$ci" == true ]]; then
192+
TryLogClientIpAddress
193+
fi
191194
InitializeToolset
192195
InitializeCustomToolset
193196

‎eng/common/post-build/sourcelink-validation.ps1

+6-2
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,12 @@ $ValidatePackage = {
107107
try {
108108
$Uri = $Link -as [System.URI]
109109

110-
# Only GitHub links are valid
111-
if ($Uri.AbsoluteURI -ne $null -and ($Uri.Host -match 'github' -or $Uri.Host -match 'githubusercontent')) {
110+
if ($Link -match "submodules") {
111+
# Skip submodule links until sourcelink properly handles submodules
112+
$Status = 200
113+
}
114+
elseif ($Uri.AbsoluteURI -ne $null -and ($Uri.Host -match 'github' -or $Uri.Host -match 'githubusercontent')) {
115+
# Only GitHub links are valid
112116
$Status = (Invoke-WebRequest -Uri $Link -UseBasicParsing -Method HEAD -TimeoutSec 5).StatusCode
113117
}
114118
else {

‎eng/common/sdk-task.ps1

+3-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,9 @@ try {
8383
}
8484

8585
if ($restore) {
86-
Try-LogClientIpAddress
86+
if ($ci) {
87+
Try-LogClientIpAddress
88+
}
8789
Build 'Restore'
8890
}
8991

‎eng/common/templates/job/job.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103

104104
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
105105
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
106-
- task: MicroBuildSigningPlugin@2
106+
- task: MicroBuildSigningPlugin@3
107107
displayName: Install MicroBuild plugin
108108
inputs:
109109
signType: $(_SignType)

‎eng/common/tools.ps1

+3-3
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
154154
return $global:_DotNetInstallDir
155155
}
156156

157-
# In case of network error, try to log the current IP for reference
158-
Try-LogClientIpAddress
159-
160157
# Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism
161158
$env:DOTNET_MULTILEVEL_LOOKUP=0
162159

@@ -166,6 +163,9 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
166163
# Disable telemetry on CI.
167164
if ($ci) {
168165
$env:DOTNET_CLI_TELEMETRY_OPTOUT=1
166+
167+
# In case of network error, try to log the current IP for reference
168+
Try-LogClientIpAddress
169169
}
170170

171171
# Source Build uses DotNetCoreSdkDir variable

‎eng/common/tools.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ function StopProcesses {
402402
function TryLogClientIpAddress () {
403403
echo 'Attempting to log this client''s IP for Azure Package feed telemetry purposes'
404404
if command -v curl > /dev/null; then
405-
curl -s 'http://co1.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: '
405+
curl -s 'http://co1.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: ' || true
406406
fi
407407
}
408408

‎global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"dotnet": "6.0.100-rc.1.21379.2"
1010
},
1111
"msbuild-sdks": {
12-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21420.4",
13-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21420.4"
12+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21427.6",
13+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21427.6"
1414
}
1515
}

0 commit comments

Comments
 (0)