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

[main] Update dependencies from dotnet/runtime #45042

Merged
merged 32 commits into from
Dec 10, 2024
Merged

[main] Update dependencies from dotnet/runtime #45042

Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
db89f09
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Nov 22, 2024
1abba7d
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Nov 23, 2024
6ced50b
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Nov 25, 2024
009e52c
[runtime patch] Only update runtime maintenance-packages dependencies…
carlossanlop Nov 26, 2024
0e301f9
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Nov 26, 2024
eeb87af
Fix runtime patch to include correct comments and issue link.
carlossanlop Nov 26, 2024
fa0e55d
Merge branch 'darc-main-1f7b1145-06b9-49b5-a579-9c430e034d35' of http…
carlossanlop Nov 26, 2024
8354b9a
Merge branch 'main' into darc-main-1f7b1145-06b9-49b5-a579-9c430e034d35
nagilson Nov 26, 2024
bfdce89
Delete runtime patch. Add roslyn patch to conditionally bump the main…
carlossanlop Nov 27, 2024
7682ef9
Merge branch 'darc-main-1f7b1145-06b9-49b5-a579-9c430e034d35' of http…
carlossanlop Nov 27, 2024
5dc52c1
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Nov 27, 2024
3afcbc7
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Nov 28, 2024
faed963
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Nov 29, 2024
84c2dd6
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Nov 30, 2024
62ea6c5
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Dec 1, 2024
702e474
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Dec 2, 2024
28ffe20
Merge branch 'main' into darc-main-1f7b1145-06b9-49b5-a579-9c430e034d35
nagilson Dec 2, 2024
0f1417a
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Dec 3, 2024
cf527b3
[PATCH] Only update msbuild dependencies coming from maintenance-pack…
carlossanlop Dec 3, 2024
6e89180
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Dec 4, 2024
aee47b7
Merge branch 'darc-main-1f7b1145-06b9-49b5-a579-9c430e034d35' of http…
carlossanlop Dec 4, 2024
7f4d947
Merge branch 'main' into darc-main-1f7b1145-06b9-49b5-a579-9c430e034d35
akoeplinger Dec 5, 2024
94373ca
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Dec 5, 2024
c9cc399
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Dec 6, 2024
547dbc9
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Dec 7, 2024
736fce1
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Dec 9, 2024
fd833e1
Add patch
jkoritzinsky Dec 9, 2024
5e75ea1
LF line endings for patch
ViktorHofer Dec 9, 2024
d2e16f6
Update patch
ViktorHofer Dec 9, 2024
c06365e
[PATCH] Only update razor dependencies coming from
carlossanlop Dec 9, 2024
8295bb9
Merge branch 'main' into darc-main-1f7b1145-06b9-49b5-a579-9c430e034d35
ViktorHofer Dec 10, 2024
5b9f248
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] Dec 10, 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
Prev Previous commit
Next Next commit
LF line endings for patch
  • Loading branch information
@ViktorHofer
ViktorHofer authored Dec 9, 2024
commit 5e75ea1c66f0dc70812c5ee5b51426f1b7631788
45 changes: 23 additions & 22 deletions src/SourceBuild/patches/runtime/0001-re-enable-bundle-in-source-build.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
From ab487578a9e5de5950beed59ed9e4c8906557352 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Thu, 5 Dec 2024 10:11:01 -0800
Subject: [PATCH] Re-enable bundle archive building in source build

Backport: https://github.com/dotnet/runtime/pull/110448
---
eng/Subsets.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Subsets.props b/eng/Subsets.props
index a50fd3e80025e..1491a0aeba8a3 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -550,7 +550,7 @@
</ItemGroup>
<ItemGroup>
<SharedFrameworkProjectToBuild Condition="'$(BuildMonoAOTCrossCompilerOnly)' != 'true'" Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Runtime.sfxproj" />
- <SharedFrameworkProjectToBuild Condition="'$(BuildNativeAOTRuntimePack)' != 'true' and '$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)' and '$(TargetsMobile)' != 'true' and '$(DotNetBuildSourceOnly)' != 'true'" Include="$(InstallerProjectRoot)pkg\sfx\bundle\Microsoft.NETCore.App.Bundle.bundleproj" />
+ <SharedFrameworkProjectToBuild Condition="'$(BuildNativeAOTRuntimePack)' != 'true' and '$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)' and '$(TargetsMobile)' != 'true'" Include="$(InstallerProjectRoot)pkg\sfx\bundle\Microsoft.NETCore.App.Bundle.bundleproj" />
<ProjectToBuild Include="@(SharedFrameworkProjectToBuild)" Category="packs" />
</ItemGroup>
From ab487578a9e5de5950beed59ed9e4c8906557352 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Thu, 5 Dec 2024 10:11:01 -0800
Subject: [PATCH] Re-enable bundle archive building in source build

Backport: https://github.com/dotnet/runtime/pull/110448

---
eng/Subsets.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Subsets.props b/eng/Subsets.props
index a50fd3e80025e..1491a0aeba8a3 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -550,7 +550,7 @@
</ItemGroup>
<ItemGroup>
<SharedFrameworkProjectToBuild Condition="'$(BuildMonoAOTCrossCompilerOnly)' != 'true'" Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Runtime.sfxproj" />
- <SharedFrameworkProjectToBuild Condition="'$(BuildNativeAOTRuntimePack)' != 'true' and '$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)' and '$(TargetsMobile)' != 'true' and '$(DotNetBuildSourceOnly)' != 'true'" Include="$(InstallerProjectRoot)pkg\sfx\bundle\Microsoft.NETCore.App.Bundle.bundleproj" />
+ <SharedFrameworkProjectToBuild Condition="'$(BuildNativeAOTRuntimePack)' != 'true' and '$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)' and '$(TargetsMobile)' != 'true'" Include="$(InstallerProjectRoot)pkg\sfx\bundle\Microsoft.NETCore.App.Bundle.bundleproj" />
<ProjectToBuild Include="@(SharedFrameworkProjectToBuild)" Category="packs" />
</ItemGroup>
</When>
Loading