Skip to content

Commit 765c9b0

Browse files
[main] Source code updates from dotnet/dotnet (#48691)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Your Name <[email protected]>
1 parent 2e6a713 commit 765c9b0

File tree

10 files changed

+476
-457
lines changed

10 files changed

+476
-457
lines changed

eng/Version.Details.xml

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

eng/Versions.props

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

eng/common/SetupNugetSources.sh

100644100755
File mode changed.

eng/common/core-templates/steps/source-build.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,9 @@ steps:
9393
$portableBuildArgs \
9494
/p:DotNetBuildSourceOnly=true \
9595
/p:DotNetBuildRepo=true \
96-
/p:AssetManifestFileName=$assetManifestFileName
96+
/p:AssetManifestFileName=$assetManifestFileName \
97+
/p:SetUpSourceBuildIntermediateNupkgCache=false \
98+
/p:ReportPrebuiltUsage=false
9799
displayName: Build
98100

99101
# Upload build logs for diagnosis.

eng/common/cross/install-debs.py

100644100755
File mode changed.

eng/common/cross/tizen-build-rootfs.sh

100644100755
File mode changed.

eng/common/cross/tizen-fetch.sh

100644100755
File mode changed.

eng/common/generate-sbom-prep.sh

100644100755
File mode changed.

eng/common/sdk-task.sh

100644100755
File mode changed.

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25221.2",
18-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25221.2",
17+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25223.119",
18+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25223.119",
1919
"Microsoft.Build.NoTargets": "3.7.0",
2020
"Microsoft.Build.Traversal": "3.4.0"
2121
}

0 commit comments

Comments
 (0)