Skip to content

Commit 4fc9d40

Browse files
Update dependencies from https://github.com/dotnet/dotnet build 269724
No dependency updates to commit
1 parent 6842c77 commit 4fc9d40

File tree

6 files changed

+280
-283
lines changed

6 files changed

+280
-283
lines changed

eng/Version.Details.xml

Lines changed: 185 additions & 185 deletions
Large diffs are not rendered by default.

eng/Versions.props

Lines changed: 89 additions & 89 deletions
Large diffs are not rendered by default.

eng/common/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ function Build {
257257
/p:Sign=$sign \
258258
/p:Publish=$publish \
259259
/p:RestoreStaticGraphEnableBinaryLogger=$binary_log \
260-
"${properties[@]}"
260+
${properties[@]+"${properties[@]}"}
261261

262262
ExitWithExitCode 0
263263
}

eng/common/tools.ps1

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,6 @@ function GetNuGetPackageCachePath() {
644644
$env:NUGET_PACKAGES = Join-Path $env:UserProfile '.nuget\packages\'
645645
} else {
646646
$env:NUGET_PACKAGES = Join-Path $RepoRoot '.packages\'
647-
$env:RESTORENOHTTPCACHE = $true
648647
}
649648
}
650649

eng/common/tools.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,14 +345,12 @@ function InitializeBuildTool {
345345
_InitializeBuildToolCommand="msbuild"
346346
}
347347

348-
# Set RestoreNoHttpCache as a workaround for https://github.com/NuGet/Home/issues/3116
349348
function GetNuGetPackageCachePath {
350349
if [[ -z ${NUGET_PACKAGES:-} ]]; then
351350
if [[ "$use_global_nuget_cache" == true ]]; then
352351
export NUGET_PACKAGES="$HOME/.nuget/packages/"
353352
else
354353
export NUGET_PACKAGES="$repo_root/.packages/"
355-
export RESTORENOHTTPCACHE=true
356354
fi
357355
fi
358356

global.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-preview.5.25265.106"
3+
"version": "10.0.100-preview.6.25272.112"
44
},
55
"tools": {
6-
"dotnet": "10.0.100-preview.5.25265.106",
6+
"dotnet": "10.0.100-preview.6.25272.112",
77
"runtimes": {
88
"dotnet/x86": [
99
"$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)"
@@ -27,9 +27,9 @@
2727
"jdk": "latest"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25272.109",
31-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25272.109",
32-
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25272.109",
30+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25277.102",
31+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25277.102",
32+
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25277.102",
3333
"Microsoft.Build.NoTargets": "3.7.0",
3434
"Microsoft.Build.Traversal": "3.4.0"
3535
}

0 commit comments

Comments
 (0)