8000 [automated] Merge branch 'release/8.0.4xx' => 'release/9.0.1xx' by github-actions[bot] · Pull Request #48867 · dotnet/sdk · GitHub
[go: up one dir, main page]
Skip to content

[automated] Merge branch 'release/8.0.4xx' => 'release/9.0.1xx' #48867

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
merged 9 commits into from
May 12, 2025
Merged

[automated] Merge branch 'release/8.0.4xx' => 'release/9.0.1xx' #48867

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0e1448c
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Apr 26, 2025
cb93b17
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Apr 29, 2025
492fc39
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Apr 30, 2025
570ce8f
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] May 1, 2025
a17f88b
Update branding to 8.0.410
vseanreesermsft May 7, 2025
e385011
Update queue to ubuntu 2204
May 8, 2025
eaacd33
Update branding to 8.0.410 (#48849)
May 8, 2025
262b634
[release/8.0.4xx] Update dependencies from dotnet/arcade (#48734)
May 8, 2025
2ed0240
Merge branch 'release/9.0.1xx' of https://github.com/dotnet/sdk into …
May 8, 2025
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
Next Next commit
Update dependencies from https://github.com/dotnet/arcade build 20250… 
…425.5

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25214.7 -> To Version 8.0.0-beta.25225.5
  • Loading branch information
@dotnet-maestro
dotnet-maestro[bot] committed Apr 26, 2025
commit 0e1448ca01c59dd5d1fd54d80df6227219b7c12a
4 changes: 4 additions & 0 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from dotnet-format -->
<add key="darc-pub-dotnet-format-59e6d3d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-59e6d3d2/nuget/v3/index.json" />
<add key="darc-pub-dotnet-format-59e6d3d-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-59e6d3d2-4/nuget/v3/index.json" />
<add key="darc-pub-dotnet-format-59e6d3d-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-59e6d3d2-3/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-format -->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<!-- End: Package sources from dotnet-aspnetcore -->
Expand All @@ -19,6 +21,8 @@
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-pub-dotnet-templating-731d469" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-731d4697/nuget/v3/index.json" />
<add key="darc-pub-dotnet-templating-731d469-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-731d4697-4/nuget/v3/index.json" />
<add key="darc-pub-dotnet-templating-731d469-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-731d4697-3/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<!-- End: Package sources from dotnet-windowsdesktop -->
Expand Down
16 changes: 8 additions & 8 deletions eng/Version.Details.xml
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
Expand Up @@ -491,22 +491,22 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25214.7">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25225.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
<Sha>d3c4c4644a5af855cd30944d9221886369ab375d</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25214.7">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25225.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
<Sha>d3c4c4644a5af855cd30944d9221886369ab375d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25214.7">
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25225.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
<Sha>d3c4c4644a5af855cd30944d9221886369ab375d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25214.7">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25225.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
<Sha>d3c4c4644a5af855cd30944d9221886369ab375d</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<SystemCollectionsImmutablePackageVersion>8.0.0</SystemCollectionsImmutablePackageVersion>
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
<SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25214.7</MicrosoftDotNetSignToolVersion>
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25225.5</MicrosoftDotNetSignToolVersion>
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
Expand Down Expand Up @@ -213,7 +213,7 @@
<PropertyGroup>
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25214.7</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25225.5</MicrosoftDotNetXUnitExtensionsVersion>
<MoqPackageVersion>4.18.4</MoqPackageVersion>
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates-official/job/source-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')]
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open

${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
Expand Down
4 changes: 2 additions & 2 deletions eng/common/templates-official/job/source-index-stage1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
parameters:
runAsPublic: false
sourceIndexUploadPackageVersion: 2.0.0-20240502.12
sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2
sourceIndexUploadPackageVersion: 2.0.0-20250425.2
sourceIndexProcessBinlogPackageVersion: 1.0.1-20250425.2
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
preSteps: []
Expand Down
4 changes: 2 additions & 2 deletions eng/common/templates/job/source-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ jobs:
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')]
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open

${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64

${{ if ne(parameters.platform.pool, '') }}:
pool: ${{ parameters.platform.pool }}
Expand Down
4 changes: 2 additions & 2 deletions eng/common/templates/job/source-index-stage1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
parameters:
runAsPublic: false
sourceIndexUploadPackageVersion: 2.0.0-20240502.12
sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2
sourceIndexUploadPackageVersion: 2.0.0-20250425.2
sourceIndexProcessBinlogPackageVersion: 1.0.1-20250425.2
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
preSteps: []
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25214.7",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25214.7"
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25225.5",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25225.5"
}
}
Loading
0