diff --git a/NuGet.config b/NuGet.config
index e05500157b4..be9cec9b230 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -4,7 +4,7 @@
-
+
@@ -23,7 +23,7 @@
-
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 9d7b0e1c689..16d221ec3a9 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -7,13 +7,13 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
-->
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 50c4cb9fc31c47f03eac865d7bc518af173b74b7
+ efd5742bb5dd1677fbbbeb277bcfb5c9025548e5
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 50c4cb9fc31c47f03eac865d7bc518af173b74b7
+ efd5742bb5dd1677fbbbeb277bcfb5c9025548e5
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
@@ -23,29 +23,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
5535e31a712343a63f5d7d796cd874e563e5ac14
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 50c4cb9fc31c47f03eac865d7bc518af173b74b7
+ efd5742bb5dd1677fbbbeb277bcfb5c9025548e5
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 50c4cb9fc31c47f03eac865d7bc518af173b74b7
+ efd5742bb5dd1677fbbbeb277bcfb5c9025548e5
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 50c4cb9fc31c47f03eac865d7bc518af173b74b7
+ efd5742bb5dd1677fbbbeb277bcfb5c9025548e5
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 50c4cb9fc31c47f03eac865d7bc518af173b74b7
+ efd5742bb5dd1677fbbbeb277bcfb5c9025548e5
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
81cabf2857a01351e5ab578947c7403a5b128ad1
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 50c4cb9fc31c47f03eac865d7bc518af173b74b7
+ efd5742bb5dd1677fbbbeb277bcfb5c9025548e5
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
@@ -55,17 +55,17 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
81cabf2857a01351e5ab578947c7403a5b128ad1
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 50c4cb9fc31c47f03eac865d7bc518af173b74b7
+ efd5742bb5dd1677fbbbeb277bcfb5c9025548e5
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 50c4cb9fc31c47f03eac865d7bc518af173b74b7
+ efd5742bb5dd1677fbbbeb277bcfb5c9025548e5
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 50c4cb9fc31c47f03eac865d7bc518af173b74b7
+ efd5742bb5dd1677fbbbeb277bcfb5c9025548e5
@@ -179,29 +179,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
-
+
https://github.com/dotnet/arcade
- 4ff4ce248e95ae74b0040de6a6c5939aa63120dc
+ c7a36e53f91e41943746f97a8c183549364c5092
-
+
https://github.com/dotnet/arcade
- 4ff4ce248e95ae74b0040de6a6c5939aa63120dc
+ c7a36e53f91e41943746f97a8c183549364c5092
-
+
https://github.com/dotnet/arcade
- 4ff4ce248e95ae74b0040de6a6c5939aa63120dc
+ c7a36e53f91e41943746f97a8c183549364c5092
-
+
https://github.com/dotnet/arcade
- 4ff4ce248e95ae74b0040de6a6c5939aa63120dc
+ c7a36e53f91e41943746f97a8c183549364c5092
-
+
https://github.com/dotnet/arcade
- 4ff4ce248e95ae74b0040de6a6c5939aa63120dc
+ c7a36e53f91e41943746f97a8c183549364c5092
-
+
https://github.com/dotnet/arcade
- 4ff4ce248e95ae74b0040de6a6c5939aa63120dc
+ c7a36e53f91e41943746f97a8c183549364c5092
diff --git a/eng/Versions.props b/eng/Versions.props
index ad037fe3376..8be220a3066 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -3,7 +3,7 @@
8
0
- 15
+ 16
servicing
@@ -16,14 +16,14 @@
- 8.0.15-servicing.25164.13
+ 8.0.16-servicing.25215.6
8.0.2
8.0.0
8.0.1
8.0.2
8.0.1
5.0.0-preview.7.20320.5
- 8.0.15-servicing.25164.13
+ 8.0.16-servicing.25215.6
8.0.1
6.0.0
8.0.1
@@ -32,18 +32,18 @@
8.0.5
8.0.0
8.0.0
- 8.0.15
- 8.0.15
- 8.0.15-servicing.25164.13
+ 8.0.16
+ 8.0.16
+ 8.0.16-servicing.25215.6
8.0.0
8.0.0
8.0.1
8.0.0
8.0.0
8.0.0
- 8.0.15-servicing.25164.13
- 8.0.15-servicing.25164.13
- 8.0.15-servicing.25164.13
+ 8.0.16-servicing.25215.6
+ 8.0.16-servicing.25215.6
+ 8.0.16-servicing.25215.6
@@ -56,9 +56,9 @@
- 8.0.0-beta.25120.1
- 8.0.0-beta.25120.1
- 8.0.0-beta.25120.1
+ 8.0.0-beta.25208.7
+ 8.0.0-beta.25208.7
+ 8.0.0-beta.25208.7
17.4.0-preview-20220707-01
diff --git a/eng/common/generate-sbom-prep.ps1 b/eng/common/generate-sbom-prep.ps1
index 3e5c1c74a1c..a0c7d792a76 100644
--- a/eng/common/generate-sbom-prep.ps1
+++ b/eng/common/generate-sbom-prep.ps1
@@ -4,18 +4,26 @@ Param(
. $PSScriptRoot\pipeline-logging-functions.ps1
+# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly
+# with their own overwriting ours. So we create it as a sub directory of the requested manifest path.
+$ArtifactName = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM"
+$SafeArtifactName = $ArtifactName -replace '["/:<>\\|?@*"() ]', '_'
+$SbomGenerationDir = Join-Path $ManifestDirPath $SafeArtifactName
+
+Write-Host "Artifact name before : $ArtifactName"
+Write-Host "Artifact name after : $SafeArtifactName"
+
Write-Host "Creating dir $ManifestDirPath"
+
# create directory for sbom manifest to be placed
-if (!(Test-Path -path $ManifestDirPath))
+if (!(Test-Path -path $SbomGenerationDir))
{
- New-Item -ItemType Directory -path $ManifestDirPath
- Write-Host "Successfully created directory $ManifestDirPath"
+ New-Item -ItemType Directory -path $SbomGenerationDir
+ Write-Host "Successfully created directory $SbomGenerationDir"
}
else{
Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder."
}
Write-Host "Updating artifact name"
-$artifact_name = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" -replace '["/:<>\\|?@*"() ]', '_'
-Write-Host "Artifact name $artifact_name"
-Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$artifact_name"
+Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$SafeArtifactName"
diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh
index d5c76dc827b..bbb4922151e 100644
--- a/eng/common/generate-sbom-prep.sh
+++ b/eng/common/generate-sbom-prep.sh
@@ -14,19 +14,24 @@ done
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
. $scriptroot/pipeline-logging-functions.sh
+# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts.
+artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM"
+safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}"
+
manifest_dir=$1
-if [ ! -d "$manifest_dir" ] ; then
- mkdir -p "$manifest_dir"
- echo "Sbom directory created." $manifest_dir
+# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly
+# with their own overwriting ours. So we create it as a sub directory of the requested manifest path.
+sbom_generation_dir="$manifest_dir/$safe_artifact_name"
+
+if [ ! -d "$sbom_generation_dir" ] ; then
+ mkdir -p "$sbom_generation_dir"
+ echo "Sbom directory created." $sbom_generation_dir
else
Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder."
fi
-artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM"
echo "Artifact name before : "$artifact_name
-# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts.
-safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}"
echo "Artifact name after : "$safe_artifact_name
export ARTIFACT_NAME=$safe_artifact_name
echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name"
diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml
index 1f035fee73f..98ccbd7a9c1 100644
--- a/eng/common/templates-official/job/job.yml
+++ b/eng/common/templates-official/job/job.yml
@@ -38,6 +38,7 @@ parameters:
enableSbom: true
PackageVersion: 7.0.0
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
+ ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
jobs:
- job: ${{ parameters.name }}
@@ -261,4 +262,4 @@ jobs:
targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration'
artifactName: 'BuildConfiguration'
displayName: 'Publish build retry configuration'
- continueOnError: true
\ No newline at end of file
+ continueOnError: true
diff --git a/eng/common/templates-official/steps/generate-sbom.yml b/eng/common/templates-official/steps/generate-sbom.yml
index 1bf43bf807a..daf0957b68d 100644
--- a/eng/common/templates-official/steps/generate-sbom.yml
+++ b/eng/common/templates-official/steps/generate-sbom.yml
@@ -35,7 +35,7 @@ steps:
PackageName: ${{ parameters.packageName }}
BuildDropPath: ${{ parameters.buildDropPath }}
PackageVersion: ${{ parameters.packageVersion }}
- ManifestDirPath: ${{ parameters.manifestDirPath }}
+ ManifestDirPath: ${{ parameters.manifestDirPath }}/$(ARTIFACT_NAME)
${{ if ne(parameters.IgnoreDirectories, '') }}:
AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}'
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index a00577ed17a..82b2798ba30 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -42,7 +42,7 @@
[bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true }
# Enable repos to use a particular version of the on-line dotnet-install scripts.
-# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1
+# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1
[string]$dotnetInstallScriptVersion = if (Test-Path variable:dotnetInstallScriptVersion) { $dotnetInstallScriptVersion } else { 'v1' }
# True to use global NuGet cache instead of restoring packages to repository-local directory.
@@ -263,7 +263,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
if (!(Test-Path $installScript)) {
Create-Directory $dotnetRoot
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
- $uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
+ $uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
Retry({
Write-Host "GET $uri"
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index b9b329ce37f..68db1543023 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -54,7 +54,7 @@ warn_as_error=${warn_as_error:-true}
use_installed_dotnet_cli=${use_installed_dotnet_cli:-true}
# Enable repos to use a particular version of the on-line dotnet-install scripts.
-# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh
+# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh
dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'}
# True to use global NuGet cache instead of restoring packages to repository-local directory.
@@ -297,7 +297,7 @@ function with_retries {
function GetDotNetInstallScript {
local root=$1
local install_script="$root/dotnet-install.sh"
- local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
+ local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
if [[ ! -a "$install_script" ]]; then
mkdir -p "$root"
diff --git a/global.json b/global.json
index 4ebee7f7c50..6434ffe3cbb 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"tools": {
- "dotnet": "8.0.113",
+ "dotnet": "8.0.115",
"runtimes": {
"dotnet/x64": [
"$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
@@ -11,14 +11,14 @@
}
},
"sdk": {
- "version": "8.0.113"
+ "version": "8.0.115"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25120.1",
- "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.25120.1",
- "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25120.1",
+ "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25208.7",
+ "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.25208.7",
+ "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25208.7",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
- "Microsoft.NET.Sdk.IL": "8.0.15-servicing.25164.13"
+ "Microsoft.NET.Sdk.IL": "8.0.16-servicing.25215.6"
},
"native-tools": {
"cmake": "latest"