diff --git a/NuGet.config b/NuGet.config index db5b1af50a8164..6f27ed7b451290 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,6 +9,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c9d1e0b022329..c8b8f23e2344a2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,37 +12,37 @@ https://github.com/dotnet/wcf 7f504aabb1988e9a093c1e74d8040bd52feb2f01 - + https://github.com/dotnet/llvm-project - f98a0db595fe3f28dac4594acc7114b16281d090 + 158c0c35f7a4ca5b2214cb259ba581396458c502 - + https://github.com/dotnet/llvm-project - f98a0db595fe3f28dac4594acc7114b16281d090 + 158c0c35f7a4ca5b2214cb259ba581396458c502 - + https://github.com/dotnet/llvm-project - f98a0db595fe3f28dac4594acc7114b16281d090 + 158c0c35f7a4ca5b2214cb259ba581396458c502 - + https://github.com/dotnet/llvm-project - f98a0db595fe3f28dac4594acc7114b16281d090 + 158c0c35f7a4ca5b2214cb259ba581396458c502 - + https://github.com/dotnet/llvm-project - f98a0db595fe3f28dac4594acc7114b16281d090 + 158c0c35f7a4ca5b2214cb259ba581396458c502 - + https://github.com/dotnet/llvm-project - f98a0db595fe3f28dac4594acc7114b16281d090 + 158c0c35f7a4ca5b2214cb259ba581396458c502 - + https://github.com/dotnet/llvm-project - f98a0db595fe3f28dac4594acc7114b16281d090 + 158c0c35f7a4ca5b2214cb259ba581396458c502 - + https://github.com/dotnet/llvm-project - f98a0db595fe3f28dac4594acc7114b16281d090 + 158c0c35f7a4ca5b2214cb259ba581396458c502 https://github.com/dotnet/command-line-api @@ -64,18 +64,18 @@ e9c26dfe3cdc9cafe5acd2bb9aa1fa1b4cbcc72f - + https://github.com/dotnet/emsdk - 78be8cdf4f0bfd93018fd7a87f8282a41d041298 + b8d8fec81291264a825ba4c803ad50577b9d2265 https://github.com/dotnet/emsdk - 78be8cdf4f0bfd93018fd7a87f8282a41d041298 + b8d8fec81291264a825ba4c803ad50577b9d2265 - + https://github.com/dotnet/emsdk - 78be8cdf4f0bfd93018fd7a87f8282a41d041298 + b8d8fec81291264a825ba4c803ad50577b9d2265 @@ -226,61 +226,61 @@ https://github.com/dotnet/runtime-assets aedfa03dd61c8e5ef1253d33a245d884669b0476 - + https://github.com/dotnet/llvm-project - f98a0db595fe3f28dac4594acc7114b16281d090 + 158c0c35f7a4ca5b2214cb259ba581396458c502 - + https://github.com/dotnet/llvm-project - f98a0db595fe3f28dac4594acc7114b16281d090 + 158c0c35f7a4ca5b2214cb259ba581396458c502 - + https://github.com/dotnet/llvm-project - f98a0db595fe3f28dac4594acc7114b16281d090 + 158c0c35f7a4ca5b2214cb259ba581396458c502 - + https://github.com/dotnet/llvm-project - f98a0db595fe3f28dac4594acc7114b16281d090 + 158c0c35f7a4ca5b2214cb259ba581396458c502 - + https://github.com/dotnet/llvm-project - f98a0db595fe3f28dac4594acc7114b16281d090 + 158c0c35f7a4ca5b2214cb259ba581396458c502 - + https://github.com/dotnet/llvm-project - f98a0db595fe3f28dac4594acc7114b16281d090 + 158c0c35f7a4ca5b2214cb259ba581396458c502 - + https://github.com/dotnet/llvm-project - f98a0db595fe3f28dac4594acc7114b16281d090 + 158c0c35f7a4ca5b2214cb259ba581396458c502 - + https://github.com/dotnet/llvm-project - f98a0db595fe3f28dac4594acc7114b16281d090 + 158c0c35f7a4ca5b2214cb259ba581396458c502 - + https://github.com/dotnet/llvm-project - f98a0db595fe3f28dac4594acc7114b16281d090 + 158c0c35f7a4ca5b2214cb259ba581396458c502 - + https://github.com/dotnet/llvm-project - f98a0db595fe3f28dac4594acc7114b16281d090 + 158c0c35f7a4ca5b2214cb259ba581396458c502 - + https://github.com/dotnet/llvm-project - f98a0db595fe3f28dac4594acc7114b16281d090 + 158c0c35f7a4ca5b2214cb259ba581396458c502 - + https://github.com/dotnet/llvm-project - f98a0db595fe3f28dac4594acc7114b16281d090 + 158c0c35f7a4ca5b2214cb259ba581396458c502 - + https://github.com/dotnet/llvm-project - f98a0db595fe3f28dac4594acc7114b16281d090 + 158c0c35f7a4ca5b2214cb259ba581396458c502 - + https://github.com/dotnet/llvm-project - f98a0db595fe3f28dac4594acc7114b16281d090 + 158c0c35f7a4ca5b2214cb259ba581396458c502 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 5ed5b3fc471653..5d1c5477e65938 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -225,39 +225,39 @@ 2.4.8 9.0.0-alpha.1.24167.3 - 19.1.0-alpha.1.25113.2 - 19.1.0-alpha.1.25113.2 - 19.1.0-alpha.1.25113.2 - 19.1.0-alpha.1.25113.2 - 19.1.0-alpha.1.25113.2 - 19.1.0-alpha.1.25113.2 - 19.1.0-alpha.1.25113.2 - 19.1.0-alpha.1.25113.2 - 19.1.0-alpha.1.25113.2 - 19.1.0-alpha.1.25113.2 - 19.1.0-alpha.1.25113.2 - 19.1.0-alpha.1.25113.2 - 19.1.0-alpha.1.25113.2 - 19.1.0-alpha.1.25113.2 + 19.1.0-alpha.1.25163.1 + 19.1.0-alpha.1.25163.1 + 19.1.0-alpha.1.25163.1 + 19.1.0-alpha.1.25163.1 + 19.1.0-alpha.1.25163.1 + 19.1.0-alpha.1.25163.1 + 19.1.0-alpha.1.25163.1 + 19.1.0-alpha.1.25163.1 + 19.1.0-alpha.1.25163.1 + 19.1.0-alpha.1.25163.1 + 19.1.0-alpha.1.25163.1 + 19.1.0-alpha.1.25163.1 + 19.1.0-alpha.1.25163.1 + 19.1.0-alpha.1.25163.1 - 9.0.4-servicing.25157.2 + 9.0.4-servicing.25177.1 9.0.4 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version) 1.1.87-gba258badda 1.0.0-v3.14.0.5722 - 19.1.0-alpha.1.25113.2 - 19.1.0-alpha.1.25113.2 - 19.1.0-alpha.1.25113.2 - 19.1.0-alpha.1.25113.2 - 19.1.0-alpha.1.25113.2 - 19.1.0-alpha.1.25113.2 - 19.1.0-alpha.1.25113.2 - 19.1.0-alpha.1.25113.2 + 19.1.0-alpha.1.25163.1 + 19.1.0-alpha.1.25163.1 + 19.1.0-alpha.1.25163.1 + 19.1.0-alpha.1.25163.1 + 19.1.0-alpha.1.25163.1 + 19.1.0-alpha.1.25163.1 + 19.1.0-alpha.1.25163.1 + 19.1.0-alpha.1.25163.1 3.1.7 1.0.406601 diff --git a/eng/pipelines/official/jobs/prepare-signed-artifacts.yml b/eng/pipelines/official/jobs/prepare-signed-artifacts.yml index eb25d311890a98..482e2cc2b1e6f5 100644 --- a/eng/pipelines/official/jobs/prepare-signed-artifacts.yml +++ b/eng/pipelines/official/jobs/prepare-signed-artifacts.yml @@ -8,6 +8,9 @@ jobs: parameters: name: 'PrepareSignedArtifacts' displayName: 'Prepare Signed Artifacts' + + # Disable SBOM at job template level + enableSbom: false pool: name: $(DncEngInternalBuildPool) @@ -52,7 +55,11 @@ jobs: /p:DotNetSignType=$(_SignType) /bl:$(Build.SourcesDirectory)\prepare-artifacts.binlog displayName: Prepare artifacts and upload to build - + + - template: /eng/common/templates-official/steps/generate-sbom.yml + parameters: + BuildDropPath: $(Build.SourcesDirectory)\artifacts + - task: CopyFiles@2 displayName: Copy Files to $(Build.StagingDirectory)\BuildLogs inputs: