Skip to content

Commit 4dce55c

Browse files
authored
Merge pull request #13405 from dotnet/merges/main-to-release/dev17.3
Merge main to release/dev17.3
2 parents a370ac4 + d6aaefb commit 4dce55c

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
</Dependency>
99
</ProductDependencies>
1010
<ToolsetDependencies>
11-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22322.3">
11+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22327.2">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>eaa4673f2a82355f7cd2f1c1243578be2e961d0f</Sha>
13+
<Sha>a264eb13fea14125f3ef8d4056586cd66fa55309</Sha>
1414
<SourceBuild RepoName="arcade" ManagedOnly="true" />
1515
</Dependency>
1616
</ToolsetDependencies>

eng/common/tools.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ function InitializeBuildTool() {
573573
ExitWithExitCode 1
574574
}
575575
$dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet')
576-
$buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'netcoreapp3.1' }
576+
$buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net7.0' }
577577
} elseif ($msbuildEngine -eq "vs") {
578578
try {
579579
$msbuildPath = InitializeVisualStudioMSBuild -install:$restore

eng/common/tools.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ function InitializeBuildTool {
312312
# return values
313313
_InitializeBuildTool="$_InitializeDotNetCli/dotnet"
314314
_InitializeBuildToolCommand="msbuild"
315-
_InitializeBuildToolFramework="netcoreapp3.1"
315+
_InitializeBuildToolFramework="net7.0"
316316
}
317317

318318
# Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116

global.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,23 @@
22
"sdk": {
33
"version": "6.0.301",
44
"allowPrerelease": true,
5-
"rollForward": "minor"
5+
"rollForward": "latestMajor"
66
},
77
"tools": {
8-
"dotnet": "6.0.301",
8+
"dotnet": "7.0.100-preview.2.22153.17",
99
"vs": {
10-
"version": "16.8",
10+
"version": "17.0",
1111
"components": [
1212
"Microsoft.VisualStudio.Component.FSharp"
1313
]
14-
}
14+
},
15+
"xcopy-msbuild": "17.1.0"
1516
},
1617
"native-tools": {
1718
"perl": "5.32.1.1"
1819
},
1920
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22322.3",
21+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22327.1",
2122
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2"
2223
}
2324
}

0 commit comments

Comments
 (0)