Skip to content

Commit ee59a10

Browse files
vseanreesermsftvseanreesermsft
committed
Merged PR 43911: [internal/release/8.0.3xx] Merge from public
Merge from public release/8.0.3xx to internal/release/8.0.3xx and resolve conflicts if necessary ---- #### AI description (iteration 1) #### PR Classification Code enhancement and dependency updates. #### PR Summary This pull request introduces a new feature for device ID retrieval and caching, along with updates to various dependencies. - Added `src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs` to implement device ID retrieval and caching for Windows, Linux, and macOS. - Updated dependency versions in `eng/Version.Details.xml` for `Microsoft.Net.Compilers.Toolset`, `Microsoft.CodeAnalysis`, and other related packages. - Added new package sources and updated existing ones in `NuGet.config`.
2 parents a461944 + 16f5752 commit ee59a10

18 files changed

+254
-79
lines changed

‎NuGet.config

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<add key="darc-pub-dotnet-emsdk-d667257-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-d6672570-1/nuget/v3/index.json" />
1010
<!-- End: Package sources from dotnet-emsdk -->
1111
<!-- Begin: Package sources from dotnet-format -->
12+
<add key="darc-pub-dotnet-format-86f5186" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-86f5186d/nuget/v3/index.json" />
1213
<add key="darc-int-dotnet-format-86f5186" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d/nuget/v3/index.json" />
1314
<add key="darc-int-dotnet-format-86f5186-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d-2/nuget/v3/index.json" />
1415
<add key="darc-int-dotnet-format-86f5186-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d-1/nuget/v3/index.json" />
@@ -36,9 +37,7 @@
3637
<add key="darc-int-dotnet-runtime-2aade6b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-1/nuget/v3/index.json" />
3738
<!-- End: Package sources from dotnet-runtime -->
3839
<!-- Begin: Package sources from dotnet-templating -->
39-
<add key="darc-pub-dotnet-templating-9d03ca2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-9d03ca28/nuget/v3/index.json" />
40-
<add key="darc-pub-dotnet-templating-9d03ca2-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-9d03ca28-2/nuget/v3/index.json" />
41-
<add key="darc-pub-dotnet-templating-9d03ca2-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-9d03ca28-1/nuget/v3/index.json" />
40+
<add key="darc-pub-dotnet-templating-c4f355e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-c4f355e0/nuget/v3/index.json" />
4241
<!-- End: Package sources from dotnet-templating -->
4342
<!-- Begin: Package sources from dotnet-windowsdesktop -->
4443
<add key="darc-int-dotnet-windowsdesktop-f655eec" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f655eecd/nuget/v3/index.json" />

‎eng/Version.Details.xml

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.306">
4+
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.307">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>9d03ca280f603ddfded8780363eb4dc699e4b6c8</Sha>
6+
<Sha>c4f355e05e7e0e8e4fe79381a540feeb4ba9a7ac</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.306-servicing.24460.3">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.307-servicing.24511.9">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>9d03ca280f603ddfded8780363eb4dc699e4b6c8</Sha>
10+
<Sha>c4f355e05e7e0e8e4fe79381a540feeb4ba9a7ac</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.306-servicing.24460.3">
12+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.307-servicing.24511.9">
1313
<Uri>https://github.com/dotnet/templating</Uri>
14-
<Sha>9d03ca280f603ddfded8780363eb4dc699e4b6c8</Sha>
14+
<Sha>c4f355e05e7e0e8e4fe79381a540feeb4ba9a7ac</Sha>
1515
<SourceBuild RepoName="templating" ManagedOnly="true" />
1616
</Dependency>
1717
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.10">
@@ -82,34 +82,34 @@
8282
<Sha>86f5186deeea364bd8541d51657e52a54b2a96b2</Sha>
8383
<SourceBuild RepoName="format" ManagedOnly="true" />
8484
</Dependency>
85-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.10.0-3.24468.7">
86-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn</Uri>
87-
<Sha>154f8a3b6c93384fa1ab0b6a6e30c8230d7fdf7c</Sha>
85+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.10.0-3.24515.13">
86+
<Uri>https://github.com/dotnet/roslyn</Uri>
87+
<Sha>e29d0b744b8facc8e2ef8b687e9bd2e51d0db531</Sha>
8888
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
8989
</Dependency>
90-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.10.0-3.24468.7">
91-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn</Uri>
92-
<Sha>154f8a3b6c93384fa1ab0b6a6e30c8230d7fdf7c</Sha>
90+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.10.0-3.24515.13">
91+
<Uri>https://github.com/dotnet/roslyn</Uri>
92+
<Sha>e29d0b744b8facc8e2ef8b687e9bd2e51d0db531</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.10.0-3.24468.7">
95-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn</Uri>
96-
<Sha>154f8a3b6c93384fa1ab0b6a6e30c8230d7fdf7c</Sha>
94+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.10.0-3.24515.13">
95+
<Uri>https://github.com/dotnet/roslyn</Uri>
96+
<Sha>e29d0b744b8facc8e2ef8b687e9bd2e51d0db531</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.10.0-3.24468.7">
99-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn</Uri>
100-
<Sha>154f8a3b6c93384fa1ab0b6a6e30c8230d7fdf7c</Sha>
98+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.10.0-3.24515.13">
99+
<Uri>https://github.com/dotnet/roslyn</Uri>
100+
<Sha>e29d0b744b8facc8e2ef8b687e9bd2e51d0db531</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.10.0-3.24468.7">
103-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn</Uri>
104-
<Sha>154f8a3b6c93384fa1ab0b6a6e30c8230d7fdf7c</Sha>
102+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.10.0-3.24515.13">
103+
<Uri>https://github.com/dotnet/roslyn</Uri>
104+
<Sha>e29d0b744b8facc8e2ef8b687e9bd2e51d0db531</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.10.0-3.24468.7">
107-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn</Uri>
108-
<Sha>154f8a3b6c93384fa1ab0b6a6e30c8230d7fdf7c</Sha>
106+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.10.0-3.24515.13">
107+
<Uri>https://github.com/dotnet/roslyn</Uri>
108+
<Sha>e29d0b744b8facc8e2ef8b687e9bd2e51d0db531</Sha>
109109
</Dependency>
110-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.10.0-3.24468.7">
111-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn</Uri>
112-
<Sha>154f8a3b6c93384fa1ab0b6a6e30c8230d7fdf7c</Sha>
110+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.10.0-3.24515.13">
111+
<Uri>https://github.com/dotnet/roslyn</Uri>
112+
<Sha>e29d0b744b8facc8e2ef8b687e9bd2e51d0db531</Sha>
113113
</Dependency>
114114
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="8.0.10-servicing.24468.4">
115115
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
@@ -293,18 +293,18 @@
293293
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
294294
<Sha>c2a442982e736e17ae6bcadbfd8ccba278ee1be6</Sha>
295295
</Dependency>
296-
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.24454.1">
296+
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.24515.3">
297297
<Uri>https://github.com/dotnet/razor</Uri>
298-
<Sha>187962c1773a6056402dd1d92099abaea5c7fdac</Sha>
298+
<Sha>2ea52456adcb9d1ca04cf28025a02b2576c3c2e3</Sha>
299299
<SourceBuild RepoName="razor" ManagedOnly="true" />
300300
</Dependency>
301-
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="7.0.0-preview.24454.1">
301+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="7.0.0-preview.24515.3">
302302
<Uri>https://github.com/dotnet/razor</Uri>
303-
<Sha>187962c1773a6056402dd1d92099abaea5c7fdac</Sha>
303+
<Sha>2ea52456adcb9d1ca04cf28025a02b2576c3c2e3</Sha>
304304
</Dependency>
305-
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="7.0.0-preview.24454.1">
305+
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="7.0.0-preview.24515.3">
306306
<Uri>https://github.com/dotnet/razor</Uri>
307-
<Sha>187962c1773a6056402dd1d92099abaea5c7fdac</Sha>
307+
<Sha>2ea52456adcb9d1ca04cf28025a02b2576c3c2e3</Sha>
308308
</Dependency>
309309
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.10">
310310
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
@@ -349,9 +349,9 @@
349349
<Sha>02fe27cd6a9b001c8feb7938e6ef4b3799745759</Sha>
350350
<SourceBuild RepoName="command-line-api" ManagedOnly="true" />
351351
</Dependency>
352-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.24379.1">
352+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.24510.2">
353353
<Uri>https://github.com/dotnet/source-build-externals</Uri>
354-
<Sha>fb970eccb0a9cae3092464e29cbabda0d4115049</Sha>
354+
<Sha>d4feb7e49067fc9bbf7dfb9fa76a326c33fa0595</Sha>
355355
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
356356
</Dependency>
357357
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.24415.1">
@@ -491,22 +491,22 @@
491491
</Dependency>
492492
</ProductDependencies>
493493
<ToolsetDependencies>
494-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24461.2">
494+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24516.1">
495495
<Uri>https://github.com/dotnet/arcade</Uri>
496-
<Sha>0028fccccc2181a64c5c4a283ac0baae3913284b</Sha>
496+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
497497
<SourceBuild RepoName="arcade" ManagedOnly="true" />
498498
</Dependency>
499-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24461.2">
499+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24516.1">
500500
<Uri>https://github.com/dotnet/arcade</Uri>
501-
<Sha>0028fccccc2181a64c5c4a283ac0baae3913284b</Sha>
501+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
502502
</Dependency>
503-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.24461.2">
503+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.24516.1">
504504
<Uri>https://github.com/dotnet/arcade</Uri>
505-
<Sha>0028fccccc2181a64c5c4a283ac0baae3913284b</Sha>
505+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
506506
</Dependency>
507-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24461.2">
507+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24516.1">
508508
<Uri>https://github.com/dotnet/arcade</Uri>
509-
<Sha>0028fccccc2181a64c5c4a283ac0baae3913284b</Sha>
509+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
510510
</Dependency>
511511
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
512512
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>

‎eng/Versions.props

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
3737
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3838
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
39-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.24461.2</MicrosoftDotNetSignToolVersion>
39+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.24516.1</MicrosoftDotNetSignToolVersion>
4040
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
4141
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
4242
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -141,13 +141,13 @@
141141
</PropertyGroup>
142142
<PropertyGroup>
143143
<!-- Dependencies from https://github.com/dotnet/templating -->
144-
<MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.306</MicrosoftTemplateEngineAbstractionsPackageVersion>
144+
<MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.307</MicrosoftTemplateEngineAbstractionsPackageVersion>
145145
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
146146
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
147147
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
148148
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
149149
<!-- test dependencies -->
150-
<MicrosoftTemplateEngineMocksPackageVersion>8.0.306-servicing.24460.3</MicrosoftTemplateEngineMocksPackageVersion>
150+
<MicrosoftTemplateEngineMocksPackageVersion>8.0.307-servicing.24511.9</MicrosoftTemplateEngineMocksPackageVersion>
151151
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
152152
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
153153
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
@@ -158,13 +158,13 @@
158158
</PropertyGroup>
159159
<PropertyGroup>
160160
<!-- Dependencies from https://github.com/dotnet/roslyn -->
161-
<MicrosoftNetCompilersToolsetPackageVersion>4.10.0-3.24468.7</MicrosoftNetCompilersToolsetPackageVersion>
162-
<MicrosoftCodeAnalysisPackageVersion>4.10.0-3.24468.7</MicrosoftCodeAnalysisPackageVersion>
163-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.10.0-3.24468.7</MicrosoftCodeAnalysisCSharpPackageVersion>
164-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.10.0-3.24468.7</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
165-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.10.0-3.24468.7</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
166-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.10.0-3.24468.7</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
167-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.10.0-3.24468.7</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
161+
<MicrosoftNetCompilersToolsetPackageVersion>4.10.0-3.24515.13</MicrosoftNetCompilersToolsetPackageVersion>
162+
<MicrosoftCodeAnalysisPackageVersion>4.10.0-3.24515.13</MicrosoftCodeAnalysisPackageVersion>
163+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.10.0-3.24515.13</MicrosoftCodeAnalysisCSharpPackageVersion>
164+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.10.0-3.24515.13</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
165+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.10.0-3.24515.13</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
166+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.10.0-3.24515.13</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
167+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.10.0-3.24515.13</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
168168
<MicrosoftNetCompilersToolsetVersion>$(MicrosoftNetCompilersToolsetPackageVersion)</MicrosoftNetCompilersToolsetVersion>
169169
</PropertyGroup>
170170
<PropertyGroup>
@@ -179,9 +179,9 @@
179179
</PropertyGroup>
180180
<!-- Dependencies from https://github.com/dotnet/razor -->
181181
<PropertyGroup>
182-
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>7.0.0-preview.24454.1</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
183-
<MicrosoftCodeAnalysisRazorToolingInternalVersion>7.0.0-preview.24454.1</MicrosoftCodeAnalysisRazorToolingInternalVersion>
184-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>7.0.0-preview.24454.1</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
182+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>7.0.0-preview.24515.3</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
183+
<MicrosoftCodeAnalysisRazorToolingInternalVersion>7.0.0-preview.24515.3</MicrosoftCodeAnalysisRazorToolingInternalVersion>
184+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>7.0.0-preview.24515.3</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
185185
</PropertyGroup>
186186
<PropertyGroup>
187187
<!-- Dependencies from https://github.com/dotnet/wpf -->
@@ -213,7 +213,7 @@
213213
<PropertyGroup>
214214
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
215215
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
216-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24461.2</MicrosoftDotNetXUnitExtensionsVersion>
216+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24516.1</MicrosoftDotNetXUnitExtensionsVersion>
217217
<MoqPackageVersion>4.18.4</MoqPackageVersion>
218218
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
219219
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>

‎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 {

0 commit comments

Comments
 (0)