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] Onboard runtime-portable and runtime #13770

Merged
merged 10 commits into from
May 13, 2022
Merged

[main] Onboard runtime-portable and runtime #13770

Show file tree
Hide file tree
Changes from all 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
3 changes: 1 addition & 2 deletions src/SourceBuild/tarball/content/repos/deployment-tools.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
</PropertyGroup>

<ItemGroup>
<!-- TODO: Renable once runtime is building in tarball -->
<!-- <RepositoryReference Include="runtime" /> -->
<RepositoryReference Include="runtime" />
</ItemGroup>

<ItemGroup>
Expand Down
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
3 changes: 1 addition & 2 deletions src/SourceBuild/tarball/content/repos/msbuild.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@

<ItemGroup>
<RepositoryReference Include="arcade" />
<!-- TODO: Renable once runtime is building in tarball -->
<!-- <RepositoryReference Include="runtime" /> -->
<RepositoryReference Include="runtime" />
<RepositoryReference Include="roslyn" />
</ItemGroup>

Expand Down
3 changes: 1 addition & 2 deletions src/SourceBuild/tarball/content/repos/vstest.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@

<ItemGroup>
<RepositoryReference Include="diagnostics" />
<!-- TODO: Renable once runtime is building in tarball -->
<!-- <RepositoryReference Include="runtime" /> -->
<RepositoryReference Include="runtime" />
<RepositoryReference Include="source-build-externals" />
</ItemGroup>

Expand Down
51 changes: 51 additions & 0 deletions src/SourceBuild/tarball/patches/runtime/0001-Move-tools-and-apps-to-net7.0.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Larry Ewing <lewing@microsoft.com>
Date: Fri, 8 Apr 2022 17:26:16 -0500
Subject: [PATCH] Move tools and apps to net7.0

Original PR: https://github.com/dotnet/runtime/pull/67771
---
Directory.Build.props | 4 ++--
.../ILStrip/AssemblyStripper/AssemblyStripper.csproj | 5 ++---
2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 2ec01ea57e6..2e6a7b6c0f5 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>

@@ -61,7 +61,7 @@
<NetCoreAppLatestStablePackageBaselineVersion>$(NetCoreAppLatestStableVersion).0</NetCoreAppLatestStablePackageBaselineVersion>
<NetCoreAppLatestStable>net$(NetCoreAppLatestStableVersion)</NetCoreAppLatestStable>

- <AspNetCoreAppCurrentVersion>6.0</AspNetCoreAppCurrentVersion>
+ <AspNetCoreAppCurrentVersion>7.0</AspNetCoreAppCurrentVersion>
<AspNetCoreAppCurrent>net$(AspNetCoreAppCurrentVersion)</AspNetCoreAppCurrent>

<NetFrameworkMinimum>net462</NetFrameworkMinimum>
diff --git a/src/tasks/MonoTargetsTasks/ILStrip/AssemblyStripper/AssemblyStripper.csproj b/src/tasks/MonoTargetsTasks/ILStrip/AssemblyStripper/AssemblyStripper.csproj
index 439b5b8b21b..2eb8a61b633 100644
--- a/src/tasks/MonoTargetsTasks/ILStrip/AssemblyStripper/AssemblyStripper.csproj
+++ b/src/tasks/MonoTargetsTasks/ILStrip/AssemblyStripper/AssemblyStripper.csproj
@@ -4,11 +4,10 @@
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<!-- CilStrip.Sources doesn't play nicely with nullability -->
<Nullable>disable</Nullable>
- <!-- SYSLIB0003: Mono.Cecil uses Code Access Security types
- CS0618: Mono.Cecil uses a number of other obsolete types
+ <!-- CS0618,SYSLIB0003,SYSLIB0037: Mono.Cecil uses a number of other obsolete types
CS0649: Mono.Cecil.Binary.ExportTable has some unused fields
-->
- <NoWarn>$(NoWarn),CS0618,CS0649,SYSLIB0003</NoWarn>
+ <NoWarn>$(NoWarn),CS0618,CS0649,SYSLIB0003,SYSLIB0037</NoWarn>
<!-- the analyzers don't like Mono.Cecil either -->
<RunAnalyzers>false</RunAnalyzers>
</PropertyGroup>