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

Enable efcore in the VMR build (#19313)

Browse source
This commit is contained in:
Jeremy Koritzinsky 2024-04-17 07:06:27 -07:00 committed by GitHub
parent 869de275e9
commit a94bcfb173
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 50 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/WritePackageVersionsProps.cs
View file

@ -172,7 +172,7 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks
if (VersionPropsFlowType == DependenciesOnlyVersionPropsFlowType && (string.IsNullOrEmpty(VersionDetails) || !File.Exists(VersionDetails)))
{
Log.LogError($"When version flow type is DependenciesOnly, the VersionDetails task parameter must point to a valid path to the Version.Details.xml file for the repo. " +
"Provided file path '{VersionDetails}' does not exist.");
$"Provided file path '{VersionDetails}' does not exist.");
return !Log.HasLoggedErrors;
}

4
src/SourceBuild/content/repo-projects/aspnetcore.proj
View file

@ -36,6 +36,10 @@
<RepositoryReference Include="symreader" />
</ItemGroup>
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
<RepositoryReference Include="efcore" />
</ItemGroup>
<ItemGroup>
<EnvironmentVariables Include="warn_as_error=false" />
</ItemGroup>

8
src/SourceBuild/content/repo-projects/efcore.proj Normal file
View file

@ -0,0 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<RepositoryReference Include="arcade" />
<RepositoryReference Include="runtime" />
</ItemGroup>
</Project>

37
src/SourceBuild/patches/efcore/0001-Various-fixes-for-issues-in-efcore-in-VMR-build.patch Normal file
View file

@ -0,0 +1,37 @@
From a6d02a6f3859f341707a8c5fd76b68e2f13a5a86 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Mon, 15 Apr 2024 12:16:14 -0700
Subject: [PATCH] Various fixes for issues in efcore-in-VMR build (#33540)
Backport: https://github.com/dotnet/efcore/pull/33540
---
Directory.Build.props | 1 +
src/dotnet-ef/Project.cs | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/Directory.Build.props b/Directory.Build.props
index 3a445c23b9d..80858aaddfc 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -10,6 +10,7 @@
( $(MSBuildProjectName.EndsWith('.Tests')) OR
$(MSBuildProjectName.EndsWith('.FunctionalTests'))) ">true</IsUnitTestProject>
<IsUnitTestProject Condition=" '$(IsUnitTestProject)' == '' ">false</IsUnitTestProject>
+ <IsTestUtilityProject Condition="'$(IsSpecificationTestProject)' == 'true'">true</IsTestUtilityProject>
<SolutionRoot>$(MSBuildThisFileDirectory)</SolutionRoot>
</PropertyGroup>
diff --git a/src/dotnet-ef/Project.cs b/src/dotnet-ef/Project.cs
index 1296a2d1c41..4b923364899 100644
--- a/src/dotnet-ef/Project.cs
+++ b/src/dotnet-ef/Project.cs
@@ -58,7 +58,7 @@ public Project(string file, string? framework, string? configuration, string? ru
"Microsoft.EntityFrameworkCore.Tools.Resources.EntityFrameworkCore.targets")!)
{
efTargets = new byte[input.Length];
- input.Read(efTargets);
+ input.ReadExactly(efTargets);
}
var efTargetsPath = Path.Combine(