Enable efcore in the VMR build (#19313)
This commit is contained in:
parent
869de275e9
commit
a94bcfb173
4 changed files with 50 additions and 1 deletions
|
@ -172,7 +172,7 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks
|
||||||
if (VersionPropsFlowType == DependenciesOnlyVersionPropsFlowType && (string.IsNullOrEmpty(VersionDetails) || !File.Exists(VersionDetails)))
|
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. " +
|
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;
|
return !Log.HasLoggedErrors;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -36,6 +36,10 @@
|
||||||
<RepositoryReference Include="symreader" />
|
<RepositoryReference Include="symreader" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
|
||||||
|
<RepositoryReference Include="efcore" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<EnvironmentVariables Include="warn_as_error=false" />
|
<EnvironmentVariables Include="warn_as_error=false" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
8
src/SourceBuild/content/repo-projects/efcore.proj
Normal file
8
src/SourceBuild/content/repo-projects/efcore.proj
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<RepositoryReference Include="arcade" />
|
||||||
|
<RepositoryReference Include="runtime" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
|
@ -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(
|
Loading…
Reference in a new issue