Skip to content

See what happens with blazor build in helix #18962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 24 commits into from
Closed

See what happens with blazor build in helix #18962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
a94728e
See what happens with blazor build in helix
HaoK Feb 11, 2020
0878123
Tactical
pranavkm Mar 9, 2020
ea449c8
update since test assets are in helix workitem root
HaoK Mar 19, 2020
9113e41
Update ProjectDirectory.cs
HaoK Mar 19, 2020
2284e89
Update Microsoft.AspNetCore.Blazor.Build.Tests.csproj
HaoK Mar 19, 2020
81ced02
Update ProjectDirectory.cs
HaoK Mar 19, 2020
95e65b1
Add conditional to versions.props
HaoK Mar 19, 2020
0b5c27b
Include versions.props in helix payload
HaoK Mar 19, 2020
5f37b0c
Update Directory.Build.props
HaoK Mar 20, 2020
4fb54da
Update Directory.Build.props
HaoK Mar 20, 2020
e5756c9
Update Directory.Build.props
HaoK Mar 20, 2020
7b6870b
Update Directory.Build.props
HaoK Mar 20, 2020
84a725b
Update Directory.Build.props
HaoK Mar 20, 2020
a20713e
Update Directory.Build.props
HaoK Mar 20, 2020
7631856
Update Directory.Build.props
HaoK Mar 20, 2020
1c4b8a9
Hardcode versions to see if this unblocks things
HaoK May 5, 2020
4df5079
Use versions available on nuget
HaoK May 5, 2020
7d916aa
Rework file resolution path
captainsafia May 6, 2020
a7b6962
Fix resolution for ReferenceBlazorBuildFromSource
captainsafia Jun 8, 2020
2bd2721
Fix route for Microsoft.Net.Sdk.Razor.props
captainsafia Jun 9, 2020
3222bd7
Looks for Sdk.props in current directory
captainsafia Jun 9, 2020
48e0e3c
Update Directory.Build.props
captainsafia Jun 9, 2020
e749715
Update Directory.Build.props
captainsafia Jun 11, 2020
1d140df
Change where Razor SDK is resolved
captainsafia Jun 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions src/Components/WebAssembly/Build/test/BuildIntegrationTests/ProjectDirectory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ public static readonly string TestProjectConfiguration
#error Configuration not supported
#endif

private static readonly string RepoRoot = GetTestAttribute("Testing.RepoRoot");
private static readonly string RepoRoot = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("helix"))
? GetTestAttribute("Testing.RepoRoot") : Directory.GetCurrentDirectory();

public static ProjectDirectory Create(string projectName, string baseDirectory = "", string[] additionalProjects = null)
{
Expand All @@ -43,7 +44,16 @@ public static ProjectDirectory Create(string projectName, string baseDirectory =
throw new InvalidOperationException("RepoRoot was not specified.");
}

var testAppsRoot = Path.Combine(RepoRoot, "src", "Components", "WebAssembly", "Build", "testassets");
var testAppsRoot = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("helix"))
? Path.Combine(RepoRoot, "src", "Components", "Blazor", "Build", "testassets")
: Directory.GetCurrentDirectory();

if (!Directory.Exists(testAppsRoot))
{
throw new DirectoryNotFoundException("Unable to find testassets in " +
$"{Directory.GetCurrentDirectory()} or {testAppsRoot}.");
}

foreach (var project in new string[] { projectName, }.Concat(additionalProjects ?? Array.Empty<string>()))
{
var projectRoot = Path.Combine(testAppsRoot, project);
Expand Down Expand Up @@ -132,7 +142,9 @@ static void SetupDirectoryBuildFiles(string repoRoot, string testAppsRoot, strin
static void CopyRepositoryAssets(string projectRoot)
{
const string GlobalJsonFileName = "global.json";
var globalJsonPath = Path.Combine(RepoRoot, GlobalJsonFileName);
var path = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("helix"))
? RepoRoot : Directory.GetCurrentDirectory();
var globalJsonPath = Path.Combine(path, GlobalJsonFileName);

var destinationFile = Path.Combine(projectRoot, GlobalJsonFileName);
File.Copy(globalJsonPath, destinationFile);
Expand Down
9 changes: 8 additions & 1 deletion ...nts/WebAssembly/Build/test/Microsoft.AspNetCore.Components.WebAssembly.Build.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

<!-- Exclude the TestFiles directory from default wildcards -->
<DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**\*</DefaultItemExcludes>
<BuildHelixPayload>false</BuildHelixPayload>
<!-- Avoid CS1705 errors due to mix of assemblies brought in transitively. -->
<CompileUsingReferenceAssemblies>false</CompileUsingReferenceAssemblies>
</PropertyGroup>
Expand Down Expand Up @@ -37,6 +36,14 @@
<Compile Include="$(SharedSourceRoot)CommandLineUtils\**\*.cs" />
</ItemGroup>

<ItemGroup>
<HelixContent Include="..\testassets\**\*" />
<HelixContent Include="$(RepoRoot)global.json" />
<HelixContent Include="$(RepoRoot)eng\Versions.props" />
<HelixContent Include="$(RepoRoot)\src\Components\WebAssembly\Build\src\ReferenceBlazorBuildFromSource.props"/>
<HelixContent Include="$(RepoRoot)src\Razor\Microsoft.NET.Sdk.Razor\src\build\netstandard2.0\Microsoft.NET.Sdk.Razor.props"/>
</ItemGroup>

<ItemGroup>
<AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
<_Parameter1>Testing.RepoRoot</_Parameter1>
Expand Down
12 changes: 8 additions & 4 deletions src/Components/WebAssembly/Build/testassets/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
<RepoRoot Condition="'$(RepoRoot)' ==''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), global.json))\</RepoRoot>
<ComponentsRoot>$(RepoRoot)src\Components\</ComponentsRoot>
<BlazorBuildRoot>$(ComponentsRoot)WebAssembly\Build\src\</BlazorBuildRoot>
<ReferenceBlazorBuildFromSourceProps>$(BlazorBuildRoot)ReferenceBlazorBuildFromSource.props</ReferenceBlazorBuildFromSourceProps>
<ReferenceBlazorBuildFromSourceProps Condition="'$(IsHelixJob)' != 'true'">$(BlazorBuildRoot)ReferenceBlazorBuildFromSource.props</ReferenceBlazorBuildFromSourceProps>
<ReferenceBlazorBuildFromSourceProps Condition="'$(ReferenceBlazorBuildFromSourceProps)' == ''">$(MSBuildThisFileDirectory)\..\src\ReferenceBlazorBuildFromSource.props</ReferenceBlazorBuildFromSourceProps>


<!-- Workaround for https://github.com/dotnet/aspnetcore/issues/17308 -->
<DefaultNetCoreTargetFramework>netcoreapp3.1</DefaultNetCoreTargetFramework>
Expand All @@ -16,15 +18,17 @@
<DeterministicSourcePaths>false</DeterministicSourcePaths>
</PropertyGroup>

<Import Project="$(RepoRoot)eng\Versions.props" />
<Import Project="$(RepoRoot)eng\Versions.props" Condition="'$(HELIX_WORKITEM_ROOT)' == ''" />
<Import Project="$(MSBuildThisFileDirectory)Versions.props" Condition="Exists('$(MSBuildThisFileDirectory)Versions.props')" />

<ItemGroup>
<!-- Use the sample compiler \ SDK that the rest of our build uses-->
<PackageReference Include="Microsoft.Net.Compilers.Toolset"
Version="$(MicrosoftNetCompilersToolsetPackageVersion)"
Version="3.6.0-4.final"
PrivateAssets="all"
IsImplicitlyDefined="true" />
</ItemGroup>

<Import Project="$(RepoRoot)src\Razor\Microsoft.NET.Sdk.Razor\src\build\netstandard2.0\Microsoft.NET.Sdk.Razor.props"/>
<Import Project="$(MSBuildThisFileDirectory)..\test\Microsoft.NET.Sdk.Razor.props" Condition="'$(IsHelixJob)' == 'true'" />
<Import Project="$(RepoRoot)src\Razor\Microsoft.NET.Sdk.Razor\src\build\netstandard2.0\Microsoft.NET.Sdk.Razor.props" Condition="'$(IsHelixJob)' != 'true'" />
</Project>