[release/8.0-rc1] Update dependencies from dotnet/arcade#90665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carlossanlop merged 2 commits into from
Aug 16, 2023
Merged

[release/8.0-rc1] Update dependencies from dotnet/arcade #90665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b31258
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Aug 16, 2023
4b46db6
Merge branch 'release/8.0-rc1' into darc-release/8.0-rc1-7b52f368-c04…
carlossanlop Aug 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 38 additions & 38 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -107,79 +107,79 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23411.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23415.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23408.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23415.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>493329204079519072f0241ed26f692bdee0d60c</Sha>
<Sha>649a1e75101b701d753ee41efbe9038f9b23a0db</Sha>
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23411.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23415.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23411.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23415.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23411.1">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23415.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23411.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23415.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23411.1">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23415.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23411.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23415.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23411.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23415.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23411.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23415.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23411.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23415.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23411.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23415.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23411.1">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23415.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23411.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23415.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23411.1">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23415.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23411.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23415.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23411.1">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23415.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23411.1">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23415.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.23408.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand DownExpand Up@@ -330,9 +330,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>480b9159eb7e69b182a87581d5a336e97e0b6dae</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23411.1">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23415.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23362.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
30 changes: 15 additions & 15 deletions eng/Versions.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,21 +83,21 @@
<!-- SDK dependencies -->
<MicrosoftDotNetApiCompatTaskVersion>8.0.100-preview.7.23329.3</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23411.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.23411.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23411.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23411.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23411.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23411.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23411.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23411.1</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23415.4</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.23415.4</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23415.4</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23415.4</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23415.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23415.4</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23415.4</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23415.4</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down
8 changes: 4 additions & 4 deletions eng/common/SetupNugetSources.ps1
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080
#
# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry
# under <packageSourceCredentials> for each Maestro managed private feed. Two additional credential
# under <packageSourceCredentials> for each Maestro managed private feed. Two additional credential
# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport.
#
# This script needs to be called in every job that will restore packages and which the base repo has
Expand DownExpand Up@@ -37,7 +37,7 @@ Set-StrictMode -Version 2.0
# Add source entry to PackageSources
function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) {
$packageSource = $sources.SelectSingleNode("add[@key='$SourceName']")

if ($packageSource -eq $null)
{
$packageSource = $doc.CreateElement("add")
Expand All@@ -48,7 +48,7 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern
else {
Write-Host "Package source $SourceName already present."
}

AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password
}

Expand DownExpand Up@@ -89,7 +89,7 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Passw
$maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]")

Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds."

ForEach ($PackageSource in $maestroPrivateSources) {
Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key
AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password
Expand Down
6 changes: 3 additions & 3 deletions eng/common/SetupNugetSources.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080
#
# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry
# under <packageSourceCredentials> for each Maestro's managed private feed. Two additional credential
# under <packageSourceCredentials> for each Maestro's managed private feed. Two additional credential
# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport.
#
# This script needs to be called in every job that will restore packages and which the base repo has
Expand DownExpand Up@@ -68,7 +68,7 @@ if [ "$?" != "0" ]; then
sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" $ConfigFile
fi

# Ensure there is a <packageSourceCredentials>...</packageSourceCredentials> section.
# Ensure there is a <packageSourceCredentials>...</packageSourceCredentials> section.
grep -i "<packageSourceCredentials>" $ConfigFile
if [ "$?" != "0" ]; then
echo "Adding <packageSourceCredentials>...</packageSourceCredentials> section."
Expand DownExpand Up@@ -142,7 +142,7 @@ IFS=$PrevIFS

for FeedName in ${PackageSources[@]} ; do
# Check if there is no existing credential for this FeedName
grep -i "<$FeedName>" $ConfigFile
grep -i "<$FeedName>" $ConfigFile
if [ "$?" != "0" ]; then
echo "Adding credentials for $FeedName."

Expand Down
6 changes: 2 additions & 4 deletions eng/common/native/init-distro-rid.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,6 @@ getNonPortableDistroRid()
# Input:
# os: (str)
# arch: (str)
# isPortable: (int)
# rootfsDir?: (nullable:string)
#
# Return:
Expand All@@ -97,10 +96,9 @@ initDistroRidGlobal()
{
local targetOs="$1"
local targetArch="$2"
local isPortable="$3"
local rootfsDir=""
if [ "$#" -ge 4 ]; then
rootfsDir="$4"
if [ "$#" -ge 3 ]; then
rootfsDir="$3"
fi

if [ -n "${rootfsDir}" ]; then
Expand Down
75 changes: 75 additions & 0 deletions eng/common/sdl/trim-assets-version.ps1
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
<#
.SYNOPSIS
Install and run the 'Microsoft.DotNet.VersionTools.Cli' tool with the 'trim-artifacts-version' command to trim the version from the NuGet assets file name.

.PARAMETER InputPath
Full path to directory where artifact packages are stored

.PARAMETER Recursive
Search for NuGet packages recursively

#>

Param(
[string] $InputPath,
[bool] $Recursive = $true
)

$CliToolName = "Microsoft.DotNet.VersionTools.Cli"

function Install-VersionTools-Cli {
param(
[Parameter(Mandatory=$true)][string]$Version
)

Write-Host "Installing the package '$CliToolName' with a version of '$version' ..."
$feed = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json"

$argumentList = @("tool", "install", "--local", "$CliToolName", "--add-source $feed", "--no-cache", "--version $Version")
Start-Process "$dotnet" -Verbose -ArgumentList $argumentList -NoNewWindow -Wait
}

# -------------------------------------------------------------------

if (!(Test-Path $InputPath)) {
Write-Host "Input Path '$InputPath' does not exist"
ExitWithExitCode 1
}

$ErrorActionPreference = 'Stop'
Set-StrictMode -Version 2.0

$disableConfigureToolsetImport = $true
$global:LASTEXITCODE = 0

# `tools.ps1` checks $ci to perform some actions. Since the SDL
# scripts don't necessarily execute in the same agent that run the
# build.ps1/sh script this variable isn't automatically set.
$ci = $true
. $PSScriptRoot\..\tools.ps1

try {
$dotnetRoot = InitializeDotNetCli -install:$true
$dotnet = "$dotnetRoot\dotnet.exe"

$toolsetVersion = Read-ArcadeSdkVersion
Install-VersionTools-Cli -Version $toolsetVersion

$cliToolFound = (& "$dotnet" tool list --local | Where-Object {$_.Split(' ')[0] -eq $CliToolName})
if ($null -eq $cliToolFound) {
Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "The '$CliToolName' tool is not installed."
ExitWithExitCode 1
}

Exec-BlockVerbosely {
& "$dotnet" $CliToolName trim-assets-version `
--assets-path $InputPath `
--recursive $Recursive
Exit-IfNZEC "Sdl"
}
}
catch {
Write-Host $_
Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_
ExitWithExitCode 1
}
6 changes: 5 additions & 1 deletion eng/common/tools.ps1
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -671,14 +671,18 @@ function InitializeNativeTools() {
}
}

function Read-ArcadeSdkVersion() {
return $GlobalJson.'msbuild-sdks'.'Microsoft.DotNet.Arcade.Sdk'
}

function InitializeToolset() {
if (Test-Path variable:global:_ToolsetBuildProj) {
return $global:_ToolsetBuildProj
}

$nugetCache = GetNuGetPackageCachePath

$toolsetVersion = $GlobalJson.'msbuild-sdks'.'Microsoft.DotNet.Arcade.Sdk'
$toolsetVersion = Read-ArcadeSdkVersion
$toolsetLocationFile = Join-Path $ToolsetDir "$toolsetVersion.txt"

if (Test-Path $toolsetLocationFile) {
Expand Down
6 changes: 3 additions & 3 deletions global.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,9 @@
"dotnet": "8.0.100-preview.7.23376.3"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23411.1",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23411.1",
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23411.1",
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23415.4",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23415.4",
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23415.4",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6"
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[release/8.0-rc1] Update dependencies from dotnet/arcade#90665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

carlossanlop
merged 2 commits into

from

Aug 16, 2023
 Merged


[release/8.0-rc1] Update dependencies from dotnet/arcade
#90665
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
9b31258

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Aug 16, 2023
4b46db6

Merge branch 'release/8.0-rc1' into darc-release/8.0-rc1-7b52f368-c04…


carlossanlop Aug 16, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


76 changes: 38 additions & 38 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,79 +107,79 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 <SourceBuild RepoName="arcade" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23408.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23415.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
 <Uri>https://github.com/dotnet/xliff-tasks</Uri>
 <Sha>493329204079519072f0241ed26f692bdee0d60c</Sha>
 <Sha>649a1e75101b701d753ee41efbe9038f9b23a0db</Sha>
 <SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.23408.1">
 <Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand DownExpand Up@@ -330,9 +330,9 @@
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>480b9159eb7e69b182a87581d5a336e97e0b6dae</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23362.5">
 <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down

30 changes: 15 additions & 15 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,21 +83,21 @@
 <!-- SDK dependencies -->
 <MicrosoftDotNetApiCompatTaskVersion>8.0.100-preview.7.23329.3</MicrosoftDotNetApiCompatTaskVersion>
 <!-- Arcade dependencies -->
 <MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23411.1</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>8.0.0-beta.23411.1</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23411.1</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23411.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23411.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23411.1</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23411.1</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23411.1</MicrosoftDotNetPackageTestingVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23415.4</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>8.0.0-beta.23415.4</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23415.4</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23415.4</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23415.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23415.4</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23415.4</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23415.4</MicrosoftDotNetPackageTestingVersion>
 <!-- NuGet dependencies -->
 <NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
 <!-- Installer dependencies -->
Expand Down

8 changes: 4 additions & 4 deletions
eng/common/SetupNugetSources.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080
#
# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry
# under <packageSourceCredentials> for each Maestro managed private feed. Two additional credential
# under <packageSourceCredentials> for each Maestro managed private feed. Two additional credential
# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport.
#
# This script needs to be called in every job that will restore packages and which the base repo has
Expand DownExpand Up@@ -37,7 +37,7 @@ Set-StrictMode -Version 2.0
# Add source entry to PackageSources
function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) {
 $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']")

 if ($packageSource -eq $null)
 {
 $packageSource = $doc.CreateElement("add")
Expand All@@ -48,7 +48,7 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern
 else {
 Write-Host "Package source $SourceName already present."
 }

 AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password
}

Expand DownExpand Up@@ -89,7 +89,7 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Passw
 $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]")

 Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds."

 ForEach ($PackageSource in $maestroPrivateSources) {
 Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key
 AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password
Expand Down

6 changes: 3 additions & 3 deletions
eng/common/SetupNugetSources.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080
#
# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry
# under <packageSourceCredentials> for each Maestro's managed private feed. Two additional credential
# under <packageSourceCredentials> for each Maestro's managed private feed. Two additional credential
# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport.
#
# This script needs to be called in every job that will restore packages and which the base repo has
Expand DownExpand Up@@ -68,7 +68,7 @@ if [ "$?" != "0" ]; then
 sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" $ConfigFile
fi

# Ensure there is a <packageSourceCredentials>...</packageSourceCredentials> section.
# Ensure there is a <packageSourceCredentials>...</packageSourceCredentials> section.
grep -i "<packageSourceCredentials>" $ConfigFile
if [ "$?" != "0" ]; then
 echo "Adding <packageSourceCredentials>...</packageSourceCredentials> section."
Expand DownExpand Up@@ -142,7 +142,7 @@ IFS=$PrevIFS

for FeedName in ${PackageSources[@]} ; do
 # Check if there is no existing credential for this FeedName
 grep -i "<$FeedName>" $ConfigFile
 grep -i "<$FeedName>" $ConfigFile
 if [ "$?" != "0" ]; then
 echo "Adding credentials for $FeedName."

Expand Down

6 changes: 2 additions & 4 deletions
eng/common/native/init-distro-rid.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,6 @@ getNonPortableDistroRid()
# Input:
# os: (str)
# arch: (str)
# isPortable: (int)
# rootfsDir?: (nullable:string)
#
# Return:
Expand All@@ -97,10 +96,9 @@ initDistroRidGlobal()
{
 local targetOs="$1"
 local targetArch="$2"
 local isPortable="$3"
 local rootfsDir=""
 if [ "$#" -ge 4 ]; then
 rootfsDir="$4"
 if [ "$#" -ge 3 ]; then
 rootfsDir="$3"
 fi

 if [ -n "${rootfsDir}" ]; then
Expand Down

75 changes: 75 additions & 0 deletions
eng/common/sdl/trim-assets-version.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
<#
.SYNOPSIS
Install and run the 'Microsoft.DotNet.VersionTools.Cli' tool with the 'trim-artifacts-version' command to trim the version from the NuGet assets file name.

.PARAMETER InputPath
Full path to directory where artifact packages are stored

.PARAMETER Recursive
Search for NuGet packages recursively

#>

Param(
 [string] $InputPath,
 [bool] $Recursive = $true
)

$CliToolName = "Microsoft.DotNet.VersionTools.Cli"

function Install-VersionTools-Cli {
 param(
 [Parameter(Mandatory=$true)][string]$Version
 )

 Write-Host "Installing the package '$CliToolName' with a version of '$version' ..."
 $feed = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json"

 $argumentList = @("tool", "install", "--local", "$CliToolName", "--add-source $feed", "--no-cache", "--version $Version")
 Start-Process "$dotnet" -Verbose -ArgumentList $argumentList -NoNewWindow -Wait
}

# -------------------------------------------------------------------

if (!(Test-Path $InputPath)) {
 Write-Host "Input Path '$InputPath' does not exist"
 ExitWithExitCode 1
}

$ErrorActionPreference = 'Stop'
Set-StrictMode -Version 2.0

$disableConfigureToolsetImport = $true
$global:LASTEXITCODE = 0

# `tools.ps1` checks $ci to perform some actions. Since the SDL
# scripts don't necessarily execute in the same agent that run the
# build.ps1/sh script this variable isn't automatically set.
$ci = $true
. $PSScriptRoot\..\tools.ps1

try {
 $dotnetRoot = InitializeDotNetCli -install:$true
 $dotnet = "$dotnetRoot\dotnet.exe"

 $toolsetVersion = Read-ArcadeSdkVersion
 Install-VersionTools-Cli -Version $toolsetVersion

 $cliToolFound = (& "$dotnet" tool list --local | Where-Object {$_.Split(' ')[0] -eq $CliToolName})
 if ($null -eq $cliToolFound) {
 Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "The '$CliToolName' tool is not installed."
 ExitWithExitCode 1
 }

 Exec-BlockVerbosely {
 & "$dotnet" $CliToolName trim-assets-version `
 --assets-path $InputPath `
 --recursive $Recursive
 Exit-IfNZEC "Sdl"
 }
}
catch {
 Write-Host $_
 Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_
 ExitWithExitCode 1
}

6 changes: 5 additions & 1 deletion
eng/common/tools.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -671,14 +671,18 @@ function InitializeNativeTools() {
 }
}

function Read-ArcadeSdkVersion() {
 return $GlobalJson.'msbuild-sdks'.'Microsoft.DotNet.Arcade.Sdk'
}

function InitializeToolset() {
 if (Test-Path variable:global:_ToolsetBuildProj) {
 return $global:_ToolsetBuildProj
 }

 $nugetCache = GetNuGetPackageCachePath

 $toolsetVersion = $GlobalJson.'msbuild-sdks'.'Microsoft.DotNet.Arcade.Sdk'
 $toolsetVersion = Read-ArcadeSdkVersion
 $toolsetLocationFile = Join-Path $ToolsetDir "$toolsetVersion.txt"

 if (Test-Path $toolsetLocationFile) {
Expand Down

6 changes: 3 additions & 3 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,9 @@
 "dotnet": "8.0.100-preview.7.23376.3"
 },
 "msbuild-sdks": {
 "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23411.1",
 "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23411.1",
 "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23411.1",
 "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23415.4",
 "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23415.4",
 "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23415.4",
 "Microsoft.Build.NoTargets": "3.7.0",
 "Microsoft.Build.Traversal": "3.4.0",
 "Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6"
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[release/8.0-rc1] Update dependencies from dotnet/arcade#90665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

carlossanlop
merged 2 commits into

from

Aug 16, 2023
 Merged


[release/8.0-rc1] Update dependencies from dotnet/arcade
#90665
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
9b31258

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Aug 16, 2023
4b46db6

Merge branch 'release/8.0-rc1' into darc-release/8.0-rc1-7b52f368-c04…


carlossanlop Aug 16, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


76 changes: 38 additions & 38 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,79 +107,79 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 <SourceBuild RepoName="arcade" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23408.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23415.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
 <Uri>https://github.com/dotnet/xliff-tasks</Uri>
 <Sha>493329204079519072f0241ed26f692bdee0d60c</Sha>
 <Sha>649a1e75101b701d753ee41efbe9038f9b23a0db</Sha>
 <SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.23408.1">
 <Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand DownExpand Up@@ -330,9 +330,9 @@
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>480b9159eb7e69b182a87581d5a336e97e0b6dae</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23362.5">
 <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down

30 changes: 15 additions & 15 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,21 +83,21 @@
 <!-- SDK dependencies -->
 <MicrosoftDotNetApiCompatTaskVersion>8.0.100-preview.7.23329.3</MicrosoftDotNetApiCompatTaskVersion>
 <!-- Arcade dependencies -->
 <MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23411.1</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>8.0.0-beta.23411.1</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23411.1</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23411.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23411.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23411.1</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23411.1</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23411.1</MicrosoftDotNetPackageTestingVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23415.4</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>8.0.0-beta.23415.4</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23415.4</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23415.4</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23415.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23415.4</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23415.4</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23415.4</MicrosoftDotNetPackageTestingVersion>
 <!-- NuGet dependencies -->
 <NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
 <!-- Installer dependencies -->
Expand Down

8 changes: 4 additions & 4 deletions
eng/common/SetupNugetSources.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080
#
# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry
# under <packageSourceCredentials> for each Maestro managed private feed. Two additional credential
# under <packageSourceCredentials> for each Maestro managed private feed. Two additional credential
# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport.
#
# This script needs to be called in every job that will restore packages and which the base repo has
Expand DownExpand Up@@ -37,7 +37,7 @@ Set-StrictMode -Version 2.0
# Add source entry to PackageSources
function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) {
 $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']")

 if ($packageSource -eq $null)
 {
 $packageSource = $doc.CreateElement("add")
Expand All@@ -48,7 +48,7 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern
 else {
 Write-Host "Package source $SourceName already present."
 }

 AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password
}

Expand DownExpand Up@@ -89,7 +89,7 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Passw
 $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]")

 Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds."

 ForEach ($PackageSource in $maestroPrivateSources) {
 Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key
 AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password
Expand Down

6 changes: 3 additions & 3 deletions
eng/common/SetupNugetSources.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080
#
# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry
# under <packageSourceCredentials> for each Maestro's managed private feed. Two additional credential
# under <packageSourceCredentials> for each Maestro's managed private feed. Two additional credential
# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport.
#
# This script needs to be called in every job that will restore packages and which the base repo has
Expand DownExpand Up@@ -68,7 +68,7 @@ if [ "$?" != "0" ]; then
 sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" $ConfigFile
fi

# Ensure there is a <packageSourceCredentials>...</packageSourceCredentials> section.
# Ensure there is a <packageSourceCredentials>...</packageSourceCredentials> section.
grep -i "<packageSourceCredentials>" $ConfigFile
if [ "$?" != "0" ]; then
 echo "Adding <packageSourceCredentials>...</packageSourceCredentials> section."
Expand DownExpand Up@@ -142,7 +142,7 @@ IFS=$PrevIFS

for FeedName in ${PackageSources[@]} ; do
 # Check if there is no existing credential for this FeedName
 grep -i "<$FeedName>" $ConfigFile
 grep -i "<$FeedName>" $ConfigFile
 if [ "$?" != "0" ]; then
 echo "Adding credentials for $FeedName."

Expand Down

6 changes: 2 additions & 4 deletions
eng/common/native/init-distro-rid.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,6 @@ getNonPortableDistroRid()
# Input:
# os: (str)
# arch: (str)
# isPortable: (int)
# rootfsDir?: (nullable:string)
#
# Return:
Expand All@@ -97,10 +96,9 @@ initDistroRidGlobal()
{
 local targetOs="$1"
 local targetArch="$2"
 local isPortable="$3"
 local rootfsDir=""
 if [ "$#" -ge 4 ]; then
 rootfsDir="$4"
 if [ "$#" -ge 3 ]; then
 rootfsDir="$3"
 fi

 if [ -n "${rootfsDir}" ]; then
Expand Down

75 changes: 75 additions & 0 deletions
eng/common/sdl/trim-assets-version.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
<#
.SYNOPSIS
Install and run the 'Microsoft.DotNet.VersionTools.Cli' tool with the 'trim-artifacts-version' command to trim the version from the NuGet assets file name.

.PARAMETER InputPath
Full path to directory where artifact packages are stored

.PARAMETER Recursive
Search for NuGet packages recursively

#>

Param(
 [string] $InputPath,
 [bool] $Recursive = $true
)

$CliToolName = "Microsoft.DotNet.VersionTools.Cli"

function Install-VersionTools-Cli {
 param(
 [Parameter(Mandatory=$true)][string]$Version
 )

 Write-Host "Installing the package '$CliToolName' with a version of '$version' ..."
 $feed = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json"

 $argumentList = @("tool", "install", "--local", "$CliToolName", "--add-source $feed", "--no-cache", "--version $Version")
 Start-Process "$dotnet" -Verbose -ArgumentList $argumentList -NoNewWindow -Wait
}

# -------------------------------------------------------------------

if (!(Test-Path $InputPath)) {
 Write-Host "Input Path '$InputPath' does not exist"
 ExitWithExitCode 1
}

$ErrorActionPreference = 'Stop'
Set-StrictMode -Version 2.0

$disableConfigureToolsetImport = $true
$global:LASTEXITCODE = 0

# `tools.ps1` checks $ci to perform some actions. Since the SDL
# scripts don't necessarily execute in the same agent that run the
# build.ps1/sh script this variable isn't automatically set.
$ci = $true
. $PSScriptRoot\..\tools.ps1

try {
 $dotnetRoot = InitializeDotNetCli -install:$true
 $dotnet = "$dotnetRoot\dotnet.exe"

 $toolsetVersion = Read-ArcadeSdkVersion
 Install-VersionTools-Cli -Version $toolsetVersion

 $cliToolFound = (& "$dotnet" tool list --local | Where-Object {$_.Split(' ')[0] -eq $CliToolName})
 if ($null -eq $cliToolFound) {
 Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "The '$CliToolName' tool is not installed."
 ExitWithExitCode 1
 }

 Exec-BlockVerbosely {
 & "$dotnet" $CliToolName trim-assets-version `
 --assets-path $InputPath `
 --recursive $Recursive
 Exit-IfNZEC "Sdl"
 }
}
catch {
 Write-Host $_
 Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_
 ExitWithExitCode 1
}

6 changes: 5 additions & 1 deletion
eng/common/tools.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -671,14 +671,18 @@ function InitializeNativeTools() {
 }
}

function Read-ArcadeSdkVersion() {
 return $GlobalJson.'msbuild-sdks'.'Microsoft.DotNet.Arcade.Sdk'
}

function InitializeToolset() {
 if (Test-Path variable:global:_ToolsetBuildProj) {
 return $global:_ToolsetBuildProj
 }

 $nugetCache = GetNuGetPackageCachePath

 $toolsetVersion = $GlobalJson.'msbuild-sdks'.'Microsoft.DotNet.Arcade.Sdk'
 $toolsetVersion = Read-ArcadeSdkVersion
 $toolsetLocationFile = Join-Path $ToolsetDir "$toolsetVersion.txt"

 if (Test-Path $toolsetLocationFile) {
Expand Down

6 changes: 3 additions & 3 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,9 @@
 "dotnet": "8.0.100-preview.7.23376.3"
 },
 "msbuild-sdks": {
 "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23411.1",
 "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23411.1",
 "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23411.1",
 "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23415.4",
 "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23415.4",
 "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23415.4",
 "Microsoft.Build.NoTargets": "3.7.0",
 "Microsoft.Build.Traversal": "3.4.0",
 "Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6"
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[release/8.0-rc1] Update dependencies from dotnet/arcade#90665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

carlossanlop
merged 2 commits into

from

Aug 16, 2023
 Merged


[release/8.0-rc1] Update dependencies from dotnet/arcade
#90665
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
9b31258

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Aug 16, 2023
4b46db6

Merge branch 'release/8.0-rc1' into darc-release/8.0-rc1-7b52f368-c04…


carlossanlop Aug 16, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


76 changes: 38 additions & 38 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,79 +107,79 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 <SourceBuild RepoName="arcade" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23408.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23415.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
 <Uri>https://github.com/dotnet/xliff-tasks</Uri>
 <Sha>493329204079519072f0241ed26f692bdee0d60c</Sha>
 <Sha>649a1e75101b701d753ee41efbe9038f9b23a0db</Sha>
 <SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.23408.1">
 <Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand DownExpand Up@@ -330,9 +330,9 @@
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>480b9159eb7e69b182a87581d5a336e97e0b6dae</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23362.5">
 <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down

30 changes: 15 additions & 15 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,21 +83,21 @@
 <!-- SDK dependencies -->
 <MicrosoftDotNetApiCompatTaskVersion>8.0.100-preview.7.23329.3</MicrosoftDotNetApiCompatTaskVersion>
 <!-- Arcade dependencies -->
 <MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23411.1</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>8.0.0-beta.23411.1</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23411.1</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23411.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23411.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23411.1</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23411.1</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23411.1</MicrosoftDotNetPackageTestingVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23415.4</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>8.0.0-beta.23415.4</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23415.4</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23415.4</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23415.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23415.4</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23415.4</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23415.4</MicrosoftDotNetPackageTestingVersion>
 <!-- NuGet dependencies -->
 <NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
 <!-- Installer dependencies -->
Expand Down

8 changes: 4 additions & 4 deletions
eng/common/SetupNugetSources.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080
#
# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry
# under <packageSourceCredentials> for each Maestro managed private feed. Two additional credential
# under <packageSourceCredentials> for each Maestro managed private feed. Two additional credential
# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport.
#
# This script needs to be called in every job that will restore packages and which the base repo has
Expand DownExpand Up@@ -37,7 +37,7 @@ Set-StrictMode -Version 2.0
# Add source entry to PackageSources
function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) {
 $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']")

 if ($packageSource -eq $null)
 {
 $packageSource = $doc.CreateElement("add")
Expand All@@ -48,7 +48,7 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern
 else {
 Write-Host "Package source $SourceName already present."
 }

 AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password
}

Expand DownExpand Up@@ -89,7 +89,7 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Passw
 $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]")

 Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds."

 ForEach ($PackageSource in $maestroPrivateSources) {
 Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key
 AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password
Expand Down

6 changes: 3 additions & 3 deletions
eng/common/SetupNugetSources.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080
#
# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry
# under <packageSourceCredentials> for each Maestro's managed private feed. Two additional credential
# under <packageSourceCredentials> for each Maestro's managed private feed. Two additional credential
# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport.
#
# This script needs to be called in every job that will restore packages and which the base repo has
Expand DownExpand Up@@ -68,7 +68,7 @@ if [ "$?" != "0" ]; then
 sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" $ConfigFile
fi

# Ensure there is a <packageSourceCredentials>...</packageSourceCredentials> section.
# Ensure there is a <packageSourceCredentials>...</packageSourceCredentials> section.
grep -i "<packageSourceCredentials>" $ConfigFile
if [ "$?" != "0" ]; then
 echo "Adding <packageSourceCredentials>...</packageSourceCredentials> section."
Expand DownExpand Up@@ -142,7 +142,7 @@ IFS=$PrevIFS

for FeedName in ${PackageSources[@]} ; do
 # Check if there is no existing credential for this FeedName
 grep -i "<$FeedName>" $ConfigFile
 grep -i "<$FeedName>" $ConfigFile
 if [ "$?" != "0" ]; then
 echo "Adding credentials for $FeedName."

Expand Down

6 changes: 2 additions & 4 deletions
eng/common/native/init-distro-rid.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,6 @@ getNonPortableDistroRid()
# Input:
# os: (str)
# arch: (str)
# isPortable: (int)
# rootfsDir?: (nullable:string)
#
# Return:
Expand All@@ -97,10 +96,9 @@ initDistroRidGlobal()
{
 local targetOs="$1"
 local targetArch="$2"
 local isPortable="$3"
 local rootfsDir=""
 if [ "$#" -ge 4 ]; then
 rootfsDir="$4"
 if [ "$#" -ge 3 ]; then
 rootfsDir="$3"
 fi

 if [ -n "${rootfsDir}" ]; then
Expand Down

75 changes: 75 additions & 0 deletions
eng/common/sdl/trim-assets-version.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
<#
.SYNOPSIS
Install and run the 'Microsoft.DotNet.VersionTools.Cli' tool with the 'trim-artifacts-version' command to trim the version from the NuGet assets file name.

.PARAMETER InputPath
Full path to directory where artifact packages are stored

.PARAMETER Recursive
Search for NuGet packages recursively

#>

Param(
 [string] $InputPath,
 [bool] $Recursive = $true
)

$CliToolName = "Microsoft.DotNet.VersionTools.Cli"

function Install-VersionTools-Cli {
 param(
 [Parameter(Mandatory=$true)][string]$Version
 )

 Write-Host "Installing the package '$CliToolName' with a version of '$version' ..."
 $feed = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json"

 $argumentList = @("tool", "install", "--local", "$CliToolName", "--add-source $feed", "--no-cache", "--version $Version")
 Start-Process "$dotnet" -Verbose -ArgumentList $argumentList -NoNewWindow -Wait
}

# -------------------------------------------------------------------

if (!(Test-Path $InputPath)) {
 Write-Host "Input Path '$InputPath' does not exist"
 ExitWithExitCode 1
}

$ErrorActionPreference = 'Stop'
Set-StrictMode -Version 2.0

$disableConfigureToolsetImport = $true
$global:LASTEXITCODE = 0

# `tools.ps1` checks $ci to perform some actions. Since the SDL
# scripts don't necessarily execute in the same agent that run the
# build.ps1/sh script this variable isn't automatically set.
$ci = $true
. $PSScriptRoot\..\tools.ps1

try {
 $dotnetRoot = InitializeDotNetCli -install:$true
 $dotnet = "$dotnetRoot\dotnet.exe"

 $toolsetVersion = Read-ArcadeSdkVersion
 Install-VersionTools-Cli -Version $toolsetVersion

 $cliToolFound = (& "$dotnet" tool list --local | Where-Object {$_.Split(' ')[0] -eq $CliToolName})
 if ($null -eq $cliToolFound) {
 Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "The '$CliToolName' tool is not installed."
 ExitWithExitCode 1
 }

 Exec-BlockVerbosely {
 & "$dotnet" $CliToolName trim-assets-version `
 --assets-path $InputPath `
 --recursive $Recursive
 Exit-IfNZEC "Sdl"
 }
}
catch {
 Write-Host $_
 Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_
 ExitWithExitCode 1
}

6 changes: 5 additions & 1 deletion
eng/common/tools.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -671,14 +671,18 @@ function InitializeNativeTools() {
 }
}

function Read-ArcadeSdkVersion() {
 return $GlobalJson.'msbuild-sdks'.'Microsoft.DotNet.Arcade.Sdk'
}

function InitializeToolset() {
 if (Test-Path variable:global:_ToolsetBuildProj) {
 return $global:_ToolsetBuildProj
 }

 $nugetCache = GetNuGetPackageCachePath

 $toolsetVersion = $GlobalJson.'msbuild-sdks'.'Microsoft.DotNet.Arcade.Sdk'
 $toolsetVersion = Read-ArcadeSdkVersion
 $toolsetLocationFile = Join-Path $ToolsetDir "$toolsetVersion.txt"

 if (Test-Path $toolsetLocationFile) {
Expand Down

6 changes: 3 additions & 3 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,9 @@
 "dotnet": "8.0.100-preview.7.23376.3"
 },
 "msbuild-sdks": {
 "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23411.1",
 "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23411.1",
 "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23411.1",
 "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23415.4",
 "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23415.4",
 "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23415.4",
 "Microsoft.Build.NoTargets": "3.7.0",
 "Microsoft.Build.Traversal": "3.4.0",
 "Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6"
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[release/8.0-rc1] Update dependencies from dotnet/arcade#90665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

carlossanlop
merged 2 commits into

from

Aug 16, 2023
 Merged


[release/8.0-rc1] Update dependencies from dotnet/arcade
#90665
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
9b31258

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Aug 16, 2023
4b46db6

Merge branch 'release/8.0-rc1' into darc-release/8.0-rc1-7b52f368-c04…


carlossanlop Aug 16, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


76 changes: 38 additions & 38 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,79 +107,79 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 <SourceBuild RepoName="arcade" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23408.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23415.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
 <Uri>https://github.com/dotnet/xliff-tasks</Uri>
 <Sha>493329204079519072f0241ed26f692bdee0d60c</Sha>
 <Sha>649a1e75101b701d753ee41efbe9038f9b23a0db</Sha>
 <SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.23408.1">
 <Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand DownExpand Up@@ -330,9 +330,9 @@
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>480b9159eb7e69b182a87581d5a336e97e0b6dae</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23362.5">
 <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down

30 changes: 15 additions & 15 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,21 +83,21 @@
 <!-- SDK dependencies -->
 <MicrosoftDotNetApiCompatTaskVersion>8.0.100-preview.7.23329.3</MicrosoftDotNetApiCompatTaskVersion>
 <!-- Arcade dependencies -->
 <MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23411.1</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>8.0.0-beta.23411.1</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23411.1</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23411.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23411.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23411.1</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23411.1</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23411.1</MicrosoftDotNetPackageTestingVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23415.4</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>8.0.0-beta.23415.4</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23415.4</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23415.4</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23415.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23415.4</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23415.4</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23415.4</MicrosoftDotNetPackageTestingVersion>
 <!-- NuGet dependencies -->
 <NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
 <!-- Installer dependencies -->
Expand Down

8 changes: 4 additions & 4 deletions
eng/common/SetupNugetSources.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080
#
# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry
# under <packageSourceCredentials> for each Maestro managed private feed. Two additional credential
# under <packageSourceCredentials> for each Maestro managed private feed. Two additional credential
# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport.
#
# This script needs to be called in every job that will restore packages and which the base repo has
Expand DownExpand Up@@ -37,7 +37,7 @@ Set-StrictMode -Version 2.0
# Add source entry to PackageSources
function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) {
 $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']")

 if ($packageSource -eq $null)
 {
 $packageSource = $doc.CreateElement("add")
Expand All@@ -48,7 +48,7 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern
 else {
 Write-Host "Package source $SourceName already present."
 }

 AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password
}

Expand DownExpand Up@@ -89,7 +89,7 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Passw
 $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]")

 Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds."

 ForEach ($PackageSource in $maestroPrivateSources) {
 Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key
 AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password
Expand Down

6 changes: 3 additions & 3 deletions
eng/common/SetupNugetSources.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080
#
# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry
# under <packageSourceCredentials> for each Maestro's managed private feed. Two additional credential
# under <packageSourceCredentials> for each Maestro's managed private feed. Two additional credential
# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport.
#
# This script needs to be called in every job that will restore packages and which the base repo has
Expand DownExpand Up@@ -68,7 +68,7 @@ if [ "$?" != "0" ]; then
 sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" $ConfigFile
fi

# Ensure there is a <packageSourceCredentials>...</packageSourceCredentials> section.
# Ensure there is a <packageSourceCredentials>...</packageSourceCredentials> section.
grep -i "<packageSourceCredentials>" $ConfigFile
if [ "$?" != "0" ]; then
 echo "Adding <packageSourceCredentials>...</packageSourceCredentials> section."
Expand DownExpand Up@@ -142,7 +142,7 @@ IFS=$PrevIFS

for FeedName in ${PackageSources[@]} ; do
 # Check if there is no existing credential for this FeedName
 grep -i "<$FeedName>" $ConfigFile
 grep -i "<$FeedName>" $ConfigFile
 if [ "$?" != "0" ]; then
 echo "Adding credentials for $FeedName."

Expand Down

6 changes: 2 additions & 4 deletions
eng/common/native/init-distro-rid.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,6 @@ getNonPortableDistroRid()
# Input:
# os: (str)
# arch: (str)
# isPortable: (int)
# rootfsDir?: (nullable:string)
#
# Return:
Expand All@@ -97,10 +96,9 @@ initDistroRidGlobal()
{
 local targetOs="$1"
 local targetArch="$2"
 local isPortable="$3"
 local rootfsDir=""
 if [ "$#" -ge 4 ]; then
 rootfsDir="$4"
 if [ "$#" -ge 3 ]; then
 rootfsDir="$3"
 fi

 if [ -n "${rootfsDir}" ]; then
Expand Down

75 changes: 75 additions & 0 deletions
eng/common/sdl/trim-assets-version.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
<#
.SYNOPSIS
Install and run the 'Microsoft.DotNet.VersionTools.Cli' tool with the 'trim-artifacts-version' command to trim the version from the NuGet assets file name.

.PARAMETER InputPath
Full path to directory where artifact packages are stored

.PARAMETER Recursive
Search for NuGet packages recursively

#>

Param(
 [string] $InputPath,
 [bool] $Recursive = $true
)

$CliToolName = "Microsoft.DotNet.VersionTools.Cli"

function Install-VersionTools-Cli {
 param(
 [Parameter(Mandatory=$true)][string]$Version
 )

 Write-Host "Installing the package '$CliToolName' with a version of '$version' ..."
 $feed = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json"

 $argumentList = @("tool", "install", "--local", "$CliToolName", "--add-source $feed", "--no-cache", "--version $Version")
 Start-Process "$dotnet" -Verbose -ArgumentList $argumentList -NoNewWindow -Wait
}

# -------------------------------------------------------------------

if (!(Test-Path $InputPath)) {
 Write-Host "Input Path '$InputPath' does not exist"
 ExitWithExitCode 1
}

$ErrorActionPreference = 'Stop'
Set-StrictMode -Version 2.0

$disableConfigureToolsetImport = $true
$global:LASTEXITCODE = 0

# `tools.ps1` checks $ci to perform some actions. Since the SDL
# scripts don't necessarily execute in the same agent that run the
# build.ps1/sh script this variable isn't automatically set.
$ci = $true
. $PSScriptRoot\..\tools.ps1

try {
 $dotnetRoot = InitializeDotNetCli -install:$true
 $dotnet = "$dotnetRoot\dotnet.exe"

 $toolsetVersion = Read-ArcadeSdkVersion
 Install-VersionTools-Cli -Version $toolsetVersion

 $cliToolFound = (& "$dotnet" tool list --local | Where-Object {$_.Split(' ')[0] -eq $CliToolName})
 if ($null -eq $cliToolFound) {
 Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "The '$CliToolName' tool is not installed."
 ExitWithExitCode 1
 }

 Exec-BlockVerbosely {
 & "$dotnet" $CliToolName trim-assets-version `
 --assets-path $InputPath `
 --recursive $Recursive
 Exit-IfNZEC "Sdl"
 }
}
catch {
 Write-Host $_
 Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_
 ExitWithExitCode 1
}

6 changes: 5 additions & 1 deletion
eng/common/tools.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -671,14 +671,18 @@ function InitializeNativeTools() {
 }
}

function Read-ArcadeSdkVersion() {
 return $GlobalJson.'msbuild-sdks'.'Microsoft.DotNet.Arcade.Sdk'
}

function InitializeToolset() {
 if (Test-Path variable:global:_ToolsetBuildProj) {
 return $global:_ToolsetBuildProj
 }

 $nugetCache = GetNuGetPackageCachePath

 $toolsetVersion = $GlobalJson.'msbuild-sdks'.'Microsoft.DotNet.Arcade.Sdk'
 $toolsetVersion = Read-ArcadeSdkVersion
 $toolsetLocationFile = Join-Path $ToolsetDir "$toolsetVersion.txt"

 if (Test-Path $toolsetLocationFile) {
Expand Down

6 changes: 3 additions & 3 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,9 @@
 "dotnet": "8.0.100-preview.7.23376.3"
 },
 "msbuild-sdks": {
 "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23411.1",
 "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23411.1",
 "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23411.1",
 "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23415.4",
 "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23415.4",
 "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23415.4",
 "Microsoft.Build.NoTargets": "3.7.0",
 "Microsoft.Build.Traversal": "3.4.0",
 "Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6"
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[release/8.0-rc1] Update dependencies from dotnet/arcade#90665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

carlossanlop
merged 2 commits into

from

Aug 16, 2023
 Merged


[release/8.0-rc1] Update dependencies from dotnet/arcade
#90665
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
9b31258

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Aug 16, 2023
4b46db6

Merge branch 'release/8.0-rc1' into darc-release/8.0-rc1-7b52f368-c04…


carlossanlop Aug 16, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


76 changes: 38 additions & 38 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,79 +107,79 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 <SourceBuild RepoName="arcade" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23408.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23415.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
 <Uri>https://github.com/dotnet/xliff-tasks</Uri>
 <Sha>493329204079519072f0241ed26f692bdee0d60c</Sha>
 <Sha>649a1e75101b701d753ee41efbe9038f9b23a0db</Sha>
 <SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.23408.1">
 <Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand DownExpand Up@@ -330,9 +330,9 @@
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>480b9159eb7e69b182a87581d5a336e97e0b6dae</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23362.5">
 <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down

30 changes: 15 additions & 15 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,21 +83,21 @@
 <!-- SDK dependencies -->
 <MicrosoftDotNetApiCompatTaskVersion>8.0.100-preview.7.23329.3</MicrosoftDotNetApiCompatTaskVersion>
 <!-- Arcade dependencies -->
 <MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23411.1</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>8.0.0-beta.23411.1</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23411.1</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23411.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23411.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23411.1</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23411.1</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23411.1</MicrosoftDotNetPackageTestingVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23415.4</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>8.0.0-beta.23415.4</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23415.4</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23415.4</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23415.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23415.4</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23415.4</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23415.4</MicrosoftDotNetPackageTestingVersion>
 <!-- NuGet dependencies -->
 <NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
 <!-- Installer dependencies -->
Expand Down

8 changes: 4 additions & 4 deletions
eng/common/SetupNugetSources.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080
#
# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry
# under <packageSourceCredentials> for each Maestro managed private feed. Two additional credential
# under <packageSourceCredentials> for each Maestro managed private feed. Two additional credential
# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport.
#
# This script needs to be called in every job that will restore packages and which the base repo has
Expand DownExpand Up@@ -37,7 +37,7 @@ Set-StrictMode -Version 2.0
# Add source entry to PackageSources
function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) {
 $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']")

 if ($packageSource -eq $null)
 {
 $packageSource = $doc.CreateElement("add")
Expand All@@ -48,7 +48,7 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern
 else {
 Write-Host "Package source $SourceName already present."
 }

 AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password
}

Expand DownExpand Up@@ -89,7 +89,7 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Passw
 $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]")

 Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds."

 ForEach ($PackageSource in $maestroPrivateSources) {
 Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key
 AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password
Expand Down

6 changes: 3 additions & 3 deletions
eng/common/SetupNugetSources.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080
#
# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry
# under <packageSourceCredentials> for each Maestro's managed private feed. Two additional credential
# under <packageSourceCredentials> for each Maestro's managed private feed. Two additional credential
# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport.
#
# This script needs to be called in every job that will restore packages and which the base repo has
Expand DownExpand Up@@ -68,7 +68,7 @@ if [ "$?" != "0" ]; then
 sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" $ConfigFile
fi

# Ensure there is a <packageSourceCredentials>...</packageSourceCredentials> section.
# Ensure there is a <packageSourceCredentials>...</packageSourceCredentials> section.
grep -i "<packageSourceCredentials>" $ConfigFile
if [ "$?" != "0" ]; then
 echo "Adding <packageSourceCredentials>...</packageSourceCredentials> section."
Expand DownExpand Up@@ -142,7 +142,7 @@ IFS=$PrevIFS

for FeedName in ${PackageSources[@]} ; do
 # Check if there is no existing credential for this FeedName
 grep -i "<$FeedName>" $ConfigFile
 grep -i "<$FeedName>" $ConfigFile
 if [ "$?" != "0" ]; then
 echo "Adding credentials for $FeedName."

Expand Down

6 changes: 2 additions & 4 deletions
eng/common/native/init-distro-rid.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,6 @@ getNonPortableDistroRid()
# Input:
# os: (str)
# arch: (str)
# isPortable: (int)
# rootfsDir?: (nullable:string)
#
# Return:
Expand All@@ -97,10 +96,9 @@ initDistroRidGlobal()
{
 local targetOs="$1"
 local targetArch="$2"
 local isPortable="$3"
 local rootfsDir=""
 if [ "$#" -ge 4 ]; then
 rootfsDir="$4"
 if [ "$#" -ge 3 ]; then
 rootfsDir="$3"
 fi

 if [ -n "${rootfsDir}" ]; then
Expand Down

75 changes: 75 additions & 0 deletions
eng/common/sdl/trim-assets-version.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
<#
.SYNOPSIS
Install and run the 'Microsoft.DotNet.VersionTools.Cli' tool with the 'trim-artifacts-version' command to trim the version from the NuGet assets file name.

.PARAMETER InputPath
Full path to directory where artifact packages are stored

.PARAMETER Recursive
Search for NuGet packages recursively

#>

Param(
 [string] $InputPath,
 [bool] $Recursive = $true
)

$CliToolName = "Microsoft.DotNet.VersionTools.Cli"

function Install-VersionTools-Cli {
 param(
 [Parameter(Mandatory=$true)][string]$Version
 )

 Write-Host "Installing the package '$CliToolName' with a version of '$version' ..."
 $feed = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json"

 $argumentList = @("tool", "install", "--local", "$CliToolName", "--add-source $feed", "--no-cache", "--version $Version")
 Start-Process "$dotnet" -Verbose -ArgumentList $argumentList -NoNewWindow -Wait
}

# -------------------------------------------------------------------

if (!(Test-Path $InputPath)) {
 Write-Host "Input Path '$InputPath' does not exist"
 ExitWithExitCode 1
}

$ErrorActionPreference = 'Stop'
Set-StrictMode -Version 2.0

$disableConfigureToolsetImport = $true
$global:LASTEXITCODE = 0

# `tools.ps1` checks $ci to perform some actions. Since the SDL
# scripts don't necessarily execute in the same agent that run the
# build.ps1/sh script this variable isn't automatically set.
$ci = $true
. $PSScriptRoot\..\tools.ps1

try {
 $dotnetRoot = InitializeDotNetCli -install:$true
 $dotnet = "$dotnetRoot\dotnet.exe"

 $toolsetVersion = Read-ArcadeSdkVersion
 Install-VersionTools-Cli -Version $toolsetVersion

 $cliToolFound = (& "$dotnet" tool list --local | Where-Object {$_.Split(' ')[0] -eq $CliToolName})
 if ($null -eq $cliToolFound) {
 Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "The '$CliToolName' tool is not installed."
 ExitWithExitCode 1
 }

 Exec-BlockVerbosely {
 & "$dotnet" $CliToolName trim-assets-version `
 --assets-path $InputPath `
 --recursive $Recursive
 Exit-IfNZEC "Sdl"
 }
}
catch {
 Write-Host $_
 Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_
 ExitWithExitCode 1
}

6 changes: 5 additions & 1 deletion
eng/common/tools.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -671,14 +671,18 @@ function InitializeNativeTools() {
 }
}

function Read-ArcadeSdkVersion() {
 return $GlobalJson.'msbuild-sdks'.'Microsoft.DotNet.Arcade.Sdk'
}

function InitializeToolset() {
 if (Test-Path variable:global:_ToolsetBuildProj) {
 return $global:_ToolsetBuildProj
 }

 $nugetCache = GetNuGetPackageCachePath

 $toolsetVersion = $GlobalJson.'msbuild-sdks'.'Microsoft.DotNet.Arcade.Sdk'
 $toolsetVersion = Read-ArcadeSdkVersion
 $toolsetLocationFile = Join-Path $ToolsetDir "$toolsetVersion.txt"

 if (Test-Path $toolsetLocationFile) {
Expand Down

6 changes: 3 additions & 3 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,9 @@
 "dotnet": "8.0.100-preview.7.23376.3"
 },
 "msbuild-sdks": {
 "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23411.1",
 "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23411.1",
 "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23411.1",
 "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23415.4",
 "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23415.4",
 "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23415.4",
 "Microsoft.Build.NoTargets": "3.7.0",
 "Microsoft.Build.Traversal": "3.4.0",
 "Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6"
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[release/8.0-rc1] Update dependencies from dotnet/arcade#90665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

carlossanlop
merged 2 commits into

from

Aug 16, 2023
 Merged


[release/8.0-rc1] Update dependencies from dotnet/arcade
#90665
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
9b31258

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Aug 16, 2023
4b46db6

Merge branch 'release/8.0-rc1' into darc-release/8.0-rc1-7b52f368-c04…


carlossanlop Aug 16, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


76 changes: 38 additions & 38 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,79 +107,79 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 <SourceBuild RepoName="arcade" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23408.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23415.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
 <Uri>https://github.com/dotnet/xliff-tasks</Uri>
 <Sha>493329204079519072f0241ed26f692bdee0d60c</Sha>
 <Sha>649a1e75101b701d753ee41efbe9038f9b23a0db</Sha>
 <SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.23408.1">
 <Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand DownExpand Up@@ -330,9 +330,9 @@
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>480b9159eb7e69b182a87581d5a336e97e0b6dae</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23362.5">
 <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down

30 changes: 15 additions & 15 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,21 +83,21 @@
 <!-- SDK dependencies -->
 <MicrosoftDotNetApiCompatTaskVersion>8.0.100-preview.7.23329.3</MicrosoftDotNetApiCompatTaskVersion>
 <!-- Arcade dependencies -->
 <MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23411.1</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>8.0.0-beta.23411.1</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23411.1</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23411.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23411.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23411.1</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23411.1</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23411.1</MicrosoftDotNetPackageTestingVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23415.4</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>8.0.0-beta.23415.4</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23415.4</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23415.4</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23415.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23415.4</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23415.4</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23415.4</MicrosoftDotNetPackageTestingVersion>
 <!-- NuGet dependencies -->
 <NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
 <!-- Installer dependencies -->
Expand Down

8 changes: 4 additions & 4 deletions
eng/common/SetupNugetSources.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080
#
# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry
# under <packageSourceCredentials> for each Maestro managed private feed. Two additional credential
# under <packageSourceCredentials> for each Maestro managed private feed. Two additional credential
# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport.
#
# This script needs to be called in every job that will restore packages and which the base repo has
Expand DownExpand Up@@ -37,7 +37,7 @@ Set-StrictMode -Version 2.0
# Add source entry to PackageSources
function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) {
 $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']")

 if ($packageSource -eq $null)
 {
 $packageSource = $doc.CreateElement("add")
Expand All@@ -48,7 +48,7 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern
 else {
 Write-Host "Package source $SourceName already present."
 }

 AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password
}

Expand DownExpand Up@@ -89,7 +89,7 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Passw
 $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]")

 Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds."

 ForEach ($PackageSource in $maestroPrivateSources) {
 Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key
 AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password
Expand Down

6 changes: 3 additions & 3 deletions
eng/common/SetupNugetSources.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080
#
# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry
# under <packageSourceCredentials> for each Maestro's managed private feed. Two additional credential
# under <packageSourceCredentials> for each Maestro's managed private feed. Two additional credential
# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport.
#
# This script needs to be called in every job that will restore packages and which the base repo has
Expand DownExpand Up@@ -68,7 +68,7 @@ if [ "$?" != "0" ]; then
 sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" $ConfigFile
fi

# Ensure there is a <packageSourceCredentials>...</packageSourceCredentials> section.
# Ensure there is a <packageSourceCredentials>...</packageSourceCredentials> section.
grep -i "<packageSourceCredentials>" $ConfigFile
if [ "$?" != "0" ]; then
 echo "Adding <packageSourceCredentials>...</packageSourceCredentials> section."
Expand DownExpand Up@@ -142,7 +142,7 @@ IFS=$PrevIFS

for FeedName in ${PackageSources[@]} ; do
 # Check if there is no existing credential for this FeedName
 grep -i "<$FeedName>" $ConfigFile
 grep -i "<$FeedName>" $ConfigFile
 if [ "$?" != "0" ]; then
 echo "Adding credentials for $FeedName."

Expand Down

6 changes: 2 additions & 4 deletions
eng/common/native/init-distro-rid.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,6 @@ getNonPortableDistroRid()
# Input:
# os: (str)
# arch: (str)
# isPortable: (int)
# rootfsDir?: (nullable:string)
#
# Return:
Expand All@@ -97,10 +96,9 @@ initDistroRidGlobal()
{
 local targetOs="$1"
 local targetArch="$2"
 local isPortable="$3"
 local rootfsDir=""
 if [ "$#" -ge 4 ]; then
 rootfsDir="$4"
 if [ "$#" -ge 3 ]; then
 rootfsDir="$3"
 fi

 if [ -n "${rootfsDir}" ]; then
Expand Down

75 changes: 75 additions & 0 deletions
eng/common/sdl/trim-assets-version.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
<#
.SYNOPSIS
Install and run the 'Microsoft.DotNet.VersionTools.Cli' tool with the 'trim-artifacts-version' command to trim the version from the NuGet assets file name.

.PARAMETER InputPath
Full path to directory where artifact packages are stored

.PARAMETER Recursive
Search for NuGet packages recursively

#>

Param(
 [string] $InputPath,
 [bool] $Recursive = $true
)

$CliToolName = "Microsoft.DotNet.VersionTools.Cli"

function Install-VersionTools-Cli {
 param(
 [Parameter(Mandatory=$true)][string]$Version
 )

 Write-Host "Installing the package '$CliToolName' with a version of '$version' ..."
 $feed = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json"

 $argumentList = @("tool", "install", "--local", "$CliToolName", "--add-source $feed", "--no-cache", "--version $Version")
 Start-Process "$dotnet" -Verbose -ArgumentList $argumentList -NoNewWindow -Wait
}

# -------------------------------------------------------------------

if (!(Test-Path $InputPath)) {
 Write-Host "Input Path '$InputPath' does not exist"
 ExitWithExitCode 1
}

$ErrorActionPreference = 'Stop'
Set-StrictMode -Version 2.0

$disableConfigureToolsetImport = $true
$global:LASTEXITCODE = 0

# `tools.ps1` checks $ci to perform some actions. Since the SDL
# scripts don't necessarily execute in the same agent that run the
# build.ps1/sh script this variable isn't automatically set.
$ci = $true
. $PSScriptRoot\..\tools.ps1

try {
 $dotnetRoot = InitializeDotNetCli -install:$true
 $dotnet = "$dotnetRoot\dotnet.exe"

 $toolsetVersion = Read-ArcadeSdkVersion
 Install-VersionTools-Cli -Version $toolsetVersion

 $cliToolFound = (& "$dotnet" tool list --local | Where-Object {$_.Split(' ')[0] -eq $CliToolName})
 if ($null -eq $cliToolFound) {
 Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "The '$CliToolName' tool is not installed."
 ExitWithExitCode 1
 }

 Exec-BlockVerbosely {
 & "$dotnet" $CliToolName trim-assets-version `
 --assets-path $InputPath `
 --recursive $Recursive
 Exit-IfNZEC "Sdl"
 }
}
catch {
 Write-Host $_
 Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_
 ExitWithExitCode 1
}

6 changes: 5 additions & 1 deletion
eng/common/tools.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -671,14 +671,18 @@ function InitializeNativeTools() {
 }
}

function Read-ArcadeSdkVersion() {
 return $GlobalJson.'msbuild-sdks'.'Microsoft.DotNet.Arcade.Sdk'
}

function InitializeToolset() {
 if (Test-Path variable:global:_ToolsetBuildProj) {
 return $global:_ToolsetBuildProj
 }

 $nugetCache = GetNuGetPackageCachePath

 $toolsetVersion = $GlobalJson.'msbuild-sdks'.'Microsoft.DotNet.Arcade.Sdk'
 $toolsetVersion = Read-ArcadeSdkVersion
 $toolsetLocationFile = Join-Path $ToolsetDir "$toolsetVersion.txt"

 if (Test-Path $toolsetLocationFile) {
Expand Down

6 changes: 3 additions & 3 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,9 @@
 "dotnet": "8.0.100-preview.7.23376.3"
 },
 "msbuild-sdks": {
 "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23411.1",
 "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23411.1",
 "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23411.1",
 "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23415.4",
 "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23415.4",
 "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23415.4",
 "Microsoft.Build.NoTargets": "3.7.0",
 "Microsoft.Build.Traversal": "3.4.0",
 "Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6"
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[release/8.0-rc1] Update dependencies from dotnet/arcade#90665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

carlossanlop
merged 2 commits into

from

Aug 16, 2023
 Merged


[release/8.0-rc1] Update dependencies from dotnet/arcade
#90665
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
9b31258

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Aug 16, 2023
4b46db6

Merge branch 'release/8.0-rc1' into darc-release/8.0-rc1-7b52f368-c04…


carlossanlop Aug 16, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


76 changes: 38 additions & 38 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,79 +107,79 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 <SourceBuild RepoName="arcade" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23408.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23415.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
 <Uri>https://github.com/dotnet/xliff-tasks</Uri>
 <Sha>493329204079519072f0241ed26f692bdee0d60c</Sha>
 <Sha>649a1e75101b701d753ee41efbe9038f9b23a0db</Sha>
 <SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.23408.1">
 <Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand DownExpand Up@@ -330,9 +330,9 @@
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>480b9159eb7e69b182a87581d5a336e97e0b6dae</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23411.1">
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23415.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
 <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
 </Dependency>
 <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23362.5">
 <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down

30 changes: 15 additions & 15 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,21 +83,21 @@
 <!-- SDK dependencies -->
 <MicrosoftDotNetApiCompatTaskVersion>8.0.100-preview.7.23329.3</MicrosoftDotNetApiCompatTaskVersion>
 <!-- Arcade dependencies -->
 <MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23411.1</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>8.0.0-beta.23411.1</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23411.1</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23411.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23411.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23411.1</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23411.1</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23411.1</MicrosoftDotNetPackageTestingVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23415.4</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>8.0.0-beta.23415.4</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23415.4</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23415.4</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23415.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23415.4</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23415.4</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23415.4</MicrosoftDotNetPackageTestingVersion>
 <!-- NuGet dependencies -->
 <NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
 <!-- Installer dependencies -->
Expand Down

8 changes: 4 additions & 4 deletions
eng/common/SetupNugetSources.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080
#
# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry
# under <packageSourceCredentials> for each Maestro managed private feed. Two additional credential
# under <packageSourceCredentials> for each Maestro managed private feed. Two additional credential
# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport.
#
# This script needs to be called in every job that will restore packages and which the base repo has
Expand DownExpand Up@@ -37,7 +37,7 @@ Set-StrictMode -Version 2.0
# Add source entry to PackageSources
function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) {
 $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']")

 if ($packageSource -eq $null)
 {
 $packageSource = $doc.CreateElement("add")
Expand All@@ -48,7 +48,7 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern
 else {
 Write-Host "Package source $SourceName already present."
 }

 AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password
}

Expand DownExpand Up@@ -89,7 +89,7 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Passw
 $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]")

 Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds."

 ForEach ($PackageSource in $maestroPrivateSources) {
 Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key
 AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password
Expand Down

6 changes: 3 additions & 3 deletions
eng/common/SetupNugetSources.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080
#
# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry
# under <packageSourceCredentials> for each Maestro's managed private feed. Two additional credential
# under <packageSourceCredentials> for each Maestro's managed private feed. Two additional credential
# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport.
#
# This script needs to be called in every job that will restore packages and which the base repo has
Expand DownExpand Up@@ -68,7 +68,7 @@ if [ "$?" != "0" ]; then
 sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" $ConfigFile
fi

# Ensure there is a <packageSourceCredentials>...</packageSourceCredentials> section.
# Ensure there is a <packageSourceCredentials>...</packageSourceCredentials> section.
grep -i "<packageSourceCredentials>" $ConfigFile
if [ "$?" != "0" ]; then
 echo "Adding <packageSourceCredentials>...</packageSourceCredentials> section."
Expand DownExpand Up@@ -142,7 +142,7 @@ IFS=$PrevIFS

for FeedName in ${PackageSources[@]} ; do
 # Check if there is no existing credential for this FeedName
 grep -i "<$FeedName>" $ConfigFile
 grep -i "<$FeedName>" $ConfigFile
 if [ "$?" != "0" ]; then
 echo "Adding credentials for $FeedName."

Expand Down

6 changes: 2 additions & 4 deletions
eng/common/native/init-distro-rid.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,6 @@ getNonPortableDistroRid()
# Input:
# os: (str)
# arch: (str)
# isPortable: (int)
# rootfsDir?: (nullable:string)
#
# Return:
Expand All@@ -97,10 +96,9 @@ initDistroRidGlobal()
{
 local targetOs="$1"
 local targetArch="$2"
 local isPortable="$3"
 local rootfsDir=""
 if [ "$#" -ge 4 ]; then
 rootfsDir="$4"
 if [ "$#" -ge 3 ]; then
 rootfsDir="$3"
 fi

 if [ -n "${rootfsDir}" ]; then
Expand Down

75 changes: 75 additions & 0 deletions
eng/common/sdl/trim-assets-version.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
<#
.SYNOPSIS
Install and run the 'Microsoft.DotNet.VersionTools.Cli' tool with the 'trim-artifacts-version' command to trim the version from the NuGet assets file name.

.PARAMETER InputPath
Full path to directory where artifact packages are stored

.PARAMETER Recursive
Search for NuGet packages recursively

#>

Param(
 [string] $InputPath,
 [bool] $Recursive = $true
)

$CliToolName = "Microsoft.DotNet.VersionTools.Cli"

function Install-VersionTools-Cli {
 param(
 [Parameter(Mandatory=$true)][string]$Version
 )

 Write-Host "Installing the package '$CliToolName' with a version of '$version' ..."
 $feed = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json"

 $argumentList = @("tool", "install", "--local", "$CliToolName", "--add-source $feed", "--no-cache", "--version $Version")
 Start-Process "$dotnet" -Verbose -ArgumentList $argumentList -NoNewWindow -Wait
}

# -------------------------------------------------------------------

if (!(Test-Path $InputPath)) {
 Write-Host "Input Path '$InputPath' does not exist"
 ExitWithExitCode 1
}

$ErrorActionPreference = 'Stop'
Set-StrictMode -Version 2.0

$disableConfigureToolsetImport = $true
$global:LASTEXITCODE = 0

# `tools.ps1` checks $ci to perform some actions. Since the SDL
# scripts don't necessarily execute in the same agent that run the
# build.ps1/sh script this variable isn't automatically set.
$ci = $true
. $PSScriptRoot\..\tools.ps1

try {
 $dotnetRoot = InitializeDotNetCli -install:$true
 $dotnet = "$dotnetRoot\dotnet.exe"

 $toolsetVersion = Read-ArcadeSdkVersion
 Install-VersionTools-Cli -Version $toolsetVersion

 $cliToolFound = (& "$dotnet" tool list --local | Where-Object {$_.Split(' ')[0] -eq $CliToolName})
 if ($null -eq $cliToolFound) {
 Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "The '$CliToolName' tool is not installed."
 ExitWithExitCode 1
 }

 Exec-BlockVerbosely {
 & "$dotnet" $CliToolName trim-assets-version `
 --assets-path $InputPath `
 --recursive $Recursive
 Exit-IfNZEC "Sdl"
 }
}
catch {
 Write-Host $_
 Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_
 ExitWithExitCode 1
}

6 changes: 5 additions & 1 deletion
eng/common/tools.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -671,14 +671,18 @@ function InitializeNativeTools() {
 }
}

function Read-ArcadeSdkVersion() {
 return $GlobalJson.'msbuild-sdks'.'Microsoft.DotNet.Arcade.Sdk'
}

function InitializeToolset() {
 if (Test-Path variable:global:_ToolsetBuildProj) {
 return $global:_ToolsetBuildProj
 }

 $nugetCache = GetNuGetPackageCachePath

 $toolsetVersion = $GlobalJson.'msbuild-sdks'.'Microsoft.DotNet.Arcade.Sdk'
 $toolsetVersion = Read-ArcadeSdkVersion
 $toolsetLocationFile = Join-Path $ToolsetDir "$toolsetVersion.txt"

 if (Test-Path $toolsetLocationFile) {
Expand Down

6 changes: 3 additions & 3 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,9 @@
 "dotnet": "8.0.100-preview.7.23376.3"
 },
 "msbuild-sdks": {
 "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23411.1",
 "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23411.1",
 "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23411.1",
 "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23415.4",
 "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23415.4",
 "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23415.4",
 "Microsoft.Build.NoTargets": "3.7.0",
 "Microsoft.Build.Traversal": "3.4.0",
 "Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6"
Expand Down