Skip to content
This repository has been archived by the owner on Nov 20, 2023. It is now read-only.

[main] Update dependencies from dotnet/arcade #1598

Open
wants to merge 117 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
117 commits
Select commit Hold shift + click to select a range
18f1ba0
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jun 22, 2023
85d6371
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jun 24, 2023
146c94b
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jun 27, 2023
d633189
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jun 28, 2023
b265b2b
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jun 29, 2023
2961aa7
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jun 30, 2023
84ceab0
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jul 1, 2023
2aa2674
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jul 4, 2023
ea1d990
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jul 7, 2023
ad0dc8b
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jul 8, 2023
d3d9c0c
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jul 10, 2023
1f43723
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jul 11, 2023
c65adf8
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jul 12, 2023
33dd6dd
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jul 13, 2023
6d4acbc
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jul 14, 2023
fe45d58
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jul 15, 2023
3d014ef
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jul 20, 2023
e980cf5
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jul 21, 2023
e111024
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jul 22, 2023
9246fbe
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jul 27, 2023
9226c20
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jul 28, 2023
174fc6d
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jul 29, 2023
8851c78
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Aug 1, 2023
37ea18a
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Aug 2, 2023
50ab0ea
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Aug 3, 2023
17846e0
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Aug 4, 2023
1eb6bff
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Aug 5, 2023
6a281c3
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Aug 8, 2023
3812b47
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Aug 9, 2023
586714f
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Aug 10, 2023
4ed8c59
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Aug 12, 2023
ade39b1
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Aug 15, 2023
cff168a
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Aug 16, 2023
ced2009
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Aug 18, 2023
4fa5347
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Aug 20, 2023
b0219a6
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Aug 23, 2023
09bfd4a
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Aug 26, 2023
8bbf4f9
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Aug 29, 2023
0932ae1
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Aug 30, 2023
8bc2a4d
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 1, 2023
cc3f8e1
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 2, 2023
e225eed
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 6, 2023
3fe1d9d
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 7, 2023
6e9b46b
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 8, 2023
b9c5161
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 9, 2023
8a95193
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 10, 2023
4d4ca31
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 11, 2023
fc8282c
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 12, 2023
a1e598b
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 13, 2023
a659800
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 14, 2023
3d2c938
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 15, 2023
9dcbf54
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 16, 2023
e7073f7
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 17, 2023
39568d1
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 18, 2023
ea1334d
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 19, 2023
5a348ab
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 20, 2023
b89f8a3
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 21, 2023
cb910e2
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 22, 2023
5b259c1
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 23, 2023
2c895fb
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 24, 2023
ff7437e
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 25, 2023
68ad1ad
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 26, 2023
7d34eaa
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 27, 2023
9cdac97
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 28, 2023
310abae
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 29, 2023
76fec24
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 30, 2023
6f7c57f
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Oct 1, 2023
0a9e9e6
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Oct 2, 2023
5b87ce8
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Oct 3, 2023
841f26f
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Oct 4, 2023
6e2d766
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 5, 2023
27df9a9
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 6, 2023
c4d2245
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 7, 2023
b4a188c
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 8, 2023
3efda36
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 9, 2023
389a016
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 10, 2023
a4ecf79
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 11, 2023
18dc874
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 12, 2023
4ecd8f5
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 13, 2023
70ccca9
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 14, 2023
358dd29
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 15, 2023
5fca15c
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 16, 2023
3113452
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 17, 2023
b50ec9a
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 18, 2023
fb42112
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 19, 2023
14c3277
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 20, 2023
6e6d937
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 21, 2023
89ba573
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 22, 2023
95b98c3
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 23, 2023
d11b96a
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 24, 2023
ec4a63c
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 25, 2023
57f426f
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 26, 2023
40b59c1
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 27, 2023
839c93e
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 28, 2023
6249121
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 29, 2023
bbf26a6
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 30, 2023
161aa3a
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 31, 2023
9155693
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 1, 2023
5a3e996
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 2, 2023
7c69068
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 3, 2023
d3186cd
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 4, 2023
49658e9
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 5, 2023
26051b2
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 6, 2023
26aa360
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 7, 2023
e3d402e
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 8, 2023
ebecdb7
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 9, 2023
cfa57c0
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 10, 2023
a7a85aa
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 11, 2023
5de069f
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 12, 2023
6ce9dc4
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 13, 2023
720b48b
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 14, 2023
5342c95
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 15, 2023
6a28dca
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 16, 2023
1a40053
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 17, 2023
9ffacd4
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 18, 2023
b60dd8f
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 19, 2023
5714d52
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 20, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23265.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23320.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2d8d59065b5e090584a8e90c4371fc06ed60bdc5</Sha>
<Sha>06d73ccc1f421af06c2794741a9913f474f66b3d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23265.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23320.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2d8d59065b5e090584a8e90c4371fc06ed60bdc5</Sha>
<Sha>06d73ccc1f421af06c2794741a9913f474f66b3d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.23265.1">
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.23320.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2d8d59065b5e090584a8e90c4371fc06ed60bdc5</Sha>
<Sha>06d73ccc1f421af06c2794741a9913f474f66b3d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23265.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23320.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2d8d59065b5e090584a8e90c4371fc06ed60bdc5</Sha>
<Sha>06d73ccc1f421af06c2794741a9913f474f66b3d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="8.0.0-beta.23265.1">
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="8.0.0-beta.23320.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2d8d59065b5e090584a8e90c4371fc06ed60bdc5</Sha>
<Sha>06d73ccc1f421af06c2794741a9913f474f66b3d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.19556.4">
<Uri>https://github.com/dotnet/arcade-services</Uri>
Expand Down
4 changes: 4 additions & 0 deletions eng/common/dotnet-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ cpuname=$(uname -m)
case $cpuname in
arm64|aarch64)
buildarch=arm64
if [ "$(getconf LONG_BIT)" -lt 64 ]; then
# This is 32-bit OS running on 64-bit CPU (for example Raspberry Pi OS)
buildarch=arm
fi
;;
loongarch64)
buildarch=loongarch64
Expand Down
2 changes: 1 addition & 1 deletion eng/common/sdk-task.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ try {
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
}
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.4.1" -MemberType NoteProperty
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.6.0-2" -MemberType NoteProperty
}
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
Expand Down
12 changes: 8 additions & 4 deletions eng/common/templates/job/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@ jobs:
- ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}:
- name: EnableRichCodeNavigation
value: 'true'
# Retry signature validation up to three times, waiting 2 seconds between attempts.
# See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures
- name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY
value: 3,2000
- ${{ each variable in parameters.variables }}:
# handle name-value variable syntax
# example:
Expand All @@ -83,7 +87,7 @@ jobs:
- ${{ if ne(variable.name, '') }}:
- name: ${{ variable.name }}
value: ${{ variable.value }}

# handle variable groups
- ${{ if ne(variable.group, '') }}:
- group: ${{ variable.group }}
Expand Down Expand Up @@ -169,7 +173,7 @@ jobs:
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- task: MicroBuildCleanup@1
displayName: Execute Microbuild cleanup tasks
displayName: Execute Microbuild cleanup tasks
condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
continueOnError: ${{ parameters.continueOnError }}
env:
Expand Down Expand Up @@ -219,7 +223,7 @@ jobs:
displayName: Publish XUnit Test Results
inputs:
testResultsFormat: 'xUnit'
testResultsFiles: '*.xml'
testResultsFiles: '*.xml'
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
mergeTestResults: ${{ parameters.mergeTestResults }}
Expand All @@ -230,7 +234,7 @@ jobs:
displayName: Publish TRX Test Results
inputs:
testResultsFormat: 'VSTest'
testResultsFiles: '*.trx'
testResultsFiles: '*.trx'
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
mergeTestResults: ${{ parameters.mergeTestResults }}
Expand Down
6 changes: 6 additions & 0 deletions eng/common/templates/steps/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@ steps:
runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}'
fi

baseOsArgs=
if [ '${{ parameters.platform.baseOS }}' != '' ]; then
baseOsArgs='/p:BaseOS=${{ parameters.platform.baseOS }}'
fi

publishArgs=
if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then
publishArgs='--publish'
Expand All @@ -86,6 +91,7 @@ steps:
$internalRestoreArgs \
$targetRidArgs \
$runtimeOsArgs \
$baseOsArgs \
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
/p:ArcadeBuildFromSource=true \
/p:AssetManifestFileName=$assetManifestFileName
Expand Down
6 changes: 3 additions & 3 deletions eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -379,13 +379,13 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
}

# Minimum VS version to require.
$vsMinVersionReqdStr = '16.8'
$vsMinVersionReqdStr = '17.6'
$vsMinVersionReqd = [Version]::new($vsMinVersionReqdStr)

# If the version of msbuild is going to be xcopied,
# use this version. Version matches a package here:
# https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.4.1&view=overview
$defaultXCopyMSBuildVersion = '17.4.1'
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.6.0-2
$defaultXCopyMSBuildVersion = '17.6.0-2'

if (!$vsRequirements) {
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"allowPrerelease": true
},
"tools": {
"dotnet": "8.0.100-preview.3.23178.7",
"dotnet": "8.0.100-preview.5.23303.2",
"runtimes": {
"dotnet": [
"6.0.0"
Expand All @@ -14,6 +14,6 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23265.1"
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23320.3"
}
}
Loading