Skip to content

Commit

Permalink
[release/6.0] Update dependencies from dotnet/arcade dotnet/emsdk (#9…
Browse files Browse the repository at this point in the history
…3394)

* Update dependencies from https://github.com/dotnet/arcade build 20231011.8

Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 6.0.0-beta.23408.5 -> To Version 6.0.0-beta.23511.8

* Update dependencies from https://github.com/dotnet/emsdk build 20231012.2

Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
 From Version 6.0.23 -> To Version 6.0.23

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
  • Loading branch information
dotnet-maestro[bot] and dotnet-maestro[bot] authored Oct 12, 2023
1 parent 4e8c523 commit e505120
Show file tree
Hide file tree
Showing 6 changed files with 136 additions and 63 deletions.
2 changes: 1 addition & 1 deletion NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-f472bde" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-f472bde6/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-0b73b53" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-0b73b536/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from dotnet-wcf -->
<!-- End: Package sources from dotnet-wcf -->
Expand Down
82 changes: 41 additions & 41 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,93 +10,93 @@
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.23">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>f472bde6484a7b860c6647cf2ac64fd2870853e0</Sha>
<Sha>0b73b536f6e0d0a6143387439c3308db4db9fdfe</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.23">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>f472bde6484a7b860c6647cf2ac64fd2870853e0</Sha>
<Sha>0b73b536f6e0d0a6143387439c3308db4db9fdfe</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.23">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>f472bde6484a7b860c6647cf2ac64fd2870853e0</Sha>
<Sha>0b73b536f6e0d0a6143387439c3308db4db9fdfe</Sha>
</Dependency>
<Dependency Name="System.ServiceModel.Primitives" Version="4.9.0">
<Uri>https://github.com/dotnet/wcf</Uri>
<Sha>04c3656e0325277aefa18378f24238d39b259222</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.23408.5">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.23511.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>98fd22588fbb0f407faa6a74cb1aa79031306151</Sha>
<Sha>06ccd9430e2e3bd29a381a5b27e7976d11b0ed18</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.23408.5">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.23511.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>98fd22588fbb0f407faa6a74cb1aa79031306151</Sha>
<Sha>06ccd9430e2e3bd29a381a5b27e7976d11b0ed18</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.23408.5">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.23511.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>98fd22588fbb0f407faa6a74cb1aa79031306151</Sha>
<Sha>06ccd9430e2e3bd29a381a5b27e7976d11b0ed18</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.23408.5">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.23511.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>98fd22588fbb0f407faa6a74cb1aa79031306151</Sha>
<Sha>06ccd9430e2e3bd29a381a5b27e7976d11b0ed18</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.23408.5">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.23511.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>98fd22588fbb0f407faa6a74cb1aa79031306151</Sha>
<Sha>06ccd9430e2e3bd29a381a5b27e7976d11b0ed18</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.23408.5">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.23511.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>98fd22588fbb0f407faa6a74cb1aa79031306151</Sha>
<Sha>06ccd9430e2e3bd29a381a5b27e7976d11b0ed18</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23408.5">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23511.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>98fd22588fbb0f407faa6a74cb1aa79031306151</Sha>
<Sha>06ccd9430e2e3bd29a381a5b27e7976d11b0ed18</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.23408.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.23511.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>98fd22588fbb0f407faa6a74cb1aa79031306151</Sha>
<Sha>06ccd9430e2e3bd29a381a5b27e7976d11b0ed18</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.23408.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.23511.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>98fd22588fbb0f407faa6a74cb1aa79031306151</Sha>
<Sha>06ccd9430e2e3bd29a381a5b27e7976d11b0ed18</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.23408.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.23511.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>98fd22588fbb0f407faa6a74cb1aa79031306151</Sha>
<Sha>06ccd9430e2e3bd29a381a5b27e7976d11b0ed18</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.23408.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.23511.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>98fd22588fbb0f407faa6a74cb1aa79031306151</Sha>
<Sha>06ccd9430e2e3bd29a381a5b27e7976d11b0ed18</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.23408.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.23511.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>98fd22588fbb0f407faa6a74cb1aa79031306151</Sha>
<Sha>06ccd9430e2e3bd29a381a5b27e7976d11b0ed18</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.23408.5">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.23511.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>98fd22588fbb0f407faa6a74cb1aa79031306151</Sha>
<Sha>06ccd9430e2e3bd29a381a5b27e7976d11b0ed18</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.23408.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.23511.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>98fd22588fbb0f407faa6a74cb1aa79031306151</Sha>
<Sha>06ccd9430e2e3bd29a381a5b27e7976d11b0ed18</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.23408.5">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.23511.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>98fd22588fbb0f407faa6a74cb1aa79031306151</Sha>
<Sha>06ccd9430e2e3bd29a381a5b27e7976d11b0ed18</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.23408.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.23511.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>98fd22588fbb0f407faa6a74cb1aa79031306151</Sha>
<Sha>06ccd9430e2e3bd29a381a5b27e7976d11b0ed18</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.23408.5">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.23511.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>98fd22588fbb0f407faa6a74cb1aa79031306151</Sha>
<Sha>06ccd9430e2e3bd29a381a5b27e7976d11b0ed18</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.23408.5">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.23511.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>98fd22588fbb0f407faa6a74cb1aa79031306151</Sha>
<Sha>06ccd9430e2e3bd29a381a5b27e7976d11b0ed18</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
<Uri>https://github.com/microsoft/vstest</Uri>
Expand Down Expand Up @@ -222,9 +222,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>5aa438c8aa5ca20646b5d91149fd9be8646dbe65</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.23408.5">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.23511.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>98fd22588fbb0f407faa6a74cb1aa79031306151</Sha>
<Sha>06ccd9430e2e3bd29a381a5b27e7976d11b0ed18</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21416.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
30 changes: 15 additions & 15 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,21 @@
<!-- SDK dependencies -->
<MicrosoftDotNetCompatibilityVersion>1.1.0-preview.22164.17</MicrosoftDotNetCompatibilityVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.23408.5</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.23408.5</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.23408.5</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.23408.5</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.23408.5</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.23408.5</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23408.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.23408.5</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.23408.5</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.23408.5</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.23408.5</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.23408.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.23408.5</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.23408.5</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.23408.5</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.23511.8</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.23511.8</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.23511.8</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.23511.8</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.23511.8</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.23511.8</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23511.8</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.23511.8</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.23511.8</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.23511.8</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.23511.8</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.23511.8</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.23511.8</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.23511.8</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.23511.8</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down
45 changes: 45 additions & 0 deletions eng/common/retain-build.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@

Param(
[Parameter(Mandatory=$true)][int] $buildId,
[Parameter(Mandatory=$true)][string] $azdoOrgUri,
[Parameter(Mandatory=$true)][string] $azdoProject,
[Parameter(Mandatory=$true)][string] $token
)

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

function Get-AzDOHeaders(
[string] $token)
{
$base64AuthInfo = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes(":${token}"))
$headers = @{"Authorization"="Basic $base64AuthInfo"}
return $headers
}

function Update-BuildRetention(
[string] $azdoOrgUri,
[string] $azdoProject,
[int] $buildId,
[string] $token)
{
$headers = Get-AzDOHeaders -token $token
$requestBody = "{
`"keepForever`": `"true`"
}"

$requestUri = "${azdoOrgUri}/${azdoProject}/_apis/build/builds/${buildId}?api-version=6.0"
write-Host "Attempting to retain build using the following URI: ${requestUri} ..."

try {
Invoke-RestMethod -Uri $requestUri -Method Patch -Body $requestBody -Header $headers -contentType "application/json"
Write-Host "Updated retention settings for build ${buildId}."
}
catch {
Write-Error "Failed to update retention settings for build: $_.Exception.Response.StatusDescription"
exit 1
}
}

Update-BuildRetention -azdoOrgUri $azdoOrgUri -azdoProject $azdoProject -buildId $buildId -token $token
exit 0
28 changes: 28 additions & 0 deletions eng/common/templates/steps/retain-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
parameters:
# Optional azure devops PAT with build execute permissions for the build's organization,
# only needed if the build that should be retained ran on a different organization than
# the pipeline where this template is executing from
Token: ''
# Optional BuildId to retain, defaults to the current running build
BuildId: ''
# Azure devops Organization URI for the build in the https://dev.azure.com/<organization> format.
# Defaults to the organization the current pipeline is running on
AzdoOrgUri: '$(System.CollectionUri)'
# Azure devops project for the build. Defaults to the project the current pipeline is running on
AzdoProject: '$(System.TeamProject)'

steps:
- task: powershell@2
inputs:
targetType: 'filePath'
filePath: eng/common/retain-build.ps1
pwsh: true
arguments: >
-AzdoOrgUri: ${{parameters.AzdoOrgUri}}
-AzdoProject ${{parameters.AzdoProject}}
-Token ${{coalesce(parameters.Token, '$env:SYSTEM_ACCESSTOKEN') }}
-BuildId ${{coalesce(parameters.BuildId, '$env:BUILD_ID')}}
displayName: Enable permanent build retention
env:
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
BUILD_ID: $(Build.BuildId)
12 changes: 6 additions & 6 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{
"sdk": {
"version": "6.0.121",
"version": "6.0.123",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "6.0.121"
"dotnet": "6.0.123"
},
"native-tools": {
"cmake": "3.16.4",
"python3": "3.7.1"
},
"msbuild-sdks": {
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.23408.5",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23408.5",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23408.5",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.23408.5",
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.23511.8",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23511.8",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23511.8",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.23511.8",
"Microsoft.Build.NoTargets": "3.1.0",
"Microsoft.Build.Traversal": "3.0.23",
"Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6"
Expand Down

0 comments on commit e505120

Please sign in to comment.