Skip to content

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

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.

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 127 commits into from
May 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
127 commits
Select commit Hold shift + click to select a range
dbbfadc
Merged PR 47881: [internal/release/8.0] Merge from public
AndriySvyryd Feb 24, 2025
ba707f8
Merged PR 47880: [internal/release/9.0] Merge from public
AndriySvyryd Feb 24, 2025
a094d41
Merge commit '51e50e920032c0edbde289bd1ec684b86cde5dbb'
Mar 6, 2025
416d4c0
Merge commit 'a43de14451e3a3b38c253754a4fcaa2551f466fa'
Mar 6, 2025
3e7609b
Merge commit '5f9d0dc62b08f1c6d924303cf04bcc0958aac29f'
Mar 6, 2025
2dca39b
Merge commit '873d1a53e146f3af3fed1e4e513c4bdbad739151'
Mar 6, 2025
9739ecb
Merge commit 'c18fc677233d1c27e8282ad94439d177eaaacaa2'
Mar 7, 2025
52c3481
Merged PR 48209: [internal/release/9.0] Update dependencies from dnce…
Mar 12, 2025
554ab8e
Merged PR 48359: [internal/release/8.0] Merge from public
vseanreesermsft Mar 12, 2025
a96171b
Merged PR 48358: [internal/release/9.0] Merge from public
vseanreesermsft Mar 12, 2025
75ef23b
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 13, 2025
6402fa2
Merged PR 48385: [internal/release/8.0] Update dependencies from dnce…
Mar 13, 2025
0bf3075
Merged PR 48407: [internal/release/8.0] Merge from public
vseanreesermsft Mar 13, 2025
bb7c843
Merged PR 48408: [internal/release/9.0] Merge from public
vseanreesermsft Mar 13, 2025
a2ed5ad
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 13, 2025
7465b32
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 14, 2025
9275e9a
Merged PR 48431: [internal/release/9.0] Update dependencies from dnce…
Mar 14, 2025
becaf2e
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 14, 2025
9c05314
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 15, 2025
0118cb6
Merged PR 48489: [internal/release/8.0] Update dependencies from dnce…
Mar 15, 2025
55700ce
Merged PR 48569: [internal/release/9.0] Merge from public
AndriySvyryd Mar 18, 2025
47339ae
Merge commit 'ab2e3cc2e07c1cafda973c05fccccbf1520125a8'
Apr 2, 2025
f94df06
Merge commit 'b991582fa07a2ee24abb5660ba8a6acb0c776244'
Apr 2, 2025
2727815
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Apr 3, 2025
194a1f5
Merge commit 'e8dee646e216e51d5709cfc445914ad48f55599d'
Apr 3, 2025
56ce177
Merge commit '894a90b8653cff55ef1b3db62761290fc27974dd'
Apr 3, 2025
8e275d1
Merge branch 'release/9.0' =>'release/9.0-staging' (#35896)
AndriySvyryd Apr 3, 2025
5109f3b
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Apr 7, 2025
2246d3f
Merge commit '5109f3b4e312fbc3d3b6af5d159f2412a4e0a8df'
Apr 7, 2025
55254c1
Merge commit '9275e9ac55e413546a09551c29d5227d6d009747' into internal…
vseanreesermsft Apr 8, 2025
1aff26a
Merge commit '0118cb6810a48869bf7494aabd86ef44da5940a3' into internal…
vseanreesermsft Apr 8, 2025
ca2e49c
Merging internal commits for release/8.0 (#35926)
AndriySvyryd Apr 8, 2025
863a67c
Merge commit 'ca2e49c4fdaf3320d869bf7133dc37321667f6d7'
Apr 8, 2025
32928fb
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Apr 9, 2025
0e38aae
Merge commit '32928fbc57d076dd09709935bcd44bb381f54e44'
Apr 9, 2025
19b2edd
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Apr 9, 2025
1572132
Merge commit '19b2edd40e97c404dd8e04e8b20b722941d15920'
Apr 9, 2025
314458d
Merging internal commits for release/9.0 (#35925)
AndriySvyryd Apr 9, 2025
3962b7c
Merge commit '314458daa2f34cb8dcae78be2d59ce39786e2f1c'
Apr 9, 2025
d0d53e5
Disable Cosmos tests on CI (#35933)
AndriySvyryd Apr 10, 2025
ad1cc7e
Merge commit 'd0d53e51d0dc668fdd2a1854f13371f667fc7dfb'
Apr 10, 2025
0c098b3
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Apr 11, 2025
ae4a6bc
Correct Relationsjips -> Relationships (#35941)
roji Apr 12, 2025
33f7061
Add model building support for complex type collections (#35905)
AndriySvyryd Apr 12, 2025
bf46251
More relationship test fixes (#35942)
roji Apr 12, 2025
06035d7
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Apr 14, 2025
2b564f7
Update dependencies from https://github.com/dotnet/runtime build 2025…
dotnet-maestro[bot] Apr 14, 2025
1c96bce
[release/9.0-staging] Cosmos Full Text Search support (query part) (#…
maumar Apr 14, 2025
bf3fa4e
Merge branch 'release/9.0-staging' into merge_fts_from_staging
maumar Apr 14, 2025
442604c
Merge pull request #35953 from dotnet/merge_fts_from_staging
maumar Apr 15, 2025
2d91e4f
Merge commit '442604c8c7e9dc788065d537f3b373cb9a1aa0f0'
Apr 15, 2025
e500cda
SQLite: implement MAX/MIN/ORDER BY for `decimal` (#35606)
ranma42 Apr 15, 2025
8f67cf8
[release/9.0] Bump version of Cosmos SDK from 3.45 to 3.48 to improve…
maumar Apr 15, 2025
14a96b4
Merge commit '8f67cf8489be6fbf949daa7081213a6fe5c634f0'
Apr 15, 2025
0024b2b
Cosmos Full Text Search support (#35868)
maumar Apr 15, 2025
3ca997c
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Apr 16, 2025
6f33e42
Translate COALESCE as ISNULL (#34171)
ranma42 Apr 16, 2025
62a94cb
Per our conventions, this parameter shouldn't have "is" prefix. (#35957)
cincuranet Apr 16, 2025
cc5bcc6
Add Cosmos DB query translation and collection navigation tests
SamMonoRT Apr 16, 2025
6765359
Merged PR 48916: [internal/release/9.0] Update dependencies from dnce…
Apr 16, 2025
74ab206
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Apr 17, 2025
c755c4a
Merged PR 49262: [internal/release/8.0] Update dependencies from dnce…
Apr 17, 2025
18918ef
Cleanup around vector in Cosmos (#35960)
maumar Apr 19, 2025
29be5ef
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Apr 21, 2025
4d9dc42
Update dependencies from https://github.com/dotnet/runtime build 2025…
dotnet-maestro[bot] Apr 21, 2025
74350ae
update branding to preview 5 (#35977)
maumar Apr 22, 2025
354df8c
Update dependencies from https://github.com/dotnet/dotnet (#35990)
dotnet-maestro[bot] Apr 24, 2025
7399468
Update dependencies from https://github.com/dotnet/dotnet (#35994)
dotnet-maestro[bot] Apr 25, 2025
0cec46a
temporarily disable cosmos tests on ci (#35996)
maumar Apr 25, 2025
3dddb18
Update dependencies from https://github.com/dotnet/dotnet (#36001)
dotnet-maestro[bot] Apr 26, 2025
2ea7192
Fix to #35983 - Cosmos/FTS: update translation of FullTextScore to us…
maumar Apr 27, 2025
215dcc6
Merging main into darc-main-10157bc1-cdb0-4f97-9f6a-d16fc81a08be
dotnet-maestro[bot] Apr 28, 2025
ce54a84
Update dependencies from https://github.com/dotnet/dotnet
dotnet-maestro[bot] Apr 28, 2025
4e3bc90
Merge pull request #36005 from dotnet/darc-main-10157bc1-cdb0-4f97-9f…
maumar Apr 28, 2025
c728c1c
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Apr 28, 2025
1b02929
Update dependencies from https://github.com/dotnet/dotnet (#36011)
dotnet-maestro[bot] Apr 29, 2025
c2b8483
Merging main into darc-main-2fa3b940-d035-4f0f-8d67-706c36c8f297
dotnet-maestro[bot] Apr 30, 2025
4bc2837
Update dependencies from https://github.com/dotnet/dotnet build 266331
dotnet-maestro[bot] Apr 30, 2025
c481582
Merge pull request #36013 from dotnet/darc-main-2fa3b940-d035-4f0f-8d…
maumar Apr 30, 2025
9344f49
Use SqlClient 6.1.0-preview1.25120.4 (#36020)
roji May 1, 2025
cc16eae
Update dependencies from https://github.com/dotnet/dotnet build 26649…
dotnet-maestro[bot] May 2, 2025
4ff9270
[main] Source code updates from dotnet/dotnet (#36027)
dotnet-maestro[bot] May 2, 2025
bad7584
Update dependencies from https://github.com/dotnet/dotnet build 26665…
dotnet-maestro[bot] May 3, 2025
9b42f36
Slightly improve performance and maintainability (#35981)
rameel May 5, 2025
aaa3650
Try BinSkim extraction
web-flow May 5, 2025
fa75a5d
Merge branch 'main' of https://github.com/dotnet/efcore
web-flow May 5, 2025
4b16eca
Revert "Merge branch 'main' of https://github.com/dotnet/efcore"
web-flow May 5, 2025
b5b3c65
Revert "Try BinSkim extraction"
web-flow May 5, 2025
19f60c5
Revert "Add Cosmos DB query translation and collection navigation tests"
web-flow May 5, 2025
7f8c495
Remove unnecessary temporary file cereation/deletion. (#36033)
paulomorgado May 5, 2025
3542c20
Try BinSkim extract feature azure-pipelines.yml (#36034)
SamMonoRT May 5, 2025
39c4afd
Revert "Try BinSkim extract feature azure-pipelines.yml (#36034)"
SamMonoRT May 5, 2025
14d4548
Merge pull request #36035 from dotnet/revert-36034-SamMonoRT-binSkim-…
maumar May 5, 2025
f0c41ec
BinSkim extract - try 2 - Update azure-pipelines.yml (#36037)
SamMonoRT May 6, 2025
72a6ebe
Update dependencies from https://github.com/dotnet/dotnet build 26684…
dotnet-maestro[bot] May 6, 2025
41fcdf7
Update dependencies from https://github.com/dotnet/dotnet build 26704…
dotnet-maestro[bot] May 7, 2025
e89b062
Fix Cosmos tests on official CI by ignoring the ambient MI
AndriySvyryd May 7, 2025
512a7f2
Update branding to 8.0.17
vseanreesermsft May 7, 2025
76faf7c
Update branding to 9.0.6
vseanreesermsft May 7, 2025
c07d330
Merge pull request #36044 from vseanreesermsft/branding-9.0.6-2025-05…
maumar May 7, 2025
782bac7
Merge pull request #36043 from vseanreesermsft/branding-8.0.17-2025-0…
maumar May 7, 2025
96eb069
Merge branch 'release/9.0' into merge/release/8.0-to-release/9.0
AndriySvyryd May 7, 2025
44c091f
Revert job.yml changes
AndriySvyryd May 7, 2025
b7cc12f
[automated] Merge branch 'release/8.0' => 'release/9.0' (#35927)
AndriySvyryd May 8, 2025
a72632d
[main] Source code updates from dotnet/dotnet (#36048)
dotnet-maestro[bot] May 8, 2025
7d809e7
Update dependencies from https://github.com/dotnet/dotnet build 267468
dotnet-maestro[bot] May 9, 2025
0d14968
Merge release/9.0 to release/9.0-staging (#36051)
AndriySvyryd May 9, 2025
667c569
Merge pull request #36056 from dotnet/darc-main-24b5a98e-b060-4cb5-b6…
maumar May 9, 2025
6ce8dff
Support accessing members of a conditional value (#35390)
ranma42 May 11, 2025
7a87abf
[main] Source code updates from dotnet/dotnet (#36061)
dotnet-maestro[bot] May 12, 2025
015f170
Fix to #35983 - Cosmos/FTS: update translation of FullTextScore to us…
maumar May 12, 2025
bafe387
Update ConventionSetBuilder.cs - Spelling mistake TImplementaion (#36…
Kloppie5 May 12, 2025
9ae9e34
Merge commit 'c755c4a6f3df392ac86ce9985f27a8c3e851b3b3' into internal…
vseanreesermsft May 13, 2025
352dc99
Merge commit '6765359588e8b38bab2a7974db9398432703828f' into internal…
vseanreesermsft May 13, 2025
7950192
CanConnectAsync: throw OperationCanceledException in case of cancella…
aomader May 14, 2025
db3af35
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] May 14, 2025
b677f33
[release/9.0] Update dependencies from dotnet/arcade (#36065)
dotnet-maestro[bot] May 14, 2025
059c5c2
[main] Source code updates from dotnet/dotnet (#36082)
dotnet-maestro[bot] May 15, 2025
a9cc40a
Merge branch 'release/8.0' into internal-merge-8.0-2025-05-13-1457
vseanreesermsft May 15, 2025
8d569c9
Merging internal commits for release/8.0 (#36080)
AndriySvyryd May 15, 2025
131362f
Merging internal commits for release/9.0 (#36081)
AndriySvyryd May 15, 2025
1c5f94a
Merge branch 'release/9.0' into merge/release/8.0-to-release/9.0
AndriySvyryd May 15, 2025
b9775b4
[automated] Merge branch 'release/8.0' => 'release/9.0' (#36088)
AndriySvyryd May 15, 2025
cd96ce3
Merge release/9.0-staging to release/9.0 (#36089)
AndriySvyryd May 15, 2025
7de0c47
Merge branch 'release/9.0' into main
AndriySvyryd May 16, 2025
f7f0235
Skip FullTextSearchCosmosTest on the emulator
AndriySvyryd May 16, 2025
ceb845a
Skip HybridSearchCosmosTest on emulator
AndriySvyryd May 16, 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
1 change: 1 addition & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
<DebugType>portable</DebugType>
<PackageProjectUrl>https://docs.microsoft.com/ef/core/</PackageProjectUrl>
<PackageIconFullPath>$(MSBuildThisFileDirectory)logo\ef-logo.png</PackageIconFullPath>
<PublishWindowsPdb>false</PublishWindowsPdb>
</PropertyGroup>

<PropertyGroup Condition="'$(DeveloperBuild)' == 'true'">
Expand Down
3 changes: 2 additions & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,11 @@
<PackageVersion Include="Microsoft.Build.Locator" Version="1.7.8" />
<PackageVersion Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" />
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" />
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
<PackageVersion Include="Microsoft.DotNet.Build.Tasks.Templating" Version="$(MicrosoftDotNetBuildTasksTemplatingVersion)" />

<!-- Azure SDK for .NET dependencies -->
<PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.46.0" />
<PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.49.0-preview.0" />

<!-- SQL Server dependencies -->
<PackageVersion Include="Microsoft.Data.SqlClient" Version="6.0.1" />
Expand Down
4 changes: 4 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ extends:
binskim:
scanOutputDirectoryOnly: true
preReleaseVersion: '4.3.1'
env:
GDN_EXTRACT_TOOLS: "binskim"
GDN_EXTRACT_TARGETS: true
GDN_EXTRACT_FILTER: "f|**\\*.zip;f|**\\*.nupkg;f|**\\*.vsix;f|**\\*.cspkg;f|**\\*.sfpkg;f|**\\*.package"
policheck:
enabled: true
tsa:
Expand Down
7 changes: 0 additions & 7 deletions eng/DotNetBuild.props

This file was deleted.

16 changes: 8 additions & 8 deletions eng/Publishing.props
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<PublishingVersion>3</PublishingVersion>
<!-- This repo does its own symbol package generation. Arcade's symbols.nupkg generation conflicts with the symbol package generation in
this repo and causes confusion (due to empty symblos.nupkg's) in downstream processes -->
<AutoGenerateSymbolPackages>false</AutoGenerateSymbolPackages>
<ProducesDotNetReleaseShippingAssets>true</ProducesDotNetReleaseShippingAssets>
</PropertyGroup>

<PropertyGroup>
<!-- This repo does its own symbol package generation. Arcade's symbols.nupkg generation conflicts with the symbol package generation in
this repo and causes confusion (due to empty symblos.nupkg's) in downstream processes -->
<AutoGenerateSymbolPackages>false</AutoGenerateSymbolPackages>
<ProducesDotNetReleaseShippingAssets>true</ProducesDotNetReleaseShippingAssets>
</PropertyGroup>

</Project>
1 change: 0 additions & 1 deletion eng/Signing.props

This file was deleted.

109 changes: 55 additions & 54 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,83 +1,84 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="ad8565092bbfdd5c8b4a94a718d10b2d394f7aee" BarId="268384" />
<ProductDependencies>
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.4.25206.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>367e0a8a23e444a94c029fcb72dcb4ac66bd6717</Sha>
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.5.25265.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-preview.4.25206.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>367e0a8a23e444a94c029fcb72dcb4ac66bd6717</Sha>
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-preview.5.25265.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-preview.4.25206.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>367e0a8a23e444a94c029fcb72dcb4ac66bd6717</Sha>
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-preview.5.25265.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-preview.4.25206.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>367e0a8a23e444a94c029fcb72dcb4ac66bd6717</Sha>
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-preview.5.25265.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-preview.4.25206.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>367e0a8a23e444a94c029fcb72dcb4ac66bd6717</Sha>
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-preview.5.25265.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-preview.4.25206.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>367e0a8a23e444a94c029fcb72dcb4ac66bd6717</Sha>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-preview.5.25265.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-preview.4.25206.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>367e0a8a23e444a94c029fcb72dcb4ac66bd6717</Sha>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-preview.5.25265.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-preview.4.25206.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>367e0a8a23e444a94c029fcb72dcb4ac66bd6717</Sha>
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-preview.5.25265.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-preview.4.25206.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>367e0a8a23e444a94c029fcb72dcb4ac66bd6717</Sha>
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-preview.5.25265.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.4.25206.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>367e0a8a23e444a94c029fcb72dcb4ac66bd6717</Sha>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.5.25265.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
</Dependency>
<!--
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
All Runtime.$rid packages should have the same version.
-->
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.4.25206.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>367e0a8a23e444a94c029fcb72dcb4ac66bd6717</Sha>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.5.25265.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="10.0.0-preview.4.25206.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>367e0a8a23e444a94c029fcb72dcb4ac66bd6717</Sha>
<Dependency Name="System.Text.Json" Version="10.0.0-preview.5.25265.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.4.25206.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>367e0a8a23e444a94c029fcb72dcb4ac66bd6717</Sha>
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.5.25265.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
</Dependency>
<Dependency Name="System.Formats.Asn1" Version="10.0.0-preview.4.25206.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>367e0a8a23e444a94c029fcb72dcb4ac66bd6717</Sha>
<Dependency Name="System.Formats.Asn1" Version="10.0.0-preview.5.25265.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
</Dependency>
<Dependency Name="System.Runtime.Caching" Version="10.0.0-preview.4.25206.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>367e0a8a23e444a94c029fcb72dcb4ac66bd6717</Sha>
<Dependency Name="System.Runtime.Caching" Version="10.0.0-preview.5.25265.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25206.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>37f732fbfa006386f89a16be417278ea4fee375e</Sha>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25265.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25206.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>37f732fbfa006386f89a16be417278ea4fee375e</Sha>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25265.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25206.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>37f732fbfa006386f89a16be417278ea4fee375e</Sha>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25265.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
32 changes: 16 additions & 16 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,24 @@
<UsingToolXliff>False</UsingToolXliff>
</PropertyGroup>
<PropertyGroup Label="Dependencies from dotnet/runtime">
<MicrosoftExtensionsCachingMemoryVersion>10.0.0-preview.4.25206.1</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationVersion>10.0.0-preview.4.25206.1</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-preview.4.25206.1</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>10.0.0-preview.4.25206.1</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-preview.4.25206.1</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-preview.4.25206.1</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDependencyModelVersion>10.0.0-preview.4.25206.1</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>10.0.0-preview.4.25206.1</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsLoggingVersion>10.0.0-preview.4.25206.1</MicrosoftExtensionsLoggingVersion>
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.4.25206.1</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-preview.4.25206.1</MicrosoftNETCoreAppRuntimewinx64Version>
<SystemTextEncodingsWebVersion>10.0.0-preview.4.25206.1</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>10.0.0-preview.4.25206.1</SystemTextJsonVersion>
<SystemFormatsAsn1Version>10.0.0-preview.4.25206.1</SystemFormatsAsn1Version>
<SystemRuntimeCachingVersion>10.0.0-preview.4.25206.1</SystemRuntimeCachingVersion>
<MicrosoftExtensionsCachingMemoryVersion>10.0.0-preview.5.25265.101</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationVersion>10.0.0-preview.5.25265.101</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-preview.5.25265.101</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>10.0.0-preview.5.25265.101</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-preview.5.25265.101</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-preview.5.25265.101</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDependencyModelVersion>10.0.0-preview.5.25265.101</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>10.0.0-preview.5.25265.101</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsLoggingVersion>10.0.0-preview.5.25265.101</MicrosoftExtensionsLoggingVersion>
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.5.25265.101</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-preview.5.25265.101</MicrosoftNETCoreAppRuntimewinx64Version>
<SystemTextEncodingsWebVersion>10.0.0-preview.5.25265.101</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>10.0.0-preview.5.25265.101</SystemTextJsonVersion>
<SystemFormatsAsn1Version>10.0.0-preview.5.25265.101</SystemFormatsAsn1Version>
<SystemRuntimeCachingVersion>10.0.0-preview.5.25265.101</SystemRuntimeCachingVersion>
</PropertyGroup>
<PropertyGroup Label="Dependencies from dotnet/arcade">
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25206.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25265.101</MicrosoftDotNetBuildTasksTemplatingVersion>
</PropertyGroup>
<PropertyGroup Label="Other dependencies">
<MicrosoftBuildFrameworkVersion>17.13.9</MicrosoftBuildFrameworkVersion>
Expand Down
Empty file modified eng/common/SetupNugetSources.sh
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion eng/common/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ while [[ $# > 0 ]]; do
restore=true
pack=true
;;
-productBuild|-pb)
-productbuild|-pb)
build=true
product_build=true
restore=true
Expand Down
24 changes: 15 additions & 9 deletions eng/common/core-templates/job/publish-build-assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ parameters:

is1ESPipeline: ''

# Optional: 🌤️ or not the build has assets it wants to publish to BAR
isAssetlessBuild: false

jobs:
- job: Asset_Registry_Publish

Expand Down Expand Up @@ -72,14 +75,15 @@ jobs:
- checkout: self
fetchDepth: 3
clean: true

- task: DownloadPipelineArtifact@2
displayName: Download Asset Manifests
inputs:
artifactName: AssetManifests
targetPath: '$(Build.StagingDirectory)/AssetManifests'
condition: ${{ parameters.condition }}
continueOnError: ${{ parameters.continueOnError }}

- ${{ if eq(parameters.isAssetlessBuild, 'false') }}:
- task: DownloadPipelineArtifact@2
displayName: Download Asset Manifests
inputs:
artifactName: AssetManifests
targetPath: '$(Build.StagingDirectory)/AssetManifests'
condition: ${{ parameters.condition }}
continueOnError: ${{ parameters.continueOnError }}

- task: NuGetAuthenticate@1

Expand All @@ -92,6 +96,7 @@ jobs:
scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
/p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
/p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }}
/p:MaestroApiEndpoint=https://maestro.dot.net
/p:OfficialBuildId=$(Build.BuildNumber)
condition: ${{ parameters.condition }}
Expand Down Expand Up @@ -124,7 +129,7 @@ jobs:
publishLocation: Container
artifactName: ReleaseConfigs

- ${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
- ${{ if or(eq(parameters.publishAssetsImmediately, 'true'), eq(parameters.isAssetlessBuild, 'true')) }}:
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
parameters:
BARBuildId: ${{ parameters.BARBuildId }}
Expand All @@ -145,6 +150,7 @@ jobs:
-WaitPublishingFinish true
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
-SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'

- ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
- template: /eng/common/core-templates/steps/publish-logs.yml
Expand Down
2 changes: 2 additions & 0 deletions eng/common/core-templates/job/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ parameters:
# Specifies the build script to invoke to perform the build in the repo. The default
# './build.sh' should work for typical Arcade repositories, but this is customizable for
# difficult situations.
# buildArguments: ''
# Specifies additional build arguments to pass to the build script.
# jobProperties: {}
# A list of job properties to inject at the top level, for potential extensibility beyond
# container and pool.
Expand Down
8 changes: 6 additions & 2 deletions eng/common/core-templates/jobs/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ parameters:
# Optional: Publish the assets as soon as the publish to BAR stage is complete, rather doing so in a separate stage.
publishAssetsImmediately: false

# Optional: 🌤️ or not the build has assets it wants to publish to BAR
isAssetlessBuild: false

# Optional: If using publishAssetsImmediately and additional parameters are needed, can be used to send along additional parameters (normally sent to post-build.yml)
artifactsPublishingAdditionalParameters: ''
signingValidationAdditionalParameters: ''
Expand Down Expand Up @@ -93,7 +96,7 @@ jobs:
${{ parameter.key }}: ${{ parameter.value }}

- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}:
- ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, ''), eq(parameters.isAssetlessBuild, true)) }}:
- template: ../job/publish-build-assets.yml
parameters:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
Expand All @@ -109,7 +112,8 @@ jobs:
- Source_Build_Complete

runAsPublic: ${{ parameters.runAsPublic }}
publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }}
publishAssetsImmediately: ${{ or(parameters.publishAssetsImmediately, parameters.isAssetlessBuild) }}
isAssetlessBuild: ${{ parameters.isAssetlessBuild }}
enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }}
Loading