Skip to content

Commit 974d43a

Browse files
author
John Luo
committed
Fix solution resolution for xplat on Helix
1 parent 3785455 commit 974d43a

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

src/Servers/Kestrel/Kestrel/test/GeneratedCodeTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ public class GeneratedCodeTests
1717
[Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2223", FlakyOn.Helix.All)]
1818
public void GeneratedCodeIsUpToDate()
1919
{
20-
var repositoryRoot = typeof(GeneratedCodeTests).Assembly.GetCustomAttributes<AssemblyMetadataAttribute>().First(f => string.Equals(f.Key, "RepositoryRoot", StringComparison.OrdinalIgnoreCase)).Value;
20+
var repositoryRoot = TestPathUtilities.GetSolutionRootDirectory("Kestrel");
2121

22-
var httpHeadersGeneratedPath = Path.Combine(repositoryRoot, "src/Servers/Kestrel/Core/src/Internal/Http/HttpHeaders.Generated.cs");
23-
var httpProtocolGeneratedPath = Path.Combine(repositoryRoot, "src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.Generated.cs");
24-
var httpUtilitiesGeneratedPath = Path.Combine(repositoryRoot, "src/Servers/Kestrel/Core/src/Internal/Infrastructure/HttpUtilities.Generated.cs");
25-
var transportConnectionGeneratedPath = Path.Combine(repositoryRoot, "src/Servers/Kestrel/Transport.Abstractions/src/Internal/TransportConnection.Generated.cs");
22+
var httpHeadersGeneratedPath = Path.Combine(repositoryRoot, "Kestrel/Core/src/Internal/Http/HttpHeaders.Generated.cs");
23+
var httpProtocolGeneratedPath = Path.Combine(repositoryRoot, "Kestrel/Core/src/Internal/Http/HttpProtocol.Generated.cs");
24+
var httpUtilitiesGeneratedPath = Path.Combine(repositoryRoot, "Kestrel/Core/src/Internal/Infrastructure/HttpUtilities.Generated.cs");
25+
var transportConnectionGeneratedPath = Path.Combine(repositoryRoot, "Kestrel/Transport.Abstractions/src/Internal/TransportConnection.Generated.cs");
2626

2727
var testHttpHeadersGeneratedPath = Path.GetTempFileName();
2828
var testHttpProtocolGeneratedPath = Path.GetTempFileName();

src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>netcoreapp3.0</TargetFramework>
@@ -9,11 +9,6 @@
99
<Compile Include="$(KestrelSharedSourceRoot)test\*.cs" LinkBase="shared" />
1010
<Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
1111
<Content Include="$(KestrelSharedSourceRoot)test\TestCertificates\*.pfx" LinkBase="shared\TestCertificates" CopyToOutputDirectory="PreserveNewest" />
12-
13-
<AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
14-
<_Parameter1>RepositoryRoot</_Parameter1>
15-
<_Parameter2>$(RepositoryRoot)</_Parameter2>
16-
</AssemblyAttribute>
1712
</ItemGroup>
1813

1914
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'">

0 commit comments

Comments
 (0)