Skip to content

[main] Onboard runtime-portable and runtime #13770

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
lbussell merged 10 commits into from
May 13, 2022
Merged

[main] Onboard runtime-portable and runtime #13770

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
45be86c
Enable all repos in source-build known-good.proj
lbussell May 3, 2022
9eb8027
Add patches necessary for building runtime-portable
lbussell May 4, 2022
2c4a233
Disable other repos that are not building yet
lbussell May 4, 2022
a0f38b7
Enable runtime in source-build known-good.proj
lbussell May 5, 2022
b47c40e
Merge remote-tracking branch 'upstream/main' into net7.0-wip
lbussell May 9, 2022
b02a9d5
Remove now-unnecessary runtime patch
lbussell May 9, 2022
f9e1f6d
Add description to runtime patch
lbussell May 9, 2022
fdd1594
Re-enable RepositoryReferences to runtime
lbussell May 11, 2022
b2abfc4
Update patch to official runtime version
lbussell May 12, 2022
72ed198
Add original PR link to runtime patch
lbussell May 12, 2022
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
4 changes: 2 additions & 2 deletions src/SourceBuild/tarball/content/repos/known-good.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
<!-- Tier 2 -->
<RepositoryReference Include="linker" />
<RepositoryReference Include="msbuild" />
<!-- <RepositoryReference Include="runtime-portable" /> -->
<!-- <RepositoryReference Include="runtime" /> -->
<RepositoryReference Include="runtime-portable" />
<RepositoryReference Include="runtime" />

<!-- Tier 3 -->
<!-- <RepositoryReference Include="roslyn-analyzers" /> -->
Expand Down
23 changes: 23 additions & 0 deletions src/SourceBuild/tarball/patches/runtime/0001-Set-current-.NET-tooling-to-7.0.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Logan Bussell <[email protected]>
Date: Wed, 4 May 2022 15:55:51 -0700
Subject: [PATCH 1/1] Set current .NET tooling to 7.0

This patch will be unnecessary when https://github.com/dotnet/runtime/pull/67771 flows into installer/main.
---
Directory.Build.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 5cc6f25e1d6..cff0cbb756f 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -53,7 +53,7 @@
<NetCoreAppCurrent>net$(NetCoreAppCurrentVersion)</NetCoreAppCurrent>
<NetCoreAppMinimum>net6.0</NetCoreAppMinimum>

- <NetCoreAppToolCurrentVersion>6.0</NetCoreAppToolCurrentVersion>
+ <NetCoreAppToolCurrentVersion>7.0</NetCoreAppToolCurrentVersion>
<NetCoreAppToolCurrent>net$(NetCoreAppToolCurrentVersion)</NetCoreAppToolCurrent>
<NetCoreAppCurrentToolTargetFrameworkMoniker>$(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppToolCurrentVersion)</NetCoreAppCurrentToolTargetFrameworkMoniker>