diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 49c065469..8917810eb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,6 @@ + @@ -13,13 +14,13 @@ 80d7b4ee29c31c0886b139ad02d85da48b543cd6 - - https://github.com/dotnet/arcade - 80d7b4ee29c31c0886b139ad02d85da48b543cd6 + + https://github.com/dotnet/dotnet + 721dc7a2a59416b21fc49447d264009d708d6000 - - https://github.com/dotnet/sdk - f4de547215d995985f21f195b29909d8569bcf46 + + https://github.com/dotnet/dotnet + 721dc7a2a59416b21fc49447d264009d708d6000 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index aeaac6650..b60545ef9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ 6.0.0-preview.6.21352.12 6.0.0-preview.6.21352.12 - 10.0.100-preview.4.25220.1 + 10.0.100-preview.5.25223.119 1.4.13 diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh old mode 100644 new mode 100755 diff --git a/eng/common/core-templates/jobs/jobs.yml b/eng/common/core-templates/jobs/jobs.yml index bf35b78fa..e653d1997 100644 --- a/eng/common/core-templates/jobs/jobs.yml +++ b/eng/common/core-templates/jobs/jobs.yml @@ -96,7 +96,7 @@ jobs: ${{ parameter.key }}: ${{ parameter.value }} - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, ''), eq(parameters.isAssetlessBuild, true)) }}: + - ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}: - template: ../job/publish-build-assets.yml parameters: is1ESPipeline: ${{ parameters.is1ESPipeline }} @@ -112,7 +112,7 @@ jobs: - Source_Build_Complete runAsPublic: ${{ parameters.runAsPublic }} - publishAssetsImmediately: ${{ or(parameters.publishAssetsImmediately, parameters.isAssetlessBuild) }} + publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }} isAssetlessBuild: ${{ parameters.isAssetlessBuild }} enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 2341706b0..d65c222c0 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -93,7 +93,9 @@ steps: $portableBuildArgs \ /p:DotNetBuildSourceOnly=true \ /p:DotNetBuildRepo=true \ - /p:AssetManifestFileName=$assetManifestFileName + /p:AssetManifestFileName=$assetManifestFileName \ + /p:SetUpSourceBuildIntermediateNupkgCache=false \ + /p:ReportPrebuiltUsage=false displayName: Build # Upload build logs for diagnosis. diff --git a/eng/common/cross/install-debs.py b/eng/common/cross/install-debs.py old mode 100644 new mode 100755 diff --git a/eng/common/cross/tizen-build-rootfs.sh b/eng/common/cross/tizen-build-rootfs.sh old mode 100644 new mode 100755 diff --git a/eng/common/cross/tizen-fetch.sh b/eng/common/cross/tizen-fetch.sh old mode 100644 new mode 100755 diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh old mode 100644 new mode 100755 diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh old mode 100644 new mode 100755 diff --git a/eng/common/sdk-task.sh b/eng/common/sdk-task.sh old mode 100644 new mode 100755 diff --git a/global.json b/global.json index 4247463b9..02084c0ba 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "dotnet": "10.0.100-preview.3.25201.16" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25222.2", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25223.119", "Microsoft.Build.NoTargets": "3.7.0" } }