Skip to content
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

Merging internal commits for release/6.0.4xx #43981

Merged
merged 41 commits into from
Oct 9, 2024
Merged

Merging internal commits for release/6.0.4xx #43981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
b6fe276
Merge commit '48e7a560453ce37c42434153a617685b700db6f4'
Aug 6, 2024
95d5492
Merge commit '5ec1ffe779e6ab8f7d16b615f7d35ac7d39e2045'
Aug 7, 2024
c614c9a
Merge commit 'bde3cf29b9821c75eb759b3487bf6ad6e94e13f9'
Aug 7, 2024
27d2ba2
Merge commit 'a68a8fcd421e11b5f77e5ed670598a26b5669e77'
Aug 11, 2024
5f44517
Merge commit '7e240af6828cbe8b3b71b46dcb6ebbcf0ac79bcc'
Aug 12, 2024
d9b8f56
Merge commit '81560bf803092c5646ded3b602984410567f4ed2'
Aug 14, 2024
08d63f9
Merge commit 'aeb357b3c2d54cbe506f49b93010c7a0adb177ab'
Aug 14, 2024
63e3680
Merge commit '8062eb1f06b1c321e369ab3803966930674e58c0'
Aug 15, 2024
35d91f6
Merged PR 41537: [internal/release/6.0.4xx] Update dependencies from …
Aug 15, 2024
691dfd4
Merged PR 41771: [internal/release/6.0.4xx] Update dependencies from …
Aug 16, 2024
85d7e1e
Merged PR 41779: [internal/release/6.0.4xx] Update dependencies from …
Aug 16, 2024
e529830
Merged PR 41818: [internal/release/6.0.4xx] Update dependencies from …
Aug 17, 2024
082c978
Merged PR 41827: [internal/release/6.0.4xx] Update dependencies from …
Aug 17, 2024
b426ce9
Merged PR 41865: [internal/release/6.0.4xx] Update dependencies from …
Aug 19, 2024
9deba6c
Merge commit '06037a9a5edc3de215c789416f0dfbaeae1a0dcb'
Aug 29, 2024
46eddb1
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 3, 2024
b255dc8
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 5, 2024
e1261e7
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 6, 2024
f82a725
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 9, 2024
cf51a7a
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 10, 2024
e5f9136
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 10, 2024
2111278
Merged PR 42558: Merge public release/6.0.4xx to internal/release/6.0…
marcpopMSFT Sep 10, 2024
0cdd72c
Merged PR 42392: [internal/release/6.0.4xx] Update dependencies from …
Sep 11, 2024
f9229b3
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 11, 2024
6e3fdfe
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 12, 2024
853c4ee
Merged PR 42753: [internal/release/6.0.4xx] Update dependencies from …
Sep 12, 2024
578d95d
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 12, 2024
29da875
Merged PR 42780: [internal/release/6.0.4xx] Update dependencies from …
Sep 12, 2024
2e956ef
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 12, 2024
c3caa83
Merged PR 42795: [internal/release/6.0.4xx] Update dependencies from …
Sep 13, 2024
71a7d8a
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 13, 2024
bd08383
Update format
Cosifne Sep 13, 2024
1ce0315
Merged PR 42831: Fix full framework and disable some tests
marcpopMSFT Sep 13, 2024
9e198e0
Merged PR 42839: [internal/release/6.0.4xx] Update dependencies from …
Sep 13, 2024
0a95111
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 16, 2024
142fc74
Merged PR 42873: [internal/release/6.0.4xx] Update dependencies from …
Sep 16, 2024
0f7bfed
Merged PR 42878: [internal/release/6.0.4xx] Merge from public
vseanreesermsft Sep 16, 2024
5205550
Merge remote-tracking branch 'dnceng/internal/release/6.0.4xx' into d…
Cosifne Sep 17, 2024
aa87185
Merged PR 42718: Insert format into internal/release/6.0.4xx
Cosifne Sep 17, 2024
d404f56
Merged PR 43008: Insert format into internal/release/6.0.4xx
vseanreesermsft Sep 18, 2024
795da3c
Merge commit 'd404f562916f5be62c6661e4f7033f26859ce939' into internal…
vseanreesermsft Oct 8, 2024
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
6 changes: 2 additions & 4 deletions .vsts-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,10 @@ extends:
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore-Svc-Public
image: 1es-windows-2022-open
os: windows
demands: ImageOverride -equals windows.vs2022preview.amd64.open
${{ if ne(variables['System.TeamProject'], 'public') }}:
name: NetCore1ESPool-Svc-Internal
image: 1es-windows-2022
os: windows
demands: ImageOverride -equals windows.vs2022preview.amd64
${{ if eq(variables['System.TeamProject'], 'public') }}:
helixTargetQueue: Windows.Amd64.VS2022.Pre.Open
${{ if ne(variables['System.TeamProject'], 'public') }}:
Expand Down
54 changes: 8 additions & 46 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,40 +4,21 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-f0f9de5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-f0f9de56/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-f0f9de5-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-f0f9de56-5/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-827b960" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-827b9604/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<add key="darc-pub-DotNet-msbuild-Trusted-a400405" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-a400405b/nuget/v3/index.json" />
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
<!-- End: Package sources from dotnet-roslyn-analyzers -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-6c63698" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-6c636980/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-b357f86" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-b357f86c/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-8413a0d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-8413a0d-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df-9/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-8413a0d-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df-8/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-8413a0d-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df-7/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-8413a0d-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df-6/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-8413a0d-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df-5/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-8413a0d-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df-4/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-8413a0d-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-8413a0d-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-8413a0d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-7de8a28" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-7de8a286/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-db4e5a3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-db4e5a36/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-db4e5a36-9/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-db4e5a36-8/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-db4e5a36-7/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-db4e5a36-6/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-db4e5a36-5/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-db4e5a36-4/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-db4e5a36-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-db4e5a36-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-db4e5a36-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-fc5b097" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-fc5b0978/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
Expand All @@ -57,35 +38,16 @@
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-8413a0d-1" value="true" />
<add key="darc-int-dotnet-templating-8413a0d-2" value="true" />
<add key="darc-int-dotnet-templating-8413a0d-3" value="true" />
<add key="darc-int-dotnet-templating-8413a0d-4" value="true" />
<add key="darc-int-dotnet-templating-8413a0d-5" value="true" />
<add key="darc-int-dotnet-templating-8413a0d-6" value="true" />
<add key="darc-int-dotnet-templating-8413a0d-7" value="true" />
<add key="darc-int-dotnet-templating-8413a0d-8" value="true" />
<add key="darc-int-dotnet-templating-8413a0d-9" value="true" />
<add key="darc-int-dotnet-templating-8413a0d" value="true" />
<add key="darc-int-dotnet-templating-7de8a28" value="true" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-f0f9de5-5" value="true" />
<add key="darc-int-dotnet-aspnetcore-f0f9de5" value="true" />
<add key="darc-int-dotnet-aspnetcore-827b960" value="true" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-6c63698" value="true" />
<add key="darc-int-dotnet-runtime-b357f86" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-1" value="true" />
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-2" value="true" />
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-3" value="true" />
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-4" value="true" />
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-5" value="true" />
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-6" value="true" />
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-7" value="true" />
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-8" value="true" />
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-9" value="true" />
<add key="darc-int-dotnet-windowsdesktop-db4e5a3" value="true" />
<add key="darc-int-dotnet-windowsdesktop-fc5b097" value="true" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
Expand Down
Loading
Loading