Skip to content

Commit d3aaf79

Browse files
vseanreesermsftvseanreesermsft
committed
Merged PR 43912: [internal/release/8.0.1xx] Merge from public
Merge from public release/8.0.1xx to internal/release/8.0.1xx 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 updates several dependencies. - Added `src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs` to implement device ID retrieval and caching across different OS platforms. - Updated dependency versions in `eng/Version.Details.xml` for `Microsoft.Net.Compilers.Toolset`, `Microsoft.CodeAnalysis`, and other related packages. - Modified `NuGet.config` to include additional package sources and update existing ones.
2 parents 9b27227 + 0872692 commit d3aaf79

18 files changed

+245
-70
lines changed

‎NuGet.config

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<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" />
99
<!-- End: Package sources from dotnet-emsdk -->
1010
<!-- Begin: Package sources from dotnet-format -->
11+
<add key="darc-pub-dotnet-format-27f1865" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-27f18656/nuget/v3/index.json" />
1112
<add key="darc-int-dotnet-format-27f1865" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-27f18656/nuget/v3/index.json" />
1213
<add key="darc-int-dotnet-format-27f1865-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-27f18656-2/nuget/v3/index.json" />
1314
<add key="darc-int-dotnet-format-27f1865-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-27f18656-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-450f4db" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-450f4db7/nuget/v3/index.json" />
40-
<add key="darc-pub-dotnet-templating-450f4db-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-450f4db7-2/nuget/v3/index.json" />
41-
<add key="darc-pub-dotnet-templating-450f4db-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-450f4db7-1/nuget/v3/index.json" />
40+
<add key="darc-pub-dotnet-templating-b5712b9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b5712b99/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: 37 additions & 37 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.109">
4+
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.111">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>450f4db7dd93753dd86cbd1d781c934812efc906</Sha>
6+
<Sha>b5712b997be1bdfef6bcdf0ff79c3677777894cb</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.109-servicing.24415.13">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.111-servicing.24516.5">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>450f4db7dd93753dd86cbd1d781c934812efc906</Sha>
10+
<Sha>b5712b997be1bdfef6bcdf0ff79c3677777894cb</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.109-servicing.24415.13">
12+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.111-servicing.24516.5">
1313
<Uri>https://github.com/dotnet/templating</Uri>
14-
<Sha>450f4db7dd93753dd86cbd1d781c934812efc906</Sha>
14+
<Sha>b5712b997be1bdfef6bcdf0ff79c3677777894cb</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>27f18656aab37d71839f562c0653afce07a2d2fd</Sha>
8383
<SourceBuild RepoName="format" ManagedOnly="true" />
8484
</Dependency>
85-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.8.0-7.24468.9">
86-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn</Uri>
87-
<Sha>def88648f7e78a44bf300acd0a4e2009c44a6b39</Sha>
85+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.8.0-7.24514.16">
86+
<Uri>https://github.com/dotnet/roslyn</Uri>
87+
<Sha>4ff64493649bd045ced204661958393dc5575e96</Sha>
8888
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
8989
</Dependency>
90-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.8.0-7.24468.9">
91-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn</Uri>
92-
<Sha>def88648f7e78a44bf300acd0a4e2009c44a6b39</Sha>
90+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.8.0-7.24514.16">
91+
<Uri>https://github.com/dotnet/roslyn</Uri>
92+
<Sha>4ff64493649bd045ced204661958393dc5575e96</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.8.0-7.24468.9">
95-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn</Uri>
96-
<Sha>def88648f7e78a44bf300acd0a4e2009c44a6b39</Sha>
94+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.8.0-7.24514.16">
95+
<Uri>https://github.com/dotnet/roslyn</Uri>
96+
<Sha>4ff64493649bd045ced204661958393dc5575e96</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.8.0-7.24468.9">
99-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn</Uri>
100-
<Sha>def88648f7e78a44bf300acd0a4e2009c44a6b39</Sha>
98+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.8.0-7.24514.16">
99+
<Uri>https://github.com/dotnet/roslyn</Uri>
100+
<Sha>4ff64493649bd045ced204661958393dc5575e96</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.8.0-7.24468.9">
103-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn</Uri>
104-
<Sha>def88648f7e78a44bf300acd0a4e2009c44a6b39</Sha>
102+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.8.0-7.24514.16">
103+
<Uri>https://github.com/dotnet/roslyn</Uri>
104+
<Sha>4ff64493649bd045ced204661958393dc5575e96</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0-7.24468.9">
107-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn</Uri>
108-
<Sha>def88648f7e78a44bf300acd0a4e2009c44a6b39</Sha>
106+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0-7.24514.16">
107+
<Uri>https://github.com/dotnet/roslyn</Uri>
108+
<Sha>4ff64493649bd045ced204661958393dc5575e96</Sha>
109109
</Dependency>
110-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.8.0-7.24468.9">
111-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn</Uri>
112-
<Sha>def88648f7e78a44bf300acd0a4e2009c44a6b39</Sha>
110+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.8.0-7.24514.16">
111+
<Uri>https://github.com/dotnet/roslyn</Uri>
112+
<Sha>4ff64493649bd045ced204661958393dc5575e96</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>
@@ -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.24516.2">
353353
<Uri>https://github.com/dotnet/source-build-externals</Uri>
354-
<Sha>fb970eccb0a9cae3092464e29cbabda0d4115049</Sha>
354+
<Sha>3b85d089311e89b47758ba6a84eeb79374476dc8</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.24463.3">
494+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24516.1">
495495
<Uri>https://github.com/dotnet/arcade</Uri>
496-
<Sha>8c08d889b3c0b3f19398faceaccd74d0f184a3fb</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.24463.3">
499+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24516.1">
500500
<Uri>https://github.com/dotnet/arcade</Uri>
501-
<Sha>8c08d889b3c0b3f19398faceaccd74d0f184a3fb</Sha>
501+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
502502
</Dependency>
503-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.24463.3">
503+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.24516.1">
504504
<Uri>https://github.com/dotnet/arcade</Uri>
505-
<Sha>8c08d889b3c0b3f19398faceaccd74d0f184a3fb</Sha>
505+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
506506
</Dependency>
507-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24463.3">
507+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24516.1">
508508
<Uri>https://github.com/dotnet/arcade</Uri>
509-
<Sha>8c08d889b3c0b3f19398faceaccd74d0f184a3fb</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: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
3535
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3636
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
37-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.24463.3</MicrosoftDotNetSignToolVersion>
37+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.24516.1</MicrosoftDotNetSignToolVersion>
3838
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
3939
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
4040
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -137,13 +137,13 @@
137137
</PropertyGroup>
138138
<PropertyGroup>
139139
<!-- Dependencies from https://github.com/dotnet/templating -->
140-
<MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.109</MicrosoftTemplateEngineAbstractionsPackageVersion>
140+
<MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.111</MicrosoftTemplateEngineAbstractionsPackageVersion>
141141
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
142142
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
143143
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
144144
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
145145
<!-- test dependencies -->
146-
<MicrosoftTemplateEngineMocksPackageVersion>8.0.109-servicing.24415.13</MicrosoftTemplateEngineMocksPackageVersion>
146+
<MicrosoftTemplateEngineMocksPackageVersion>8.0.111-servicing.24516.5</MicrosoftTemplateEngineMocksPackageVersion>
147147
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
148148
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
149149
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
@@ -154,13 +154,13 @@
154154
</PropertyGroup>
155155
<PropertyGroup>
156156
<!-- Dependencies from https://github.com/dotnet/roslyn -->
157-
<MicrosoftNetCompilersToolsetPackageVersion>4.8.0-7.24468.9</MicrosoftNetCompilersToolsetPackageVersion>
158-
<MicrosoftCodeAnalysisPackageVersion>4.8.0-7.24468.9</MicrosoftCodeAnalysisPackageVersion>
159-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.8.0-7.24468.9</MicrosoftCodeAnalysisCSharpPackageVersion>
160-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.8.0-7.24468.9</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
161-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.8.0-7.24468.9</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
162-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.8.0-7.24468.9</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
163-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.8.0-7.24468.9</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
157+
<MicrosoftNetCompilersToolsetPackageVersion>4.8.0-7.24514.16</MicrosoftNetCompilersToolsetPackageVersion>
158+
<MicrosoftCodeAnalysisPackageVersion>4.8.0-7.24514.16</MicrosoftCodeAnalysisPackageVersion>
159+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.8.0-7.24514.16</MicrosoftCodeAnalysisCSharpPackageVersion>
160+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.8.0-7.24514.16</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
161+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.8.0-7.24514.16</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
162+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.8.0-7.24514.16</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
163+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.8.0-7.24514.16</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
164164
<MicrosoftNetCompilersToolsetVersion>$(MicrosoftNetCompilersToolsetPackageVersion)</MicrosoftNetCompilersToolsetVersion>
165165
</PropertyGroup>
166166
<PropertyGroup>
@@ -209,7 +209,7 @@
209209
<PropertyGroup>
210210
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
211211
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
212-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24463.3</MicrosoftDotNetXUnitExtensionsVersion>
212+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24516.1</MicrosoftDotNetXUnitExtensionsVersion>
213213
<MoqPackageVersion>4.18.4</MoqPackageVersion>
214214
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
215215
<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 {

‎global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "8.0.108",
3+
"dotnet": "8.0.110",
44
"runtimes": {
55
"dotnet": [
66
"$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
@@ -14,7 +14,7 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24463.3",
18-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24463.3"
17+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24516.1",
18+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24516.1"
1919
}
2020
}

0 commit comments

Comments
 (0)