Skip to content

Commit cb771e5

Browse files
vseanreesermsftvseanreesermsft
committed
Merged PR 44008: [internal/release/8.0] Merge from public
Merge from public release/8.0 to internal/release/8.0 and resolve conflicts if necessary ---- #### AI description (iteration 1) #### PR Classification Merge from public branch to internal release branch. #### PR Summary This pull request updates dependencies, fixes a bug related to SAS token generation, and improves error handling for certificate export. - `/eng/Version.Details.xml`, `/global.json`, `/eng/Versions.props`: Updated various dependencies to newer versions. - `/eng/common/templates-official/steps/get-delegation-sas.yml`, `/eng/common/templates/steps/get-delegation-sas.yml`: Added workaround for SAS token generation issue. - `/src/Tools/dotnet-dev-certs/src/Program.cs`, `/src/Shared/CertificateGeneration/CertificateManager.cs`, `/src/Shared/CertificateGeneration/EnsureCertificateResult.cs`: Improved error handling for exporting certificates to non-existent directories. - `/NuGet.config`: Added multiple new package sources. - `/src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs`: Updated test to reflect new error handling for certificate export.
2 parents fc878b7 + 49c3e20 commit cb771e5

File tree

10 files changed

+46
-22
lines changed

10 files changed

+46
-22
lines changed

‎eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,9 @@
189189
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
190190
<Sha>9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5</Sha>
191191
</Dependency>
192-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.24379.1">
192+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.24510.2">
193193
<Uri>https://github.com/dotnet/source-build-externals</Uri>
194-
<Sha>fb970eccb0a9cae3092464e29cbabda0d4115049</Sha>
194+
<Sha>d4feb7e49067fc9bbf7dfb9fa76a326c33fa0595</Sha>
195195
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
196196
</Dependency>
197197
<Dependency Name="Microsoft.SourceBuild.Intermediate.symreader" Version="2.0.0-beta-23228-03">
@@ -376,26 +376,26 @@
376376
<Uri>https://github.com/dotnet/winforms</Uri>
377377
<Sha>abda8e3bfa78319363526b5a5f86863ec979940e</Sha>
378378
</Dependency>
379-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24504.2">
379+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24516.1">
380380
<Uri>https://github.com/dotnet/arcade</Uri>
381-
<Sha>103916ccdbe7f4ab2e194068a1a3cd330542601f</Sha>
381+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
382382
<SourceBuild RepoName="arcade" ManagedOnly="true" />
383383
</Dependency>
384-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24504.2">
384+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24516.1">
385385
<Uri>https://github.com/dotnet/arcade</Uri>
386-
<Sha>103916ccdbe7f4ab2e194068a1a3cd330542601f</Sha>
386+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
387387
</Dependency>
388-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.24504.2">
388+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.24516.1">
389389
<Uri>https://github.com/dotnet/arcade</Uri>
390-
<Sha>103916ccdbe7f4ab2e194068a1a3cd330542601f</Sha>
390+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
391391
</Dependency>
392-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24504.2">
392+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24516.1">
393393
<Uri>https://github.com/dotnet/arcade</Uri>
394-
<Sha>103916ccdbe7f4ab2e194068a1a3cd330542601f</Sha>
394+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
395395
</Dependency>
396-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.24504.2">
396+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.24516.1">
397397
<Uri>https://github.com/dotnet/arcade</Uri>
398-
<Sha>103916ccdbe7f4ab2e194068a1a3cd330542601f</Sha>
398+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
399399
</Dependency>
400400
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="8.1.0-preview.23604.1">
401401
<Uri>https://github.com/dotnet/extensions</Uri>

‎eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,11 @@
162162
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
163163
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
164164
<!-- Packages from dotnet/arcade -->
165-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.24504.2</MicrosoftDotNetBuildTasksInstallersVersion>
166-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.24504.2</MicrosoftDotNetBuildTasksTemplatingVersion>
167-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24504.2</MicrosoftDotNetRemoteExecutorVersion>
165+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.24516.1</MicrosoftDotNetBuildTasksInstallersVersion>
166+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.24516.1</MicrosoftDotNetBuildTasksTemplatingVersion>
167+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24516.1</MicrosoftDotNetRemoteExecutorVersion>
168168
<!-- Packages from dotnet/source-build-externals -->
169-
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.24379.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
169+
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.24510.2</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
170170
<!-- Packages from dotnet/source-build-reference-packages -->
171171
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>8.0.0-alpha.1.24415.1</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>
172172
<!-- Packages from dotnet/symreader -->

‎eng/common/templates-official/steps/get-delegation-sas.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,16 @@ steps:
2828
# Calculate the expiration of the SAS token and convert to UTC
2929
$expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
3030
31-
$sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv
31+
# Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads
32+
# of correlation payloads. https://github.com/dotnet/dnceng/issues/3484
33+
$sas = ""
34+
do {
35+
$sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv
36+
if ($LASTEXITCODE -ne 0) {
37+
Write-Error "Failed to generate SAS token."
38+
exit 1
39+
}
40+
} while($sas.IndexOf('/') -ne -1)
3241
3342
if ($LASTEXITCODE -ne 0) {
3443
Write-Error "Failed to generate SAS token."

‎eng/common/templates/steps/get-delegation-sas.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,16 @@ steps:
2828
# Calculate the expiration of the SAS token and convert to UTC
2929
$expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
3030
31-
$sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv
31+
# Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads
32+
# of correlation payloads. https://github.com/dotnet/dnceng/issues/3484
33+
$sas = ""
34+
do {
35+
$sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv
36+
if ($LASTEXITCODE -ne 0) {
37+
Write-Error "Failed to generate SAS token."
38+
exit 1
39+
}
40+
} while($sas.IndexOf('/') -ne -1)
3241
3342
if ($LASTEXITCODE -ne 0) {
3443
Write-Error "Failed to generate SAS token."

‎eng/common/tools.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -892,7 +892,7 @@ function IsWindowsPlatform() {
892892
}
893893

894894
function Get-Darc($version) {
895-
$darcPath = "$TempDir\darc\$(New-Guid)"
895+
$darcPath = "$TempDir\darc\$([guid]::NewGuid())"
896896
if ($version -ne $null) {
897897
& $PSScriptRoot\darc-init.ps1 -toolpath $darcPath -darcVersion $version | Out-Host
898898
} else {

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
},
2828
"msbuild-sdks": {
2929
"Yarn.MSBuild": "1.22.19",
30-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24504.2",
31-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24504.2"
30+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24516.1",
31+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24516.1"
3232
}
3333
}

‎src/Shared/CertificateGeneration/CertificateManager.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,7 @@ public EnsureCertificateResult EnsureAspNetCoreHttpsDevelopmentCertificate(
328328
var exportDir = Path.GetDirectoryName(path);
329329
if (!string.IsNullOrEmpty(exportDir) && !Directory.Exists(exportDir))
330330
{
331+
result = EnsureCertificateResult.ErrorExportingTheCertificateToNonExistentDirectory;
331332
throw new InvalidOperationException($"The directory '{exportDir}' does not exist. Choose permissions carefully when creating it.");
332333
}
333334

‎src/Shared/CertificateGeneration/EnsureCertificateResult.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ internal enum EnsureCertificateResult
1010
ErrorCreatingTheCertificate,
1111
ErrorSavingTheCertificateIntoTheCurrentUserPersonalStore,
1212
ErrorExportingTheCertificate,
13+
ErrorExportingTheCertificateToNonExistentDirectory,
1314
FailedToTrustTheCertificate,
1415
PartiallyFailedToTrustTheCertificate,
1516
UserCancelledTrustStep,

‎src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ public void EnsureCreateHttpsCertificate_CannotExportToNonExistentDirectory()
373373
.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), Path.Combine("NoSuchDirectory", CertificateName));
374374

375375
// Assert
376-
Assert.Equal(EnsureCertificateResult.ErrorExportingTheCertificate, result);
376+
Assert.Equal(EnsureCertificateResult.ErrorExportingTheCertificateToNonExistentDirectory, result);
377377
}
378378

379379
[Fact]

‎src/Tools/dotnet-dev-certs/src/Program.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,10 @@ private static int EnsureHttpsCertificate(CommandOption exportPath, CommandOptio
425425
case EnsureCertificateResult.ErrorExportingTheCertificate:
426426
reporter.Warn("There was an error exporting the HTTPS developer certificate to a file.");
427427
return ErrorExportingTheCertificate;
428+
case EnsureCertificateResult.ErrorExportingTheCertificateToNonExistentDirectory:
429+
// A distinct warning is useful, but a distinct error code is probably not.
430+
reporter.Warn("There was an error exporting the HTTPS developer certificate to a file. Please create the target directory before exporting. Choose permissions carefully when creating it.");
431+
return ErrorExportingTheCertificate;
428432
case EnsureCertificateResult.PartiallyFailedToTrustTheCertificate:
429433
// A distinct warning is useful, but a distinct error code is probably not.
430434
reporter.Warn("There was an error trusting the HTTPS developer certificate. It will be trusted by some clients but not by others.");

0 commit comments

Comments
 (0)