Skip to content

Commit 59df269

Browse files
authored
[main] Onboard runtime-portable and runtime (#13770)
* Enable runtime and runtime-portable in source-build known-good.proj * Add patch that retargets runtime to net7.0 * Re-enable RepositoryReferences to runtime in other repos
1 parent 0be5584 commit 59df269

File tree

5 files changed

+56
-8
lines changed

5 files changed

+56
-8
lines changed

src/SourceBuild/tarball/content/repos/deployment-tools.proj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<!-- TODO: Renable once runtime is building in tarball -->
14-
<!-- <RepositoryReference Include="runtime" /> -->
13+
<RepositoryReference Include="runtime" />
1514
</ItemGroup>
1615

1716
<ItemGroup>

src/SourceBuild/tarball/content/repos/known-good.proj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
<!-- Tier 2 -->
4444
<RepositoryReference Include="linker" />
4545
<RepositoryReference Include="msbuild" />
46-
<!-- <RepositoryReference Include="runtime-portable" /> -->
47-
<!-- <RepositoryReference Include="runtime" /> -->
46+
<RepositoryReference Include="runtime-portable" />
47+
<RepositoryReference Include="runtime" />
4848

4949
<!-- Tier 3 -->
5050
<!-- <RepositoryReference Include="roslyn-analyzers" /> -->

src/SourceBuild/tarball/content/repos/msbuild.proj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@
3030

3131
<ItemGroup>
3232
<RepositoryReference Include="arcade" />
33-
<!-- TODO: Renable once runtime is building in tarball -->
34-
<!-- <RepositoryReference Include="runtime" /> -->
33+
<RepositoryReference Include="runtime" />
3534
<RepositoryReference Include="roslyn" />
3635
</ItemGroup>
3736

src/SourceBuild/tarball/content/repos/vstest.proj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313

1414
<ItemGroup>
1515
<RepositoryReference Include="diagnostics" />
16-
<!-- TODO: Renable once runtime is building in tarball -->
17-
<!-- <RepositoryReference Include="runtime" /> -->
16+
<RepositoryReference Include="runtime" />
1817
<RepositoryReference Include="source-build-externals" />
1918
</ItemGroup>
2019

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Larry Ewing <[email protected]>
3+
Date: Fri, 8 Apr 2022 17:26:16 -0500
4+
Subject: [PATCH] Move tools and apps to net7.0
5+
6+
Original PR: https://github.com/dotnet/runtime/pull/67771
7+
---
8+
Directory.Build.props | 4 ++--
9+
.../ILStrip/AssemblyStripper/AssemblyStripper.csproj | 5 ++---
10+
2 files changed, 4 insertions(+), 5 deletions(-)
11+
12+
diff --git a/Directory.Build.props b/Directory.Build.props
13+
index 2ec01ea57e6..2e6a7b6c0f5 100644
14+
--- a/Directory.Build.props
15+
+++ b/Directory.Build.props
16+
@@ -53,7 +53,7 @@
17+
<NetCoreAppCurrent>net$(NetCoreAppCurrentVersion)</NetCoreAppCurrent>
18+
<NetCoreAppMinimum>net6.0</NetCoreAppMinimum>
19+
20+
- <NetCoreAppToolCurrentVersion>6.0</NetCoreAppToolCurrentVersion>
21+
+ <NetCoreAppToolCurrentVersion>7.0</NetCoreAppToolCurrentVersion>
22+
<NetCoreAppToolCurrent>net$(NetCoreAppToolCurrentVersion)</NetCoreAppToolCurrent>
23+
<NetCoreAppCurrentToolTargetFrameworkMoniker>$(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppToolCurrentVersion)</NetCoreAppCurrentToolTargetFrameworkMoniker>
24+
25+
@@ -61,7 +61,7 @@
26+
<NetCoreAppLatestStablePackageBaselineVersion>$(NetCoreAppLatestStableVersion).0</NetCoreAppLatestStablePackageBaselineVersion>
27+
<NetCoreAppLatestStable>net$(NetCoreAppLatestStableVersion)</NetCoreAppLatestStable>
28+
29+
- <AspNetCoreAppCurrentVersion>6.0</AspNetCoreAppCurrentVersion>
30+
+ <AspNetCoreAppCurrentVersion>7.0</AspNetCoreAppCurrentVersion>
31+
<AspNetCoreAppCurrent>net$(AspNetCoreAppCurrentVersion)</AspNetCoreAppCurrent>
32+
33+
<NetFrameworkMinimum>net462</NetFrameworkMinimum>
34+
diff --git a/src/tasks/MonoTargetsTasks/ILStrip/AssemblyStripper/AssemblyStripper.csproj b/src/tasks/MonoTargetsTasks/ILStrip/AssemblyStripper/AssemblyStripper.csproj
35+
index 439b5b8b21b..2eb8a61b633 100644
36+
--- a/src/tasks/MonoTargetsTasks/ILStrip/AssemblyStripper/AssemblyStripper.csproj
37+
+++ b/src/tasks/MonoTargetsTasks/ILStrip/AssemblyStripper/AssemblyStripper.csproj
38+
@@ -4,11 +4,10 @@
39+
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
40+
<!-- CilStrip.Sources doesn't play nicely with nullability -->
41+
<Nullable>disable</Nullable>
42+
- <!-- SYSLIB0003: Mono.Cecil uses Code Access Security types
43+
- CS0618: Mono.Cecil uses a number of other obsolete types
44+
+ <!-- CS0618,SYSLIB0003,SYSLIB0037: Mono.Cecil uses a number of other obsolete types
45+
CS0649: Mono.Cecil.Binary.ExportTable has some unused fields
46+
-->
47+
- <NoWarn>$(NoWarn),CS0618,CS0649,SYSLIB0003</NoWarn>
48+
+ <NoWarn>$(NoWarn),CS0618,CS0649,SYSLIB0003,SYSLIB0037</NoWarn>
49+
<!-- the analyzers don't like Mono.Cecil either -->
50+
<RunAnalyzers>false</RunAnalyzers>
51+
</PropertyGroup>

0 commit comments

Comments
 (0)