Skip to content

[automated] Merge branch 'release/9.0' => 'main' #36104

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 10 commits into from
May 20, 2025
Merged

[automated] Merge branch 'release/9.0' => 'main' #36104

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ec124aa
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] May 19, 2025
f299fbe
Delete src/arcade/eng/common directory
akoeplinger May 19, 2025
523170c
[VMR] Codeflow 059c5c2-059c5c2
dotnet-maestro[bot] May 17, 2025
0bd8058
Update dependencies from https://github.com/dotnet/dotnet build 268651
dotnet-maestro[bot] May 17, 2025
c281f3c
Update dependencies from https://github.com/dotnet/dotnet build 268722
dotnet-maestro[bot] May 18, 2025
745536b
Fix to #11502 - Allow to specify constraint name for default values
maumar May 4, 2025
29c055e
Default constraint name PR feedback:
AndriySvyryd May 20, 2025
e0e8cf0
ExecuteUpdate: compare by alias, not by reference (#34601)
ChrisJollyAU May 20, 2025
f2e4879
Update dependencies (#36107)
AndriySvyryd May 20, 2025
3f3f22d
Merge branch 'release/9.0' into main
AndriySvyryd May 20, 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
16 changes: 16 additions & 0 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-e36e4d1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e36e4d1a/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-e36e4d1-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e36e4d1a-8/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-e36e4d1-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e36e4d1a-7/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-e36e4d1-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e36e4d1a-6/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-e36e4d1-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e36e4d1a-5/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-e36e4d1-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e36e4d1a-4/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-e36e4d1-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e36e4d1a-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-e36e4d1-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e36e4d1a-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-e36e4d1-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e36e4d1a-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
Expand All @@ -21,6 +29,14 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-e36e4d1-1" value="true" />
<add key="darc-int-dotnet-runtime-e36e4d1-2" value="true" />
<add key="darc-int-dotnet-runtime-e36e4d1-3" value="true" />
<add key="darc-int-dotnet-runtime-e36e4d1-4" value="true" />
<add key="darc-int-dotnet-runtime-e36e4d1-5" value="true" />
<add key="darc-int-dotnet-runtime-e36e4d1-6" value="true" />
<add key="darc-int-dotnet-runtime-e36e4d1-7" value="true" />
<add key="darc-int-dotnet-runtime-e36e4d1-8" value="true" />
<add key="darc-int-dotnet-runtime-e36e4d1" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
Expand Down
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,17 +67,17 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25263.5">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25266.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>93823d49ca01742464ad1c0b49ea940e693b1be3</Sha>
<Sha>c62eeb5b5432f9eaa034fbd641ccd9fd0d928fb3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25263.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25266.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>93823d49ca01742464ad1c0b49ea940e693b1be3</Sha>
<Sha>c62eeb5b5432f9eaa034fbd641ccd9fd0d928fb3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25263.5">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25266.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>93823d49ca01742464ad1c0b49ea940e693b1be3</Sha>
<Sha>c62eeb5b5432f9eaa034fbd641ccd9fd0d928fb3</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<SystemFormatsAsn1Version>9.0.5</SystemFormatsAsn1Version>
</PropertyGroup>
<PropertyGroup Label="Dependencies from dotnet/arcade">
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25263.5</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25266.2</MicrosoftDotNetBuildTasksTemplatingVersion>
</PropertyGroup>
<PropertyGroup Label="Other dependencies">
<MicrosoftBuildFrameworkVersion>17.8.3</MicrosoftBuildFrameworkVersion>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/sdl/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Guardian.Cli" version="0.199.0"/>
<package id="Microsoft.Guardian.Cli" version="0.109.0"/>
</packages>
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 @@ -13,7 +13,7 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25263.5",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25263.5"
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25266.2",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25266.2"
}
}
4 changes: 0 additions & 4 deletions src/arcade/eng/common/BuildConfiguration/build-configuration.json
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions src/arcade/eng/common/PSScriptAnalyzerSettings.psd1
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions src/arcade/eng/common/README.md
View file
Open in desktop

This file was deleted.

171 changes: 0 additions & 171 deletions src/arcade/eng/common/SetupNugetSources.ps1
View file
Open in desktop

This file was deleted.

Loading