Skip to content

Commit 0de0a76

Browse files
[main] Source code updates from dotnet/dotnet (#61656)
* Update dependencies from https://github.com/dotnet/dotnet * Add comment about roslyn manual updates --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com>
1 parent 029dbea commit 0de0a76

File tree

11 files changed

+367
-363
lines changed

11 files changed

+367
-363
lines changed

eng/Version.Details.xml

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

eng/Versions.props

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

eng/common/core-templates/jobs/jobs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
${{ parameter.key }}: ${{ parameter.value }}
9797

9898
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
99-
- ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, ''), eq(parameters.isAssetlessBuild, true)) }}:
99+
- ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}:
100100
- template: ../job/publish-build-assets.yml
101101
parameters:
102102
is1ESPipeline: ${{ parameters.is1ESPipeline }}
@@ -112,7 +112,7 @@ jobs:
112112
- Source_Build_Complete
113113

114114
runAsPublic: ${{ parameters.runAsPublic }}
115-
publishAssetsImmediately: ${{ or(parameters.publishAssetsImmediately, parameters.isAssetlessBuild) }}
115+
publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }}
116116
isAssetlessBuild: ${{ parameters.isAssetlessBuild }}
117117
enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
118118
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}

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/native/install-dependencies.sh

100644100755
File mode changed.

eng/common/sdk-task.sh

100644100755
File mode changed.

global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
"jdk": "latest"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25223.1",
31-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25223.1",
32-
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25223.1",
30+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25223.119",
31+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25223.119",
32+
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25223.119",
3333
"Microsoft.Build.NoTargets": "3.7.0",
3434
"Microsoft.Build.Traversal": "3.4.0"
3535
}

0 commit comments

Comments
 (0)