mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

[main] Onboard runtime-portable and runtime (#13770)

Browse source 
* 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
This commit is contained in:
Logan Bussell 2022-05-12 17:09:11 -07:00 • committed by GitHub
parent 0be55844f8
commit 59df269041
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 56 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/SourceBuild/tarball/content/repos/deployment-tools.proj
View file

@ -10,8 +10,7 @@
</PropertyGroup>
<ItemGroup>
<!-- TODO: Renable once runtime is building in tarball -->
<!-- <RepositoryReference Include="runtime" /> -->
<RepositoryReference Include="runtime" />
</ItemGroup>
<ItemGroup>

4
src/SourceBuild/tarball/content/repos/known-good.proj
View file

@ -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" /> -->

3
src/SourceBuild/tarball/content/repos/msbuild.proj
View file

@ -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>

3
src/SourceBuild/tarball/content/repos/vstest.proj
View file

@ -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>

51
src/SourceBuild/tarball/patches/runtime/0001-Move-tools-and-apps-to-net7.0.patch Normal file
View file

@ -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>